Merge pull request #535 from xylar/add-back-mpas-mask-creator

Add back the `MpasMaskCreator.x` tool
MPAS-Dev · Oct 28, 2023 · e6a00ca · e6a00ca
2 parents 436d930 + 949f153
commit e6a00ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/conda_package/recipe/build.sh b/conda_package/recipe/build.sh
@@ -19,6 +19,17 @@ cmake \
 cmake --build .
 cmake --install .
 
+# build and install legacy mask creator
+cd ${SRC_DIR}/conda_package/mesh_tools/mesh_conversion_tools
+mkdir build
+cd build
+cmake \
+  -D CMAKE_INSTALL_PREFIX=${PREFIX} \
+  -D CMAKE_BUILD_TYPE=Release \
+  ..
+cmake --build .
+cp MpasMaskCreator.x ${PREFIX}/bin
+
 # build and install mesh conversion tools
 cd ${SRC_DIR}/conda_package/mesh_tools/mesh_conversion_tools_netcdf_c
 mkdir build

diff --git a/conda_package/recipe/meta.yaml b/conda_package/recipe/meta.yaml
@@ -104,7 +104,7 @@ test:
     - MpasMeshConverter.x mesh_tools/mesh_conversion_tools/test/mesh.QU.1920km.151026.nc mesh.nc
     - sort_mesh --mesh-file mesh.nc --sort-file sorted_mesh.nc
     - MpasCellCuller.x mesh.nc culled_mesh.nc -m mesh_tools/mesh_conversion_tools/test/land_mask_final.nc
-    # - MpasMaskCreator.x mesh.nc arctic_mask.nc -f mesh_tools/mesh_conversion_tools/test/Arctic_Ocean.geojson
+    - MpasMaskCreator.x mesh.nc arctic_mask.nc -f mesh_tools/mesh_conversion_tools/test/Arctic_Ocean.geojson
     - planar_hex --nx=30 --ny=20 --dc=1000. --npx --npy --outFileName='nonperiodic_mesh_30x20_1km.nc'
     - MpasCellCuller.x nonperiodic_mesh_30x20_1km.nc culled_nonperiodic_mesh_30x20_1km.nc
     - python -m pytest conda_package/mpas_tools/tests