add MACHINFO and ENVINFO, remove thunder and loft (#323)

* add MACHINFO and ENVINFO, remove thunder and loft * update documentation
CICE-Consortium · Jun 23, 2020 · 0a37e99 · 0a37e99
1 parent 2b27a78
commit 0a37e99
Show file tree

Hide file tree

Showing 45 changed files with 450 additions and 289 deletions.
diff --git a/configuration/scripts/icepack.batch.csh b/configuration/scripts/icepack.batch.csh
@@ -72,7 +72,7 @@ cat >> ${jobfile} << EOFB
 #PBS -l walltime=00:50:00
 EOFB
 
-else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad* || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr*) then
+else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad* || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr*) then
 cat >> ${jobfile} << EOFB
 #PBS -N ${shortcase}
 #PBS -q ${ICE_MACHINE_QUEUE}
@@ -125,11 +125,6 @@ cat >> ${jobfile} << EOFB
 #SBATCH --qos=standby
 EOFB
 
-else if (${ICE_MACHINE} =~ loft*) then
-cat >> ${jobfile} << EOFB
-# nothing to do
-EOFB
-
 else if (${ICE_MACHINE} =~ high_Sierra*) then
 cat >> ${jobfile} << EOFB
 # nothing to do

diff --git a/configuration/scripts/icepack.build b/configuration/scripts/icepack.build
@@ -3,11 +3,11 @@
 source ./icepack.settings
 source ${ICE_CASEDIR}/env.${ICE_MACHCOMP} || exit 2
 
-if (${ICE_MACHINE} != ${ICE_MACHINE_ENVNAME}) then
-  echo "WARNING, is ICE_MACHINE setting OK, ${ICE_MACHINE}, ${ICE_MACHINE_ENVNAME}"
+if (${ICE_MACHINE} != ${ICE_MACHINE_MACHNAME}) then
+  echo "WARNING, is ICE_MACHINE setting OK, ${ICE_MACHINE}, ${ICE_MACHINE_MACHNAME}"
 endif
-if (${ICE_COMPILER} != ${ICE_MACHINE_COMPILER}) then
-  echo "WARNING, is ICE_COMPILER setting OK, ${ICE_COMPILER}, ${ICE_MACHINE_COMPILER}"
+if (${ICE_ENVNAME} != ${ICE_MACHINE_ENVNAME}) then
+  echo "WARNING, is ICE_ENVNAME setting OK, ${ICE_ENVNAME}, ${ICE_MACHINE_ENVNAME}"
 endif
 
 echo " "

diff --git a/configuration/scripts/icepack.settings b/configuration/scripts/icepack.settings
@@ -3,7 +3,7 @@
 setenv ICE_CASENAME   undefined
 setenv ICE_SANDBOX    undefined
 setenv ICE_MACHINE    undefined
-setenv ICE_COMPILER   undefined
+setenv ICE_ENVNAME    undefined
 setenv ICE_MACHCOMP   undefined
 setenv ICE_SCRIPTS    undefined
 setenv ICE_CASEDIR    undefined

diff --git a/configuration/scripts/machines/Macros.loft_gnu b/configuration/scripts/machines/Macros.loft_gnu
diff --git a/configuration/scripts/machines/Macros.thunder_intel b/configuration/scripts/machines/Macros.thunder_intel
diff --git a/configuration/scripts/machines/env.badger_intel b/configuration/scripts/machines/env.badger_intel
@@ -1,5 +1,12 @@
 #!/bin/tcsh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 #source /usr/share/Modules/init/csh
 
 #module purge
@@ -17,8 +24,12 @@ setenv PNETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/paralle
 #setenv MP_EUILIB us
 #setenv MP_EAGER_LIMIT 0
 
-setenv ICE_MACHINE_ENVNAME badger
-setenv ICE_MACHINE_COMPILER intel
+endif
+
+setenv ICE_MACHINE_MACHNAME badger
+setenv ICE_MACHINE_MACHINFO "Penguin Intel Xeon Broadwell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "(Note: can vary) ifort 19.0.4.243 20190416"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /net/scratch3/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/Consortium

diff --git a/configuration/scripts/machines/env.cheyenne_gnu b/configuration/scripts/machines/env.cheyenne_gnu
@@ -1,5 +1,12 @@
 #!/bin/csh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
 
 module purge
@@ -9,8 +16,12 @@ module load mpt/2.19
 module load ncarcompilers/0.5.0
 module load netcdf/4.6.3
 
-setenv ICE_MACHINE_ENVNAME cheyenne
-setenv ICE_MACHINE_COMPILER gnu
+endif
+
+setenv ICE_MACHINE_MACHNAME cheyenne
+setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 8.3.0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev

diff --git a/configuration/scripts/machines/env.cheyenne_intel b/configuration/scripts/machines/env.cheyenne_intel
@@ -1,16 +1,27 @@
 #!/bin/csh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
 
 module purge
 module load ncarenv/1.2
 module load intel/19.0.2
 module load mpt/2.19
 module load ncarcompilers/0.5.0
