Merge pull request #197 from jedwards4b/backout_derecho_updates

backout derecho module update
ESMCI · Dec 6, 2024 · 26aacc1 · 26aacc1
2 parents 2455e86 + e99b0ed
commit 26aacc1
Showing 1 changed file with 15 additions and 16 deletions.
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,cray</COMPILERS>
+    <COMPILERS>intel,gnu,nvhpc,intel-oneapi,intel-classic</COMPILERS>
     <MPILIBS>mpich</MPILIBS>
     <CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
@@ -43,32 +43,35 @@
 	<command name="load">craype</command>
       </modules>
       <modules compiler="intel">
-        <command name="load">intel/2024.0.2</command>
+        <command name="load">intel/2023.2.1</command>
 	<command name="load">mkl</command>
       </modules>
       <modules compiler="intel-oneapi">
-        <command name="load">intel-oneapi/2024.0.2</command>
+        <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">mkl</command>
       </modules>
       <modules compiler="cray">
-        <command name="load">cce/17.0.1</command>
-        <command name="load">cray-libsci/23.09.1.1</command>
+        <command name="load">cce/15.0.1</command>
+        <command name="load">cray-libsci/23.02.1.1</command>
       </modules>
       <modules compiler="gnu">
-        <command name="load">gcc/13.2.0</command>
+        <command name="load">gcc/12.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.7</command>
+        <command name="load">nvhpc/24.3</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.29</command>
+	<command name="load">cray-mpich/8.1.27</command>
       </modules>
 
       <modules mpilib="mpich" compiler="nvhpc" gpu_type="!none">
@@ -87,22 +90,18 @@
 
       <modules DEBUG="FALSE">
 	<command name="load">parallelio/2.6.2</command>
-	<command name="load">esmf/8.6.1</command>
+	<command name="load">esmf/8.6.0</command>
       </modules>
 
       <modules DEBUG="TRUE" mpilib="mpi-serial">
 	<command name="load">parallelio/2.6.2</command>
-	<command name="load">esmf/8.6.1</command>
+	<command name="load">esmf/8.6.0</command>
       </modules>
 
-      <modules DEBUG="TRUE" mpilib="!mpi-serial" compiler="!cray">
+      <modules DEBUG="TRUE" mpilib="!mpi-serial">
 	<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>