Use an internal bilinear interpolation instead of scipy for meshDensity and bathymetry

compass/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "compass" %}
-{% set version = "0.1.9" %}
+{% set version = "0.1.10" %}
 {% set build = 0 %}
 
 {% if mpi == "nompi" %}
@@ -31,7 +31,7 @@ requirements:
   run:
     - python
     - geometric_features 0.1.11
-    - mpas_tools 0.0.11
+    - mpas_tools 0.0.12
     - jigsaw 0.9.12
     - jigsawpy 0.2.1
     - metis

conda_package/docs/api.rst

@@ -28,20 +28,20 @@ MPAS mesh tools
 .. autosummary::
    :toctree: generated/
 
-   build_mesh.build_mesh
-   coastal_tools.coastal_refined_mesh
-   inject_bathymetry.inject_bathymetry
-   inject_meshDensity.inject_meshDensity
-   inject_preserve_floodplain.inject_preserve_floodplain
+   build_mesh.build_spherical_mesh
+   build_mesh.build_planar_mesh
    jigsaw_driver.jigsaw_driver
+   jigsaw_to_netcdf.jigsaw_to_netcdf
    mesh_definition_tools.mergeCellWidthVsLat
    mesh_definition_tools.EC_CellWidthVsLat
    mesh_definition_tools.RRS_CellWidthVsLat
    mesh_definition_tools.AtlanticPacificGrid
    mpas_to_triangle.mpas_to_triangle
    open_msh.readmsh
+   signed_distance.signed_distance_from_geojson
+   signed_distance.mask_from_geojson
+   signed_distance.distance_from_geojson
    triangle_to_netcdf.triangle_to_netcdf
-   jigsaw_to_netcdf.jigsaw_to_netcdf
 
 .. currentmodule:: mpas_tools.mesh.conversion
 
@@ -99,6 +99,49 @@ Ocean Tools
    make_moc_basins_and_transects
    build_moc_basins
 
+.. currentmodule:: mpas_tools.ocean.coastal_tools
+
+.. autosummary::
+   :toctree: generated/
+
+   coastal_refined_mesh
+   create_background_mesh
+   extract_coastlines
+   distance_to_coast
+   compute_cell_width
+   save_matfile
+   CPP_projection
+   smooth_coastline
+   get_data_inside_box
+   get_indices_inside_quad
+   get_convex_hull_coordinates
+   plot_coarse_coast
+   plot_region_box
+
+.. currentmodule:: mpas_tools.ocean.inject_bathymetry
+
+.. autosummary::
+   :toctree: generated/
+
+   inject_bathymetry
+
+.. currentmodule:: mpas_tools.ocean.inject_meshDensity
+
+.. autosummary::
+   :toctree: generated/
+
+   inject_meshDensity_from_file
+   inject_spherical_meshDensity
+   inject_planar_meshDensity
+
+.. currentmodule:: mpas_tools.ocean.inject_preserve_floodplain
+
+.. autosummary::
+   :toctree: generated/
+
+   inject_preserve_floodplain
+
+
 Visualization
 =============
 

conda_package/docs/mesh_creation.rst

@@ -7,6 +7,8 @@ Mesh Creation
 Building a Mesh
 ===============
 
+This is all out of date and needs refining!!!
+
 The :py:func:`mpas_tools.mesh.creation.build_mesh.build_mesh` function is used
 create an MPAS mesh using the `JIGSAW <https://github.com/dengwirda/jigsaw>`_
 and `JIGSAW-Python <https://github.com/dengwirda/jigsaw-python>`_ packages.

conda_package/docs/versions.rst

@@ -8,9 +8,12 @@ Documentation    On GitHub
 ================ ===============
 `stable`_        `master`_
 `v0.0.11`_        `0.0.11`_
+`v0.0.12`_        `0.0.12`_
 ================ ===============
 
 .. _`stable`: ../stable/index.html
 .. _`master`: https://github.com/MPAS-Dev/MPAS-Tools/tree/master
 .. _`v0.0.11`: ../0.0.11/index.html
-.. _`0.0.11`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/0.0.11
+.. _`0.0.11`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/0.0.11
+.. _`v0.0.12`: ../0.0.12/index.html
+.. _`0.0.12`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/0.0.12

conda_package/mpas_tools/__init__.py

@@ -1,2 +1,2 @@
-__version_info__ = (0, 0, 11)
+__version_info__ = (0, 0, 12)
 __version__ = '.'.join(str(vi) for vi in __version_info__)

conda_package/mpas_tools/mesh/creation/__init__.py

@@ -1,5 +1,6 @@
+from mpas_tools.mesh.creation.build_mesh import build_spherical_mesh, \
+    build_planar_mesh
 from mpas_tools.mesh.creation.triangle_to_netcdf import triangle_to_netcdf
 from mpas_tools.mesh.creation.jigsaw_to_netcdf import jigsaw_to_netcdf
-from mpas_tools.mesh.creation.inject_meshDensity import inject_meshDensity
 from mpas_tools.mesh.creation.mpas_to_triangle import mpas_to_triangle
 from mpas_tools.mesh.creation.open_msh import readmsh