Skip to content

Commit

Permalink
Merge pull request #4724 from jedwards4b/maint-5.6_ncarenv24.12
Browse files Browse the repository at this point in the history 
updates for cesm2.1 under ncarenv/24.12
  • Loading branch information
@jedwards4b
jedwards4b authored Dec 24, 2024
2 parents 01194c2 + 8d663b1 commit 16b5f7d
Show file tree
Hide file tree
Showing 8 changed files with 4,002 additions and 3,264 deletions.
13 changes: 12 additions & 1 deletion config/cesm/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,6 @@ using a fortran linker.

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

<compiler MACH="derecho" COMPILER="intel">
<CFLAGS>
<base> -qno-opt-dynamic-align -fp-model precise -std=gnu99 </base>
<append> -march=core-avx2 -no-fma</append>
</CFLAGS>
<FFLAGS>
<append> -march=core-avx2 -no-fma</append>
</FFLAGS>
</compiler>

<compiler MACH="derecho" COMPILER="gnu">
<FFLAGS>
<append> -fallow-argument-mismatch -fallow-invalid-boz </append>
</FFLAGS>
</compiler>
<compiler MACH="derecho" COMPILER="nvhpc">
<LDFLAGS>
<append> -llapack -lblas </append>
</LDFLAGS>
</compiler>

<compiler MACH="perlmutter" >
<FFLAGS>
<append> -march=core-avx2 -no-fma</append>
Expand Down
36 changes: 14 additions & 22 deletions config/cesm/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ This allows using a different mpirun command to launch unit tests
<DESC>NCAR AMD EPYC </DESC>
<NODENAME_REGEX>de.*.hpc.ucar.edu</NODENAME_REGEX>
<OS>CNL</OS>
<COMPILERS>intel,gnu</COMPILERS>
<COMPILERS>intel,gnu,nvhpc</COMPILERS>
<!-- <COMPILERS>intel,gnu,cray,nvhpc,intel-oneapi,intel-classic</COMPILERS> -->
<MPILIBS>mpich</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
Expand Down Expand Up @@ -1030,43 +1030,35 @@ This allows using a different mpirun command to launch unit tests
<cmd_path lang="csh">module</cmd_path>
<modules>
<command name="load">cesmdev/1.0</command>
<command name="load">ncarenv/23.09</command>
<command name="load">ncarenv/24.12</command>
<command name="purge"/>
<command name="load">craype</command>
</modules>
<modules compiler="intel">
<command name="load">intel/2023.2.1</command>
<command name="load">mkl</command>
<command name="load">spherepack/3.2</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/2024.2.1</command>
<command name="load">mkl</command>
<!-- <command name="load">spherepack/3.2</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/24.03.0</command>
</modules>
<modules compiler="gnu">
<command name="load">gcc/12.2.0</command>
<command name="load">cray-libsci/23.02.1.1</command>
<command name="load">gcc/12.4.0</command>
<command name="load">cray-libsci/24.03.0</command>
</modules>
<modules compiler="nvhpc">
<command name="load">nvhpc/23.7</command>
<command name="load">nvhpc/24.11</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="mpi-serial">
<command name="load">mpi-serial/2.3.0</command>
<command name="load">mpi-serial/2.5.0</command>
</modules>

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

<modules mpilib="!mpi-serial">
<command name="load">netcdf-mpi/4.9.2</command>
<command name="load">parallel-netcdf/1.12.3</command>
<command name="load">parallel-netcdf/1.14.0</command>
</modules>

<modules>
<command name="load">esmf/8.6.0</command>
<command name="load">esmf/8.7.0</command>
</modules>

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

</machine>
Expand Down
7 changes: 4 additions & 3 deletions src/externals/mct/aclocal.m4
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# generated automatically by aclocal 1.10 -*- Autoconf -*-
# generated automatically by aclocal 1.16.5 -*- Autoconf -*-

# Copyright (C) 1996-2021 Free Software Foundation, Inc.

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

m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_include([m4/acx_mpi.m4])
m4_include([m4/ax_fc_version.m4])
m4_include([m4/fortran.m4])
14 changes: 8 additions & 6 deletions src/externals/mct/config.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD

/* Define to dummy `main' function (if any) required to link to the Fortran
/* Define to dummy 'main' function (if any) required to link to the Fortran
libraries. */
#undef FC_DUMMY_MAIN

/* Define if F77 and FC dummy `main' functions are identical. */
/* Define if F77 and FC dummy 'main' functions are identical. */
#undef FC_DUMMY_MAIN_EQ_F77

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

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define if you have the MPI library. */
#undef HAVE_MPI

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

/* Define to 1 if you have the <stdio.h> header file. */
#undef HAVE_STDIO_H

/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H

Expand Down Expand Up @@ -65,7 +65,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION

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

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
Expand Down
Loading

0 comments on commit 16b5f7d

Please sign in to comment.