[feature/hash_update] Update Gaea modulefiles to allow the SRW App to…

… build and run following update to Cray PE. Allow all comprehensive WE2E tests to successfully run on Gaea.
ufs-community · Oct 24, 2024 · d87c930 · d87c930
1 parent b01f41f
commit d87c930
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua
@@ -6,10 +6,10 @@ the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0
 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea C5 ]===])
 
 prepend_path("MODULEPATH","/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
-stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.25"
+stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.28"
 load(pathJoin("stack-cray-mpich", stack_mpich_ver))
 
 stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"

diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaea/python_srw.lua
@@ -3,5 +3,6 @@ unload("python")
 load("conda")
 
 setenv("SRW_ENV", "srw_app")
-setenv("LD_PRELOAD", "/opt/cray/pe/gcc/12.2.0/snos/lib64/libstdc++.so.6")
+setenv("LD_PRELOAD", "/usr/lib64/libstdc++.so.6")
+setenv("FI_VERBS_PREFER_XRC", "0")
 
diff --git a/modulefiles/wflow_gaea.lua b/modulefiles/wflow_gaea.lua
@@ -11,7 +11,6 @@ load("rocoto")
 load("conda")
 
 pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.1.0/")
-setenv("LD_PRELOAD", "/opt/cray/pe/gcc/12.2.0/snos/lib64/libstdc++.so.6")
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:

diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml
@@ -12,7 +12,7 @@ platform:
   QUEUE_HPSS: normal
   REMOVE_MEMORY: True
   PARTITION_HPSS: eslogin_c5
-  RUN_CMD_FCST: srun --export=ALL -n ${PE_MEMBER01}
+  RUN_CMD_FCST: srun --export=ALL
   RUN_CMD_POST: srun --export=ALL -n $nprocs
   RUN_CMD_PRDGEN: srun --export=ALL -n $nprocs
   RUN_CMD_SERIAL: time
@@ -47,9 +47,9 @@ rocoto:
   tasks:
     metatask_run_ensemble:
       task_run_fcst_mem#mem#:
-        cores: '{{ task_run_fcst.PE_MEMBER01 // 1 }}'
+        cores:
         native: '--cpus-per-task {{ task_run_fcst.OMP_NUM_THREADS_RUN_FCST|int }} --exclusive {{ platform.SCHED_NATIVE_CMD }}'
-        nodes:
+        nodes: '{{ task_run_fcst.NNODES_RUN_FCST // 1 }}:ppn={{ task_run_fcst.PPN_RUN_FCST // 1 }}'
         nnodes:
         nodesize:
         ppn: