Merge pull request #179 from jedwards4b/derecho_updates_080224

update nvhpc and gnu on derecho
ESMCI · Dec 6, 2024 · 74fd80c · 74fd80c
2 parents 1ebe594 + 3998db3
commit 74fd80c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/machines/Depends.intel-oneapi b/machines/Depends.intel-oneapi
@@ -6,7 +6,8 @@ derivative_mod.o \
 bndry_mod.o \
 prim_advance_mod.o
 
-# FMS netcdf_io fails with optimization
+# FMS netcdf_io gives ICE in intel-oneapi/2024.0.2
+
 REDUCED_OPT_OBJS=\
 netcdf_io.o \
 fms_netcdf_domain_io.o \
@@ -15,7 +16,6 @@ fms_netcdf_unstructured_domain_io.o
 REDUCED_DEBUG_OBJS=\
 unicon.o
 
-
 # shr_wv_sat_mod does not need to have better than ~0.1% precision, and benefits
 # enormously from a lower precision in the vector functions.
 REDUCED_PRECISION_OBJS=\

diff --git a/machines/cmake_macros/cray.cmake b/machines/cmake_macros/cray.cmake
@@ -1,3 +1,5 @@
+set(FIXEDFLAGS " -f fixed")
+set(FREEFLAGS " -f free")
 if (NOT compile_threaded)
   string(APPEND CFLAGS " -h noomp")
 endif()
@@ -11,14 +13,11 @@ if (NOT DEBUG)
   string(APPEND CFLAGS " -O2")
 endif()
 string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRCRAY")
-if (COMP_NAME STREQUAL pop)
-  string(APPEND CPPDEFS " -DDIR=NOOP")
-endif()
 if (COMP_NAME STREQUAL moby)
   string(APPEND CPPDEFS " -DDIR=NOOP")
 endif()
 set(FC_AUTO_R8 "-s real64")
-string(APPEND FFLAGS " -f free -N 255  -h byteswapio -x dir -ef")
+string(APPEND FFLAGS " -N 255  -h byteswapio -x dir -ef")
 if (NOT compile_threaded)
   string(APPEND FFLAGS " -h noomp")
 endif()

diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml
@@ -1,7 +1,7 @@
   <machine MACH="derecho">
     <DESC>NCAR AMD EPYC system</DESC>
     <OS>CNL</OS>
-    <COMPILERS>intel,gnu,nvhpc,intel-oneapi,intel-classic</COMPILERS>
+    <COMPILERS>intel,gnu,nvhpc,intel-oneapi,cray</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
     <CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
@@ -43,35 +43,32 @@
 	<command name="load">craype</command>
       </modules>
       <modules compiler="intel">
-        <command name="load">intel/2023.2.1</command>
+        <command name="load">intel/2024.0.2</command>
 	<command name="load">mkl</command>
       </modules>
       <modules compiler="intel-oneapi">
-        <command name="load">intel-oneapi/2023.2.1</command>
-	<command name="load">mkl</command>
-      </modules>
-      <modules compiler="intel-classic">
-        <command name="load">intel-classic/2023.2.1</command>
+        <command name="load">intel-oneapi/2024.0.2</command>
 	<command name="load">mkl</command>
       </modules>
       <modules compiler="cray">
-        <command name="load">cce/15.0.1</command>
-        <command name="load">cray-libsci/23.02.1.1</command>
+        <command name="load">cce/17.0.1</command>
+        <command name="load">cray-libsci/23.09.1.1</command>
       </modules>
       <modules compiler="gnu">
-        <command name="load">gcc/12.2.0</command>
+        <command name="load">gcc/13.2.0</command>
         <command name="load">cray-libsci/23.02.1.1</command>
+        <command name="load">openblas/0.3.25</command>
       </modules>
       <modules compiler="nvhpc">
-        <command name="load">nvhpc/24.3</command>
+        <command name="load">nvhpc/24.7</command>
       </modules>
 
       <modules>
 	<command name="load">ncarcompilers/1.0.0</command>
         <command name="load">cmake</command>
       </modules>
       <modules mpilib="mpich">
-	<command name="load">cray-mpich/8.1.27</command>
+	<command name="load">cray-mpich/8.1.29</command>
       </modules>
 
       <modules mpilib="mpich" compiler="nvhpc" gpu_type="!none">
@@ -90,18 +87,22 @@
 
       <modules DEBUG="FALSE">
 	<command name="load">parallelio/2.6.2</command>
-	<command name="load">esmf/8.6.0</command>
+	<command name="load">esmf/8.6.1</command>
       </modules>
 
       <modules DEBUG="TRUE" mpilib="mpi-serial">
 	<command name="load">parallelio/2.6.2</command>
-	<command name="load">esmf/8.6.0</command>
+	<command name="load">esmf/8.6.1</command>
       </modules>
 
-      <modules DEBUG="TRUE" mpilib="!mpi-serial">
+      <modules DEBUG="TRUE" mpilib="!mpi-serial" compiler="!cray">
 	<command name="load">parallelio/2.6.2-debug</command>
 	<command name="load">esmf/8.6.0-debug</command>
       </modules>
+      <modules DEBUG="TRUE" mpilib="!mpi-serial" compiler="cray">
+	<command name="load">parallelio/2.6.2-debug</command>
+	<command name="load">esmf/8.6.1-debug</command>
+      </modules>
     </module_system>
 
     <environment_variables>