From bf6975a07c36fdb213870ee88facc6d797f5fce4 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:22:39 -0500
Subject: [PATCH 01/18] Update rt.sh

---
 tests/rt.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index e165b8096a..14cb81efe1 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -304,30 +304,32 @@ elif [[ $MACHINE_ID = acorn ]]; then
   PTMP=/lfs/h2/emc/ptmp
   SCHEDULER=pbs
 
-elif [[ $MACHINE_ID = gaea-c5 ]]; then
+elif [[ $MACHINE_ID = gaea ]]; then
 
-  module use /lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles
+  module use /ncrc/proj/epic/rocoto/modulefiles
   module load rocoto
   ROCOTORUN=$(which rocotorun)
   ROCOTOSTAT=$(which rocotostat)
   ROCOTOCOMPLETE=$(which rocotocomplete)
   ROCOTO_SCHEDULER=slurm
 
+  module use /ncrc/proj/epic/miniconda3/modulefiles
+  module load miniconda3/4.12.0
   module load PrgEnv-intel/8.3.3
   module load intel-classic/2023.1.0
   module load cray-mpich/8.1.25
   module load python/3.9.12
-  module use /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles
+  module use /ncrc/proj/epic/spack-stack/modulefiles
   module load ecflow/5.8.4
-  ECFLOW_START=/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/ecflow-5.8.4/bin/ecflow_start.sh
+  ECFLOW_START=/ncrc/proj/epic/spack-stack/ecflow-5.8.4/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
 
-  DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT
+  DISKNM=/gpfs/f5/epic/world-shared/lustre/epic/UFS-WM_RT
   QUEUE=normal
   COMPILE_QUEUE=normal
   PARTITION=c5
-  STMP=/lustre/f2/scratch
-  PTMP=/lustre/f2/scratch
+  STMP=/gpfs/f5/epic/scratch
+  PTMP=/gpfs/f5/epic/scratch
 
   SCHEDULER=slurm
 

From 205ab66b8be5508b1c90f8e19fa2f85031ccef9e Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:25:29 -0500
Subject: [PATCH 02/18] Update rt.sh

---
 tests/rt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index 14cb81efe1..8c7919edd1 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -659,7 +659,7 @@ if [[ $ROCOTO == true ]]; then
     QUEUE=main
     COMPILE_QUEUE=main
     ROCOTO_SCHEDULER=pbspro
-  elif [[ $MACHINE_ID = gaea-c5 ]]; then
+  elif [[ $MACHINE_ID = gaea ]]; then
     QUEUE=normal
     COMPILE_QUEUE=normal
     ROCOTO_SCHEDULER=slurm

From eefd6cbff154837fb5e6d4cae15ad78fe11d0687 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:51:23 -0500
Subject: [PATCH 03/18] Rename ufs_gaea-c5.intel.lua to ufs_gaea.intel.lua

---
 modulefiles/{ufs_gaea-c5.intel.lua => ufs_gaea.intel.lua} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modulefiles/{ufs_gaea-c5.intel.lua => ufs_gaea.intel.lua} (100%)

diff --git a/modulefiles/ufs_gaea-c5.intel.lua b/modulefiles/ufs_gaea.intel.lua
similarity index 100%
rename from modulefiles/ufs_gaea-c5.intel.lua
rename to modulefiles/ufs_gaea.intel.lua

From ef9be14f9cb2bc051fea7c4919b76f740d46f60d Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:57:28 -0500
Subject: [PATCH 04/18] Update compile.sh Machine name change

---
 tests/compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index 567c80c756..e75683f8b7 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -58,8 +58,8 @@ if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
   source $PATHTR/modulefiles/ufs_${MACHINE_ID}.${RT_COMPILER}
 else
   # Activate lua environment for gaea c5
-  if [[ $MACHINE_ID == gaea-c5 ]]; then
-    source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
+  if [[ $MACHINE_ID == gaea ]]; then
+    source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh
   fi
   # Load fv3 module
   module use $PATHTR/modulefiles

From 7a2a23040c99f719111ac480334bbc5ab31832b6 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:58:25 -0500
Subject: [PATCH 05/18] Update default_vars.sh Gaea Machine name change

---
 tests/default_vars.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index b12407a31d..e0783bdafc 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -216,7 +216,7 @@ elif [[ $MACHINE_ID = s4 ]]; then
   ICE_tasks_cpl_bmrk=48
   WAV_tasks_cpl_bmrk=80
 
-elif [[ $MACHINE_ID = gaea-c5 ]]; then
+elif [[ $MACHINE_ID = gaea ]]; then
 
   TPN=128
 

From 883531af4f0768bb7c33cc5df2cb28e482e34f49 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:01:02 -0500
Subject: [PATCH 06/18] Rename compile_slurm.IN_gaea-c5 to
 compile_slurm.IN_gaea

