Merge branch 'NOAA-EMC:develop' into feature/orion_rocky9

RussTreadon-NOAA · Jun 27, 2024 · eea4550 · eea4550
2 parents 3d5da07 + 24b731a
commit eea4550
Show file tree

Hide file tree

Showing 12 changed files with 708 additions and 558 deletions.
diff --git a/fix b/fix
diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt
@@ -40,14 +40,20 @@ endif()
 list(APPEND GSI_REG_TEST_NAMES
   global_4denvar
   rtma
-  rrfs_3denvar_glbens netcdf_fv3_regional
+  rrfs_3denvar_rdasens
   hafs_4denvar_glbens hafs_3denvar_hybens
 )
 
 # EnKF regression test names
-list(APPEND ENKF_REG_TEST_NAMES
-  global_enkf
-)
+if(ENKF_MODE MATCHES "^(FV3REG)$")
+  list(APPEND ENKF_REG_TEST_NAMES
+    rrfs_enkf_conv
+  )
+else()
+  list(APPEND ENKF_REG_TEST_NAMES
+    global_enkf
+  )
+endif()
 
 # Add GSI regression tests to list of tests
 if(GSICONTROLEXEC)

diff --git a/regression/multi_regression.sh b/regression/multi_regression.sh
@@ -1,16 +1,16 @@
 #!/bin/sh --login
 
 regtests_all="global_4denvar
-              netcdf_fv3_regional
-              rrfs_3denvar_glbens
+              rrfs_3denvar_rdasens
               hafs_4denvar_glbens
               hafs_3denvar_hybens
               rtma
               global_enkf"
 
+#              rrfs_enkf_conv   : comment out RRFS enkf case for now
+#                                 need to update EnKF code
 regtests_debug="global_4denvar
-                netcdf_fv3_regional
-                rrfs_3denvar_glbens
+                rrfs_3denvar_rdasens
                 hafs_4denvar_glbens
                 hafs_3denvar_hybens
                 rtma

diff --git a/regression/netcdf_fv3_regional.sh b/regression/netcdf_fv3_regional.sh
diff --git a/regression/regression_driver.sh b/regression/regression_driver.sh
@@ -59,7 +59,7 @@ if [ "$debug" == ".false." ]; then
 
    export scripts=${scripts_updat:-$scripts}
 
-   if [ $regtest = 'global_enkf' ]; then
+   if [ $regtest = 'global_enkf' ] || [ $regtest = 'rrfs_enkf_conv' ]; then
       /bin/sh $scripts/regression_test_enkf.sh ${job[1]} ${job[2]} ${job[3]} ${job[4]} ${tmpregdir} ${result} ${scaling[1]} ${scaling[2]} ${scaling[3]}
    else
       /bin/sh $scripts/regression_test.sh ${job[1]} ${job[2]} ${job[3]} ${job[4]} ${tmpregdir} ${result} ${scaling[1]} ${scaling[2]} ${scaling[3]}