Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add MACHINFO and ENVINFO, remove thunder and loft #323

Merged
merged 4 commits into from
Jun 23, 2020
Merged

add MACHINFO and ENVINFO, remove thunder and loft #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0b7162
add MACHINFO and ENVINFO, remove thunder and loft
apcraig Jun 22, 2020
e3d8943
update documentation
apcraig Jun 23, 2020
e6ff5dd
update documentation
apcraig Jun 23, 2020
9e07c58
update documentation
apcraig Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions configuration/scripts/icepack.batch.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions configuration/scripts/icepack.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 " "
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/icepack.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
54 changes: 0 additions & 54 deletions configuration/scripts/machines/Macros.loft_gnu
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions configuration/scripts/machines/Macros.thunder_intel
View file
Open in desktop

This file was deleted.

15 changes: 13 additions & 2 deletions configuration/scripts/machines/env.badger_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
15 changes: 13 additions & 2 deletions configuration/scripts/machines/env.cheyenne_gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
17 changes: 14 additions & 3 deletions configuration/scripts/machines/env.cheyenne_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 13 additions & 2 deletions configuration/scripts/machines/env.cheyenne_pgi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions configuration/scripts/machines/env.conda_linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions configuration/scripts/machines/env.conda_macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions configuration/scripts/machines/env.conrad_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions configuration/scripts/machines/env.conrad_gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
19 changes: 15 additions & 4 deletions configuration/scripts/machines/env.conrad_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 "
Loading