---
 .../fv3_conf/{compile_slurm.IN_gaea-c5 => compile_slurm.IN_gaea}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/fv3_conf/{compile_slurm.IN_gaea-c5 => compile_slurm.IN_gaea} (100%)

diff --git a/tests/fv3_conf/compile_slurm.IN_gaea-c5 b/tests/fv3_conf/compile_slurm.IN_gaea
similarity index 100%
rename from tests/fv3_conf/compile_slurm.IN_gaea-c5
rename to tests/fv3_conf/compile_slurm.IN_gaea

From 5ddf7e60fd73ab9db85c21dcdf05c11e134e70ac Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:06:33 -0500
Subject: [PATCH 07/18] Rename fv3_slurm.IN_gaea-c5 to fv3_slurm.IN_gaea

---
 tests/fv3_conf/{fv3_slurm.IN_gaea-c5 => fv3_slurm.IN_gaea} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/fv3_conf/{fv3_slurm.IN_gaea-c5 => fv3_slurm.IN_gaea} (100%)

diff --git a/tests/fv3_conf/fv3_slurm.IN_gaea-c5 b/tests/fv3_conf/fv3_slurm.IN_gaea
similarity index 100%
rename from tests/fv3_conf/fv3_slurm.IN_gaea-c5
rename to tests/fv3_conf/fv3_slurm.IN_gaea

From 9904511d3f4fa19e89d0ed39f0cb49ce642b3383 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:11:30 -0500
Subject: [PATCH 08/18] Update module-setup.sh

---
 tests/module-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/module-setup.sh b/tests/module-setup.sh
index f0daa24cdb..255e5c6baa 100755
--- a/tests/module-setup.sh
+++ b/tests/module-setup.sh
@@ -65,8 +65,8 @@ elif [[ $MACHINE_ID = stampede ]] ; then
     fi
     module purge
 
-elif [[ $MACHINE_ID = gaea-c5 ]] ; then
-    # We are on GAEA C5
+elif [[ $MACHINE_ID = gaea ]] ; then
+    # We are on GAEA
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         # We cannot simply load the module command.  The GAEA
         # /etc/profile modifies a number of module-related variables
@@ -75,7 +75,7 @@ elif [[ $MACHINE_ID = gaea-c5 ]] ; then
         # /etc/profile here.
         source /etc/profile
     fi
-    source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
+    source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh
 
 elif [[ $MACHINE_ID = expanse ]]; then
     # We are on SDSC Expanse

From 9f481370465947174c6e2aa10c611068d63d2b78 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:13:20 -0500
Subject: [PATCH 09/18] Update run_test.sh

---
 tests/run_test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/run_test.sh b/tests/run_test.sh
index 2b9e3ebf9d..ac565d8268 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -97,7 +97,7 @@ cp ${PATHTR}/modulefiles/ufs_common*                 ./modulefiles/.
 cp ${PATHRT}/module-setup.sh                       module-setup.sh
 
 # load nccmp module
