Merge branch 'NOAA-EMC:develop' into observer_fv3reg_init_var

modulefiles/gsi_orion.intel.lua

@@ -1,11 +1,11 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env-rocky9/install/modulefiles/Core")
 
-local stack_python_ver=os.getenv("python_ver") or "3.11.6"
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+local stack_python_ver=os.getenv("stack_python_ver") or "3.11.6"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
@@ -16,6 +16,7 @@ load(pathJoin("cmake", cmake_ver))
 
 load("gsi_common")
 load(pathJoin("prod_util", prod_util_ver))
+load("intel-oneapi-mkl/2022.2.1")
 
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")

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)

regression/global_4denvar.sh

@@ -61,7 +61,7 @@ suffix=tm00.bufr_d
 dumpges=gdas
 COMROOTgfs=$casesdir/gfs/prod
 datobs=$COMROOTgfs/$dumpobs.$PDYa/${cyca}/obs
-dathis=$COMROOTgfs/$dumpges.$PDYg/${cycg}/model_data/atmos/history
+dathis=$COMROOTgfs/$dumpges.$PDYg/${cycg}/model/atmos/history
 datanl=$COMROOTgfs/gdas.$PDYg/${cycg}/analysis/atmos
 datens=$COMROOTgfs/enkfgdas.$PDYg/${cycg}
 
@@ -291,7 +291,7 @@ $nln $dathis/${prefix_ges}.atmf007.nc         ./sigf07
 $nln $dathis/${prefix_ges}.atmf008.nc         ./sigf08
 $nln $dathis/${prefix_ges}.atmf009.nc         ./sigf09
 
-$nln $datens/ensstat/model_data/atmos/history/${prefix_ens}.sfcf006.ensmean.nc         ./sfcf06_anlgrid
+$nln $datens/ensstat/model/atmos/history/${prefix_ens}.sfcf006.ensmean.nc         ./sfcf06_anlgrid
 
 export ENS_PATH='./ensemble_data/'
 mkdir -p ${ENS_PATH}
@@ -301,7 +301,7 @@ for fh in $flist; do
     imem=1
     while [[ $imem -le $NMEM_ENKF ]]; do
 	member="mem"`printf %03i $imem`
-	$nln $datens/$member/model_data/atmos/history/$sigens ${ENS_PATH}sigf${fh}_ens_${member}
+	$nln $datens/$member/model/atmos/history/$sigens ${ENS_PATH}sigf${fh}_ens_${member}
 	(( imem = $imem + 1 ))
     done
 done

regression/global_enkf.sh

@@ -76,14 +76,11 @@ export use_correlated_oberrs=${use_correlated_oberrs:-".false."}
 if [ $USE_CORRELATED_OBERRS == "YES" ]; then
     export use_correlated_oberrs=".true."
 fi
-export imp_physics=${imp_physics:-"11"}
 export lupp=${lupp:-".true."}
 export corrlength=${corrlength:-1250}
 export lnsigcutoff=${lnsigcutoff:-2.75}
 export analpertwt=${analpertwt:-0.85}
 export readin_localization_enkf=".false."
-export readin_localization_enkf=${readin_localization_enkf:-".true."}
-export reducedgrid=${reducedgrid:-".true."}
 export letkf_flag=${letkf_flag:-".true."}
 export getkf=${getkf:-".true."}
 export denkf=${denkf:-".true."}
@@ -163,13 +160,13 @@ nfhrs=`echo $IAUFHRS_ENKF | sed 's/,/ /g'`
 for fhr in $nfhrs; do
     for imem in $(seq 1 $NMEM_ENKF); do
 	memchar="mem"$(printf %03i $imem)
-	$nln $datens/$memchar/model_data/atmos/history/${prefix_ens}.atmf00${fhr}.nc sfg_${global_adate}_fhr0${fhr}_${memchar}
+	$nln $datens/$memchar/model/atmos/history/${prefix_ens}.atmf00${fhr}.nc sfg_${global_adate}_fhr0${fhr}_${memchar}
         if [ $cnvw_option = ".true." ]; then
-            $nln $datens/$memchar/model_data/atmos/history/${prefix_ens}sfcf00${fhr}.nc sfgsfc_${global_adate}_fhr0${fhr}_${memchar}
+            $nln $datens/$memchar/model/atmos/history/${prefix_ens}sfcf00${fhr}.nc sfgsfc_${global_adate}_fhr0${fhr}_${memchar}
         fi
 	(( imem = $imem + 1 ))
     done
-    $nln $datens/ensstat/model_data/atmos/history/${prefix_ens}.atmf00${fhr}.ensmean.nc sfg_${global_adate}_fhr0${fhr}_ensmean
+    $nln $datens/ensstat/model/atmos/history/${prefix_ens}.atmf00${fhr}.ensmean.nc sfg_${global_adate}_fhr0${fhr}_ensmean
     if [ $cnvw_option = ".true." ]; then
         $nln $datens/${prefix_ens}.sfcf00${fhr}.ensmean.nc sfgsfc_${global_adate}_fhr0${fhr}_ensmean
     fi

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

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]}