Update baroclinic config

Author: cbegeman

polaris/ocean/tasks/drying_slope/drying_slope.cfg

@@ -40,6 +40,9 @@ btr_dt_per_km = 1.5
 # Coriolis parameter
 coriolis_parameter = 0.0
 
+# Background temperature
+background_temperature = 20.0
+
 # config options for barotropic drying slope test cases
 [drying_slope_barotropic]
 
@@ -67,9 +70,6 @@ plug_width_frac = 0.0
 # Plug temperature
 plug_temperature = 20.0
 
-# Background temperature
-background_temperature = 20.0
-
 # Background salinity
 background_salinity = 35.0
 
@@ -89,7 +89,7 @@ ly = 55.
 ly_analysis = 50.
 
 # Bottom depth at the right side of the domain in m
-right_bottom_depth = 2.5
+right_bottom_depth = -2.5
 
 # Bottom depth at the left side of the domain in m
 left_bottom_depth = 0.

polaris/ocean/tasks/drying_slope/forward.py

@@ -214,10 +214,14 @@ def dynamic_model_config(self, at_setup):
                 '%H:%M:%S', time.gmtime(dt * self.run_time_steps))
 
         if self.baroclinic:
+            section = self.config['vertical_grid']
+            vert_levels = section.getint('vert_levels')
             section = self.config['drying_slope_baroclinic']
+            thin_film_thickness = section.getfloat('min_column_thickness') / \
+                vert_levels
         else:
             section = self.config['drying_slope_barotropic']
-        thin_film_thickness = section.getfloat('thin_film_thickness')
+            thin_film_thickness = section.getfloat('thin_film_thickness')
         options['config_drying_min_cell_height'] = thin_film_thickness
         options['config_zero_drying_velocity_ramp_hmin'] = \
             thin_film_thickness

polaris/ocean/tasks/drying_slope/init.py

@@ -77,31 +77,33 @@ def run(self):
 
         section = config['drying_slope']
         coriolis_parameter = section.getfloat('coriolis_parameter')
+        background_temperature = section.getfloat('background_temperature')
+        vert_levels = config.getint('vertical_grid', 'vert_levels')
 
         if self.baroclinic:
             section = config['drying_slope_baroclinic']
             right_salinity = section.getfloat('right_salinity')
             left_salinity = section.getfloat('left_salinity')
             manning_coefficient = section.getfloat('manning_coefficient')
+            thin_film_thickness = section.getfloat('min_column_thickness') / \
+                vert_levels + 1.e-8
         else:
             section = config['drying_slope_barotropic']
             plug_width_frac = section.getfloat('plug_width_frac')
             plug_temperature = section.getfloat('plug_temperature')
-            background_temperature = section.getfloat('background_temperature')
             background_salinity = section.getfloat('background_salinity')
+            thin_film_thickness = section.getfloat('thin_film_thickness') + \
+                1.e-8
 
         # config options used in both configurations but which have different
         # values in each
-        thin_film_thickness = section.getfloat('thin_film_thickness') + 1.e-8
         drying_length = section.getfloat('ly_analysis') * 1e3
         lx = section.getfloat('lx')
         ly = section.getfloat('ly')
         right_bottom_depth = section.getfloat('right_bottom_depth')
         left_bottom_depth = section.getfloat('left_bottom_depth')
         right_tidal_height = section.getfloat('right_tidal_height')
 
-        vert_levels = config.getint('vertical_grid', 'vert_levels')
-
         domain_length = ly * 1e3
         # Check config options
         if domain_length < drying_length:
@@ -145,10 +147,13 @@ def run(self):
 
         init_vertical_coord(config, ds)
 
-        plug_width = domain_length * plug_width_frac
-        y_plug_boundary = y_min + plug_width
-        temperature = xr.where(y_cell < y_plug_boundary,
-                               plug_temperature, background_temperature)
+        if self.baroclinic:
+            temperature = background_temperature * xr.ones_like(y_cell)
+        else:
+            plug_width = domain_length * plug_width_frac
+            y_plug_boundary = y_min + plug_width
+            temperature = xr.where(y_cell < y_plug_boundary,
+                                   plug_temperature, background_temperature)
         temperature, _ = xr.broadcast(temperature, ds.refBottomDepth)
         ds['temperature'] = temperature.expand_dims(dim='Time', axis=0)
         if self.baroclinic: