NCAR
diff --git a/‎WW3 b/‎WW3
diff --git a/‎modulefiles/ufs_acorn.intel.lua
+2-2 b/‎modulefiles/ufs_acorn.intel.lua
+2-2
diff --git a/‎modulefiles/ufs_acorn.intel_debug.lua
+2-2 b/‎modulefiles/ufs_acorn.intel_debug.lua
+2-2
diff --git a/‎tests/RegressionTests_acorn.intel.log
+979-814 b/‎tests/RegressionTests_acorn.intel.log
+979-814
diff --git a/‎tests/RegressionTests_cheyenne.gnu.log
+221-221 b/‎tests/RegressionTests_cheyenne.gnu.log
+221-221
diff --git a/‎tests/RegressionTests_cheyenne.intel.log
+646-646 b/‎tests/RegressionTests_cheyenne.intel.log
+646-646
diff --git a/‎tests/RegressionTests_gaea.intel.log
+707-710 b/‎tests/RegressionTests_gaea.intel.log
+707-710
diff --git a/‎tests/RegressionTests_hera.gnu.log
+225-225 b/‎tests/RegressionTests_hera.gnu.log
+225-225
diff --git a/‎tests/RegressionTests_hera.intel.log
+665-665 b/‎tests/RegressionTests_hera.intel.log
+665-665
diff --git a/‎tests/RegressionTests_jet.intel.log
+599-599 b/‎tests/RegressionTests_jet.intel.log
+599-599
diff --git a/‎tests/RegressionTests_orion.intel.log
+666-666 b/‎tests/RegressionTests_orion.intel.log
+666-666
diff --git a/‎tests/RegressionTests_wcoss2.intel.log
+502-514 b/‎tests/RegressionTests_wcoss2.intel.log
+502-514
diff --git a/‎tests/fv3_conf/fv3_qsub.IN_cheyenne
+5-1 b/‎tests/fv3_conf/fv3_qsub.IN_cheyenne
+5-1
diff --git a/‎tests/rt.sh
+1-1 b/‎tests/rt.sh
+1-1
@@ -11,7 +11,7 @@ load(pathJoin("intel", intel_ver))
 craype_ver=os.getenv("craype_ver") or "2.7.13"
 load(pathJoin("craype", craype_ver))
 
-cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
 load(pathJoin("cray-mpich", cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.20.2"
@@ -21,7 +21,7 @@ prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stac
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
-hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
+hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.9"
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
 
@@ -11,7 +11,7 @@ load(pathJoin("intel", intel_ver))
 craype_ver=os.getenv("craype_ver") or "2.7.13"
 load(pathJoin("craype", craype_ver))
 
-cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
 load(pathJoin("cray-mpich", cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.20.2"
@@ -21,7 +21,7 @@ prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stac
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
-hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
+hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.9"
 load(pathJoin("hpc", hpc_ver))
 load(pathJoin("hpc-intel", hpc_intel_ver))
 load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
 
@@ -13,7 +13,11 @@ echo -n " $( date +%s )," >  job_timestamp.txt
 set +x
 MACHINE_ID=cheyenne
 source ./module-setup.sh
-module use $( pwd -P )
+if [[ ! -d modulefiles ]]; then
+  mkdir modulefiles
+  mv *.lua modulefiles
+fi
+module use modulefiles
 module load modules.fv3
 module list
 set -x
 
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221017
+BL_DATE=20221024
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}