Skip to content

Commit 26aacc1

Browse files
authored
Merge pull request #197 from jedwards4b/backout_derecho_updates
backout derecho module update
2 parents 2455e86 + e99b0ed commit 26aacc1

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

machines/derecho/config_machines.xml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<machine MACH="derecho">
22
<DESC>NCAR AMD EPYC system</DESC>
33
<OS>CNL</OS>
4-
<COMPILERS>intel,gnu,nvhpc,intel-oneapi,cray</COMPILERS>
4+
<COMPILERS>intel,gnu,nvhpc,intel-oneapi,intel-classic</COMPILERS>
55
<MPILIBS>mpich</MPILIBS>
66
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
77
<DIN_LOC_ROOT>$ENV{CESMDATAROOT}/inputdata</DIN_LOC_ROOT>
@@ -43,32 +43,35 @@
4343
<command name="load">craype</command>
4444
</modules>
4545
<modules compiler="intel">
46-
<command name="load">intel/2024.0.2</command>
46+
<command name="load">intel/2023.2.1</command>
4747
<command name="load">mkl</command>
4848
</modules>
4949
<modules compiler="intel-oneapi">
50-
<command name="load">intel-oneapi/2024.0.2</command>
50+
<command name="load">intel-oneapi/2023.2.1</command>
51+
<command name="load">mkl</command>
52+
</modules>
53+
<modules compiler="intel-classic">
54+
<command name="load">intel-classic/2023.2.1</command>
5155
<command name="load">mkl</command>
5256
</modules>
5357
<modules compiler="cray">
54-
<command name="load">cce/17.0.1</command>
55-
<command name="load">cray-libsci/23.09.1.1</command>
58+
<command name="load">cce/15.0.1</command>
59+
<command name="load">cray-libsci/23.02.1.1</command>
5660
</modules>
5761
<modules compiler="gnu">
58-
<command name="load">gcc/13.2.0</command>
62+
<command name="load">gcc/12.2.0</command>
5963
<command name="load">cray-libsci/23.02.1.1</command>
60-
<command name="load">openblas/0.3.25</command>
6164
</modules>
6265
<modules compiler="nvhpc">
63-
<command name="load">nvhpc/24.7</command>
66+
<command name="load">nvhpc/24.3</command>
6467
</modules>
6568

6669
<modules>
6770
<command name="load">ncarcompilers/1.0.0</command>
6871
<command name="load">cmake</command>
6972
</modules>
7073
<modules mpilib="mpich">
71-
<command name="load">cray-mpich/8.1.29</command>
74+
<command name="load">cray-mpich/8.1.27</command>
7275
</modules>
7376

7477
<modules mpilib="mpich" compiler="nvhpc" gpu_type="!none">
@@ -87,22 +90,18 @@
8790

8891
<modules DEBUG="FALSE">
8992
<command name="load">parallelio/2.6.2</command>
90-
<command name="load">esmf/8.6.1</command>
93+
<command name="load">esmf/8.6.0</command>
9194
</modules>
9295

9396
<modules DEBUG="TRUE" mpilib="mpi-serial">
9497
<command name="load">parallelio/2.6.2</command>
95-
<command name="load">esmf/8.6.1</command>
98+
<command name="load">esmf/8.6.0</command>
9699
</modules>
97100

98-
<modules DEBUG="TRUE" mpilib="!mpi-serial" compiler="!cray">
101+
<modules DEBUG="TRUE" mpilib="!mpi-serial">
99102
<command name="load">parallelio/2.6.2-debug</command>
100103
<command name="load">esmf/8.6.0-debug</command>
101104
</modules>
102-
<modules DEBUG="TRUE" mpilib="!mpi-serial" compiler="cray">
103-
<command name="load">parallelio/2.6.2-debug</command>
104-
<command name="load">esmf/8.6.1-debug</command>
105-
</modules>
106105
</module_system>
107106

108107
<environment_variables>

0 commit comments

Comments
 (0)