Fixup

* test case name
* cleanup in setup_mesh & run_model
* set MALI/SLM coupling interval to 1 year

Case sets up and runs without error after this change,
but I have not checked correctness yet.

Author: matthewhoffman

compass/landice/tests/slm/circ_icesheet/__init__.py

@@ -21,7 +21,7 @@ def __init__(self, test_group):
             The test group that this test case belongs to
             The resolution or type of mesh of the test case
         """
-        name = 'circular_icesheet_test'
+        name = 'circ_icesheet'
         subdir = name
         super().__init__(test_group=test_group, name=name,
                          subdir=subdir)

compass/landice/tests/slm/circ_icesheet/namelist.landice

@@ -7,7 +7,7 @@
 /
 &solidearth
     config_uplift_method = 'sealevelmodel'
-    config_slm_coupling_interval = 5
+    config_slm_coupling_interval = 1
     config_MALI_to_SLM_weights_file = 'mapping_file_mali_to_slm.nc'
     config_SLM_to_MALI_weights_file = 'mapping_file_slm_to_mali.nc'
 /

compass/landice/tests/slm/circ_icesheet/run_model.py

@@ -77,7 +77,7 @@ def __init__(self, test_case, res, nglv, ntasks, name='run_model',
                                    'mapping_file_slm_to_mali.nc')
         self.add_model_as_input()
 
-        self.add_output_file(filename='output.nc')
+        self.add_output_file(filename='output/output.nc')
 
     def setup(self):
         os.makedirs(os.path.join(self.work_dir, 'OUTPUT_SLM/'),

compass/landice/tests/slm/circ_icesheet/setup_mesh.py

@@ -1,12 +1,11 @@
 import os
 import shutil
 
-import mpas_tools.io
 import netCDF4
 import numpy as np
 from mpas_tools.io import write_netcdf
 from mpas_tools.logging import check_call
-from mpas_tools.mesh.conversion import cull
+from mpas_tools.mesh.conversion import convert, cull
 from mpas_tools.planar_hex import make_planar_hex_mesh
 from mpas_tools.scrip.from_mpas import scrip_from_mpas
 from mpas_tools.translate import center, translate
@@ -72,30 +71,24 @@ def run(self):
         # factor of 2/sqrt(3) because of hexagonal mesh
         ny = max(2 * int(0.5 * ly * (2. / np.sqrt(3)) / dc + 0.5), 4)
 
-        mpas_tools.io.default_format = 'NETCDF4'
-        mpas_tools.io.default_engine = 'netcdf4'
-
         # call the mesh creation function
         dsMesh = make_planar_hex_mesh(nx=nx, ny=ny, dc=dc,
                                       nonperiodic_x=True,
                                       nonperiodic_y=True)
         dsMesh = cull(dsMesh, logger=logger)
-        # adding the time dimension is needed for netcdf4 formatting to work
-        dsMesh['xtime'] = ('Time', ['2015-01-01_00:00:00'.ljust(64)])
+        dsMesh = convert(dsMesh, logger=logger)
         # translating the mesh center to x=0 & y=0
         center(dsMesh)
         # shift the center to a quarter or radius
         shift = 200000.0
         print(f'shifting the center by {shift} meters')
         translate(dsMesh, shift, shift)
 
-        fname_culled = 'culled_mesh_before_cdf5.nc'
-        write_netcdf(dsMesh, fname_culled)
-        args = ['ncks', '-O', '-5', fname_culled, 'mpas_grid.nc']
-        check_call(args, logger=logger)
+        fname_mpas = 'mpas_grid.nc'
+        write_netcdf(dsMesh, fname_mpas)
 
         levels = 3
-        args = ['create_landice_grid_from_generic_MPAS_grid.py',
+        args = ['create_landice_grid_from_generic_mpas_grid',
                 '-i', 'mpas_grid.nc',
                 '-o', 'landice_grid.nc',
                 '-l', str(levels)]
@@ -115,7 +108,7 @@ def run(self):
         _build_mapping_files(config, logger, self.res, self.nglv,
                              mali_mesh_file='landice_grid.nc')
 
-        os.remove(fname_culled)
+        os.remove(fname_mpas)
 
 
 def _setup_circsheet_initial_conditions(config, logger, filename):
@@ -294,13 +287,13 @@ def _create_smb_forcing_file(config, logger, mali_mesh_file, filename):
             if (Rt < 0):
                 Rt = 0.0
                 sfcMassBal[t, :] = 0.0
-                print(f'At time {start_year+dt_year*t}, \
+                print(f'At time {start_year + dt_year * t}, \
                       new radius will be {Rt} km')
             else:
                 indx = np.where(r >= Rt)[0]
                 sfcMassBal[t, indx] = smb
-                print(f'At time {start_year+dt_year*t}, \
-                      new radius will be {Rt/1000} km')
+                print(f'At time {start_year + dt_year * t}, \
+                      new radius will be {Rt / 1000} km')
         smbfile.variables['sfcMassBal'][:, :] = sfcMassBal[:, :]
 
     # add xtime variable
@@ -361,12 +354,12 @@ def _build_mapping_files(config, logger, res, nglv, mali_mesh_file):
     args = ['ncremap',
             '-g', slm_scripfile,
             '-G',
-            f'latlon={slm_nglv},{2*int(slm_nglv)}#lat_typ=gss#lat_drc=n2s']
+            f'latlon={slm_nglv},{2 * int(slm_nglv)}#lat_typ=gss#lat_drc=n2s']
 
     check_call(args, logger=logger)
 
     # adjust the lat-lon values
-    args = ['set_lat_lon_fields_in_planar_grid.py',
+    args = ['set_lat_lon_fields_in_planar_grid',
             '--file', mali_mesh_file,
             '--proj', 'ais-bedmap2-sphere']
 

compass/landice/tests/slm/namelist.sealevel.template

@@ -64,3 +64,5 @@
 
 
 /
+
+! end of file