[v2.1.2-1.6] hotfix: use spack-stack-1.9.3 for gaea after its major os upgrade (NOAA-EMC#982)

* update modulefiles/rrfs/gaea.intel.lua
* update the compilers in gaea.intel.lua
* add the ifort_icx option for compiling MPAS-Model on Gaea
* update RDASApp to include its latest changes for gaea
* update build.wps: make it work for new Gaea
* use spack-stack-1.9.3 instead of 1.9.2
* remove _g01, _g02 etc from the task names in the taskinfo utility
* update MPAS-Model
* update qrocoto/taskinfo to handle group tasks (eg. mpassit_g01)
* fix a typo in qrocoto/taskinfo

Author: guoqing-noaa

modulefiles/rrfs/gaea.intel.lua

@@ -3,13 +3,13 @@ This module loads libraries for rrfs-workflow
 ]])
 
 whatis([===[Loads libraries for rrfs-workflow ]===])
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.3/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
 
-load("stack-intel/2023.2.0")
-load("stack-cray-mpich/8.1.29")
-load("cmake/3.23.1")
-load("parallel-netcdf/1.12.2")
-load("parallelio/2.5.10")
+load("stack-oneapi/2024.2.1")
+load("stack-cray-mpich/8.1.32")
+load("cmake/3.27.9")
+load("parallel-netcdf/1.12.3")
+load("parallelio/2.6.2")
 load("libpng/1.6.37")
 
 if mode() == "load" then
@@ -19,6 +19,6 @@ if mode() == "unload" then
   unsetenv("PIO")
 end
 
-setenv("CMAKE_C_COMPILER", "cc")
-setenv("CMAKE_CXX_COMPILER", "CC")
-setenv("CMAKE_Fortran_COMPILER", "fn")
+setenv("CMAKE_C_COMPILER", "mpicc")
+setenv("CMAKE_CXX_COMPILER", "mpic++")
+setenv("CMAKE_Fortran_COMPILER", "mpifort")

sorc/MPAS-Model

@@ -18,8 +18,10 @@ if [[ "${MACHINE}" == "wcoss2" ]]; then
     source "${BUILD_VERSION_FILE}"
   fi
   compiler_str="ftn-wcoss2"
-elif [[ "${MACHINE}" == "gaea" ]] || [[ "${MACHINE}" == "derecho" ]] ; then
+elif [[ "${MACHINE}" == "derecho" ]]; then
   compiler_str="ifort"
+elif [[ "${MACHINE}" == "gaea" ]]; then
+  compiler_str="ifort_icx"
 elif [[ "${MACHINE}" == "ursa" ]]; then
   compiler_str="intel-mpi-ursa"
 fi

sorc/RDASApp

@@ -30,46 +30,22 @@ cd "${HOMErrfs}/sorc/WPS" || exit 1
 ./clean
 if [[ "${MACHINE}" == "wcoss2" ]]; then
   cp ../_workaround_/WPS/configure.wps_wcoss2 configure.wps
-elif [[ "${MACHINE}" == "gaea" ]]; then
+elif [[ "${MACHINE}" == "gaea" ]] || [[ "${MACHINE}" == "orion" || "${MACHINE}" == "hercules" || "${MACHINE}" == "ursa" ]]; then
   mkdir -p .tmpNETCDFDIR/include
   mkdir -p .tmpNETCDFDIR/lib
   ln -snf "${netcdf_c_ROOT}"/include/* .tmpNETCDFDIR/include
   ln -snf "${netcdf_c_ROOT}"/lib/* .tmpNETCDFDIR/lib
   ln -snf "${netcdf_fortran_ROOT}"/include/* .tmpNETCDFDIR/include
   ln -snf "${netcdf_fortran_ROOT}"/lib/* .tmpNETCDFDIR/lib
   export NETCDF=${HOMErrfs}/sorc/WPS/.tmpNETCDFDIR
-  echo "23" | ./configure --nowrf
-elif [[ "${MACHINE}" == "ursa" ]]; then
-  mkdir -p .tmpNETCDFDIR/include
-  mkdir -p .tmpNETCDFDIR/lib
-  ln -snf "${netcdf_c_ROOT}"/include/* .tmpNETCDFDIR/include
-  ln -snf "${netcdf_c_ROOT}"/lib/* .tmpNETCDFDIR/lib
-  ln -snf "${netcdf_fortran_ROOT}"/include/* .tmpNETCDFDIR/include
-  ln -snf "${netcdf_fortran_ROOT}"/lib/* .tmpNETCDFDIR/lib
-  export NETCDF=${HOMErrfs}/sorc/WPS/.tmpNETCDFDIR
-  echo "19" | ./configure --nowrf
-elif [[ "${MACHINE}" == "orion" || "${MACHINE}" == "hercules" ]]; then
-  mkdir -p .tmpNETCDFDIR/include
-  mkdir -p .tmpNETCDFDIR/lib
-  ln -snf "${netcdf_c_ROOT}"/include/* .tmpNETCDFDIR/include
-  ln -snf "${netcdf_c_ROOT}"/lib/* .tmpNETCDFDIR/lib
-  ln -snf "${netcdf_fortran_ROOT}"/include/* .tmpNETCDFDIR/include
-  ln -snf "${netcdf_fortran_ROOT}"/lib/* .tmpNETCDFDIR/lib
   module load jasper/2.0.32
-  export NETCDF=${HOMErrfs}/sorc/WPS/.tmpNETCDFDIR
   echo "19" | ./configure --nowrf
 else
   echo "19" | ./configure --nowrf
 fi
 ./compile ungrib
 
-if [[ "${MACHINE}" == "gaea" ]]; then
-  cd ungrib/src || exit 1
-  ifort -o ungrib.exe  misc_definitions_module.o debug_cio.o module_debug.o module_stringutil.o \
-    table.o module_datarray.o gridinfo.o new_storage.o filelist.o ungrib.o output.o rrpr.o \
-    rd_grib1.o file_delete.o datint.o rd_grib2.o ./ngl/w3/libw3.a ./ngl/g2/libg2_4.a \
-    -ljasper -L"${libpng_ROOT}/lib64" -lpng -lz libpgu.a
-elif [[ "${MACHINE}" == "orion" || "${MACHINE}" == "hercules" || "${MACHINE}" == "ursa" ]]; then
+if [[ "${MACHINE}" == "gaea" ]] || [[ "${MACHINE}" == "orion" || "${MACHINE}" == "hercules" || "${MACHINE}" == "ursa" ]]; then
   cd ungrib/src || exit 1
   ifort -o ungrib.exe  misc_definitions_module.o debug_cio.o module_debug.o module_stringutil.o \
     table.o module_datarray.o gridinfo.o new_storage.o filelist.o ungrib.o output.o rrpr.o \

sorc/build.mpas

@@ -16,11 +16,12 @@ fi
 RUN=rrfs
 
 CDATE=$1
-task=$2
+taskraw=$2
+task=${taskraw%_g*}
 PDY=${CDATE:0:8}
 cyc=${CDATE:8:2}
 logroot=${COMROOT}/${NET}/${VERSION}/logs
-logfile="${logroot}/${RUN}.${PDY}/${cyc}/${WGF}/${RUN}_${task}_${TAG}_${PDY}${cyc}.log"
+logfile="${logroot}/${RUN}.${PDY}/${cyc}/${WGF}/${RUN}_${taskraw}_${TAG}_${PDY}${cyc}.log"
 echo "----log file:"
 ls ${logfile}*