Ensure bottomDepth is below 0 so that restingThickness is correct for sigma

Author: cbegeman

polaris/tasks/ocean/drying_slope/drying_slope.cfg

@@ -56,10 +56,10 @@ ly_analysis = 25.
 ly = 28.
 
 # Bottom depth at the right side of the domain in m
-right_bottom_depth = -10.
+right_bottom_depth = -11.
 
 # Bottom depth at the left side of the domain in m
-left_bottom_depth = 0.
+left_bottom_depth = -1.
 
 # Initial SSH at the right side of the domain in m
 right_tidal_height = ${drying_slope_barotropic:right_bottom_depth}
@@ -92,13 +92,13 @@ ly = 55.
 ly_analysis = 50.
 
 # Bottom depth at the right side of the domain in m
-right_bottom_depth = -2.5
+right_bottom_depth = -3.0
 
 # Bottom depth at the left side of the domain in m
-left_bottom_depth = 0.
+left_bottom_depth = -0.5
 
 # Initial SSH at the right side of the domain in m
-right_tidal_height = 0.
+right_tidal_height = -0.5
 
 # salinity at the right side of the domain
 right_salinity = 35.0

polaris/tasks/ocean/drying_slope/forward.py

@@ -268,12 +268,21 @@ def dynamic_model_config(self, at_setup):
         mpas_options['config_tidal_forcing_model'] = forcing_dict[
             self.forcing_type
         ]  # type: ignore[assignment]
+        if self.forcing_type == 'linear_drying':
+            if self.baroclinic:
+                section = self.config['drying_slope_baroclinic']
+            else:
+                section = self.config['drying_slope_barotropic']
+            replacements['tidal_min'] = (
+                section.getfloat('right_bottom_depth') + 0.5
+            )
+            replacements['tidal_baseline'] = section.getfloat(
+                'right_tidal_height'
+            )
 
-        print(mpas_options)
         self.add_model_config_options(
             options=mpas_options, config_model='mpas-ocean'
         )
-        print(replacements)
         self.add_yaml_file(
             'polaris.tasks.ocean.drying_slope',
             self.yaml_filename,

polaris/tasks/ocean/drying_slope/forward.yaml

@@ -19,6 +19,9 @@ mpas-ocean:
     config_tidal_forcing_monochromatic_amp: 10.0
     config_tidal_forcing_monochromatic_period: 1.0
     config_tidal_forcing_monochromatic_baseline: 10.0
+    config_tidal_forcing_linear_min: {{ tidal_min }}
+    config_tidal_forcing_linear_rate: -8.0
+    config_tidal_forcing_linear_baseline: {{ tidal_baseline }}
   Rayleigh_damping:
     config_Rayleigh_damping_depth_variable: true
   wetting_drying:
@@ -30,10 +33,11 @@ mpas-ocean:
     config_zero_drying_velocity_ramp_hmax: 1e-2
     config_zero_drying_velocity_ramp_factor: 1.0
   ALE_vertical_grid:
-    config_vert_coord_movement: impermeable_interfaces
+    config_vert_coord_movement: uniform_stretching
     config_ALE_thickness_proportionality: restingThickness_times_weights
   advection:
     config_thickness_flux_type: upwind
+    config_vert_advection_method: flux-form
   debug:
     config_disable_thick_sflux: true
     config_disable_vel_hmix: true