Merge pull request #767 from trhille/landice/update_lcrc_files

Update file names on LCRC server Update file names on LCRC server to use files that do not have negative basal heat flux. Note: The Antarctic data files still include NaNs as missing values. This requires the changes in MPAS-Dev/MPAS-Tools#551 to pass.
MPAS-Dev · Jan 31, 2024 · 84d8882 · 84d8882
2 parents 633a562 + b231260
commit 84d8882
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/compass/landice/tests/antarctica/mesh.py b/compass/landice/tests/antarctica/mesh.py
@@ -42,8 +42,8 @@ def __init__(self, test_case):
         self.add_output_file(filename=f'{self.mesh_filename[:-3]}_'
                                       f'ismip6_regionMasks.nc')
         self.add_input_file(
-            filename='antarctica_8km_2020_10_20.nc',
-            target='antarctica_8km_2020_10_20.nc',
+            filename='antarctica_8km_2024_01_29.nc',
+            target='antarctica_8km_2024_01_29.nc',
             database='')
 
     # no setup() method is needed
@@ -59,12 +59,12 @@ def run(self):
         cell_width, x1, y1, geom_points, geom_edges, floodFillMask = \
             build_cell_width(
                 self, section_name=section_name,
-                gridded_dataset='antarctica_8km_2020_10_20.nc')
+                gridded_dataset='antarctica_8km_2024_01_29.nc')
 
         # Apply floodFillMask to thickness field to help with culling
