Skip to content

Commit 16b5f7d

Browse files
jedwards4bjedwards4b
authored
Merge pull request #4724 from jedwards4b/maint-5.6_ncarenv24.12
updates for cesm2.1 under ncarenv/24.12
2 parents 01194c2 + 8d663b1 commit 16b5f7d

File tree

8 files changed

+4002
-3264
lines changed

8 files changed

+4002
-3264
lines changed

‎config/cesm/machines/config_compilers.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,6 @@ using a fortran linker.
750750

751751
<compiler MACH="derecho">
752752
<CFLAGS>
753-
<base> -qno-opt-dynamic-align -fp-model precise -std=gnu99 </base>
754753
<append MODEL="mpi-serial"> -std=gnu89 </append>
755754
</CFLAGS>
756755
<NETCDF_PATH>$ENV{NETCDF}</NETCDF_PATH>
@@ -762,13 +761,25 @@ using a fortran linker.
762761

763762
<compiler MACH="derecho" COMPILER="intel">
764763
<CFLAGS>
764+
<base> -qno-opt-dynamic-align -fp-model precise -std=gnu99 </base>
765765
<append> -march=core-avx2 -no-fma</append>
766766
</CFLAGS>
767767
<FFLAGS>
768768
<append> -march=core-avx2 -no-fma</append>
769769
</FFLAGS>
770770
</compiler>
771771

772+
<compiler MACH="derecho" COMPILER="gnu">
773+
<FFLAGS>
774+
<append> -fallow-argument-mismatch -fallow-invalid-boz </append>
775+
</FFLAGS>
776+
</compiler>
777+
<compiler MACH="derecho" COMPILER="nvhpc">
778+
<LDFLAGS>
779+
<append> -llapack -lblas </append>
780+
</LDFLAGS>
781+
</compiler>
782+
772783
<compiler MACH="perlmutter" >
773784
<FFLAGS>
774785
<append> -march=core-avx2 -no-fma</append>

‎config/cesm/machines/config_machines.xml‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ This allows using a different mpirun command to launch unit tests
996996
<DESC>NCAR AMD EPYC </DESC>
997997
<NODENAME_REGEX>de.*.hpc.ucar.edu</NODENAME_REGEX>
998998
<OS>CNL</OS>
999-
<COMPILERS>intel,gnu</COMPILERS>
999+
<COMPILERS>intel,gnu,nvhpc</COMPILERS>
10001000
<!-- <COMPILERS>intel,gnu,cray,nvhpc,intel-oneapi,intel-classic</COMPILERS> -->
10011001
<MPILIBS>mpich</MPILIBS>
10021002
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
@@ -1030,43 +1030,35 @@ This allows using a different mpirun command to launch unit tests
10301030
<cmd_path lang="csh">module</cmd_path>
10311031
<modules>
10321032
<command name="load">cesmdev/1.0</command>
1033-
<command name="load">ncarenv/23.09</command>
1033+
<command name="load">ncarenv/24.12</command>
10341034
<command name="purge"/>
10351035
<command name="load">craype</command>
10361036
</modules>
10371037
<modules compiler="intel">
1038-
<command name="load">intel/2023.2.1</command>
1039-
<command name="load">mkl</command>
1040-
<command name="load">spherepack/3.2</command>
1041-
</modules>
1042-
<modules compiler="intel-oneapi">
1043-
<command name="load">intel-oneapi/2023.2.1</command>
1044-
<command name="load">mkl</command>
1045-
</modules>
1046-
<modules compiler="intel-classic">
1047-
<command name="load">intel-classic/2023.2.1</command>
1038+
<command name="load">intel/2024.2.1</command>
10481039
<command name="load">mkl</command>
1040+
<!-- <command name="load">spherepack/3.2</command> -->
10491041
</modules>
10501042
<modules compiler="cray">
1051-
<command name="load">cce/15.0.1</command>
1052-
<command name="load">cray-libsci/23.02.1.1</command>
1043+
<command name="load">cce/17.0.1</command>
1044+
<command name="load">cray-libsci/24.03.0</command>
10531045
</modules>
10541046
<modules compiler="gnu">
1055-
<command name="load">gcc/12.2.0</command>
1056-
<command name="load">cray-libsci/23.02.1.1</command>
1047+
<command name="load">gcc/12.4.0</command>
1048+
<command name="load">cray-libsci/24.03.0</command>
10571049
</modules>
10581050
<modules compiler="nvhpc">
1059-
<command name="load">nvhpc/23.7</command>
1051+
<command name="load">nvhpc/24.11</command>
10601052
</modules>
10611053
<modules>
10621054
<command name="load">ncarcompilers/1.0.0</command>
10631055
<command name="load">cmake</command>
10641056
</modules>
10651057
<modules mpilib="mpich">
1066-
<command name="load">cray-mpich/8.1.27</command>
1058+
<command name="load">cray-mpich/8.1.29</command>
10671059
</modules>
10681060
<modules mpilib="mpi-serial">
1069-
<command name="load">mpi-serial/2.3.0</command>
1061+
<command name="load">mpi-serial/2.5.0</command>
10701062
</modules>
10711063

