Merge pull request #854 from xylar/fix-combine-topo-masking

Fix masking of ice draft and ice thickness in combine_topo
MPAS-Dev · Aug 29, 2024 · a0e3eee · a0e3eee
2 parents f7a7eb5 + a06b08e
commit a0e3eee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/compass/ocean/mesh/remap_topography.cfg b/compass/ocean/mesh/remap_topography.cfg
@@ -2,7 +2,7 @@
 [remap_topography]
 
 # the name of the topography file in the bathymetry database
-topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240611.nc
+topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240828.nc
 
 # variable names in topo_filename
 lon_var = lon

diff --git a/compass/ocean/tests/utility/combine_topo/__init__.py b/compass/ocean/tests/utility/combine_topo/__init__.py
@@ -299,14 +299,17 @@ def _combine(self):
         for field in ['bathymetry', 'ice_draft', 'thickness']:
             combined[field].attrs['unit'] = 'meters'
 
+        for field in ['ice_mask', 'grounded_mask', 'ocean_mask']:
+            combined[field] = bedmachine[field]
+
         combined['bathymetry_mask'] = bathy_mask
 
         fill = {'ice_draft': 0., 'thickness': 0., 'ice_mask': 0.,
-                'grounded_mask': 0., 'ocean_mask': combined.bathymetry_mask}
+                'grounded_mask': 0., 'ocean_mask': bathy_mask}
 
         for field, fill_val in fill.items():
-            valid = bedmachine[field].notnull()
-            combined[field] = bedmachine[field].where(valid, fill_val)
+            valid = combined[field].notnull()
+            combined[field] = combined[field].where(valid, fill_val)
 
         combined['water_column'] = \
             combined['ice_draft'] - combined['bathymetry']

diff --git a/compass/ocean/tests/utility/combine_topo/combine_topo.cfg b/compass/ocean/tests/utility/combine_topo/combine_topo.cfg
@@ -6,7 +6,7 @@ antarctic_filename = BedMachineAntarctica-v3.nc
 global_filename = GEBCO_2023.nc
 
 # the name of the output topography file, to be copied to the bathymetry database
-cobined_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240611.nc
+cobined_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240828.nc
 
 # the target and minimum number of MPI tasks to use in remapping
 ntasks = 512