changes to set up

MPAS-Dev · Mar 29, 2024 · 6a48d21 · 6a48d21
1 parent f1657e4
commit 6a48d21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/compass/ocean/tests/baroclinic_gyre/forward.py b/compass/ocean/tests/baroclinic_gyre/forward.py
@@ -47,7 +47,7 @@ def __init__(self, test_case, resolution, name='forward', subdir=None,
                                'btr_dt': "'00:03:00'",
                                'mom_del4': "5.0e11",
                                'run_duration': "'0000_03:00:00'"},
-                      '20km': {'ntasks': 100,
+                      '20km': {'ntasks': 128,
                                'min_tasks': 10,
                                'dt': "'00:20:00'",
                                'btr_dt': "'0000_00:00:20'",
@@ -74,7 +74,7 @@ def __init__(self, test_case, resolution, name='forward', subdir=None,
                                'namelist.forward')
         if long:
             output_interval = "0000-01-00_00:00:00"
-            restart_interval = "0001-01-01_00:00:00"
+            restart_interval = "0001-0-00_00:00:00"
         else:
             output_interval = res_params['run_duration'].replace("'", "")
             restart_interval = "0030_00:00:00"

diff --git a/compass/ocean/tests/baroclinic_gyre/namelist.forward b/compass/ocean/tests/baroclinic_gyre/namelist.forward
@@ -8,11 +8,7 @@ config_use_cvmix_convection = .true.
 config_cvmix_background_diffusion = 1.0e-5
 config_cvmix_background_viscosity = 1.0e-2
 config_use_bulk_wind_stress = .true.
-# config_eos_linear_alpha = 0.2
-# config_eos_linear_beta = 0.
-# config_eos_linear_Tref = 19.0
-# config_eos_linear_Sref = 34.0
-# config_eos_linear_densityref = 999.8
+config_use_activeTracers_surface_restoring = .true.
 config_eos_linear_alpha = 0.2
 config_eos_linear_beta = 0.8
 config_eos_linear_Tref = 5.0

diff --git a/compass/ocean/tests/baroclinic_gyre/streams.forward b/compass/ocean/tests/baroclinic_gyre/streams.forward
@@ -40,20 +40,22 @@
     <var name="indexSurfaceLayerDepth"/>
     <var name="surfaceFrictionVelocity"/>
     <var name="surfaceBuoyancyForcing"/>
-    <var name="seaIcePressure"/>
     <var name="atmosphericPressure"/>
     <var name="windStressZonal"/>
     <var name="windStressMeridional"/>
     <var name="BruntVaisalaFreqTop"/>
+    <var_array name="activeTracerSurfaceFluxTendency"/>
 </stream>
 
 <stream name="forcing_data"
         filename_template="forcing.nc">
 
+    <var_struct name="tracersSurfaceFlux"/>
     <var_struct name="tracersSurfaceRestoringFields"/>
     <var_struct name="tracersInteriorRestoringFields"/>
     <var name="windStressZonal"/>
     <var name="windStressMeridional"/>
+    <var name="bottomDrag"/>
 </stream>
 
 </streams>