From dc6b55ee1d9c6a3d44e852548a1754cce4b0945a Mon Sep 17 00:00:00 2001 From: Katetc Date: Fri, 23 Feb 2024 11:38:09 -0700 Subject: [PATCH 1/4] Updates for new derecho libraries --- builds/derecho-intel/derecho-intel-cmake | 12 ++++++++---- builds/derecho-intel/derecho-intel-cmake.sh | 5 +++++ tests/MISMIP/mismip.code/runCISM.derecho.template | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100755 tests/MISMIP/mismip.code/runCISM.derecho.template diff --git a/builds/derecho-intel/derecho-intel-cmake b/builds/derecho-intel/derecho-intel-cmake index 416d5d57..8a87fc1c 100755 --- a/builds/derecho-intel/derecho-intel-cmake +++ b/builds/derecho-intel/derecho-intel-cmake @@ -4,11 +4,15 @@ # This cmake configuration script is set up to perform a parallel build with Trilinos +source /etc/profile.d/z00_modules.csh + module purge -module load ncarenv/23.06 -module load intel/2023.0.0 -module load intel-mpi/2021.8.0 -module load mkl/2023.0.0 +module load ncarenv/23.09 +module load intel/2023.2.1 +module load ncarcompilers/1.0.0 +module load cray-mpich/8.1.27 +#module load intel-mpi/2021.8.0 +module load mkl/2023.2.0 #module load mpt/2.19 module load netcdf/4.9.2 module load ncarcompilers/1.0.0 diff --git a/builds/derecho-intel/derecho-intel-cmake.sh b/builds/derecho-intel/derecho-intel-cmake.sh index db0475b5..abae6735 100644 --- a/builds/derecho-intel/derecho-intel-cmake.sh +++ b/builds/derecho-intel/derecho-intel-cmake.sh @@ -15,12 +15,15 @@ else cism_top=${1%/} fi +source /etc/profile.d/z00_modules.sh + echo CISM: "${cism_top}" module purge module load ncarenv/23.06 module load intel/2023.0.0 +module load intel-mpi/2021.8.0 module load mkl/2023.0.0 #module load mpt/2.15f module load netcdf/4.9.2 @@ -65,6 +68,8 @@ cmake \ -D CMAKE_CXX_COMPILER=mpiicpc \ -D CMAKE_C_COMPILER=mpicc \ -D CMAKE_Fortran_COMPILER=mpif90 \ +\ + -D CMAKE_EXE_LINKER_FLAGS="-mkl=cluster" \ \ -D CMAKE_Fortran_FLAGS:STRING="-qno-opt-dynamic-align -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -qopt-report -O2 -debug minimal " \ -D CMAKE_C_FLAGS:STRING="-qno-opt-dynamic-align -fp-model precise -std=gnu99 -qopt-report -O2 -debug minimal " \ diff --git a/tests/MISMIP/mismip.code/runCISM.derecho.template b/tests/MISMIP/mismip.code/runCISM.derecho.template new file mode 100755 index 00000000..2e5b0d2a --- /dev/null +++ b/tests/MISMIP/mismip.code/runCISM.derecho.template @@ -0,0 +1,15 @@ +#!/bin/bash +# +#PBS -N MISMIP +#PBS -A P93300601 +#PBS -l walltime=01:30:00 +#PBS -q main +#PBS -j oe +#PBS -m abe +#PBS -l select=1:ncpus=128:mpiprocs=128 + +module load intel/2023.2.1 +module load craype/2.7.23 +module load mkl/2023.2.0 + +mpiexec -n 128 ./cism_driver mismip.config From 09a94f4612535675cd4107c3bd489d0a273531b2 Mon Sep 17 00:00:00 2001 From: Katetc Date: Fri, 17 May 2024 12:52:32 -0600 Subject: [PATCH 2/4] Adding a .gitignore file to make building and testing in the source tree easier --- .gitignore | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b3dda26d --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +# Ignore editor temporaries and backups +*~ +.#* +\#*# +*.swp + +# Ignore python bytecode files +*.pyc + +# Ignore build temporary files +CMakeCache.txt +CMakeFiles +Makefile +autocopy.log +Makefile.am +build +cmake_install.cmake +fortran_autocopy_includes +fortran_autogen_srcs +fortran_mod_files +lib + +#ignore cism_driver executables +cism_driver + +#ignore test outputs +results +*config.log +*out.nc +*restart.nc +output +*.o* +e1-mm.3.nc +isos.elra.nc +mismip.config +mismip3d.config +mismip3dInit.nc +greenland_20km.config.pdd.log +greenland_20km.config.smb.log +pbsout.txt +linear +P75R +P75S +Stnd +mismip+Ice0 From e449d4f0a7aa12f4b1624905142dc0c14d9959c4 Mon Sep 17 00:00:00 2001 From: Katetc Date: Fri, 17 May 2024 15:11:19 -0600 Subject: [PATCH 3/4] Updates to derecho intel compilers --- builds/derecho-intel/derecho-intel-cmake | 7 ------- builds/derecho-intel/derecho-intel-cmake.sh | 14 +++++--------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/builds/derecho-intel/derecho-intel-cmake b/builds/derecho-intel/derecho-intel-cmake index 8a87fc1c..681e10e6 100755 --- a/builds/derecho-intel/derecho-intel-cmake +++ b/builds/derecho-intel/derecho-intel-cmake @@ -11,16 +11,9 @@ module load ncarenv/23.09 module load intel/2023.2.1 module load ncarcompilers/1.0.0 module load cray-mpich/8.1.27 -#module load intel-mpi/2021.8.0 module load mkl/2023.2.0 -#module load mpt/2.19 module load netcdf/4.9.2 -module load ncarcompilers/1.0.0 -#module load pnetcdf/1.11.0 module load cmake/3.26.3 -#module load python/2.7.13 -#module load numpy/1.12.0 -#module load netcdf4-python/1.2.7 # remove old build data: rm -f ./CMakeCache.txt diff --git a/builds/derecho-intel/derecho-intel-cmake.sh b/builds/derecho-intel/derecho-intel-cmake.sh index abae6735..79ca2cbe 100644 --- a/builds/derecho-intel/derecho-intel-cmake.sh +++ b/builds/derecho-intel/derecho-intel-cmake.sh @@ -21,18 +21,14 @@ echo CISM: "${cism_top}" module purge -module load ncarenv/23.06 -module load intel/2023.0.0 -module load intel-mpi/2021.8.0 -module load mkl/2023.0.0 -#module load mpt/2.15f +module load ncarenv/23.09 +module load intel/2023.2.1 +module load cray-mpich/8.1.27 +module load mkl/2023.2.0 module load netcdf/4.9.2 module load ncarcompilers/1.0.0 -#module load pnetcdf/1.8.0 module load cmake/3.26.3 -#module load python/2.7.13 -#module load numpy/1.12.0 -#module load netcdf4-python/1.2.7 + # remove old build data: rm -f ./CMakeCache.txt From 627b3d7480d027b7be14fd471293515eaa8b1303 Mon Sep 17 00:00:00 2001 From: Katetc Date: Fri, 17 May 2024 15:25:35 -0600 Subject: [PATCH 4/4] Updates for Derecho, Changelog for 2.01.015 --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5f4df1de..ab647244 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ CISM Changelog +Changes in CISM tag cism_main_2.01.015 +====================================== +Updates for running CISM standalone on the NSF NCAR Derecho supercomputer. + Changes in CISM tag cism_main_2.01.014 ====================================== Basal hydrology scheme, new basal friction and inversion options ESCOMP/CISM PR#61