-module load netcdf-mpi/4.6.3
+module load netcdf/4.6.3
+
+endif
 
-setenv ICE_MACHINE_ENVNAME cheyenne
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME cheyenne
+setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 19.0.2.187 20190117"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev

diff --git a/configuration/scripts/machines/env.cheyenne_pgi b/configuration/scripts/machines/env.cheyenne_pgi
@@ -1,5 +1,12 @@
 #!/bin/csh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
 
 module purge
@@ -9,8 +16,12 @@ module load mpt/2.21
 module load ncarcompilers/0.5.0
 module load netcdf/4.7.3
 
-setenv ICE_MACHINE_ENVNAME cheyenne
-setenv ICE_MACHINE_COMPILER pgi
+endif
+
+setenv ICE_MACHINE_MACHNAME cheyenne
+setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
+setenv ICE_MACHINE_ENVNAME pgi
+setenv ICE_MACHINE_ENVINFO "pgf90 19.9-0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev

diff --git a/configuration/scripts/machines/env.conda_linux b/configuration/scripts/machines/env.conda_linux
@@ -26,8 +26,10 @@ endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conda
-setenv ICE_MACHINE_COMPILER linux
+setenv ICE_MACHINE_MACHNAME conda
+setenv ICE_MACHINE_MACHINFO "Generic conda setup"
+setenv ICE_MACHINE_ENVNAME linux
+setenv ICE_MACHINE_ENVINFO "(NOTE: may vary) GNU Fortran (GCC) 7.3.0"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR  $HOME/icepack-dirs/runs
 setenv ICE_MACHINE_INPUTDATA $HOME/icepack-dirs/input

diff --git a/configuration/scripts/machines/env.conda_macos b/configuration/scripts/machines/env.conda_macos
@@ -16,18 +16,20 @@ if ! $?CONDA_EXE then
 endif
 source `$CONDA_EXE info --base`/etc/profile.d/conda.csh
 # Activate "icepack" conda environment
-conda activate cice
+conda activate icepack
 if $status then
   echo ""
-  echo "${0}: 'cice' conda environment not found, see the Icepack documentation for how to create the conda icepack env"
+  echo "${0}: 'icepack' conda environment not found, see the Icepack documentation for how to create the conda icepack env"
   echo ""
   exit 1
 endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conda
-setenv ICE_MACHINE_COMPILER macos
+setenv ICE_MACHINE_MACHNAME conda
+setenv ICE_MACHINE_MACHINFO "Generic conda setup"
+setenv ICE_MACHINE_ENVNAME macos
+setenv ICE_MACHINE_ENVINFO "(NOTE: may vary) GNU Fortran 7.3.0, clang 9.0.1"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR  $HOME/icepack-dirs/runs
 setenv ICE_MACHINE_INPUTDATA $HOME/icepack-dirs/input

diff --git a/configuration/scripts/machines/env.conrad_cray b/configuration/scripts/machines/env.conrad_cray
@@ -1,5 +1,12 @@
 #!/bin/csh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 source /opt/modules/default/init/csh
 
 module unload PrgEnv-cray
@@ -32,8 +39,12 @@ setenv NETCDF_PATH ${NETCDF_DIR}
 limit coredumpsize unlimited
 limit stacksize unlimited
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER cray
+endif
+
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME cray
+setenv ICE_MACHINE_ENVINFO "cce 8.5.8"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium

diff --git a/configuration/scripts/machines/env.conrad_gnu b/configuration/scripts/machines/env.conrad_gnu
@@ -1,5 +1,12 @@
 #!/bin/csh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 source /opt/modules/default/init/csh
 
 module unload PrgEnv-cray
@@ -32,8 +39,12 @@ setenv NETCDF_PATH ${NETCDF_DIR}
 limit coredumpsize unlimited
 limit stacksize unlimited
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER gnu
+endif
+
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 6.3.0 20161221"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium

diff --git a/configuration/scripts/machines/env.conrad_intel b/configuration/scripts/machines/env.conrad_intel
@@ -1,5 +1,12 @@
 #!/bin/csh -f
 
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
 source /opt/modules/default/init/csh
 
 module unload PrgEnv-cray
@@ -32,15 +39,19 @@ setenv NETCDF_PATH ${NETCDF_DIR}
 limit coredumpsize unlimited
 limit stacksize unlimited
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER intel
+endif
+
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 17.0.2 20170213"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
 setenv ICE_MACHINE_BASELINE $WORKDIR/ICEPACK_BASELINE
 setenv ICE_MACHINE_SUBMIT "qsub "
-setenv ICE_MACHINE_ACCT ARLAP96070PET
+setenv ICE_MACHINE_ACCT P00000000
 setenv ICE_MACHINE_QUEUE "debug"
-setenv ICE_MACHINE_TPNODE 32    # tasks per node
+setenv ICE_MACHINE_TPNODE 32        # tasks per node
 setenv ICE_MACHINE_BLDTHRDS 4
 setenv ICE_MACHINE_QSTAT "qstat "