Added NWA12.COBALT to ci

NOAA-GFDL · Feb 15, 2024 · 5cd58c8 · 5cd58c8
1 parent c20344c
commit 5cd58c8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/NWA12-ci.yaml b/.github/workflows/NWA12-ci.yaml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        case: ["NWA12.CFC"]
+        case: ["NWA12.CFC", "NWA12.COBALT"]
     steps:
       - name: Run Experiment ${{ matrix.case }}
         run: |
@@ -69,7 +69,7 @@ jobs:
           done
           # 
           expected_string="All restart files are identical, PASS"
-          check_file="${{ env.TEST_DIR }}/NWA12_CHECK/exps/${{ matrix.case }}/NWA12.CFC_o.$jobid"
+          check_file="${{ env.TEST_DIR }}/NWA12_CHECK/exps/${{ matrix.case }}/${{ matrix.case }}_o.$jobid"
           if [ -f "$check_file" ]; then
              if grep -qF "$expected_string" $check_file; then
                  echo "PASSED: ${{ matrix.case }}"

diff --git a/exps/NWA12.COBALT/INPUT/MOM_override b/exps/NWA12.COBALT/INPUT/MOM_override
@@ -5,3 +5,4 @@ DT_OBC_SEG_UPDATE_OBGC = 3600
 #override CHL_FROM_FILE = False
 #override DO_GEOTHERMAL = True
 #override GENERIC_TRACER_IC_FILE = "NWA12_COBALT_2023_10_spinup_2003.nc"
+#override EPBL_ANSWER_DATE = 20231231
diff --git a/exps/NWA12.COBALT/MOM_parameter_doc.all b/exps/NWA12.COBALT/MOM_parameter_doc.all
@@ -524,7 +524,7 @@ USE_NW2_TRACERS = False         !   [Boolean] default = False
 
 ! === module register_MOM_generic_tracer ===
 GENERIC_TRACER_IC_FILE = "NWA12_COBALT_2023_10_spinup_2003.nc" ! default = ""
-                                ! The file in which the generic trcer initial values can be found, or an empty
+                                ! The file in which the generic tracer initial values can be found, or an empty
                                 ! string for internal initialization.
 GENERIC_TRACER_IC_FILE_IS_Z = False !   [Boolean] default = False
                                 ! If true, GENERIC_TRACER_IC_FILE is in depth space, not layer space.
@@ -1926,10 +1926,13 @@ ML_OMEGA_FRAC = 0.001           !   [nondim] default = 0.0
 EKMAN_SCALE_COEF = 1.0          !   [nondim] default = 1.0
                                 ! A nondimensional scaling factor controlling the inhibition of the diffusive
                                 ! length scale by rotation. Making this larger decreases the PBL diffusivity.
-EPBL_ANSWER_DATE = 99991231     ! default = 99991231
+EPBL_ANSWER_DATE = 20231231     ! default = 99991231
                                 ! The vintage of the order of arithmetic and expressions in the energetic PBL
                                 ! calculations.  Values below 20190101 recover the answers from the end of 2018,
                                 ! while higher values use updated and more robust forms of the same expressions.
+                                ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several
+                                ! expressions, while higher values use the integer root function cuberoot(A) and
+                                ! therefore can work with scaled variables.
 EPBL_ORIGINAL_PE_CALC = True    !   [Boolean] default = True
                                 ! If true, the ePBL code uses the original form of the potential energy change
                                 ! code.  Otherwise, the newer version that can work with successive increments

diff --git a/exps/NWA12.COBALT/MOM_parameter_doc.short b/exps/NWA12.COBALT/MOM_parameter_doc.short
@@ -185,7 +185,7 @@ USE_generic_tracer = True       !   [Boolean] default = False
 
 ! === module register_MOM_generic_tracer ===
 GENERIC_TRACER_IC_FILE = "NWA12_COBALT_2023_10_spinup_2003.nc" ! default = ""
-                                ! The file in which the generic trcer initial values can be found, or an empty
+                                ! The file in which the generic tracer initial values can be found, or an empty
                                 ! string for internal initialization.
 
 ! === module MOM_boundary_update ===
@@ -623,6 +623,13 @@ ML_OMEGA_FRAC = 0.001           !   [nondim] default = 0.0
                                 ! When setting the decay scale for turbulence, use this fraction of the absolute
                                 ! rotation rate blended with the local value of f, as sqrt((1-of)*f^2 +
                                 ! of*4*omega^2).
+EPBL_ANSWER_DATE = 20231231     ! default = 99991231
+                                ! The vintage of the order of arithmetic and expressions in the energetic PBL
+                                ! calculations.  Values below 20190101 recover the answers from the end of 2018,
+                                ! while higher values use updated and more robust forms of the same expressions.
+                                ! Values below 20240101 use A**(1./3.) to estimate the cube root of A in several
+                                ! expressions, while higher values use the integer root function cuberoot(A) and
+                                ! therefore can work with scaled variables.
 TKE_DECAY = 0.001               !   [nondim] default = 2.5
                                 ! TKE_DECAY relates the vertical rate of decay of the TKE available for
                                 ! mechanical entrainment to the natural Ekman depth.

diff --git a/exps/NWA12.COBALT/driver.sh b/exps/NWA12.COBALT/driver.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #SBATCH --nodes=13
-#SBATCH --time=30
+#SBATCH --time=60
 #SBATCH --job-name="NWA12.COBALT"
 #SBATCH --output=NWA12.COBALT_o.%j
 #SBATCH --error=NWA12.COBALT_e.%j
@@ -25,8 +25,8 @@ rm -rf RESTART*
 echo "Test started:  " `date`
 
 #
-echo "run 2hrs test ..."
-srun -n ${ntasks} ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out 2>err 
+echo "run 48hrs test ..."
+srun --ntasks ${ntasks} --cpus-per-task=1 --export=ALL ../../builds/build/gaea-ncrc5.intel23/ocean_ice/repro/MOM6SIS2 > out 2>err 
 
 
 #