-        copyfile('antarctica_8km_2020_10_20.nc',
-                 'antarctica_8km_2020_10_20_floodFillMask.nc')
-        gg = netCDF4.Dataset('antarctica_8km_2020_10_20_floodFillMask.nc',
+        copyfile('antarctica_8km_2024_01_29.nc',
+                 'antarctica_8km_2024_01_29_floodFillMask.nc')
+        gg = netCDF4.Dataset('antarctica_8km_2024_01_29_floodFillMask.nc',
                              'r+')
         gg.variables['thk'][0, :, :] *= floodFillMask
         gg.variables['vx'][0, :, :] *= floodFillMask
@@ -74,7 +74,7 @@ def run(self):
         build_mali_mesh(
             self, cell_width, x1, y1, geom_points, geom_edges,
             mesh_name=self.mesh_filename, section_name=section_name,
-            gridded_dataset='antarctica_8km_2020_10_20_floodFillMask.nc',
+            gridded_dataset='antarctica_8km_2024_01_29_floodFillMask.nc',
             projection='ais-bedmap2', geojson_file=None)
 
         logger.info('creating graph.info')

diff --git a/compass/landice/tests/greenland/mesh.py b/compass/landice/tests/greenland/mesh.py
@@ -34,11 +34,11 @@ def __init__(self, test_case):
         self.add_output_file(filename='graph.info')
         self.add_output_file(filename='GIS.nc')
         self.add_input_file(
-            filename='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',
-            target='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',
+            filename='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',
+            target='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',
             database='')
-        self.add_input_file(filename='greenland_2km_2020_04_20.epsg3413.nc',
-                            target='greenland_2km_2020_04_20.epsg3413.nc',
+        self.add_input_file(filename='greenland_2km_2024_01_29.epsg3413.nc',
+                            target='greenland_2km_2024_01_29.epsg3413.nc',
                             database='')
 
     # no setup() method is needed
@@ -55,13 +55,13 @@ def run(self):
         cell_width, x1, y1, geom_points, geom_edges, floodMask = \
             build_cell_width(
                 self, section_name=section_name,
-                gridded_dataset='greenland_2km_2020_04_20.epsg3413.nc',
+                gridded_dataset='greenland_2km_2024_01_29.epsg3413.nc',
                 flood_fill_start=[100, 700])
 
         build_mali_mesh(
             self, cell_width, x1, y1, geom_points, geom_edges,
             mesh_name=mesh_name, section_name=section_name,
-            gridded_dataset='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',  # noqa
+            gridded_dataset='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',  # noqa
             projection='gis-gimp', geojson_file=None)
 
         logger.info('creating graph.info')

diff --git a/compass/landice/tests/humboldt/mesh.py b/compass/landice/tests/humboldt/mesh.py
@@ -30,15 +30,15 @@ def __init__(self, test_case):
         self.add_output_file(filename='graph.info')
         self.add_output_file(filename='Humboldt.nc')
         self.add_input_file(
-            filename='humboldt_1km_2020_04_20.epsg3413.icesheetonly.nc',
-            target='humboldt_1km_2020_04_20.epsg3413.icesheetonly.nc',
+            filename='humboldt_1km_2024_01_29.epsg3413.icesheetonly.nc',
+            target='humboldt_1km_2024_01_29.epsg3413.icesheetonly.nc',
             database='')
         self.add_input_file(filename='Humboldt.geojson',
                             package='compass.landice.tests.humboldt',
                             target='Humboldt.geojson',
                             database=None)
-        self.add_input_file(filename='greenland_2km_2020_04_20.epsg3413.nc',
-                            target='greenland_2km_2020_04_20.epsg3413.nc',
+        self.add_input_file(filename='greenland_2km_2024_01_29.epsg3413.nc',
+                            target='greenland_2km_2024_01_29.epsg3413.nc',
                             database='')
 
     # no setup() method is needed
@@ -55,12 +55,12 @@ def run(self):
         cell_width, x1, y1, geom_points, geom_edges, floodMask = \
             build_cell_width(
                 self, section_name=section_name,
-                gridded_dataset='greenland_2km_2020_04_20.epsg3413.nc')
+                gridded_dataset='greenland_2km_2024_01_29.epsg3413.nc')
 
         build_mali_mesh(
             self, cell_width, x1, y1, geom_points, geom_edges,
             mesh_name=mesh_name, section_name=section_name,
-            gridded_dataset='humboldt_1km_2020_04_20.epsg3413.icesheetonly.nc',
+            gridded_dataset='humboldt_1km_2024_01_29.epsg3413.icesheetonly.nc',
             projection='gis-gimp', geojson_file='Humboldt.geojson',
             cores=self.cpus_per_task)
 

diff --git a/compass/landice/tests/kangerlussuaq/mesh.py b/compass/landice/tests/kangerlussuaq/mesh.py
@@ -31,15 +31,15 @@ def __init__(self, test_case):
         self.add_output_file(filename='graph.info')
         self.add_output_file(filename='Kangerlussuaq.nc')
         self.add_input_file(
-            filename='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',
-            target='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',
+            filename='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',
+            target='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',
             database='')
         self.add_input_file(filename='Kangerlussuaq.geojson',
                             package='compass.landice.tests.kangerlussuaq',
                             target='Kangerlussuaq.geojson',
                             database=None)
-        self.add_input_file(filename='greenland_8km_2020_04_20.epsg3413.nc',
-                            target='greenland_8km_2020_04_20.epsg3413.nc',
+        self.add_input_file(filename='greenland_8km_2024_01_29.epsg3413.nc',
+                            target='greenland_8km_2024_01_29.epsg3413.nc',
                             database='')
 
     # no setup() method is needed
@@ -56,12 +56,12 @@ def run(self):
         cell_width, x1, y1, geom_points, geom_edges, floodMask = \
             build_cell_width(
                 self, section_name=section_name,
-                gridded_dataset='greenland_8km_2020_04_20.epsg3413.nc')
+                gridded_dataset='greenland_8km_2024_01_29.epsg3413.nc')
 
         build_mali_mesh(
             self, cell_width, x1, y1, geom_points, geom_edges,
             mesh_name=mesh_name, section_name=section_name,
-            gridded_dataset='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',  # noqa
+            gridded_dataset='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',  # noqa
             projection='gis-gimp', geojson_file='Kangerlussuaq.geojson',
             cores=self.cpus_per_task)
 

diff --git a/compass/landice/tests/koge_bugt_s/mesh.py b/compass/landice/tests/koge_bugt_s/mesh.py
@@ -31,15 +31,15 @@ def __init__(self, test_case):
         self.add_output_file(filename='graph.info')
         self.add_output_file(filename='Koge_Bugt_S.nc')
         self.add_input_file(
-            filename='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',
-            target='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',
+            filename='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',
+            target='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',
             database='')
         self.add_input_file(filename='Koge_Bugt_S.geojson',
                             package='compass.landice.tests.koge_bugt_s',
                             target='Koge_Bugt_S.geojson',
                             database=None)
-        self.add_input_file(filename='greenland_8km_2020_04_20.epsg3413.nc',
-                            target='greenland_8km_2020_04_20.epsg3413.nc',
+        self.add_input_file(filename='greenland_8km_2024_01_29.epsg3413.nc',
+                            target='greenland_8km_2024_01_29.epsg3413.nc',
                             database='')
 
     # no setup() method is needed
@@ -56,12 +56,12 @@ def run(self):
         cell_width, x1, y1, geom_points, geom_edges, floodMask = \
             build_cell_width(
                 self, section_name=section_name,
-                gridded_dataset='greenland_8km_2020_04_20.epsg3413.nc')
+                gridded_dataset='greenland_8km_2024_01_29.epsg3413.nc')
 
         build_mali_mesh(
             self, cell_width, x1, y1, geom_points, geom_edges,
             mesh_name=mesh_name, section_name=section_name,
-            gridded_dataset='greenland_1km_2020_04_20.epsg3413.icesheetonly.nc',  # noqa
+            gridded_dataset='greenland_1km_2024_01_29.epsg3413.icesheetonly.nc',  # noqa
             projection='gis-gimp', geojson_file='Koge_Bugt_S.geojson',
             cores=self.cpus_per_task)
 

diff --git a/compass/landice/tests/thwaites/mesh.py b/compass/landice/tests/thwaites/mesh.py
@@ -20,15 +20,15 @@ def __init__(self, test_case):
 
         self.add_output_file(filename='graph.info')
         self.add_output_file(filename='Thwaites.nc')
-        self.add_input_file(filename='antarctica_8km_2020_10_20.nc',
-                            target='antarctica_8km_2020_10_20.nc',
+        self.add_input_file(filename='antarctica_8km_2024_01_29.nc',
+                            target='antarctica_8km_2024_01_29.nc',
                             database='')
         self.add_input_file(filename='thwaites_minimal.geojson',
                             package='compass.landice.tests.thwaites',
                             target='thwaites_minimal.geojson',
                             database=None)
-        self.add_input_file(filename='antarctica_1km_2020_10_20_ASE.nc',
-                            target='antarctica_1km_2020_10_20_ASE.nc',
+        self.add_input_file(filename='antarctica_1km_2024_01_29_ASE.nc',
+                            target='antarctica_1km_2024_01_29_ASE.nc',
                             database='')
 
     # no setup() method is needed
@@ -45,12 +45,12 @@ def run(self):
         cell_width, x1, y1, geom_points, geom_edges, floodMask = \
             build_cell_width(
                 self, section_name=section_name,
-                gridded_dataset='antarctica_8km_2020_10_20.nc')
+                gridded_dataset='antarctica_8km_2024_01_29.nc')
 
         build_mali_mesh(
             self, cell_width, x1, y1, geom_points, geom_edges,
             mesh_name=mesh_name, section_name=section_name,
-            gridded_dataset='antarctica_1km_2020_10_20_ASE.nc',
+            gridded_dataset='antarctica_1km_2024_01_29_ASE.nc',
             projection='ais-bedmap2', geojson_file='thwaites_minimal.geojson',
             cores=self.cpus_per_task)