diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml index f1cbf555..05832e40 100644 --- a/mache/cime_machine_config/config_machines.xml +++ b/mache/cime_machine_config/config_machines.xml @@ -1387,16 +1387,16 @@ Core/25.03 PrgEnv-gnu - cpe/24.11 - gcc-native/12.3 + cpe/25.09 + gcc-native/14.2 libunwind cray-python/3.11.7 subversion git cmake - cray-hdf5-parallel/1.14.3.3 - cray-netcdf-hdf5parallel/4.9.0.15 - cray-parallel-netcdf/1.12.3.15 + cray-hdf5-parallel/1.14.3.7 + cray-netcdf-hdf5parallel/4.9.2.1 + cray-parallel-netcdf/1.12.3.19 darshan-runtime @@ -1832,6 +1832,9 @@ $ENV{PARALLEL_NETCDF_ROOT} + + -1 + @@ -2930,120 +2933,64 @@ - ANL/LCRC Cluster, Cray CS400, 352-nodes Xeon Phi 7230 KNLs 64C/1.3GHz + 672-nodes Xeon E5-2695v4 Broadwells 36C/2.10GHz, Intel Omni-Path network, SLURM batch system, Lmod module environment. + ANL-LCRC, 672-nodes Xeon E5-2695v4 Broadwell 36C/2.10GHz, Intel Omni-Path OPA 100G network, PBS Pro beboplogin.* LINUX - intel,gnu - impi,mvapich + gnu + openmpi e3sm /lcrc/group/e3sm/$USER/scratch/bebop /lcrc/group/e3sm/data/inputdata /lcrc/group/e3sm/data/inputdata/atm/datm7 /lcrc/group/e3sm/$USER/archive/$CASE /lcrc/group/e3sm/baselines/bebop/$COMPILER - /lcrc/group/e3sm/soft/tools/cprnc/cprnc + /lcrc/group/e3sm/tools/cprnc/cprnc.bebop 8 e3sm_integration 4 - slurm + pbspro E3SM 36 36 TRUE - + mpirun - -l -n {{ total_tasks }} - - - - srun - - -l -n {{ total_tasks }} -N {{ num_nodes }} --kill-on-bad-exit - --cpu_bind=cores - -c $ENV{OMP_NUM_THREADS} - -m plane=$SHELL{echo 36/$OMP_NUM_THREADS|bc} + --tag-output -n {{ total_tasks }} + --map-by ppr:1:core:PE=$ENV{OMP_NUM_THREADS} --bind-to core --oversubscribe - - - - /home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/sh - /home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/csh - /home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/env_modules_python.py - /home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/libexec/lmod python + /gpfs/fs1/soft/bebop/software/spack-built/linux-rocky8-x86_64/gcc-8.5.0/lmod-8.7.37-rxz3nx5/lmod/lmod/init/sh + /gpfs/fs1/soft/bebop/software/spack-built/linux-rocky8-x86_64/gcc-8.5.0/lmod-8.7.37-rxz3nx5/lmod/lmod/init/csh + /gpfs/fs1/soft/bebop/software/spack-built/linux-rocky8-x86_64/gcc-8.5.0/lmod-8.7.37-rxz3nx5/lmod/lmod/init/env_modules_python.py + /gpfs/fs1/soft/bebop/software/spack-built/linux-rocky8-x86_64/gcc-8.5.0/lmod-8.7.37-rxz3nx5/lmod/lmod/libexec/lmod python module module - - cmake/3.20.3-vedypwm - anaconda3/5.2.0 - - - gcc/7.4.0 - intel/20.0.4-lednsve - intel-mkl/2020.4.304-voqlapk - - - intel-mpi/2019.9.304-i42whlw - hdf5/1.10.7-ugvomvt - netcdf-c/4.4.1-blyisdg - netcdf-cxx/4.2-gkqc6fq - netcdf-fortran/4.4.4-eanrh5t - parallel-netcdf/1.11.0-y3nmmej - - - mvapich2/2.3.6-verbs-x4iz7lq - hdf5/1.10.7-igh6foh - netcdf-c/4.4.1-gei7x7w - netcdf-cxx/4.2-db2f5or - netcdf-fortran/4.4.4-b4ldb3a - parallel-netcdf/1.11.0-kj4jsvt - - - gcc/8.2.0-xhxgy33 - intel-mkl/2020.4.304-d6zw4xa - - - intel-mpi/2019.9.304-rxpzd6p - hdf5/1.10.7-oy6d2nm - netcdf-c/4.4.1-fysjgfx - netcdf-cxx/4.2-oaiw2v6 - netcdf-fortran/4.4.4-kxgkaop - parallel-netcdf/1.11.0-fce7akl - - - mvapich2/2.3-bebop-a66r4jf - hdf5/1.10.5-ejeshwh - netcdf/4.4.1-ve2zfkw - netcdf-cxx/4.2-2rkopdl - netcdf-fortran/4.4.4-thtylny - parallel-netcdf/1.11.0-kozyofv + cmake/3.29.2 + gcc/13.2.0-xk53apo + openmpi/4.1.8 $CIME_OUTPUT_ROOT/$CASE/run $CIME_OUTPUT_ROOT/$CASE/bld - 0.1 0 - $SHELL{dirname $(dirname $(which nc-config))} - $SHELL{dirname $(dirname $(which nf-config))} - /lcrc/group/e3sm/soft/perl/5.26.0/bin:$ENV{PATH} - - - $SHELL{dirname $(dirname $(which pnetcdf_version))} - - - $SHELL{which h5dump | xargs dirname | xargs dirname} + /lcrc/group/e3sm/soft/bebop/netcdf-c/4.9.3/gcc-13.2.0/openmpi-4.1.8 + /lcrc/group/e3sm/soft/bebop/netcdf-fortran/4.6.2/gcc-13.2.0/openmpi-4.1.8 + /lcrc/group/e3sm/soft/bebop/pnetcdf/1.14.1/gcc-13.2.0/openmpi-4.1.8 + /lcrc/group/e3sm/soft/bebop/pnetcdf/1.14.1/gcc-13.2.0/openmpi-4.1.8/bin:/lcrc/group/e3sm/soft/bebop/netcdf-fortran/4.6.2/gcc-13.2.0/openmpi-4.1.8/bin:/lcrc/group/e3sm/soft/bebop/netcdf-c/4.9.3/gcc-13.2.0/openmpi-4.1.8/bin:/lcrc/group/e3sm/soft/perl/5.26.0/bin:$ENV{PATH} + /lcrc/group/e3sm/soft/bebop/pnetcdf/1.14.1/gcc-13.2.0/openmpi-4.1.8/lib:/lcrc/group/e3sm/soft/bebop/netcdf-fortran/4.6.2/gcc-13.2.0/openmpi-4.1.8/lib:/lcrc/group/e3sm/soft/bebop/netcdf-c/4.9.3/gcc-13.2.0/openmpi-4.1.8/lib:/lcrc/group/e3sm/soft/bebop/openmpi/4.1.8/gcc-13.2.0/lib:$ENV{LD_LIBRARY_PATH} + $SHELL{if [ -z "$LAPACK_ROOT" ]; then echo /lcrc/group/e3sm/soft/bebop/netlib-lapack/3.12.0/gcc-13.2.0; else echo "$LAPACK_ROOT"; fi} + $SHELL{if [ -z "$BLAS_ROOT" ]; then echo /lcrc/group/e3sm/soft/bebop/netlib-lapack/3.12.0/gcc-13.2.0; else echo "$BLAS_ROOT"; fi} + $SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/improv/gnu; else echo "$MOAB_ROOT"; fi} + ^lockedfile,individual 128M spread - threads - - - shm:tmi + cores @@ -3091,14 +3038,13 @@ $CIME_OUTPUT_ROOT/$CASE/run $CIME_OUTPUT_ROOT/$CASE/bld - 0.05 0 /lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6 /lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6 /lcrc/group/e3sm/soft/improv/pnetcdf/1.14.1/gcc-12.3.0/openmpi-4.1.6 /lcrc/group/e3sm/soft/improv/pnetcdf/1.14.1/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/bin:/lcrc/group/e3sm/soft/perl/improv/bin:$ENV{PATH} - $SHELL{lp=/lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0:/lcrc/group/e3sm/soft/improv/pnetcdf/1.14.1/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/lib:/opt/pbs/lib:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/lib; if [ -z "$LD_LIBRARY_PATH" ]; then echo $lp; else echo "$lp:$LD_LIBRARY_PATH"; fi} + $SHELL{lp=/lcrc/group/e3sm/soft/improv/pnetcdf/1.14.1/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/lib:/opt/pbs/lib:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/lib; if [ -z "$LD_LIBRARY_PATH" ]; then echo $lp; else echo "$lp:$LD_LIBRARY_PATH"; fi} $SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/improv/gnu; else echo "$MOAB_ROOT"; fi} $SHELL{if [ -z "$LAPACK_ROOT" ]; then echo /lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0; else echo "$LAPACK_ROOT"; fi} $SHELL{if [ -z "$BLAS_ROOT" ]; then echo /lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0; else echo "$BLAS_ROOT"; fi} @@ -3655,13 +3601,11 @@ module module - /grand/E3SMinput/soft/modulefiles/crux cmake/3.27.9 - cray-python/3.11.7 craype-accel-host - PrgEnv-gnu/8.5.0 - cray-libsci/24.03.0 + PrgEnv-gnu/8.6.0 + cray-libsci/25.09.0 cray-hdf5-parallel/1.12.2.11 cray-netcdf-hdf5parallel/4.9.0.11 cray-parallel-netcdf/1.12.3.11 @@ -3676,6 +3620,8 @@ $ENV{CRAY_PARALLEL_NETCDF_PREFIX} $ENV{CRAY_LD_LIBRARY_PATH}:$ENV{LD_LIBRARY_PATH} hybrid + 240 + 240 128M diff --git a/mache/spack/templates/frontier_craygnu-mphipcc_mpich.yaml b/mache/spack/templates/frontier_craygnu-mphipcc_mpich.yaml index 8f62f1a7..53c6dd96 100644 --- a/mache/spack/templates/frontier_craygnu-mphipcc_mpich.yaml +++ b/mache/spack/templates/frontier_craygnu-mphipcc_mpich.yaml @@ -121,9 +121,9 @@ spack: modules: - Core/25.03 - PrgEnv-gnu - - cpe/24.11 + - cpe/25.09 - libunwind - - gcc-native/12.3 + - gcc-native/14.2 - craype/2.7.33 - libfabric/1.22.0 - craype-accel-amd-gfx90a @@ -160,23 +160,23 @@ spack: {%- endif %} hdf5: externals: - - spec: hdf5@1.14.3.3~cxx+fortran+hl~java+mpi+shared - prefix: /opt/cray/pe/hdf5-parallel/1.14.3.3/gnu/12.3 + - spec: hdf5@1.14.3.7~cxx+fortran+hl~java+mpi+shared + prefix: /opt/cray/pe/hdf5-parallel/1.14.3.7/gnu/12.3 buildable: false parallel-netcdf: externals: - - spec: parallel-netcdf@1.12.3.15+cxx+fortran+pic+shared - prefix: /opt/cray/pe/parallel-netcdf/1.12.3.15/gnu/12.3 + - spec: parallel-netcdf@1.12.3.19+cxx+fortran+pic+shared + prefix: /opt/cray/pe/parallel-netcdf/1.12.3.19/gnu/12.3 buildable: false netcdf-c: externals: - - spec: netcdf-c@4.9.0.15+mpi~parallel-netcdf - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.15/gnu/12.3 + - spec: netcdf-c@4.9.2.1+mpi~parallel-netcdf + prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.2.1/gnu/12.3 buildable: false netcdf-fortran: externals: - spec: netcdf-fortran@4.5.3 - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.15/gnu/12.3 + prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.2.1/gnu/12.3 buildable: false compilers: @@ -193,9 +193,9 @@ spack: modules: - Core/25.03 - PrgEnv-gnu - - cpe/24.11 + - cpe/25.09 - libunwind - - gcc-native/12.3 + - gcc-native/14.2 - craype/2.7.33 - libfabric/1.22.0 - craype-accel-amd-gfx90a diff --git a/mache/spack/templates/frontier_craygnu_mpich.yaml b/mache/spack/templates/frontier_craygnu_mpich.yaml index e1bc6e7e..33aa8354 100644 --- a/mache/spack/templates/frontier_craygnu_mpich.yaml +++ b/mache/spack/templates/frontier_craygnu_mpich.yaml @@ -121,9 +121,9 @@ spack: modules: - Core/25.03 - PrgEnv-gnu - - cpe/24.11 + - cpe/25.09 - libunwind - - gcc-native/12.3 + - gcc-native/14.2 - craype/2.7.33 - libfabric/1.22.0 extra_attributes: @@ -158,23 +158,23 @@ spack: {%- endif %} hdf5: externals: - - spec: hdf5@1.14.3.3~cxx+fortran+hl~java+mpi+shared - prefix: /opt/cray/pe/hdf5-parallel/1.14.3.3/gnu/12.3 + - spec: hdf5@1.14.3.7~cxx+fortran+hl~java+mpi+shared + prefix: /opt/cray/pe/hdf5-parallel/1.14.3.7/gnu/12.3 buildable: false parallel-netcdf: externals: - - spec: parallel-netcdf@1.12.3.15+cxx+fortran+pic+shared - prefix: /opt/cray/pe/parallel-netcdf/1.12.3.15/gnu/12.3 + - spec: parallel-netcdf@1.12.3.19+cxx+fortran+pic+shared + prefix: /opt/cray/pe/parallel-netcdf/1.12.3.19/gnu/12.3 buildable: false netcdf-c: externals: - - spec: netcdf-c@4.9.0.15+mpi~parallel-netcdf - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.15/gnu/12.3 + - spec: netcdf-c@4.9.2.1+mpi~parallel-netcdf + prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.2.1/gnu/12.3 buildable: false netcdf-fortran: externals: - spec: netcdf-fortran@4.5.3 - prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.15/gnu/12.3 + prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.2.1/gnu/12.3 buildable: false compilers: - compiler: @@ -190,8 +190,8 @@ spack: modules: - Core/25.03 - PrgEnv-gnu - - cpe/24.11 + - cpe/25.09 - libunwind - - gcc-native/12.3 + - gcc-native/14.2 - craype/2.7.33 - libfabric/1.22.0