-if [[ " s4 hera orion hercules gaea-c5 jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
+if [[ " s4 hera orion hercules gaea jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
   if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
     module load intel/19.1.3.304 netcdf/4.7.4
     module load nccmp
@@ -106,7 +106,7 @@ if [[ " s4 hera orion hercules gaea-c5 jet derecho acorn wcoss2 " =~ " $MACHINE_
     module load stack-intel/2021.5.0 stack-intel-oneapi-mpi/2021.5.0
     module load miniconda/3.9.12
     module load nccmp/1.9.0.1
-  elif [[ " hera orion hercules gaea-c5 jet " =~ " ${MACHINE_ID} " ]] ; then
+  elif [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
     module use modulefiles
     module load modules.fv3
   else

From c1ead3f87168b2be919a8992575b15b58af29f31 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 08:56:57 -0500
Subject: [PATCH 10/18] Update ufs_gaea.intel.lua

---
 modulefiles/ufs_gaea.intel.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua
index 0162442940..746bbef471 100644
--- a/modulefiles/ufs_gaea.intel.lua
+++ b/modulefiles/ufs_gaea.intel.lua
@@ -10,8 +10,8 @@ load("intel-classic/2023.1.0")
 load("cray-mpich/8.1.25")
 load("python/3.9.12")
 
-prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/modulefiles")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
 load(pathJoin("stack-intel", stack_intel_ver))

From e79c8473284008aa49f894363bea7ac71d3b5d19 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 08:57:51 -0500
Subject: [PATCH 11/18] Update ufs_noaacloud.intel.lua

---
 modulefiles/ufs_noaacloud.intel.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/ufs_noaacloud.intel.lua b/modulefiles/ufs_noaacloud.intel.lua
index b2f1d6b759..7e8f25dade 100644
--- a/modulefiles/ufs_noaacloud.intel.lua
+++ b/modulefiles/ufs_noaacloud.intel.lua
@@ -3,7 +3,7 @@ loads UFS Model prerequisites for NOAA Parallelworks/Intel
 ]])
 
 
-prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
 load(pathJoin("stack-intel", stack_intel_ver))

From cbcabbad89a8c9e2ad8d74081a6a3bd4cefa80b8 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 08:58:38 -0500
Subject: [PATCH 12/18] Update module-setup.sh

---
 tests/module-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/module-setup.sh b/tests/module-setup.sh
index 255e5c6baa..f392a6c084 100755
--- a/tests/module-setup.sh
+++ b/tests/module-setup.sh
@@ -75,7 +75,7 @@ elif [[ $MACHINE_ID = gaea ]] ; then
         # /etc/profile here.
         source /etc/profile
     fi
-    source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh
+    module reset
 
 elif [[ $MACHINE_ID = expanse ]]; then
     # We are on SDSC Expanse

From ed870068dc04a02243b2c0a2c9db6c01dc726431 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 09:01:51 -0500
Subject: [PATCH 13/18] Update rt.sh

---
 tests/rt.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index 8c7919edd1..a7c4d901c2 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -317,13 +317,11 @@ elif [[ $MACHINE_ID = gaea ]]; then
   module load miniconda3/4.12.0
   module load PrgEnv-intel/8.3.3
   module load intel-classic/2023.1.0
-  module load cray-mpich/8.1.25
-  module load python/3.9.12
   module use /ncrc/proj/epic/spack-stack/modulefiles
+  module load python/3.9.12
   module load ecflow/5.8.4
   ECFLOW_START=/ncrc/proj/epic/spack-stack/ecflow-5.8.4/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
-
   DISKNM=/gpfs/f5/epic/world-shared/lustre/epic/UFS-WM_RT
   QUEUE=normal
   COMPILE_QUEUE=normal

From dabe8c0884e7f0439c1e58e425b21807b7a3d637 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 09:04:32 -0500
Subject: [PATCH 14/18] Update compile.sh

---
 tests/compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index e75683f8b7..284fb51cc0 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -59,7 +59,7 @@ if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
 else
   # Activate lua environment for gaea c5
   if [[ $MACHINE_ID == gaea ]]; then
-    source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh
+    module reset
   fi
   # Load fv3 module
   module use $PATHTR/modulefiles

From be901570600ff8c87bd0f70dbf586fbcc7add1d6 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 09:08:12 -0500
Subject: [PATCH 15/18] Update rt.sh

---
 tests/rt.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index a7c4d901c2..6da2b4d63a 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -313,8 +313,7 @@ elif [[ $MACHINE_ID = gaea ]]; then
   ROCOTOCOMPLETE=$(which rocotocomplete)
   ROCOTO_SCHEDULER=slurm
 
-  module use /ncrc/proj/epic/miniconda3/modulefiles
-  module load miniconda3/4.12.0
+  
   module load PrgEnv-intel/8.3.3
   module load intel-classic/2023.1.0
   module use /ncrc/proj/epic/spack-stack/modulefiles

From e0a31d087c3d21922714a127e3e5686458dbfce2 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 11:35:51 -0500
Subject: [PATCH 16/18] Update rt.sh adding back crap-mpich module

---
 tests/rt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/rt.sh b/tests/rt.sh
index 6da2b4d63a..f0a9b4fa84 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -315,6 +315,7 @@ elif [[ $MACHINE_ID = gaea ]]; then
 
   
   module load PrgEnv-intel/8.3.3
+  module load cray-mpich/8.1.25
   module load intel-classic/2023.1.0
   module use /ncrc/proj/epic/spack-stack/modulefiles
   module load python/3.9.12

From dc5966e8e92e7368df5685ed658d7acf972f6b9b Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:27:57 -0500
Subject: [PATCH 17/18] Update rt.sh revert a name change

---
 tests/rt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index f0a9b4fa84..44f94f41c7 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -304,7 +304,7 @@ elif [[ $MACHINE_ID = acorn ]]; then
   PTMP=/lfs/h2/emc/ptmp
   SCHEDULER=pbs
 
-elif [[ $MACHINE_ID = gaea ]]; then
+elif [[ $MACHINE_ID = gaea-c5 ]]; then
 
   module use /ncrc/proj/epic/rocoto/modulefiles
   module load rocoto

From cf0c1bb23c6e96d857a3fa6dda4065e79eb465aa Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:28:19 -0500
Subject: [PATCH 18/18] Rename ufs_gaea.intel.lua to ufs_gaea-c5.intel.lua

---
 modulefiles/{ufs_gaea.intel.lua => ufs_gaea-c5.intel.lua} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modulefiles/{ufs_gaea.intel.lua => ufs_gaea-c5.intel.lua} (100%)

diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea-c5.intel.lua
similarity index 100%
rename from modulefiles/ufs_gaea.intel.lua
rename to modulefiles/ufs_gaea-c5.intel.lua