From 98e030773163a6965ef533bed6e89de5105220cf Mon Sep 17 00:00:00 2001 From: apcraig Date: Fri, 15 Sep 2017 11:32:43 -0600 Subject: [PATCH] Update scripts, rename variables from CICE_ to ICE_ to be more reusable in icepack. --- README.test | 6 +- configuration/scripts/cice.batch.csh | 50 +++---- configuration/scripts/cice.build | 108 +++++++------- configuration/scripts/cice.launch.csh | 36 ++--- configuration/scripts/cice.run.setup.csh | 46 +++--- configuration/scripts/cice.settings | 72 +++++----- configuration/scripts/cice.test.setup.csh | 40 +++--- configuration/scripts/cice_decomp.csh | 78 +++++------ .../scripts/machines/Macros.cheyenne | 10 +- configuration/scripts/machines/Macros.conrad | 12 +- configuration/scripts/machines/Macros.cori | 12 +- configuration/scripts/machines/Macros.gordon | 12 +- configuration/scripts/machines/Macros.pinto | 12 +- configuration/scripts/machines/Macros.thunder | 12 +- configuration/scripts/machines/Macros.wolf | 12 +- .../scripts/machines/Macros.yellowstone | 12 +- configuration/scripts/machines/env.cheyenne | 18 +-- configuration/scripts/machines/env.conrad | 18 +-- configuration/scripts/machines/env.cori | 18 +-- configuration/scripts/machines/env.gordon | 18 +-- configuration/scripts/machines/env.pinto | 18 +-- configuration/scripts/machines/env.thunder | 18 +-- configuration/scripts/machines/env.wolf | 18 +-- .../scripts/machines/env.yellowstone | 18 +-- configuration/scripts/options/set_env.debug | 2 +- configuration/scripts/options/set_env.long | 2 +- configuration/scripts/options/set_env.medium | 2 +- configuration/scripts/options/set_env.short | 2 +- configuration/scripts/options/set_env.thread | 2 +- configuration/scripts/tests/baseline.script | 40 +++--- .../scripts/tests/test_restart.script | 24 ++-- configuration/scripts/tests/test_smoke.script | 4 +- create.case | 132 +++++++++--------- 33 files changed, 441 insertions(+), 443 deletions(-) diff --git a/README.test b/README.test index 4077eea93..950ac611b 100644 --- a/README.test +++ b/README.test @@ -166,14 +166,14 @@ Additional Details: - In general, the baseline generation, baseline compare, and test diff are independent. - Use the '-bd' flag to specify the location where you want the baseline dataset to be written. Without specifying '-bd', the baseline dataset will be written - to the default baseline directory found in the env. file (CICE_MACHINE_BASELINE). + to the default baseline directory found in the env. file (ICE_MACHINE_BASELINE). - If '-bd' is not passed, the scripts will look for baseline datasets in the default - baseline directory found in the env. file (CICE_MACHINE_BASELINE). + baseline directory found in the env. file (ICE_MACHINE_BASELINE). If the '-bd' option is passed, the scripts will look for baseline datasets in the location passed to the -bd argument. - To generate a baseline dataset for a specific version (for regression testing), use '-bg '. The scripts will then place the baseline dataset - in $CICE_MACHINE_BASELINE// + in $ICE_MACHINE_BASELINE// - The '-testid' flag allows users to specify a testing id that will be added to the end of the case directory. For example, "./create.case -m wolf -t smoke -testid t12 -p 4x1" creates the directory wolf_smoke_gx3_4x1.t12. This flag is REQUIRED if using -t or -ts. diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh index 2b7bbdbc2..f51beb00e 100755 --- a/configuration/scripts/cice.batch.csh +++ b/configuration/scripts/cice.batch.csh @@ -7,14 +7,14 @@ else endif source ./cice.settings -source ${CICE_CASEDIR}/env.${CICE_MACHINE} || exit 2 +source ${ICE_CASEDIR}/env.${ICE_MACHINE} || exit 2 set jobfile = $1 -set ntasks = ${CICE_NTASKS} -set nthrds = ${CICE_NTHRDS} -set maxtpn = ${CICE_MACHINE_TPNODE} -set acct = ${CICE_MACHINE_ACCT} +set ntasks = ${ICE_NTASKS} +set nthrds = ${ICE_NTHRDS} +set maxtpn = ${ICE_MACHINE_TPNODE} +set acct = ${ICE_MACHINE_ACCT} @ taskpernode = ${maxtpn} / $nthrds @ nnodes = ${ntasks} / ${taskpernode} @@ -34,7 +34,7 @@ EOF0 #========================================== -if (${CICE_MACHINE} =~ yellowstone*) then +if (${ICE_MACHINE} =~ yellowstone*) then cat >> ${jobfile} << EOFB #BSUB -n ${ntasks} #BSUB -R "span[ptile=${ptile}]" @@ -44,44 +44,44 @@ cat >> ${jobfile} << EOFB #BSUB -a poe #BSUB -o poe.stdout.%J #BSUB -e poe.stderr.%J -#BSUB -J ${CICE_CASENAME} -#BSUB -W ${CICE_RUNLENGTH} +#BSUB -J ${ICE_CASENAME} +#BSUB -W ${ICE_RUNLENGTH} #BSUB -P ${acct} EOFB #========================================== -else if (${CICE_MACHINE} =~ cheyenne*) then +else if (${ICE_MACHINE} =~ cheyenne*) then cat >> ${jobfile} << EOFB #PBS -j oe #PBS -m ae #PBS -V #PBS -q regular -#PBS -N ${CICE_CASENAME} -#PBS -A ${CICE_ACCT} +#PBS -N ${ICE_CASENAME} +#PBS -A ${ICE_ACCT} #PBS -l select=${nnodes}:ncpus=${corespernode}:mpiprocs=${taskpernodelimit}:ompthreads=${nthrds} -#PBS -l walltime=${CICE_RUNLENGTH} +#PBS -l walltime=${ICE_RUNLENGTH} EOFB -else if (${CICE_MACHINE} =~ thunder* || ${CICE_MACHINE} =~ gordon* || ${CICE_MACHINE} =~ conrad*) then +else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*) then cat >> ${jobfile} << EOFB -#PBS -N ${CICE_CASENAME} +#PBS -N ${ICE_CASENAME} #PBS -q debug #PBS -A ${acct} #PBS -l select=${nnodes}:ncpus=${maxtpn}:mpiprocs=${taskpernode} -#PBS -l walltime=${CICE_RUNLENGTH} +#PBS -l walltime=${ICE_RUNLENGTH} #PBS -j oe ###PBS -M username@domain.com ###PBS -m be EOFB -else if (${CICE_MACHINE} =~ cori*) then +else if (${ICE_MACHINE} =~ cori*) then cat >> ${jobfile} << EOFB -#SBATCH -J ${CICE_CASENAME} +#SBATCH -J ${ICE_CASENAME} #SBATCH -p debug ###SBATCH -A ${acct} #SBATCH -N ${nnodes} -#SBATCH -t ${CICE_RUNLENGTH} +#SBATCH -t ${ICE_RUNLENGTH} #SBATCH -L SCRATCH #SBATCH -C haswell ###SBATCH -e filename @@ -90,10 +90,10 @@ cat >> ${jobfile} << EOFB ###SBATCH --mail-user username@domain.com EOFB -else if (${CICE_MACHINE} =~ wolf*) then +else if (${ICE_MACHINE} =~ wolf*) then cat >> ${jobfile} << EOFB -#SBATCH -J ${CICE_CASENAME} -#SBATCH -t ${CICE_RUNLENGTH} +#SBATCH -J ${ICE_CASENAME} +#SBATCH -t ${ICE_RUNLENGTH} #SBATCH -A ${acct} #SBATCH -N ${nnodes} #SBATCH -e slurm%j.err @@ -103,10 +103,10 @@ cat >> ${jobfile} << EOFB #SBATCH --qos=low EOFB -else if (${CICE_MACHINE} =~ pinto*) then +else if (${ICE_MACHINE} =~ pinto*) then cat >> ${jobfile} << EOFB -#SBATCH -J ${CICE_CASENAME} -#SBATCH -t ${CICE_RUNLENGTH} +#SBATCH -J ${ICE_CASENAME} +#SBATCH -t ${ICE_RUNLENGTH} #SBATCH -A ${acct} #SBATCH -N ${nnodes} #SBATCH -e slurm%j.err @@ -117,7 +117,7 @@ cat >> ${jobfile} << EOFB EOFB else - echo "${0} ERROR: ${CICE_MACHINE} unknown" + echo "${0} ERROR: ${ICE_MACHINE} unknown" exit -1 endif diff --git a/configuration/scripts/cice.build b/configuration/scripts/cice.build index c60ffbc9d..a2531ccd2 100755 --- a/configuration/scripts/cice.build +++ b/configuration/scripts/cice.build @@ -1,102 +1,102 @@ #! /bin/csh -f source ./cice.settings -source ${CICE_CASEDIR}/env.${CICE_MACHINE} || exit 2 +source ${ICE_CASEDIR}/env.${ICE_MACHINE} || exit 2 -if (${CICE_MACHINE} != ${CICE_MACHINE_ENVNAME}) then - echo "WARNING, is CICE_MACHINE setting OK, ${CICE_MACHINE}, ${CICE_MACHINE_ENV}" +if (${ICE_MACHINE} != ${ICE_MACHINE_ENVNAME}) then + echo "WARNING, is ICE_MACHINE setting OK, ${ICE_MACHINE}, ${ICE_MACHINE_ENV}" endif echo " " echo "${0}:" set stamp = `date '+%y%m%d-%H%M%S'` -set CICE_BLDLOG_FILE = "cice.bldlog.${stamp}" +set ICE_BLDLOG_FILE = "cice.bldlog.${stamp}" -if (${CICE_CLEANBUILD} == 'true') then +if (${ICE_CLEANBUILD} == 'true') then echo "cleaning objdir" - rm -r -f ${CICE_OBJDIR} + rm -r -f ${ICE_OBJDIR} endif -if !(-d ${CICE_OBJDIR}) mkdir -p ${CICE_OBJDIR} -cd ${CICE_OBJDIR} +if !(-d ${ICE_OBJDIR}) mkdir -p ${ICE_OBJDIR} +cd ${ICE_OBJDIR} -setenv CICE_CPPDEFS "-DNXGLOB=${CICE_NXGLOB} -DNYGLOB=${CICE_NYGLOB} -DBLCKX=${CICE_BLCKX} -DBLCKY=${CICE_BLCKY} -DMXBLCKS=${CICE_MXBLCKS} -DNICELYR=${NICELYR} -DNSNWLYR=${NSNWLYR} -DNICECAT=${NICECAT} -DTRAGE=${TRAGE} -DTRFY=${TRFY} -DTRLVL=${TRLVL} -DTRPND=${TRPND} -DTRBRI=${TRBRI} -DNTRAERO=${NTRAERO} -DTRZS=${TRZS} -DNBGCLYR=${NBGCLYR} -DTRALG=${TRALG} -DTRBGCZ=${TRBGCZ} -DTRDOC=${TRDOC} -DTRDOC=${TRDOC} -DTRDIC=${TRDIC} -DTRDON=${TRDON} -DTRFED=${TRFED} -DTRFEP=${TRFEP} -DTRZAERO=${TRZAERO} -DTRBGCS=${TRBGCS} -DNUMIN=${NUMIN} -DNUMAX=${NUMAX}" +setenv ICE_CPPDEFS "-DNXGLOB=${ICE_NXGLOB} -DNYGLOB=${ICE_NYGLOB} -DBLCKX=${ICE_BLCKX} -DBLCKY=${ICE_BLCKY} -DMXBLCKS=${ICE_MXBLCKS} -DNICELYR=${NICELYR} -DNSNWLYR=${NSNWLYR} -DNICECAT=${NICECAT} -DTRAGE=${TRAGE} -DTRFY=${TRFY} -DTRLVL=${TRLVL} -DTRPND=${TRPND} -DTRBRI=${TRBRI} -DNTRAERO=${NTRAERO} -DTRZS=${TRZS} -DNBGCLYR=${NBGCLYR} -DTRALG=${TRALG} -DTRBGCZ=${TRBGCZ} -DTRDOC=${TRDOC} -DTRDOC=${TRDOC} -DTRDIC=${TRDIC} -DTRDON=${TRDON} -DTRFED=${TRFED} -DTRFEP=${TRFEP} -DTRZAERO=${TRZAERO} -DTRBGCS=${TRBGCS} -DNUMIN=${NUMIN} -DNUMAX=${NUMAX}" if ($DITTO == 'yes') then - setenv CICE_CPPDEFS "${CICE_CPPDEFS} -DREPRODUCIBLE" + setenv ICE_CPPDEFS "${ICE_CPPDEFS} -DREPRODUCIBLE" endif -if (${CICE_NTASKS} == 1) then - setenv CICE_COMMDIR serial +if (${ICE_NTASKS} == 1) then + setenv ICE_COMMDIR serial else - setenv CICE_COMMDIR mpi + setenv ICE_COMMDIR mpi endif -if (${CICE_IOTYPE} == 'netcdf') then +if (${ICE_IOTYPE} == 'netcdf') then set IODIR = io_netcdf - setenv CICE_CPPDEFS "${CICE_CPPDEFS} -Dncdf" -else if (${CICE_IOTYPE} == 'pio') then + setenv ICE_CPPDEFS "${ICE_CPPDEFS} -Dncdf" +else if (${ICE_IOTYPE} == 'pio') then set IODIR = io_pio - setenv CICE_CPPDEFS "${CICE_CPPDEFS} -Dncdf" + setenv ICE_CPPDEFS "${ICE_CPPDEFS} -Dncdf" else set IODIR = io_binary endif ### List of source code directories (in order of importance). cat >! Filepath << EOF -${CICE_SANDBOX}/cicecore/drivers/${CICE_DRVOPT} -${CICE_SANDBOX}/cicecore/cicedynB/dynamics -${CICE_SANDBOX}/cicecore/cicedynB/general -${CICE_SANDBOX}/cicecore/cicedynB/analysis -${CICE_SANDBOX}/cicecore/cicedynB/infrastructure -${CICE_SANDBOX}/cicecore/cicedynB/infrastructure/io/$IODIR -${CICE_SANDBOX}/cicecore/cicedynB/infrastructure/comm/${CICE_COMMDIR} -${CICE_SANDBOX}/cicecore/shared -${CICE_SANDBOX}/cicecore/shared/constants/${CICE_CONSTOPT} -${CICE_SANDBOX}/icepack/columnphysics -${CICE_SANDBOX}/icepack/columnphysics/constants/${CICE_CONSTOPT} +${ICE_SANDBOX}/cicecore/drivers/${ICE_DRVOPT} +${ICE_SANDBOX}/cicecore/cicedynB/dynamics +${ICE_SANDBOX}/cicecore/cicedynB/general +${ICE_SANDBOX}/cicecore/cicedynB/analysis +${ICE_SANDBOX}/cicecore/cicedynB/infrastructure +${ICE_SANDBOX}/cicecore/cicedynB/infrastructure/io/$IODIR +${ICE_SANDBOX}/cicecore/cicedynB/infrastructure/comm/${ICE_COMMDIR} +${ICE_SANDBOX}/cicecore/shared +${ICE_SANDBOX}/cicecore/shared/constants/${ICE_CONSTOPT} +${ICE_SANDBOX}/icepack/columnphysics +${ICE_SANDBOX}/icepack/columnphysics/constants/${ICE_CONSTOPT} EOF echo " " -echo CICE_GRID = ${CICE_GRID} -echo CICE_NTASK = ${CICE_NTASKS} -echo CICE_NTHRD = ${CICE_NTHRDS} +echo ICE_GRID = ${ICE_GRID} +echo ICE_NTASK = ${ICE_NTASKS} +echo ICE_NTHRD = ${ICE_NTHRDS} echo "global N, block_size" -echo "x ${CICE_NXGLOB}, ${CICE_BLCKX}" -echo "y ${CICE_NYGLOB}, ${CICE_BLCKY}" -echo "max_blocks = ${CICE_MXBLCKS}" -echo "CICE_CPPDEFS = ${CICE_CPPDEFS}" +echo "x ${ICE_NXGLOB}, ${ICE_BLCKX}" +echo "y ${ICE_NYGLOB}, ${ICE_BLCKY}" +echo "max_blocks = ${ICE_MXBLCKS}" +echo "ICE_CPPDEFS = ${ICE_CPPDEFS}" echo "Filepath = " -cat ${CICE_OBJDIR}/Filepath +cat ${ICE_OBJDIR}/Filepath echo " " echo "building makdep" -cc -o makdep ${CICE_CASEDIR}/makdep.c || exit 2 +cc -o makdep ${ICE_CASEDIR}/makdep.c || exit 2 -echo "building cice > ${CICE_OBJDIR}/${CICE_BLDLOG_FILE}" -if !(-d ${CICE_RUNDIR}) mkdir -p ${CICE_RUNDIR} -if !($?CICE_MACHINE_BLDTHRDS) then - set CICE_MACHINE_BLDTHRDS = 1 +echo "building cice > ${ICE_OBJDIR}/${ICE_BLDLOG_FILE}" +if !(-d ${ICE_RUNDIR}) mkdir -p ${ICE_RUNDIR} +if !($?ICE_MACHINE_BLDTHRDS) then + set ICE_MACHINE_BLDTHRDS = 1 endif -if (-e ${CICE_BLDLOG_FILE}) rm ${CICE_BLDLOG_FILE} -gmake -j ${CICE_MACHINE_BLDTHRDS} VPFILE=Filepath EXEC=${CICE_RUNDIR}/cice CICE_CPPDEFSDEFS="${CICE_CPPDEFS}" \ - -f ${CICE_CASEDIR}/Makefile MACFILE=${CICE_CASEDIR}/Macros.${CICE_MACHINE} | tee ${CICE_BLDLOG_FILE} -echo "#---" >! ${CICE_CASEDIR}/test_output +if (-e ${ICE_BLDLOG_FILE}) rm ${ICE_BLDLOG_FILE} +gmake -j ${ICE_MACHINE_BLDTHRDS} VPFILE=Filepath EXEC=${ICE_RUNDIR}/cice ICE_CPPDEFSDEFS="${ICE_CPPDEFS}" \ + -f ${ICE_CASEDIR}/Makefile MACFILE=${ICE_CASEDIR}/Macros.${ICE_MACHINE} | tee ${ICE_BLDLOG_FILE} +echo "#---" >! ${ICE_CASEDIR}/test_output if ($status != 0) then echo "${0}: COMPILE FAILED, see" - echo " cat ${CICE_OBJDIR}/${CICE_BLDLOG_FILE}" - if ( ${CICE_TEST} != ${CICE_SPVAL} ) then + echo " cat ${ICE_OBJDIR}/${ICE_BLDLOG_FILE}" + if ( ${ICE_TEST} != ${ICE_SPVAL} ) then # This is a test case. Write output to test_output file - echo "FAIL ${CICE_TESTNAME} build" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} build" >> ${ICE_CASEDIR}/test_output endif exit 99 endif -if !(-d ${CICE_LOGDIR}) mkdir -p ${CICE_LOGDIR} -cp -p ${CICE_BLDLOG_FILE} ${CICE_LOGDIR}/ -echo "`date` ${0}:${CICE_CASENAME} build completed ${CICE_BLDLOG_FILE}" >> ${CICE_CASEDIR}/README.case -echo "${0}: COMPILE SUCCESSFUL, ${CICE_LOGDIR}/${CICE_BLDLOG_FILE}" -if ( ${CICE_TEST} != ${CICE_SPVAL} ) then - echo "PASS ${CICE_TESTNAME} build" >> ${CICE_CASEDIR}/test_output +if !(-d ${ICE_LOGDIR}) mkdir -p ${ICE_LOGDIR} +cp -p ${ICE_BLDLOG_FILE} ${ICE_LOGDIR}/ +echo "`date` ${0}:${ICE_CASENAME} build completed ${ICE_BLDLOG_FILE}" >> ${ICE_CASEDIR}/README.case +echo "${0}: COMPILE SUCCESSFUL, ${ICE_LOGDIR}/${ICE_BLDLOG_FILE}" +if ( ${ICE_TEST} != ${ICE_SPVAL} ) then + echo "PASS ${ICE_TESTNAME} build" >> ${ICE_CASEDIR}/test_output endif diff --git a/configuration/scripts/cice.launch.csh b/configuration/scripts/cice.launch.csh index be1c13223..e33da35d1 100755 --- a/configuration/scripts/cice.launch.csh +++ b/configuration/scripts/cice.launch.csh @@ -7,52 +7,52 @@ source ./cice.settings set jobfile = $1 -set ntasks = ${CICE_NTASKS} -set nthrds = ${CICE_NTHRDS} +set ntasks = ${ICE_NTASKS} +set nthrds = ${ICE_NTHRDS} #========================================== -if (${CICE_MACHINE} =~ yellowstone*) then +if (${ICE_MACHINE} =~ yellowstone*) then cat >> ${jobfile} << EOFR setenv MP_TASK_AFFINITY core:\${OMP_NUM_THREADS} -mpirun.lsf ./cice >&! \$CICE_RUNLOG_FILE +mpirun.lsf ./cice >&! \$ICE_RUNLOG_FILE EOFR -else if (${CICE_MACHINE} =~ cheyenne*) then +else if (${ICE_MACHINE} =~ cheyenne*) then cat >> ${jobfile} << EOFR -mpiexec_mpt -n ${ntasks} ./cice >&! \$CICE_RUNLOG_FILE +mpiexec_mpt -n ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE EOFR -else if (${CICE_MACHINE} =~ thunder*) then +else if (${ICE_MACHINE} =~ thunder*) then cat >> ${jobfile} << EOFR -mpiexec_mpt -np ${ntasks} omplace ./cice >&! \$CICE_RUNLOG_FILE +mpiexec_mpt -np ${ntasks} omplace ./cice >&! \$ICE_RUNLOG_FILE EOFR -else if (${CICE_MACHINE} =~ gordon* || ${CICE_MACHINE} =~ conrad*) then +else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*) then cat >> ${jobfile} << EOFR -aprun -n ${ntasks} -N ${ntasks} -d ${nthrds} ./cice >&! \$CICE_RUNLOG_FILE +aprun -n ${ntasks} -N ${ntasks} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE EOFR -else if (${CICE_MACHINE} =~ cori*) then +else if (${ICE_MACHINE} =~ cori*) then cat >> ${jobfile} << EOFR -srun -n ${ntasks} -c ${nthrds} ./cice >&! \$CICE_RUNLOG_FILE +srun -n ${ntasks} -c ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE EOFR -else if (${CICE_MACHINE} =~ wolf*) then +else if (${ICE_MACHINE} =~ wolf*) then cat >> ${jobfile} << EOFR -mpirun -np ${ntasks} ./cice >&! \$CICE_RUNLOG_FILE +mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE EOFR -else if (${CICE_MACHINE} =~ pinto*) then +else if (${ICE_MACHINE} =~ pinto*) then cat >> ${jobfile} << EOFR -mpirun -np ${ntasks} ./cice >&! \$CICE_RUNLOG_FILE +mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE EOFR #cat >> ${jobfile} << EOFR -#srun -n ${ntasks} -c ${nthrds} ./cice >&! \$CICE_RUNLOG_FILE +#srun -n ${ntasks} -c ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE #EOFR else - echo "${0} ERROR ${CICE_MACHINE} unknown" + echo "${0} ERROR ${ICE_MACHINE} unknown" exit -1 endif diff --git a/configuration/scripts/cice.run.setup.csh b/configuration/scripts/cice.run.setup.csh index a4b4931ea..a1e448c90 100755 --- a/configuration/scripts/cice.run.setup.csh +++ b/configuration/scripts/cice.run.setup.csh @@ -4,17 +4,17 @@ echo "running cice.run.setup.csh" source ./cice.settings -source ${CICE_CASEDIR}/env.${CICE_MACHINE} || exit 2 +source ${ICE_CASEDIR}/env.${ICE_MACHINE} || exit 2 set jobfile = cice.run set subfile = cice.submit -set nthrds = ${CICE_NTHRDS} +set nthrds = ${ICE_NTHRDS} #========================================== # Write the batch code into the job file -${CICE_SCRIPTS}/cice.batch.csh ${jobfile} +${ICE_SCRIPTS}/cice.batch.csh ${jobfile} if ($? != 0) then echo "${0}: ERROR cice.batch.csh aborted" exit -1 @@ -26,33 +26,33 @@ cat >> ${jobfile} << EOF1 #-------------------------------------------- -cd ${CICE_CASEDIR} +cd ${ICE_CASEDIR} source ./cice.settings || exit 2 -source ./env.\${CICE_MACHINE} || exit 2 +source ./env.\${ICE_MACHINE} || exit 2 echo " " echo "\${0}:" set stamp = \`date '+%y%m%d-%H%M%S'\` -set CICE_RUNLOG_FILE = "cice.runlog.\${stamp}" +set ICE_RUNLOG_FILE = "cice.runlog.\${stamp}" #-------------------------------------------- -if !(-d \${CICE_RUNDIR}) mkdir -p \${CICE_RUNDIR} -if !(-d \${CICE_HSTDIR}) mkdir -p \${CICE_HSTDIR} -if !(-d \${CICE_RSTDIR}) mkdir -p \${CICE_RSTDIR} +if !(-d \${ICE_RUNDIR}) mkdir -p \${ICE_RUNDIR} +if !(-d \${ICE_HSTDIR}) mkdir -p \${ICE_HSTDIR} +if !(-d \${ICE_RSTDIR}) mkdir -p \${ICE_RSTDIR} -if !(-e \${CICE_RUNDIR}/ice.restart_file) cp \${CICE_RSTPFILE} \${CICE_RUNDIR} +if !(-e \${ICE_RUNDIR}/ice.restart_file) cp \${ICE_RSTPFILE} \${ICE_RUNDIR} #-------------------------------------------- -cd \${CICE_RUNDIR} +cd \${ICE_RUNDIR} setenv OMP_NUM_THREADS ${nthrds} -cp -f \${CICE_CASEDIR}/ice_in \${CICE_RUNDIR} +cp -f \${ICE_CASEDIR}/ice_in \${ICE_RUNDIR} echo " " -echo "CICE rundir is \${CICE_RUNDIR}" -echo "CICE log file is \${CICE_RUNLOG_FILE}" +echo "CICE rundir is \${ICE_RUNDIR}" +echo "CICE log file is \${ICE_RUNLOG_FILE}" echo "CICE run started : \`date\`" EOF1 @@ -60,7 +60,7 @@ EOF1 #========================================== # Write the job launching logic into the job file -${CICE_SCRIPTS}/cice.launch.csh ${jobfile} +${ICE_SCRIPTS}/cice.launch.csh ${jobfile} if ($? != 0) then echo "${0}: ERROR cice.launch.csh aborted" exit -1 @@ -74,17 +74,17 @@ echo " " #-------------------------------------------- -if !(-d \${CICE_LOGDIR}) mkdir -p \${CICE_LOGDIR} -cp -p \${CICE_RUNLOG_FILE} \${CICE_LOGDIR} +if !(-d \${ICE_LOGDIR}) mkdir -p \${ICE_LOGDIR} +cp -p \${ICE_RUNLOG_FILE} \${ICE_LOGDIR} -grep ' CICE COMPLETED SUCCESSFULLY' \${CICE_RUNLOG_FILE} +grep ' CICE COMPLETED SUCCESSFULLY' \${ICE_RUNLOG_FILE} if ( \$? != 0 ) then - echo "CICE run did not complete - see \${CICE_LOGDIR}/\${CICE_RUNLOG_FILE}" - echo "\`date\` \${0}: \${CICE_CASENAME} run did NOT complete \${CICE_RUNLOG_FILE}" >> \${CICE_CASEDIR}/README.case + echo "CICE run did not complete - see \${ICE_LOGDIR}/\${ICE_RUNLOG_FILE}" + echo "\`date\` \${0}: \${ICE_CASENAME} run did NOT complete \${ICE_RUNLOG_FILE}" >> \${ICE_CASEDIR}/README.case exit -1 endif -echo "\`date\` \${0}: \${CICE_CASENAME} run completed \${CICE_RUNLOG_FILE}" >> \${CICE_CASEDIR}/README.case +echo "\`date\` \${0}: \${ICE_CASENAME} run completed \${ICE_RUNLOG_FILE}" >> \${ICE_CASEDIR}/README.case echo "done \${0}" EOFE @@ -98,8 +98,8 @@ chmod +x ${jobfile} cat >! ${subfile} << EOFS #!/bin/csh -f -${CICE_MACHINE_SUBMIT} ${jobfile} -echo "\`date\` \${0}: ${CICE_CASENAME} job submitted" >> ${CICE_CASEDIR}/README.case +${ICE_MACHINE_SUBMIT} ${jobfile} +echo "\`date\` \${0}: ${ICE_CASENAME} job submitted" >> ${ICE_CASEDIR}/README.case EOFS diff --git a/configuration/scripts/cice.settings b/configuration/scripts/cice.settings index 1cfd84f01..82b40bd1f 100755 --- a/configuration/scripts/cice.settings +++ b/configuration/scripts/cice.settings @@ -1,43 +1,43 @@ #! /bin/csh -f -setenv CICE_MACHINE undefined -setenv CICE_CASENAME undefined -setenv CICE_SANDBOX undefined -setenv CICE_SCRIPTS undefined -setenv CICE_CASEDIR undefined -setenv CICE_RUNDIR /glade/scratch/tcraig/CICE_RUNS/${CICE_CASENAME} -setenv CICE_OBJDIR ${CICE_RUNDIR}/compile -setenv CICE_RSTDIR ${CICE_RUNDIR}/restart -setenv CICE_HSTDIR ${CICE_RUNDIR}/history -setenv CICE_LOGDIR ${CICE_CASEDIR}/logs -setenv CICE_RSTPFILE undefined -setenv CICE_DRVOPT cice -setenv CICE_CONSTOPT cice -setenv CICE_IOTYPE netcdf # set to none if netcdf library is unavailable -setenv CICE_CLEANBUILD true -setenv CICE_GRID gx3 -setenv CICE_NXGLOB 100 -setenv CICE_NYGLOB 116 -setenv CICE_NTASKS 4 -setenv CICE_NTHRDS 1 -setenv CICE_BLCKX 25 -setenv CICE_BLCKY 29 -setenv CICE_MXBLCKS 4 -setenv CICE_DECOMP cartesian -setenv CICE_DSHAPE slenderX2 -setenv CICE_TEST undefined # Define if this is a test case -setenv CICE_TESTNAME undefined # Define if this is a test case -setenv CICE_BASELINE undefined -setenv CICE_BASEGEN undefined -setenv CICE_BASECOM undefined -setenv CICE_BFBCOMP undefined -setenv CICE_SPVAL undefined -setenv CICE_RUNLENGTH 00:10:00 +setenv ICE_MACHINE undefined +setenv ICE_CASENAME undefined +setenv ICE_SANDBOX undefined +setenv ICE_SCRIPTS undefined +setenv ICE_CASEDIR undefined +setenv ICE_RUNDIR /glade/scratch/tcraig/CICE_RUNS/${ICE_CASENAME} +setenv ICE_OBJDIR ${ICE_RUNDIR}/compile +setenv ICE_RSTDIR ${ICE_RUNDIR}/restart +setenv ICE_HSTDIR ${ICE_RUNDIR}/history +setenv ICE_LOGDIR ${ICE_CASEDIR}/logs +setenv ICE_RSTPFILE undefined +setenv ICE_DRVOPT cice +setenv ICE_CONSTOPT cice +setenv ICE_IOTYPE netcdf # set to none if netcdf library is unavailable +setenv ICE_CLEANBUILD true +setenv ICE_GRID gx3 +setenv ICE_NXGLOB 100 +setenv ICE_NYGLOB 116 +setenv ICE_NTASKS 4 +setenv ICE_NTHRDS 1 +setenv ICE_BLCKX 25 +setenv ICE_BLCKY 29 +setenv ICE_MXBLCKS 4 +setenv ICE_DECOMP cartesian +setenv ICE_DSHAPE slenderX2 +setenv ICE_TEST undefined # Define if this is a test case +setenv ICE_TESTNAME undefined # Define if this is a test case +setenv ICE_BASELINE undefined +setenv ICE_BASEGEN undefined +setenv ICE_BASECOM undefined +setenv ICE_BFBCOMP undefined +setenv ICE_SPVAL undefined +setenv ICE_RUNLENGTH 00:10:00 #====================================================== -setenv CICE_THREADED false -if (${CICE_NTHRDS} > 1) setenv CICE_THREADED true +setenv ICE_THREADED false +if (${ICE_NTHRDS} > 1) setenv ICE_THREADED true ### Layers setenv NICELYR 7 # number of vertical layers in the ice @@ -79,7 +79,7 @@ setenv TRFED 0 # number of dissolved iron tracers setenv CAM_ICE no # set to yes for CAM runs (single column) setenv DITTO no # reproducible diagnostics setenv BARRIERS no # prevent MPI buffer overflow during gather/scatter -setenv CICE_BLDDEBUG false # build debug flags +setenv ICE_BLDDEBUG false # build debug flags ### File unit numbers setenv NUMIN 11 # minimum file unit number diff --git a/configuration/scripts/cice.test.setup.csh b/configuration/scripts/cice.test.setup.csh index 01cbff989..cbc4130ba 100755 --- a/configuration/scripts/cice.test.setup.csh +++ b/configuration/scripts/cice.test.setup.csh @@ -1,63 +1,63 @@ #! /bin/csh -f source ./cice.settings -source ${CICE_CASEDIR}/env.${CICE_MACHINE} || exit 2 +source ${ICE_CASEDIR}/env.${ICE_MACHINE} || exit 2 set jobfile = cice.test set subfile = cice.submit -set nthrds = ${CICE_NTHRDS} +set nthrds = ${ICE_NTHRDS} #========================================== # Print information about this test to stdout echo "" -echo "Test name : ${CICE_TESTNAME}" -echo "Test case dir: ${CICE_CASEDIR}" -echo "Test : ${CICE_TEST}" -echo "BaseGen : ${CICE_BASEGEN}" -echo "BaseCom : ${CICE_BASECOM}" +echo "Test name : ${ICE_TESTNAME}" +echo "Test case dir: ${ICE_CASEDIR}" +echo "Test : ${ICE_TEST}" +echo "BaseGen : ${ICE_BASEGEN}" +echo "BaseCom : ${ICE_BASECOM}" # Create test script that runs cice.run, and validates #========================================== # Write the batch code into the job file -${CICE_SCRIPTS}/cice.batch.csh ${jobfile} +${ICE_SCRIPTS}/cice.batch.csh ${jobfile} if ($? != 0) then exit -1 endif cat >> ${jobfile} << EOF2 -cd ${CICE_CASEDIR} +cd ${ICE_CASEDIR} source ./cice.settings || exit 2 -source ./env.\${CICE_MACHINE} || exit 2 +source ./env.\${ICE_MACHINE} || exit 2 -# Check to see if executable exists in CICE_RUNDIR -if ( ! -f ${CICE_RUNDIR}/cice ) then - echo "cice executable does not exist in ${CICE_RUNDIR} " +# Check to see if executable exists in ICE_RUNDIR +if ( ! -f ${ICE_RUNDIR}/cice ) then + echo "cice executable does not exist in ${ICE_RUNDIR} " echo "Please run cice.build before this test." exit 99 endif EOF2 -if ( -f ${CICE_SCRIPTS}/tests/test_${CICE_TEST}.script) then - echo "${0:t} using test_${CICE_TEST}.script" - cat >> ${jobfile} < ${CICE_SCRIPTS}/tests/test_${CICE_TEST}.script +if ( -f ${ICE_SCRIPTS}/tests/test_${ICE_TEST}.script) then + echo "${0:t} using test_${ICE_TEST}.script" + cat >> ${jobfile} < ${ICE_SCRIPTS}/tests/test_${ICE_TEST}.script else - echo "${0:t} ERROR: ${CICE_SCRIPTS}tests/test_${CICE_TEST}.script not found" + echo "${0:t} ERROR: ${ICE_SCRIPTS}tests/test_${ICE_TEST}.script not found" exit -1 endif -cat >> ${jobfile} < ${CICE_SCRIPTS}/tests/baseline.script +cat >> ${jobfile} < ${ICE_SCRIPTS}/tests/baseline.script chmod +x ${jobfile} cat >! ${subfile} << EOFS #!/bin/csh -f -${CICE_MACHINE_SUBMIT} ${jobfile} -echo "\`date\` \${0}: ${CICE_CASENAME} job submitted" >> ${CICE_CASEDIR}/README.case +${ICE_MACHINE_SUBMIT} ${jobfile} +echo "\`date\` \${0}: ${ICE_CASENAME} job submitted" >> ${ICE_CASEDIR}/README.case EOFS diff --git a/configuration/scripts/cice_decomp.csh b/configuration/scripts/cice_decomp.csh index f96ac596e..5ab637758 100755 --- a/configuration/scripts/cice_decomp.csh +++ b/configuration/scripts/cice_decomp.csh @@ -2,13 +2,13 @@ #--- inputs --- -echo "${0:t} input CICE_DECOMP_GRID = $CICE_DECOMP_GRID" -echo "${0:t} input CICE_DECOMP_NTASK = $CICE_DECOMP_NTASK" -echo "${0:t} input CICE_DECOMP_NTHRD = $CICE_DECOMP_NTHRD" +echo "${0:t} input ICE_DECOMP_GRID = $ICE_DECOMP_GRID" +echo "${0:t} input ICE_DECOMP_NTASK = $ICE_DECOMP_NTASK" +echo "${0:t} input ICE_DECOMP_NTHRD = $ICE_DECOMP_NTHRD" -set grid = $CICE_DECOMP_GRID -set task = $CICE_DECOMP_NTASK -set thrd = $CICE_DECOMP_NTHRD +set grid = $ICE_DECOMP_GRID +set task = $ICE_DECOMP_NTASK +set thrd = $ICE_DECOMP_NTHRD #--- computation --- @@ -29,11 +29,11 @@ if (${grid} == 'col') then endif else if (${grid} == 'gx3') then - if ($?CICE_SANDBOX) then - set initfile = ${CICE_SANDBOX}/configuration/data/gx3/iced_gx3_v5.nc - set gridfile = ${CICE_SANDBOX}/configuration/data/gx3/global_gx3.grid - set kmtfile = ${CICE_SANDBOX}/configuration/data/gx3/global_gx3.kmt - set rstpfile = ${CICE_SANDBOX}/configuration/data/gx3/ice.restart_file + if ($?ICE_SANDBOX) then + set initfile = ${ICE_SANDBOX}/configuration/data/gx3/iced_gx3_v5.nc + set gridfile = ${ICE_SANDBOX}/configuration/data/gx3/global_gx3.grid + set kmtfile = ${ICE_SANDBOX}/configuration/data/gx3/global_gx3.kmt + set rstpfile = ${ICE_SANDBOX}/configuration/data/gx3/ice.restart_file endif set nxglob = 100 set nyglob = 116 @@ -46,11 +46,11 @@ else if (${grid} == 'gx3') then endif else if (${grid} == 'gx1') then - if ($?CICE_SANDBOX) then - set initfile = ${CICE_SANDBOX}/configuration/data/gx1/iced_gx1_v5.nc - set gridfile = ${CICE_SANDBOX}/configuration/data/gx1/global_gx1.grid - set kmtfile = ${CICE_SANDBOX}/configuration/data/gx1/global_gx1.kmt - set rstpfile = ${CICE_SANDBOX}/configuration/data/gx1/ice.restart_file + if ($?ICE_SANDBOX) then + set initfile = ${ICE_SANDBOX}/configuration/data/gx1/iced_gx1_v5.nc + set gridfile = ${ICE_SANDBOX}/configuration/data/gx1/global_gx1.grid + set kmtfile = ${ICE_SANDBOX}/configuration/data/gx1/global_gx1.kmt + set rstpfile = ${ICE_SANDBOX}/configuration/data/gx1/ice.restart_file endif set nxglob = 320 set nyglob = 384 @@ -93,28 +93,28 @@ if (${nxglob} % ${cicepes} != 0) set decomp = 'roundrobin' #--- outputs --- -setenv CICE_DECOMP_NXGLOB $nxglob -setenv CICE_DECOMP_NYGLOB $nyglob -setenv CICE_DECOMP_BLCKX $blckx -setenv CICE_DECOMP_BLCKY $blcky -setenv CICE_DECOMP_MXBLCKS $mxblcks -setenv CICE_DECOMP_DECOMP $decomp -setenv CICE_DECOMP_DSHAPE $dshape -setenv CICE_DECOMP_GRIDFILE $gridfile -setenv CICE_DECOMP_KMTFILE $kmtfile -setenv CICE_DECOMP_INITFILE $initfile -setenv CICE_DECOMP_RSTPFILE $rstpfile - -echo "${0:t} output CICE_DECOMP_NXGLOB = $CICE_DECOMP_NXGLOB" -echo "${0:t} output CICE_DECOMP_NYGLOB = $CICE_DECOMP_NYGLOB" -echo "${0:t} output CICE_DECOMP_BLCKX = $CICE_DECOMP_BLCKX" -echo "${0:t} output CICE_DECOMP_BLCKY = $CICE_DECOMP_BLCKY" -echo "${0:t} output CICE_DECOMP_MXBLCKS = $CICE_DECOMP_MXBLCKS" -echo "${0:t} output CICE_DECOMP_DECOMP = $CICE_DECOMP_DECOMP" -echo "${0:t} output CICE_DECOMP_DSHAPE = $CICE_DECOMP_DSHAPE" -echo "${0:t} output CICE_DECOMP_GRIDFILE = $CICE_DECOMP_GRIDFILE" -echo "${0:t} output CICE_DECOMP_KMTFILE = $CICE_DECOMP_KMTFILE" -echo "${0:t} output CICE_DECOMP_INITFILE = $CICE_DECOMP_INITFILE" -echo "${0:t} output CICE_DECOMP_RSTPFILE = $CICE_DECOMP_RSTPFILE" +setenv ICE_DECOMP_NXGLOB $nxglob +setenv ICE_DECOMP_NYGLOB $nyglob +setenv ICE_DECOMP_BLCKX $blckx +setenv ICE_DECOMP_BLCKY $blcky +setenv ICE_DECOMP_MXBLCKS $mxblcks +setenv ICE_DECOMP_DECOMP $decomp +setenv ICE_DECOMP_DSHAPE $dshape +setenv ICE_DECOMP_GRIDFILE $gridfile +setenv ICE_DECOMP_KMTFILE $kmtfile +setenv ICE_DECOMP_INITFILE $initfile +setenv ICE_DECOMP_RSTPFILE $rstpfile + +echo "${0:t} output ICE_DECOMP_NXGLOB = $ICE_DECOMP_NXGLOB" +echo "${0:t} output ICE_DECOMP_NYGLOB = $ICE_DECOMP_NYGLOB" +echo "${0:t} output ICE_DECOMP_BLCKX = $ICE_DECOMP_BLCKX" +echo "${0:t} output ICE_DECOMP_BLCKY = $ICE_DECOMP_BLCKY" +echo "${0:t} output ICE_DECOMP_MXBLCKS = $ICE_DECOMP_MXBLCKS" +echo "${0:t} output ICE_DECOMP_DECOMP = $ICE_DECOMP_DECOMP" +echo "${0:t} output ICE_DECOMP_DSHAPE = $ICE_DECOMP_DSHAPE" +echo "${0:t} output ICE_DECOMP_GRIDFILE = $ICE_DECOMP_GRIDFILE" +echo "${0:t} output ICE_DECOMP_KMTFILE = $ICE_DECOMP_KMTFILE" +echo "${0:t} output ICE_DECOMP_INITFILE = $ICE_DECOMP_INITFILE" +echo "${0:t} output ICE_DECOMP_RSTPFILE = $ICE_DECOMP_RSTPFILE" exit 0 diff --git a/configuration/scripts/machines/Macros.cheyenne b/configuration/scripts/machines/Macros.cheyenne index 97b00ee58..43a0df8c2 100755 --- a/configuration/scripts/machines/Macros.cheyenne +++ b/configuration/scripts/machines/Macros.cheyenne @@ -1,11 +1,9 @@ #============================================================================== -# Makefile macros for "yellowstone" an NCAR Linux Cluster -#============================================================================== -# For use with intel compiler +# Makefile macros for NCAR cheyenne, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -13,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := mpif90 else FC := ifort diff --git a/configuration/scripts/machines/Macros.conrad b/configuration/scripts/machines/Macros.conrad index 439c23478..848b59f07 100644 --- a/configuration/scripts/machines/Macros.conrad +++ b/configuration/scripts/machines/Macros.conrad @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on ARFL thunder, intel compiler +# Macros file for NAVYDSRC conrad, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := ftn else FC := ftn @@ -48,14 +48,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -openmp CFLAGS += -openmp FFLAGS += -openmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/glade/u/home/jedwards/pio1_6_5/pio INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/Macros.cori b/configuration/scripts/machines/Macros.cori index 439c23478..0a40cb4be 100644 --- a/configuration/scripts/machines/Macros.cori +++ b/configuration/scripts/machines/Macros.cori @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on ARFL thunder, intel compiler +# Macros file for NERSC cori, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := ftn else FC := ftn @@ -48,14 +48,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -openmp CFLAGS += -openmp FFLAGS += -openmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/glade/u/home/jedwards/pio1_6_5/pio INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/Macros.gordon b/configuration/scripts/machines/Macros.gordon index 439c23478..e5fa4256b 100644 --- a/configuration/scripts/machines/Macros.gordon +++ b/configuration/scripts/machines/Macros.gordon @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on ARFL thunder, intel compiler +# Macros file for NAVYDSRC gordon, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := ftn else FC := ftn @@ -48,14 +48,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -openmp CFLAGS += -openmp FFLAGS += -openmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/glade/u/home/jedwards/pio1_6_5/pio INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/Macros.pinto b/configuration/scripts/machines/Macros.pinto index e15cfd69e..b7e361c78 100644 --- a/configuration/scripts/machines/Macros.pinto +++ b/configuration/scripts/machines/Macros.pinto @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on LANL pinto, intel compiler +# Macros file for LANL pinto, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := mpif90 else FC := ifort @@ -49,14 +49,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -qopenmp CFLAGS += -qopenmp FFLAGS += -qopenmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/usr/projects/climate/SHARED_CLIMATE/software/conejo/pio/1.7.2/intel-13.0.1/openmpi-1.6.3/netcdf-3.6.3-parallel-netcdf-1.3.1/include INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/Macros.thunder b/configuration/scripts/machines/Macros.thunder index ea4d1e859..343b1e99c 100644 --- a/configuration/scripts/machines/Macros.thunder +++ b/configuration/scripts/machines/Macros.thunder @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on ARFL thunder, intel compiler +# Macros file for ARFL thunder, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := mpif90 else FC := ifort @@ -48,14 +48,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -qopenmp CFLAGS += -qopenmp FFLAGS += -qopenmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/glade/u/home/jedwards/pio1_6_5/pio INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/Macros.wolf b/configuration/scripts/machines/Macros.wolf index ef90ea9df..cf454cc2b 100644 --- a/configuration/scripts/machines/Macros.wolf +++ b/configuration/scripts/machines/Macros.wolf @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on LANL wolf, intel compiler +# Macros file for LANL wolf, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := mpif90 else FC := ifort @@ -49,14 +49,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -openmp CFLAGS += -openmp FFLAGS += -openmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/usr/projects/climate/SHARED_CLIMATE/software/conejo/pio/1.7.2/intel-13.0.1/openmpi-1.6.3/netcdf-3.6.3-parallel-netcdf-1.3.1/include INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/Macros.yellowstone b/configuration/scripts/machines/Macros.yellowstone index bc43a0e82..f36fdd2b5 100644 --- a/configuration/scripts/machines/Macros.yellowstone +++ b/configuration/scripts/machines/Macros.yellowstone @@ -1,9 +1,9 @@ #============================================================================== -# Macros file for CICE on NCAR yellowstone, intel compiler +# Macros file for NCAR yellowstone, intel compiler #============================================================================== CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${CICE_CPPDEFS} +CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS} CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 @@ -11,13 +11,13 @@ FREEFLAGS := -FR FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost FFLAGS_NOOPT:= -O0 -ifeq ($(CICE_BLDDEBUG), true) +ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created else FFLAGS += -O2 endif -ifeq ($(CICE_COMMDIR), mpi) +ifeq ($(ICE_COMMDIR), mpi) FC := mpif90 else FC := ifort @@ -47,14 +47,14 @@ SCC:= icc SFC:= ifort -ifeq ($(CICE_THREADED), true) +ifeq ($(ICE_THREADED), true) LDFLAGS += -qopenmp CFLAGS += -qopenmp FFLAGS += -qopenmp endif ### if using parallel I/O, load all 3 libraries. PIO must be first! -ifeq ($(CICE_IOTYPE), pio) +ifeq ($(ICE_IOTYPE), pio) PIO_PATH:=/glade/u/home/jedwards/pio1_6_5/pio INCLDIR += -I$(PIO_PATH) SLIBS := $(SLIBS) -L$(PIO_PATH) -lpio diff --git a/configuration/scripts/machines/env.cheyenne b/configuration/scripts/machines/env.cheyenne index ff4809d03..f9898831c 100755 --- a/configuration/scripts/machines/env.cheyenne +++ b/configuration/scripts/machines/env.cheyenne @@ -9,16 +9,16 @@ module load mpt/2.15f module load ncarcompilers/0.4.1 module load pio/2.2.0 -setenv CICE_MACHINE_ENVNAME cheyenne -setenv CICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /glade/p/work/dbailey/atm/gx3v2m/NCAR_bulk -setenv CICE_MACHINE_BASELINE /glade/scratch/$user/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "qsub" -setenv CICE_MACHINE_TPNODE 36 -setenv CICE_MACHINE_ACCT P0000000 -setenv CICE_MACHINE_BLDTHRDS 1 +setenv ICE_MACHINE_ENVNAME cheyenne +setenv ICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /glade/p/work/dbailey/atm/gx3v2m/NCAR_bulk +setenv ICE_MACHINE_BASELINE /glade/scratch/$user/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "qsub" +setenv ICE_MACHINE_TPNODE 36 +setenv ICE_MACHINE_ACCT P0000000 +setenv ICE_MACHINE_BLDTHRDS 1 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_ACCT ${account_name} + setenv ICE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.conrad b/configuration/scripts/machines/env.conrad index fb631ee3f..4ca81070a 100755 --- a/configuration/scripts/machines/env.conrad +++ b/configuration/scripts/machines/env.conrad @@ -31,16 +31,16 @@ setenv NETCDF_PATH ${NETCDF_DIR} limit coredumpsize unlimited limit stacksize unlimited -setenv CICE_MACHINE_ENVNAME conrad -setenv CICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /p/home/turner/CICE/atm/ -setenv CICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "qsub " -setenv CICE_MACHINE_ACCT ARLAP96070PET -setenv CICE_MACHINE_TPNODE 32 # tasks per node -setenv CICE_MACHINE_BLDTHRDS 4 +setenv ICE_MACHINE_ENVNAME conrad +setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /p/home/turner/CICE/atm/ +setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "qsub " +setenv ICE_MACHINE_ACCT ARLAP96070PET +setenv ICE_MACHINE_TPNODE 32 # tasks per node +setenv ICE_MACHINE_BLDTHRDS 4 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.cori b/configuration/scripts/machines/env.cori index 83cb9ba4c..6ba0b8a65 100755 --- a/configuration/scripts/machines/env.cori +++ b/configuration/scripts/machines/env.cori @@ -33,16 +33,16 @@ setenv NETCDF_PATH ${NETCDF_DIR} limit coredumpsize unlimited limit stacksize unlimited -setenv CICE_MACHINE_ENVNAME cori -setenv CICE_MACHINE_WKDIR $SCRATCH/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /global/homes/t/tcraig/cice_data/ -setenv CICE_MACHINE_BASELINE $SCRATCH/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "sbatch " -setenv CICE_MACHINE_ACCT P00000000 -setenv CICE_MACHINE_TPNODE 32 # tasks per node -setenv CICE_MACHINE_BLDTHRDS 4 +setenv ICE_MACHINE_ENVNAME cori +setenv ICE_MACHINE_WKDIR $SCRATCH/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /global/homes/t/tcraig/cice_data/ +setenv ICE_MACHINE_BASELINE $SCRATCH/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "sbatch " +setenv ICE_MACHINE_ACCT P00000000 +setenv ICE_MACHINE_TPNODE 32 # tasks per node +setenv ICE_MACHINE_BLDTHRDS 4 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.gordon b/configuration/scripts/machines/env.gordon index 48412836d..87b713e78 100755 --- a/configuration/scripts/machines/env.gordon +++ b/configuration/scripts/machines/env.gordon @@ -31,16 +31,16 @@ setenv NETCDF_PATH ${NETCDF_DIR} limit coredumpsize unlimited limit stacksize unlimited -setenv CICE_MACHINE_ENVNAME gordon -setenv CICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_data/ -setenv CICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "qsub " -setenv CICE_MACHINE_ACCT P00000000 -setenv CICE_MACHINE_TPNODE 32 # tasks per node -setenv CICE_MACHINE_BLDTHRDS 4 +setenv ICE_MACHINE_ENVNAME gordon +setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_data/ +setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "qsub " +setenv ICE_MACHINE_ACCT P00000000 +setenv ICE_MACHINE_TPNODE 32 # tasks per node +setenv ICE_MACHINE_BLDTHRDS 4 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.pinto b/configuration/scripts/machines/env.pinto index a2d17135c..b484de4e5 100755 --- a/configuration/scripts/machines/env.pinto +++ b/configuration/scripts/machines/env.pinto @@ -17,16 +17,16 @@ setenv PNETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/paralle #setenv MP_EUILIB us #setenv MP_EAGER_LIMIT 0 -setenv CICE_MACHINE_ENVNAME pinto -setenv CICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/atm/gx3v2m/NCAR_bulk/ -setenv CICE_MACHINE_BASELINE /net/scratch3/$user/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "sbatch " -setenv CICE_MACHINE_ACCT climateacme -setenv CICE_MACHINE_TPNODE 16 -setenv CICE_MACHINE_BLDTHRDS 1 +setenv ICE_MACHINE_ENVNAME pinto +setenv ICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/atm/gx3v2m/NCAR_bulk/ +setenv ICE_MACHINE_BASELINE /net/scratch3/$user/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "sbatch " +setenv ICE_MACHINE_ACCT climateacme +setenv ICE_MACHINE_TPNODE 16 +setenv ICE_MACHINE_BLDTHRDS 1 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.thunder b/configuration/scripts/machines/env.thunder index 915e6e379..360cb7c68 100755 --- a/configuration/scripts/machines/env.thunder +++ b/configuration/scripts/machines/env.thunder @@ -25,16 +25,16 @@ setenv NETCDF_PATH /app/COST/netcdf-fortran/4.4.2/intel #setenv MP_EUILIB us #setenv MP_EAGER_LIMIT 0 -setenv CICE_MACHINE_ENVNAME thunder -setenv CICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /p/work2/projects/rasm/cice_data/ -setenv CICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "qsub " -setenv CICE_MACHINE_ACCT P00000000 -setenv CICE_MACHINE_TPNODE 36 # tasks per node -setenv CICE_MACHINE_BLDTHRDS 4 +setenv ICE_MACHINE_ENVNAME thunder +setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /p/work2/projects/rasm/cice_data/ +setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "qsub " +setenv ICE_MACHINE_ACCT P00000000 +setenv ICE_MACHINE_TPNODE 36 # tasks per node +setenv ICE_MACHINE_BLDTHRDS 4 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.wolf b/configuration/scripts/machines/env.wolf index c0247722a..928f6cddc 100755 --- a/configuration/scripts/machines/env.wolf +++ b/configuration/scripts/machines/env.wolf @@ -17,16 +17,16 @@ setenv PNETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/paralle #setenv MP_EUILIB us #setenv MP_EAGER_LIMIT 0 -setenv CICE_MACHINE_ENVNAME wolf -setenv CICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/atm/gx3v2m/NCAR_bulk/ -setenv CICE_MACHINE_BASELINE /net/scratch3/$user/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "sbatch " -setenv CICE_MACHINE_ACCT climateacme -setenv CICE_MACHINE_TPNODE 16 -setenv CICE_MACHINE_BLDTHRDS 1 +setenv ICE_MACHINE_ENVNAME wolf +setenv ICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/atm/gx3v2m/NCAR_bulk/ +setenv ICE_MACHINE_BASELINE /net/scratch3/$user/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "sbatch " +setenv ICE_MACHINE_ACCT climateacme +setenv ICE_MACHINE_TPNODE 16 +setenv ICE_MACHINE_BLDTHRDS 1 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/machines/env.yellowstone b/configuration/scripts/machines/env.yellowstone index d5dc9312b..56e776909 100755 --- a/configuration/scripts/machines/env.yellowstone +++ b/configuration/scripts/machines/env.yellowstone @@ -21,16 +21,16 @@ setenv LAPACK_LIBDIR /glade/apps/opt/lapack/3.4.2/intel/12.1.5/lib #setenv MP_EUILIB us #setenv MP_EAGER_LIMIT 0 -setenv CICE_MACHINE_ENVNAME yellowstone -setenv CICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS -setenv CICE_MACHINE_INPUTDATA /glade/u/home/tcraig/cice_data/ -setenv CICE_MACHINE_BASELINE /glade/scratch/$user/CICE_BASELINE -setenv CICE_MACHINE_SUBMIT "bsub < " -setenv CICE_MACHINE_ACCT P00000000 -setenv CICE_MACHINE_TPNODE 32 -setenv CICE_MACHINE_BLDTHRDS 4 +setenv ICE_MACHINE_ENVNAME yellowstone +setenv ICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS +setenv ICE_MACHINE_INPUTDATA /glade/u/home/tcraig/cice_data/ +setenv ICE_MACHINE_BASELINE /glade/scratch/$user/CICE_BASELINE +setenv ICE_MACHINE_SUBMIT "bsub < " +setenv ICE_MACHINE_ACCT P00000000 +setenv ICE_MACHINE_TPNODE 32 +setenv ICE_MACHINE_BLDTHRDS 4 if (-e ~/.cice_proj) then set account_name = `head -1 ~/.cice_proj` - setenv CICE_MACHINE_ACCT ${account_name} + setenv ICE_MACHINE_ACCT ${account_name} endif diff --git a/configuration/scripts/options/set_env.debug b/configuration/scripts/options/set_env.debug index c4c3b8242..0513a2a62 100644 --- a/configuration/scripts/options/set_env.debug +++ b/configuration/scripts/options/set_env.debug @@ -1 +1 @@ -setenv CICE_BLDDEBUG true +setenv ICE_BLDDEBUG true diff --git a/configuration/scripts/options/set_env.long b/configuration/scripts/options/set_env.long index a2c3c54da..e4458ae3a 100644 --- a/configuration/scripts/options/set_env.long +++ b/configuration/scripts/options/set_env.long @@ -1,2 +1,2 @@ -setenv CICE_RUNLENGTH 06:00:00 +setenv ICE_RUNLENGTH 06:00:00 diff --git a/configuration/scripts/options/set_env.medium b/configuration/scripts/options/set_env.medium index c84a90b82..9e23b56c3 100644 --- a/configuration/scripts/options/set_env.medium +++ b/configuration/scripts/options/set_env.medium @@ -1,2 +1,2 @@ -setenv CICE_RUNLENGTH 00:59:00 +setenv ICE_RUNLENGTH 00:59:00 diff --git a/configuration/scripts/options/set_env.short b/configuration/scripts/options/set_env.short index 5912815de..457c708a1 100644 --- a/configuration/scripts/options/set_env.short +++ b/configuration/scripts/options/set_env.short @@ -1,2 +1,2 @@ -setenv CICE_RUNLENGTH 00:20:00 +setenv ICE_RUNLENGTH 00:20:00 diff --git a/configuration/scripts/options/set_env.thread b/configuration/scripts/options/set_env.thread index a09fd77af..e9bc1ec1b 100644 --- a/configuration/scripts/options/set_env.thread +++ b/configuration/scripts/options/set_env.thread @@ -1,2 +1,2 @@ -setenv CICE_THREADED true +setenv ICE_THREADED true diff --git a/configuration/scripts/tests/baseline.script b/configuration/scripts/tests/baseline.script index d65db34ec..30b67a405 100644 --- a/configuration/scripts/tests/baseline.script +++ b/configuration/scripts/tests/baseline.script @@ -2,28 +2,28 @@ #----------------------------------------------------------- # Baseline generating run -if (${CICE_BASEGEN} != ${CICE_SPVAL}) then +if (${ICE_BASEGEN} != ${ICE_SPVAL}) then - set baseline_dir = ${CICE_BASELINE}/${CICE_BASEGEN}/${CICE_TESTNAME} + set baseline_dir = ${ICE_BASELINE}/${ICE_BASEGEN}/${ICE_TESTNAME} if (-e ${baseline_dir}) then - echo "FAIL ${CICE_TESTNAME} generate baseline-already-exists" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} generate baseline-already-exists" >> ${ICE_CASEDIR}/test_output echo "Baseline directory (${baseline_dir}) already exists. Exiting..." else mkdir -p ${baseline_dir} - cp -p -r ${CICE_RUNDIR}/* ${baseline_dir}/ - echo "PASS ${CICE_TESTNAME} generate" >> ${CICE_CASEDIR}/test_output + cp -p -r ${ICE_RUNDIR}/* ${baseline_dir}/ + echo "PASS ${ICE_TESTNAME} generate" >> ${ICE_CASEDIR}/test_output endif endif #----------------------------------------------------------- # Baseline comparing run -if (${CICE_BASECOM} != ${CICE_SPVAL}) then - set test_file = `ls -t1 ${CICE_RUNDIR}/restart | head -1` - set test_data = ${CICE_RUNDIR}/restart/${test_file} +if (${ICE_BASECOM} != ${ICE_SPVAL}) then + set test_file = `ls -t1 ${ICE_RUNDIR}/restart | head -1` + set test_data = ${ICE_RUNDIR}/restart/${test_file} - set baseline_dir = ${CICE_BASELINE}/${CICE_BASECOM}/${CICE_TESTNAME}/restart + set baseline_dir = ${ICE_BASELINE}/${ICE_BASECOM}/${ICE_TESTNAME}/restart set baseline_data = ${baseline_dir}/${test_file} echo "" @@ -33,13 +33,13 @@ if (${CICE_BASECOM} != ${CICE_SPVAL}) then echo "test: ${test_data}" if (-e ${baseline_data} ) then if ( { cmp -s ${test_data} ${baseline_data} } ) then - echo "PASS ${CICE_TESTNAME} compare" >> ${CICE_CASEDIR}/test_output + echo "PASS ${ICE_TESTNAME} compare" >> ${ICE_CASEDIR}/test_output else - echo "FAIL ${CICE_TESTNAME} compare different-data" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} compare different-data" >> ${ICE_CASEDIR}/test_output echo "Regression baseline and test dataset are different" endif else - echo "FAIL ${CICE_TESTNAME} compare baseline-does-not-exist" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} compare baseline-does-not-exist" >> ${ICE_CASEDIR}/test_output echo "Baseline file does not exist" endif endif @@ -48,12 +48,12 @@ endif # BFB Compare runs -if (${CICE_BFBCOMP} != ${CICE_SPVAL}) then +if (${ICE_BFBCOMP} != ${ICE_SPVAL}) then - set test_file = `ls -t1 ${CICE_RUNDIR}/restart | head -1` - set test_data = ${CICE_RUNDIR}/restart/${test_file} - set comp_file = `ls -t1 ${CICE_RUNDIR}/../${CICE_BFBCOMP}/restart | head -1` - set comp_data = ${CICE_RUNDIR}/../${CICE_BFBCOMP}/restart/${comp_file} + set test_file = `ls -t1 ${ICE_RUNDIR}/restart | head -1` + set test_data = ${ICE_RUNDIR}/restart/${test_file} + set comp_file = `ls -t1 ${ICE_RUNDIR}/../${ICE_BFBCOMP}/restart | head -1` + set comp_data = ${ICE_RUNDIR}/../${ICE_BFBCOMP}/restart/${comp_file} echo "" echo "BFB Compare Mode:" @@ -62,13 +62,13 @@ if (${CICE_BFBCOMP} != ${CICE_SPVAL}) then echo "test_data: ${test_data}" if (-e ${comp_data} ) then if ( { cmp -s ${test_data} ${comp_data} } ) then - echo "PASS ${CICE_TESTNAME} bfbcomp ${CICE_BFBCOMP}" >> ${CICE_CASEDIR}/test_output + echo "PASS ${ICE_TESTNAME} bfbcomp ${ICE_BFBCOMP}" >> ${ICE_CASEDIR}/test_output else - echo "FAIL ${CICE_TESTNAME} bfbcomp ${CICE_BFBCOMP} different-data" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} bfbcomp ${ICE_BFBCOMP} different-data" >> ${ICE_CASEDIR}/test_output echo "bfbcomp and test dataset are different" endif else - echo "FAIL ${CICE_TESTNAME} bfbcomp baseline_does-not-exist" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} bfbcomp baseline_does-not-exist" >> ${ICE_CASEDIR}/test_output echo "Baseline file does not exist" endif endif diff --git a/configuration/scripts/tests/test_restart.script b/configuration/scripts/tests/test_restart.script index e42e30194..0a43dd6c8 100644 --- a/configuration/scripts/tests/test_restart.script +++ b/configuration/scripts/tests/test_restart.script @@ -4,40 +4,40 @@ # Run the CICE model baseline simulation cp ice_in ice_in.0 -${CICE_CASEDIR}/casescripts/parse_namelist.sh ice_in ${CICE_CASEDIR}/casescripts/test_nml.restart1 +${ICE_CASEDIR}/casescripts/parse_namelist.sh ice_in ${ICE_CASEDIR}/casescripts/test_nml.restart1 cp ice_in ice_in.1 ./cice.run if ( $? != 0 ) then - echo "FAIL ${CICE_TESTNAME} run-initial" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} run-initial" >> ${ICE_CASEDIR}/test_output exit 99 else - echo "PASS ${CICE_TESTNAME} run-initial" >> ${CICE_CASEDIR}/test_output + echo "PASS ${ICE_TESTNAME} run-initial" >> ${ICE_CASEDIR}/test_output endif # Prepend 'baseline_' to the final restart file to save for comparison -set test_file = `ls -t1 ${CICE_RUNDIR}/restart | head -1` -set test_data = ${CICE_RUNDIR}/restart/${test_file} -set base_data = ${CICE_RUNDIR}/restart/base_${test_file} +set test_file = `ls -t1 ${ICE_RUNDIR}/restart | head -1` +set test_data = ${ICE_RUNDIR}/restart/${test_file} +set base_data = ${ICE_RUNDIR}/restart/base_${test_file} mv ${test_data} ${base_data} #----------------------------------------------------------- # Run the CICE model for the restart simulation # Modify the contents of the pointer file for restart -perl -i -pe's/(\d{4})-(\d{2})-(\d{2})/sprintf("%04d-%02d-%02d",$1,$2,$3-5)/e' ${CICE_RUNDIR}/ice.restart_file +perl -i -pe's/(\d{4})-(\d{2})-(\d{2})/sprintf("%04d-%02d-%02d",$1,$2,$3-5)/e' ${ICE_RUNDIR}/ice.restart_file -${CICE_CASEDIR}/casescripts/parse_namelist.sh ice_in ${CICE_CASEDIR}/casescripts/test_nml.restart2 +${ICE_CASEDIR}/casescripts/parse_namelist.sh ice_in ${ICE_CASEDIR}/casescripts/test_nml.restart2 cp ice_in ice_in.2 ./cice.run if ( $? != 0 ) then - echo "FAIL ${CICE_TESTNAME} run-restart" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} run-restart" >> ${ICE_CASEDIR}/test_output exit 99 else - echo "PASS ${CICE_TESTNAME} run-restart" >> ${CICE_CASEDIR}/test_output + echo "PASS ${ICE_TESTNAME} run-restart" >> ${ICE_CASEDIR}/test_output endif #----------------------------------------------------------- @@ -47,9 +47,9 @@ echo "Performing binary comparison between files:" echo "base: $base_data" echo "test: $test_data" if ( { cmp -s $test_data $base_data } ) then - echo "PASS ${CICE_TESTNAME} exact-restart" >> ${CICE_CASEDIR}/test_output + echo "PASS ${ICE_TESTNAME} exact-restart" >> ${ICE_CASEDIR}/test_output else - echo "FAIL ${CICE_TESTNAME} exact-restart" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} exact-restart" >> ${ICE_CASEDIR}/test_output endif #----------------------------------------------------------- diff --git a/configuration/scripts/tests/test_smoke.script b/configuration/scripts/tests/test_smoke.script index 8790898be..61731ff14 100644 --- a/configuration/scripts/tests/test_smoke.script +++ b/configuration/scripts/tests/test_smoke.script @@ -7,9 +7,9 @@ if ( $? != 0 ) then # Run failed - echo "FAIL ${CICE_TESTNAME} run" >> ${CICE_CASEDIR}/test_output + echo "FAIL ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output exit 99 else # Run succeeded - echo "PASS ${CICE_TESTNAME} run" >> ${CICE_CASEDIR}/test_output + echo "PASS ${ICE_TESTNAME} run" >> ${ICE_CASEDIR}/test_output endif diff --git a/create.case b/create.case index 6525d5f5f..449b2b69d 100755 --- a/create.case +++ b/create.case @@ -3,8 +3,8 @@ echo " " echo "${0}:" -set CICE_SANDBOX = `pwd` -set CICE_SCRIPTS = ${CICE_SANDBOX}/configuration/scripts +set ICE_SANDBOX = `pwd` +set ICE_SCRIPTS = ${ICE_SANDBOX}/configuration/scripts set initargv = ( $argv[*] ) set helpheader = 0 @@ -92,7 +92,7 @@ cat << EOF1 create.case -c ~/caseA -m yellowstone create.case -p 32x4 -g gx1 -m gordon -c caseB create.case -c ~/caseC -m spirit -s diag1,writeicf - create.case -t restart -p 8x1 -g gx1 -m cheyenne -c diag1,debug -testid myid + create.case -t restart -p 8x1 -g gx1 -m cheyenne -s diag1,debug -testid myid For more testing examples, please view README.test @@ -208,16 +208,16 @@ if ( $testsuite != $spval ) then if (-e ${testsuite}) then set tsfile = "${testsuite}" else - if (-e ${CICE_SCRIPTS}/tests/${testsuite}.ts) then - set tsfile = "${CICE_SCRIPTS}/tests/${testsuite}.ts" + if (-e ${ICE_SCRIPTS}/tests/${testsuite}.ts) then + set tsfile = "${ICE_SCRIPTS}/tests/${testsuite}.ts" else - echo "${0}: ERROR, cannot find testsuite file ${testsuite}, also checked ${CICE_SCRIPTS}/tests/${testsuite}.ts" + echo "${0}: ERROR, cannot find testsuite file ${testsuite}, also checked ${ICE_SCRIPTS}/tests/${testsuite}.ts" exit -1 endif endif mkdir ./${tsdir} - cp -f ${CICE_SCRIPTS}/tests/timeseries.csh ./${tsdir} + cp -f ${ICE_SCRIPTS}/tests/timeseries.csh ./${tsdir} cat >! ./${tsdir}/suite.run << EOF0 #!/bin/csh -f @@ -306,29 +306,29 @@ if !( -d ${casescr}) mkdir ${casescr} # from basic script dir to case foreach file (cice.build cice.settings Makefile ice_in makdep.c) - if !(-e ${CICE_SCRIPTS}/$file) then - echo "${0}: ERROR, ${CICE_SCRIPTS}/$file not found" + if !(-e ${ICE_SCRIPTS}/$file) then + echo "${0}: ERROR, ${ICE_SCRIPTS}/$file not found" exit -1 endif - cp -f -p ${CICE_SCRIPTS}/$file ${casedir} + cp -f -p ${ICE_SCRIPTS}/$file ${casedir} end # from machines dir to case foreach file (env.${mach} Macros.${mach}) - if !(-e ${CICE_SCRIPTS}/machines/$file) then - echo "${0}: ERROR, ${CICE_SCRIPTS}/machines/$file not found" + if !(-e ${ICE_SCRIPTS}/machines/$file) then + echo "${0}: ERROR, ${ICE_SCRIPTS}/machines/$file not found" exit -1 endif - cp -f -p ${CICE_SCRIPTS}/machines/$file ${casedir} + cp -f -p ${ICE_SCRIPTS}/machines/$file ${casedir} end # from basic script dir to casescr foreach file (parse_namelist.sh parse_settings.sh cice_decomp.csh cice.run.setup.csh cice.test.setup.csh) - if !(-e ${CICE_SCRIPTS}/$file) then - echo "${0}: ERROR, ${CICE_SCRIPTS}/$file not found" + if !(-e ${ICE_SCRIPTS}/$file) then + echo "${0}: ERROR, ${ICE_SCRIPTS}/$file not found" exit -1 endif - cp -f -p ${CICE_SCRIPTS}/$file ${casescr} + cp -f -p ${ICE_SCRIPTS}/$file ${casescr} end if ($case =~ */*) then @@ -340,10 +340,10 @@ endif cd ${casedir} source ./env.${mach} || exit 2 -echo CICE_SANDBOX = ${CICE_SANDBOX} -echo CICE_CASENAME = ${casename} -echo CICE_CASEDIR = ${casedir} -echo CICE_MACHINE = ${mach} +echo ICE_SANDBOX = ${ICE_SANDBOX} +echo ICE_CASENAME = ${casename} +echo ICE_CASEDIR = ${casedir} +echo ICE_MACHINE = ${mach} #------------------------------------------------------------ # Compute a default blocksize @@ -357,9 +357,9 @@ else exit -1 endif -setenv CICE_DECOMP_GRID ${grid} -setenv CICE_DECOMP_NTASK ${task} -setenv CICE_DECOMP_NTHRD ${thrd} +setenv ICE_DECOMP_GRID ${grid} +setenv ICE_DECOMP_NTASK ${task} +setenv ICE_DECOMP_NTHRD ${thrd} source ${casescr}/cice_decomp.csh if ($? != 0) then @@ -380,57 +380,57 @@ if (-e ${fsmods}) rm ${fsmods} cat >! ${fimods} << EOF1 nprocs = ${task} -atm_data_dir = '${CICE_MACHINE_INPUTDATA}/' -distribution_type = '${CICE_DECOMP_DECOMP}' -processor_shape = '${CICE_DECOMP_DSHAPE}' -ice_ic = '${CICE_DECOMP_INITFILE}' -grid_file = '${CICE_DECOMP_GRIDFILE}' -kmt_file = '${CICE_DECOMP_KMTFILE}' +atm_data_dir = '${ICE_MACHINE_INPUTDATA}/' +distribution_type = '${ICE_DECOMP_DECOMP}' +processor_shape = '${ICE_DECOMP_DSHAPE}' +ice_ic = '${ICE_DECOMP_INITFILE}' +grid_file = '${ICE_DECOMP_GRIDFILE}' +kmt_file = '${ICE_DECOMP_KMTFILE}' EOF1 -# If this is a baseline-compare test, modify CICE_RUNDIR +# If this is a baseline-compare test, modify ICE_RUNDIR if ($bdir != $spval) then setenv basedir_tmp ${bdir} else - setenv basedir_tmp ${CICE_MACHINE_BASELINE} + setenv basedir_tmp ${ICE_MACHINE_BASELINE} endif cat >! ${fsmods} << EOF1 -setenv CICE_SANDBOX ${CICE_SANDBOX} -setenv CICE_SCRIPTS ${CICE_SCRIPTS} -setenv CICE_CASENAME ${casename} -setenv CICE_CASEDIR ${casedir} -setenv CICE_MACHINE ${mach} -setenv CICE_RUNDIR ${CICE_MACHINE_WKDIR}/${casename} -setenv CICE_GRID ${grid} -setenv CICE_NXGLOB ${CICE_DECOMP_NXGLOB} -setenv CICE_NYGLOB ${CICE_DECOMP_NYGLOB} -setenv CICE_NTASKS ${task} -setenv CICE_NTHRDS ${thrd} -setenv CICE_DECOMP ${CICE_DECOMP_DECOMP} -setenv CICE_DSHAPE ${CICE_DECOMP_DSHAPE} -setenv CICE_MXBLCKS ${CICE_DECOMP_MXBLCKS} -setenv CICE_BLCKX ${CICE_DECOMP_BLCKX} -setenv CICE_BLCKY ${CICE_DECOMP_BLCKY} -setenv CICE_RSTPFILE ${CICE_DECOMP_RSTPFILE} -setenv CICE_BASELINE ${basedir_tmp} -setenv CICE_BASEGEN ${baseGen} -setenv CICE_BASECOM ${baseCom} -setenv CICE_SPVAL ${spval} +setenv ICE_SANDBOX ${ICE_SANDBOX} +setenv ICE_SCRIPTS ${ICE_SCRIPTS} +setenv ICE_CASENAME ${casename} +setenv ICE_CASEDIR ${casedir} +setenv ICE_MACHINE ${mach} +setenv ICE_RUNDIR ${ICE_MACHINE_WKDIR}/${casename} +setenv ICE_GRID ${grid} +setenv ICE_NXGLOB ${ICE_DECOMP_NXGLOB} +setenv ICE_NYGLOB ${ICE_DECOMP_NYGLOB} +setenv ICE_NTASKS ${task} +setenv ICE_NTHRDS ${thrd} +setenv ICE_DECOMP ${ICE_DECOMP_DECOMP} +setenv ICE_DSHAPE ${ICE_DECOMP_DSHAPE} +setenv ICE_MXBLCKS ${ICE_DECOMP_MXBLCKS} +setenv ICE_BLCKX ${ICE_DECOMP_BLCKX} +setenv ICE_BLCKY ${ICE_DECOMP_BLCKY} +setenv ICE_RSTPFILE ${ICE_DECOMP_RSTPFILE} +setenv ICE_BASELINE ${basedir_tmp} +setenv ICE_BASEGEN ${baseGen} +setenv ICE_BASECOM ${baseCom} +setenv ICE_SPVAL ${spval} EOF1 if ($bfbcomp != $spval) then - echo "setenv CICE_BFBCOMP ${mach}_${bfbcomp}.${testid}" >> ${fsmods} + echo "setenv ICE_BFBCOMP ${mach}_${bfbcomp}.${testid}" >> ${fsmods} else - echo "setenv CICE_BFBCOMP ${spval}" >> ${fsmods} + echo "setenv ICE_BFBCOMP ${spval}" >> ${fsmods} endif if ($test != $spval) then - echo "setenv CICE_TEST ${test}" >> ${fsmods} - echo "setenv CICE_TESTNAME ${testname_noid}" >> ${fsmods} + echo "setenv ICE_TEST ${test}" >> ${fsmods} + echo "setenv ICE_TESTNAME ${testname_noid}" >> ${fsmods} else - echo "setenv CICE_TEST ${spval}" >> ${fsmods} - echo "setenv CICE_TESTNAME ${spval}" >> ${fsmods} + echo "setenv ICE_TEST ${spval}" >> ${fsmods} + echo "setenv ICE_TESTNAME ${spval}" >> ${fsmods} endif if ($sets != "") then @@ -441,27 +441,27 @@ endif if ($test != $spval) then set testx = ${test} # from test options to casescr in case any test time changes are applied - cp -f -p ${CICE_SCRIPTS}/options/test_nml.${test}* ${casescr} + cp -f -p ${ICE_SCRIPTS}/options/test_nml.${test}* ${casescr} else set testx = "" endif foreach name ($testx $grid $setsx) set found = 0 - if (-e ${CICE_SCRIPTS}/options/set_nml.${name}) then - cat ${CICE_SCRIPTS}/options/set_nml.${name} >> ${fimods} + if (-e ${ICE_SCRIPTS}/options/set_nml.${name}) then + cat ${ICE_SCRIPTS}/options/set_nml.${name} >> ${fimods} echo "adding namelist mods set_nml.${name}" echo "`date`${0} adding namelist modes set_nml.${name}" > ${casedir}/README.case set found = 1 endif - if (-e ${CICE_SCRIPTS}/options/set_env.${name}) then - cat ${CICE_SCRIPTS}/options/set_env.${name} >> ${fsmods} + if (-e ${ICE_SCRIPTS}/options/set_env.${name}) then + cat ${ICE_SCRIPTS}/options/set_env.${name} >> ${fsmods} echo "adding env mods set_env.${name}" echo "`date`${0} adding namelist modes set_env.${name}" > ${casedir}/README.case set found = 1 endif if (${found} == 0) then - echo "${0}: ERROR, ${CICE_SCRIPTS}/options/set_[nml,env].${name} not found" + echo "${0}: ERROR, ${ICE_SCRIPTS}/options/set_[nml,env].${name} not found" exit -1 endif end @@ -501,7 +501,7 @@ if ($test != $spval) then endif if ( $testsuite != $spval ) then - cd ${CICE_SANDBOX} + cd ${ICE_SANDBOX} # Write build and run commands to suite.run cat >> ./${tsdir}/results.csh << EOF @@ -543,7 +543,7 @@ EOF # build and submit tests cd ${tsdir} ./suite.run -cd ${CICE_SANDBOX} +cd ${ICE_SANDBOX} endif