ready for version 0.1.2

MANIFEST.in

@@ -1,7 +1,8 @@
 include README.md
 include MANIFEST.in
 include COPYING
+include COPYING.LESSER
 include src/*
 include stripy/__init__.py
-include stripy/_trimesh.py
-include stripy/_strimesh.py
+include stripy/cartesian.py
+include stripy/spherical.py

setup.py

@@ -1,21 +1,21 @@
 from numpy.distutils.core import setup, Extension
 
 # interface for Renka's algorithm 772 fortran code
-ext1 = Extension(name    = '_stripack',
+ext1 = Extension(name    = 'stripy._stripack',
                  sources = ['src/stripack.pyf','src/stripack.f90'])
-ext2 = Extension(name    = '_tripack',
+ext2 = Extension(name    = 'stripy._tripack',
                  sources = ['src/tripack.pyf', 'src/tripack.f90'])
-ext3 = Extension(name    = '_srfpack',
+ext3 = Extension(name    = 'stripy._srfpack',
                  sources = ['src/srfpack.pyf', 'src/srfpack.f'])
-ext4 = Extension(name    = '_ssrfpack',
+ext4 = Extension(name    = 'stripy._ssrfpack',
                  sources = ['src/ssrfpack.pyf', 'src/ssrfpack.f'])
 
 if __name__ == "__main__":
     setup(name = 'stripy',
-          author            = "LM",
+          author            = "Louis Moresi",
           author_email      = "[email protected]",
           url               = "https://github.com/University-of-Melbourne-Geodynamics/stripy",
-          version           = "0.1.1",
+          version           = "0.1.2",
           description       = "Python interface to TRIPACK and STRIPACK fortran code for triangulation/interpolation in Cartesian coordinates and on a sphere",
           ext_modules       = [ext1, ext2, ext3, ext4],
           packages          = ['stripy'],

stripy/__init__.py

@@ -1,2 +1,18 @@
-from _strimesh import *
-from _trimesh import *
+"""
+Copyright 2017 Louis Moresi, Ben Mather
+
+Stripy is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or any later version.
+
+Stripy is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Stripy.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from spherical import *
+from cartesian import *

stripy/cartesian.py

@@ -1,14 +1,30 @@
+"""
+Copyright 2017 Louis Moresi, Ben Mather
+
+This file is part of Stripy.
+
+Stripy is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or any later version.
+
+Stripy is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Stripy.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-import _tripack
-import _srfpack
+from . import _tripack
+from . import _srfpack
 import numpy as np
 
 try: range = xrange
 except: pass
 
-__version__ = "1.1"
-
 _ier_codes = {0:  "no errors were encountered.",
               -1: "N < 3 on input.",
               -2: "the first three nodes are collinear.",

stripy/spherical.py

@@ -1,14 +1,30 @@
+"""
+Copyright 2017 Louis Moresi, Ben Mather
+
+This file is part of Stripy.
+
+Stripy is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or any later version.
+
+Stripy is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Stripy.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-import _stripack
-import _ssrfpack
+from . import _stripack
+from . import _ssrfpack
 import numpy as np
 
 try: range = xrange
 except: pass
 
-__version__ = "1.1"
-
 _ier_codes = {0:  "no errors were encountered.",
               -1: "N < 3 on input.",
               -2: "the first three nodes are collinear.",
@@ -102,6 +118,7 @@ def __init__(self, lons, lats):
         self.x = x
         self.y = y
         self.z = z
+        self.points = np.column_stack([x, y, z])
         self.lst = lst
         self.lptr = lptr
         self.lend = lend