Gaea C6 additions

BrianCurtis-NOAA · Nov 25, 2024 · 7b17f0f · 7b17f0f
1 parent 8942489
commit 7b17f0f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/cmake/configure_gaea.intel.cmake → cmake/configure_gaeac5.intel.cmake b/cmake/configure_gaea.intel.cmake → cmake/configure_gaeac5.intel.cmake
diff --git a/cmake/configure_gaea.intelllvm.cmake → cmake/configure_gaeac5.intelllvm.cmake b/cmake/configure_gaea.intelllvm.cmake → cmake/configure_gaeac5.intelllvm.cmake
diff --git a/cmake/configure_gaeac6.intel.cmake b/cmake/configure_gaeac6.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/cmake/configure_gaeac6.intelllvm.cmake b/cmake/configure_gaeac6.intelllvm.cmake
@@ -0,0 +1,2 @@
+set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
+set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
diff --git a/tests/module-setup.sh b/tests/module-setup.sh
@@ -80,7 +80,7 @@ elif [[ ${MACHINE_ID} = gaeac6 ]]; then
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /opt/cray/pe/lmod/lmod/init/bash
     fi
-    module purge
+    module reset
 
 elif [[ ${MACHINE_ID} = expanse ]]; then
     # We are on SDSC Expanse

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -328,10 +328,15 @@ rocoto_create_compile_task() {
     <queue>${COMPILE_QUEUE}</queue>
 EOF
 
-  if [[ "${MACHINE_ID}" == gaeac5 || "${MACHINE_ID}" == gaeac6 ]] ; then
+  if [[ "${MACHINE_ID}" == gaeac5 ]] ; then
     cat << EOF >> "${ROCOTO_XML}"
     <native>--clusters=es</native>
     <partition>eslogin_c5</partition>
+EOF
+  elif [[ "${MACHINE_ID}" == gaeac6 ]] ; then
+    cat << EOF >> "${ROCOTO_XML}"
+    <native>--clusters=es</native>
+    <partition>eslogin_c6</partition>
 EOF
   elif [[ -n "${PARTITION}" || ${MACHINE_ID} != hera ]] ; then
     cat << EOF >> "${ROCOTO_XML}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
		set(AVX2 OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)