10721064
<modules mpilib="mpi-serial">
@@ -1075,11 +1067,11 @@ This allows using a different mpirun command to launch unit tests
10751067

10761068
<modules mpilib="!mpi-serial">
10771069
<command name="load">netcdf-mpi/4.9.2</command>
1078-
<command name="load">parallel-netcdf/1.12.3</command>
1070+
<command name="load">parallel-netcdf/1.14.0</command>
10791071
</modules>
10801072

10811073
<modules>
1082-
<command name="load">esmf/8.6.0</command>
1074+
<command name="load">esmf/8.7.0</command>
10831075
</modules>
10841076

10851077
</module_system>
@@ -1088,7 +1080,7 @@ This allows using a different mpirun command to launch unit tests
10881080
<env name="OMP_STACKSIZE">64M</env>
10891081
<env name="FI_CXI_RX_MATCH_MODE">hybrid</env>
10901082
<env name="FI_MR_CACHE_MONITOR">memhooks</env>
1091-
<env name="SPHEREPACK_LIBDIR">$ENV{NCAR_ROOT_SPHEREPACK}/lib</env>
1083+
<!-- <env name="SPHEREPACK_LIBDIR">$ENV{NCAR_ROOT_SPHEREPACK}/lib</env> -->
10921084
</environment_variables>
10931085

10941086
</machine>

‎src/externals/mct/aclocal.m4‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# generated automatically by aclocal 1.10 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
2+
3+
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
24

3-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4-
# 2005, 2006 Free Software Foundation, Inc.
55
# This file is free software; the Free Software Foundation
66
# gives unlimited permission to copy and/or distribute it,
77
# with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,7 @@
1111
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1212
# PARTICULAR PURPOSE.
1313

14+
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1415
m4_include([m4/acx_mpi.m4])
1516
m4_include([m4/ax_fc_version.m4])
1617
m4_include([m4/fortran.m4])

‎src/externals/mct/config.h.in‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
/* Define if building universal (internal helper macro) */
44
#undef AC_APPLE_UNIVERSAL_BUILD
55

6-
/* Define to dummy `main' function (if any) required to link to the Fortran
6+
/* Define to dummy 'main' function (if any) required to link to the Fortran
77
libraries. */
88
#undef FC_DUMMY_MAIN
99

10-
/* Define if F77 and FC dummy `main' functions are identical. */
10+
/* Define if F77 and FC dummy 'main' functions are identical. */
1111
#undef FC_DUMMY_MAIN_EQ_F77
1212

1313
/* Define to a macro mangling the given C identifier (in lower and upper
@@ -20,15 +20,15 @@
2020
/* Define to 1 if you have the <inttypes.h> header file. */
2121
#undef HAVE_INTTYPES_H
2222

23-
/* Define to 1 if you have the <memory.h> header file. */
24-
#undef HAVE_MEMORY_H
25-
2623
/* Define if you have the MPI library. */
2724
#undef HAVE_MPI
2825

2926
/* Define to 1 if you have the <stdint.h> header file. */
3027
#undef HAVE_STDINT_H
3128

29+
/* Define to 1 if you have the <stdio.h> header file. */
30+
#undef HAVE_STDIO_H
31+
3232
/* Define to 1 if you have the <stdlib.h> header file. */
3333
#undef HAVE_STDLIB_H
3434

@@ -65,7 +65,9 @@
6565
/* Define to the version of this package. */
6666
#undef PACKAGE_VERSION
6767

68-
/* Define to 1 if you have the ANSI C header files. */
68+
/* Define to 1 if all of the C89 standard headers exist (not just the ones
69+
required in a freestanding environment). This macro is provided for
70+
backward compatibility; new code need not use it. */
6971
#undef STDC_HEADERS
7072

7173
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most

0 commit comments

Comments
 (0)