updates for Hera/gnu: software stack 1.6.0 path, runtime env. variable in a jobcard, enable cpld_control_p8 and cpld_debug_p8 tests

Author: Natalie Perlin

modulefiles/ufs_hera.gnu.lua

@@ -4,7 +4,7 @@ loads UFS Model prerequisites for Hera/GNU
 
 prepend_path("MODULEPATH", "/contrib/spack-stack/installs/gnu/modulefiles")
 prepend_path("MODULEPATH", "/contrib/spack-stack/installs/openmpi/modulefiles")
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gnu-fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gnu-ufs-fms-2024.01/install/modulefiles/Core")
 
 stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.0"
 load(pathJoin("stack-gcc", stack_gnu_ver))

tests-dev/ufs_test.yaml

@@ -626,8 +626,11 @@ atm_dyn64_phy32_debug_gnu:
 s2swa_gnu:
   build: 
     compiler: 'gnu'
-    option: '-DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8'
+    option: '-DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1'
     turnon: ['hera','hercules']
+  tests:
+    - cpld_control_p8: {'project':['regression'],'baseline': 'True','turnon':['hera','hercules']}
+    - cpld_debug_p8: {'project':['regression'],'baseline': 'True','turnon':['hera','hercules']}
 s2s_gnu:
   build: 
     compiler: 'gnu'
@@ -638,7 +641,7 @@ s2s_gnu:
 s2swa_debug_gnu:
   build: 
     compiler: 'gnu'
-    option: '-DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8'
+    option: '-DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1'
     turnon: ['hera','hercules']
 s2sw_pdlib_gnu:
   build: 

tests/fv3_conf/fv3_slurm.IN_hera

@@ -45,6 +45,7 @@ if [ "${JOB_SHOULD_FAIL:-NO}" = WHEN_RUNNING ] ; then
     false
 fi
 
+export OMPI_MCA_btl_openib_allow_ib=true
 # shellcheck disable=SC2102
 srun --label -n @[TASKS] ./fv3.exe