Merge remote-tracking branch 'upstream/develop' into develop

Fixes ufs-community#1977.
GeorgeGayno-NOAA · Dec 14, 2023 · a3f7bac · a3f7bac
2 parents 7733e21 + 766ae99
commit a3f7bac
Show file tree

Hide file tree

Showing 166 changed files with 22,122 additions and 16,174 deletions.
diff --git a/cmake/configure_gaea-c5.intel.cmake b/cmake/configure_gaea-c5.intel.cmake
@@ -0,0 +1,4 @@
+set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
+set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
+set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
+set(HYCOM_Extra_C_FLAGS "-xSSE4.2")
diff --git a/modulefiles/ufs_gaea-c5.intel.lua b/modulefiles/ufs_gaea-c5.intel.lua
@@ -0,0 +1,34 @@
+help([[
+  This module loads libraries required for building and running UFS Weather Model 
+  on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
+]])
+
+whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C5 ]===])
+
+load("PrgEnv-intel/8.3.3")
+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.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+
+stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
+load(pathJoin("stack-python", stack_python_ver))
+
+load("ufs_common")
+load("nccmp/1.9.0.1")
+
+unload("darshan-runtime")
+unload("cray-libsci")
+
+setenv("CC","cc")
+setenv("CXX","CC")
+setenv("FC","ftn")
+setenv("CMAKE_Platform","gaea-c5.intel")
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20231130
+export BL_DATE=20231207
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -57,9 +57,12 @@ set +x
 if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
   source $PATHTR/modulefiles/ufs_${MACHINE_ID}.${RT_COMPILER}
 else
-  # Activate lua environment for gaea
+  # Activate lua environment for gaea c4
   if [[ $MACHINE_ID == gaea ]]; then
     source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
+  # Activate lua environment for gaea c5
+  elif [[ $MACHINE_ID == gaea-c5 ]]; then
+    source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
   fi
   # Load fv3 module
   module use $PATHTR/modulefiles