Skip to content

Commit 5cd1db5

Browse files
committed
Merge branch 'vanroekel/machine-files/chicoma-intel-update' into next (PR #7391)
Updates Chicoma machine files to enable intel compiler This PR updates the cmake macros for intel_chicoma-cpu to enable functionality of the intel compiler on the LANL chicoma machine. I have tested this with the V3 HR WCYCL test and it runs successfully. [BFB]
2 parents 02c9644 + 57f9158 commit 5cd1db5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cime_config/machines/cmake_macros/intel_chicoma-cpu.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
set(PIO_FILESYSTEM_HINTS "lustre")
22
string(APPEND CONFIG_ARGS " --host=cray")
33
string(APPEND CMAKE_EXE_LINKER_FLAGS " -qmkl")
4-
4+
string(REPLACE "-fp-model source" "-fp-model precise" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
5+
string(REPLACE "-fp-model source" "-fp-model precise" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
56
set(MPICC "cc")
67
set(MPICXX "CC")
78
set(MPIFC "ftn")

cime_config/machines/config_machines.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4280,8 +4280,8 @@
42804280
<COMPILERS>gnu,intel,nvidia,amdclang</COMPILERS>
42814281
<MPILIBS>mpich</MPILIBS>
42824282
<CIME_OUTPUT_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/scratch/chicoma-cpu</CIME_OUTPUT_ROOT>
4283-
<DIN_LOC_ROOT>/usr/projects/e3sm/inputdata</DIN_LOC_ROOT>
4284-
<DIN_LOC_ROOT_CLMFORC>/usr/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
4283+
<DIN_LOC_ROOT>/lustre/scratch5/$ENV{USER}/inputdata</DIN_LOC_ROOT>
4284+
<DIN_LOC_ROOT_CLMFORC>/lustre/scratch5/$ENV{USER}/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
42854285
<DOUT_S_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/archive/$CASE</DOUT_S_ROOT>
42864286
<BASELINE_ROOT>/lustre/scratch5/$ENV{USER}/E3SM/input_data/ccsm_baselines/$COMPILER</BASELINE_ROOT>
42874287
<CCSM_CPRNC>/usr/projects/e3sm/software/chicoma-cpu/cprnc</CCSM_CPRNC>
@@ -4356,6 +4356,7 @@
43564356
<modules compiler="intel">
43574357
<command name="load">PrgEnv-intel/8.5.0</command>
43584358
<command name="load">intel/2023.2.0</command>
4359+
<command name="load">intel-mkl/2023.2.0</command>
43594360
</modules>
43604361

43614362
<modules compiler="amdclang">

0 commit comments

Comments
 (0)