From 4799ea7b23d6d909fe2b61cdfbeaa4003bfa8da9 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Mon, 8 Jul 2024 06:47:11 -0500 Subject: [PATCH] Switch to AIS_2to10km mesh --- compass/ocean/tests/global_ocean/__init__.py | 2 +- .../mesh/remap_mali_topography/__init__.py | 12 ++++++------ .../mesh/remap_mali_topography/ais_2to10km.cfg | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 compass/ocean/tests/global_ocean/mesh/remap_mali_topography/ais_2to10km.cfg diff --git a/compass/ocean/tests/global_ocean/__init__.py b/compass/ocean/tests/global_ocean/__init__.py index da065fa12..05b27a452 100644 --- a/compass/ocean/tests/global_ocean/__init__.py +++ b/compass/ocean/tests/global_ocean/__init__.py @@ -46,7 +46,7 @@ def __init__(self, mpas_core): self._add_tests(mesh_names=['SO12to30', 'SOwISC12to30']) self._add_tests(mesh_names=['SOwISC12to30'], - mali_ais_topo='AIS_4to20km') + mali_ais_topo='AIS_2to10km') self._add_tests(mesh_names=['WC14', 'WCwISC14']) diff --git a/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/__init__.py b/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/__init__.py index 069798d40..6bf7ceb88 100644 --- a/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/__init__.py +++ b/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/__init__.py @@ -43,7 +43,7 @@ def __init__(self, test_case, base_mesh_step, mesh_name, mali_ais_topo): mesh_name : str The name of the MPAS mesh to include in the mapping file - mali_ais_topo : str, optional + mali_ais_topo : str, optional Short name for the MALI dataset to use for Antarctic Ice Sheet topography """ @@ -230,27 +230,27 @@ def _combine_topo(self): 'landIceThkObserved']: ds_out[var] = ds_mali[var] - ds_out['landIceFracObserved'] = ds_mali['landIceFracConserve'] + ds_out['landIceFracObserved'] = ds_mali['landIceFrac'] ds_out['landIceFloatingFracObserved'] = ( ds_mali['landIceFrac'] - ds_mali['landIceGroundedFrac']) - for var in ['maliFracBilinear', 'maliFracConserve']: + for var in ['maliFrac']: mali_field = ds_mali[var] mali_field = xr.where(mali_field.notnull(), mali_field, 0.) ds_out[var] = mali_field # for now, blend topography at calving fronts, but we may want a # smoother blend in the future - alpha = ds_mali.landIceFracBilinear + alpha = ds_mali.landIceFrac ds_out['bed_elevation'] = ( alpha * ds_mali.bed_elevation + (1.0 - alpha) * ds_bedmachine.bed_elevation) - alpha = ds_out.maliFracConserve + alpha = ds_out.maliFrac ds_out['oceanFracObserved'] = ( - alpha * ds_mali.oceanFracConserve + + alpha * ds_mali.oceanFrac + (1.0 - alpha) * ds_bedmachine.oceanFracObserved) ds_out['ssh'] = ds_out.landIceDraftObserved diff --git a/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/ais_2to10km.cfg b/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/ais_2to10km.cfg new file mode 100644 index 000000000..cc0d81f95 --- /dev/null +++ b/compass/ocean/tests/global_ocean/mesh/remap_mali_topography/ais_2to10km.cfg @@ -0,0 +1,5 @@ +# config options related to remapping MALI topography to an MPAS-Ocean mesh +[remap_mali_topography] + +# The name of the MALI topogrpahy file +mali_filename = ais_2to10km_20231222_modifiedBathymetry-drop20m-smooth6x_bulldozedTroughs-75-400m_BEDMAP2-ASE-mjh.nc