From 199b92dcbc28ce0515e3e358a512cc85c5f73781 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Mon, 27 Oct 2025 09:17:12 -0600 Subject: [PATCH] First pass at updates to build MARBL with nvhpc 1. Updated MARBL external to latest version (has some updates needed for nvhpc) 2. Updated build.sh to use nvhpc/25.9 on derecho (includes bugfix necessary for building MARBL) 3. Hardcoded TURBO account key in job-derecho.sh --- build.sh | 7 +++++-- examples/cesm_t232_marbl/job-derecho.sh | 2 +- submodules/MARBL | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 4d72e11e..2792d47b 100755 --- a/build.sh +++ b/build.sh @@ -153,19 +153,22 @@ if [ "$MACHINE" == "ncar" ]; then if [ ! "${HOST:0:5}" == "crhtc" ] && [ ! "${HOST:0:6}" == "casper" ]; then module --force purge . /glade/u/apps/derecho/23.09/spack/opt/spack/lmod/8.7.24/gcc/7.5.0/c645/lmod/lmod/init/sh - module load cesmdev/1.0 ncarenv/23.09 case $COMPILER in "intel" ) + module load cesmdev/1.0 ncarenv/23.09 module load craype intel/2023.2.1 mkl ncarcompilers/1.0.0 cmake cray-mpich/8.1.27 netcdf-mpi/4.9.2 parallel-netcdf/1.12.3 parallelio/2.6.2 esmf/8.6.0 ;; "gnu" ) + module load cesmdev/1.0 ncarenv/23.09 module load craype gcc/12.2.0 cray-libsci/23.02.1.1 ncarcompilers/1.0.0 cmake cray-mpich/8.1.27 netcdf-mpi/4.9.2 parallel-netcdf/1.12.3 parallelio/2.6.2-debug esmf/8.6.0-debug ;; "nvhpc" ) if [ $OFFLOAD -eq 1 ]; then + module load cesmdev/1.0 ncarenv/23.09 module load craype nvhpc/24.9 ncarcompilers/1.0.0 cmake cray-mpich/8.1.29 netcdf-mpi/4.9.2 parallel-netcdf/1.12.3 cuda/12.2.1 else - module load craype nvhpc/23.7 ncarcompilers/1.0.0 cmake cray-mpich/8.1.27 netcdf-mpi/4.9.2 parallel-netcdf/1.12.3 + module load cesmdev/1.0 ncarenv/24.12 + module load craype nvhpc/25.9 ncarcompilers/1.0.0 cmake cray-mpich/8.1.29 netcdf-mpi/4.9.3 parallel-netcdf/1.14.0 fi ;; *) diff --git a/examples/cesm_t232_marbl/job-derecho.sh b/examples/cesm_t232_marbl/job-derecho.sh index e425380c..fcb7d60e 100644 --- a/examples/cesm_t232_marbl/job-derecho.sh +++ b/examples/cesm_t232_marbl/job-derecho.sh @@ -1,6 +1,6 @@ #!/bin/bash #PBS -N mom6_standalone -#PBS -A +#PBS -A NCGD0067 #PBS -j oe #PBS -k eod #PBS -q main diff --git a/submodules/MARBL b/submodules/MARBL index 2c04fb23..81092dff 160000 --- a/submodules/MARBL +++ b/submodules/MARBL @@ -1 +1 @@ -Subproject commit 2c04fb23d0ee9ceef6d61f1021652ccab62e8324 +Subproject commit 81092dff7a88e8637b19f9c3d29d2ca9d73530bc