Cleanup

Author: matthewhoffman

compass/landice/tests/mismipplus/albany_input_debrisfriction.yaml

@@ -6,7 +6,6 @@ ANONYMOUS:
       SDBC on NS dirichlet for DOF U1 prescribe Field: dirichlet_field
     LandIce BCs:
       BC 0:
-        Cubature Degree: 4
         Basal Friction Coefficient:
           Type: Debris Friction
           Power Exponent: 0.3333333333

compass/landice/tests/mismipplus/run_model.py

@@ -240,16 +240,21 @@ def run(self):
                       streams='streams.{}'.format(suffix))
 
     def _update_mesh_for_debris_friction(self):
-        with xr.open_dataset(self.mesh_file) as ds_mesh:
+        mesh_filename = os.path.join(self.work_dir, self.mesh_file)
+
+        with xr.open_dataset(mesh_filename) as ds_mesh:
             ds_mesh['muFriction'].loc[:] = 0.4
             ds_mesh['bedRoughnessBC'] = xr.full_like(ds_mesh['muFriction'],
                                                      6000.0)
             ds_mesh['basalDebrisFactor'] = xr.where(
                 ds_mesh['xCell'] < 200000.0, 3.2e-2, 0.0)
-            ds_mesh.to_netcdf(self.mesh_file, mode='a')
+            ds_mesh.to_netcdf(mesh_filename, mode='a')
 
     def _update_mesh_for_regularized_coulomb(self):
-        with xr.open_dataset(self.mesh_file) as ds_mesh:
+        mesh_filename = os.path.join(self.work_dir, self.mesh_file)
+
+        with xr.open_dataset(mesh_filename) as ds_mesh:
             ds_mesh['muFriction'].loc[:] = 0.4
-            ds_mesh['bedRoughnessBC'].loc[:] = 1.25e-4
-            ds_mesh.to_netcdf(self.mesh_file, mode='a')
+            ds_mesh['bedRoughnessBC'] = xr.full_like(ds_mesh['muFriction'],
+                                                     1.25e-4)
+            ds_mesh.to_netcdf(mesh_filename, mode='a')

compass/landice/tests/mismipplus/smoke_test/__init__.py

@@ -55,8 +55,8 @@ def __init__(self, test_group, resolution, basal_friction='weertman'):
         step_name = 'run_model'
         step = RunModel(test_case=self, name=step_name,
                 resolution=resolution,
-            basal_friction=basal_friction,
-            update_mesh_for_basal_friction=True)
+                basal_friction=basal_friction,
+                update_mesh_for_basal_friction=True)
 
         # download and link the mesh, eventually this will need to be
         # resolution aware. ``configure`` method is probably a better place