Merge pull request #62 from ESCOMP/katec/derecho_update

Katec/derecho update

.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

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

builds/derecho-intel/derecho-intel-cmake

@@ -4,19 +4,16 @@
 
 # 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 mpt/2.19
-module load netcdf/4.9.2
+module load ncarenv/23.09
+module load intel/2023.2.1
 module load ncarcompilers/1.0.0
-#module load pnetcdf/1.11.0
+module load cray-mpich/8.1.27
+module load mkl/2023.2.0
+module load netcdf/4.9.2
 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

builds/derecho-intel/derecho-intel-cmake.sh

@@ -15,21 +15,20 @@ 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 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
@@ -65,6 +64,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 " \

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