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

Jump to bottom

Fix running both Intel and GNU regression tests using ecflow on the same machine (node) #273

Closed
wants to merge 7 commits into from
Closed

Fix running both Intel and GNU regression tests using ecflow on the same machine (node) #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e6c55d
Add files to be compared in two debug tests
DusanJovic-NOAA Nov 10, 2020
3764079
Do not load fv3 module in the top-level rt.sh script (hera and orion)
DusanJovic-NOAA Nov 10, 2020
7e9245b
Set PATHTR environment variable in rocoto compile job on wcoss_cray
DusanJovic-NOAA Nov 10, 2020
b12de1f
Do not load fv3 module in the top-level rt.sh script (dell and cray)
DusanJovic-NOAA Nov 12, 2020
d9fefb6
Increase build time to 60 min on wcpss_dell_p3 when Rocoto is used
DusanJovic-NOAA Nov 12, 2020
30156a4
Move sourcing of module-setup.sh.inc outside if $MACHINE_ID tests
DusanJovic-NOAA Nov 12, 2020
7bc39d6
Load alps (aprun) in compile_bsub.IN_wcoss_cray and do not load it in…
DusanJovic-NOAA Nov 12, 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
5 changes: 5 additions & 0 deletions tests/fv3_conf/compile_bsub.IN_wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@

set -eux

set +x
module load alps
module list
set -x

echo "Compile started: " `date`

aprun -n 1 -j 1 -N 1 -d 24 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
Expand Down
1 change: 0 additions & 1 deletion tests/fv3_conf/fv3_bsub.IN_wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ set +x
source ./module-setup.sh
module use $( pwd -P )
module load modules.fv3
module load alps/5.2.3-2.0502.9295.14.14.ari
module list
set -x

Expand Down
32 changes: 2 additions & 30 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,11 @@ export RT_COMPILER=${RT_COMPILER:-intel}
source detect_machine.sh
source rt_utils.sh

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

if [[ $MACHINE_ID = wcoss_cray ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc
DusanJovic-NOAA marked this conversation as resolved.
Show resolved Hide resolved
module load xt-lsfhpc

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3

module load python/2.7.14

module use /usrx/local/emc_rocoto/modulefiles
Expand Down Expand Up @@ -136,12 +133,7 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then

elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc
module load lsf/10.1

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3

module load python/2.7.14

module use /usrx/local/dev/emc_rocoto/modulefiles
Expand Down Expand Up @@ -169,8 +161,6 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then

elif [[ $MACHINE_ID = gaea.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

# export PATH=/gpfs/hps/nco/ops/ecf/ecfdir/ecflow.v4.1.0.intel/bin:$PATH
export PYTHONPATH=
ECFLOW_START=
Expand All @@ -192,11 +182,6 @@ elif [[ $MACHINE_ID = gaea.* ]]; then

elif [[ $MACHINE_ID = hera.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3

module load rocoto
ROCOTORUN=$(which rocotorun)
ROCOTOSTAT=$(which rocotostat)
Expand Down Expand Up @@ -224,10 +209,6 @@ elif [[ $MACHINE_ID = hera.* ]]; then

elif [[ $MACHINE_ID = orion.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3
module load gcc/8.3.0

module load contrib rocoto/1.3.1
Expand All @@ -253,11 +234,6 @@ elif [[ $MACHINE_ID = orion.* ]]; then

elif [[ $MACHINE_ID = jet.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3

module load rocoto/1.3.2
ROCOTORUN=$(which rocotorun)
ROCOTOSTAT=$(which rocotostat)
Expand All @@ -283,8 +259,6 @@ elif [[ $MACHINE_ID = jet.* ]]; then

elif [[ $MACHINE_ID = cheyenne.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

module load python/2.7.16
export PATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/bin:$PATH
export PYTHONPATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/lib/python2.7/site-packages
Expand All @@ -303,8 +277,6 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then

elif [[ $MACHINE_ID = stampede.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

export PYTHONPATH=
ECFLOW_START=
QUEUE=skx-dev
Expand Down
5 changes: 3 additions & 2 deletions tests/rt_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,16 +360,17 @@ rocoto_create_compile_task() {

NATIVE=""
BUILD_CORES=8
BUILD_WALLTIME="00:30:00"
if [[ ${MACHINE_ID} == wcoss_dell_p3 ]]; then
BUILD_CORES=1
NATIVE="<memory>8G</memory> <native>-R 'affinity[core(1)]'</native>"
BUILD_WALLTIME="01:00:00"
fi
if [[ ${MACHINE_ID} == wcoss_cray ]]; then
BUILD_CORES=24
rocoto_cmd="aprun -n 1 -j 1 -N 1 -d $BUILD_CORES $rocoto_cmd"
NATIVE="<exclusive></exclusive>"
NATIVE="<exclusive></exclusive> <envar><name>PATHTR</name><value>&PATHTR;</value></envar>"
fi
BUILD_WALLTIME="00:30:00"
if [[ ${MACHINE_ID} == jet ]]; then
BUILD_WALLTIME="01:00:00"
fi
Expand Down
27 changes: 25 additions & 2 deletions tests/tests/fv3_ccpp_control_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,32 @@

export TEST_DESCR="Compare FV3 CCPP control results with previous trunk version"

export CNTL_DIR=fv3_control
export CNTL_DIR=fv3_control_debug

export LIST_FILES=""
export LIST_FILES="phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
phyf006.tile1.nc \
phyf006.tile2.nc \
phyf006.tile3.nc \
phyf006.tile4.nc \
phyf006.tile5.nc \
phyf006.tile6.nc \
dynf006.tile1.nc \
dynf006.tile2.nc \
dynf006.tile3.nc \
dynf006.tile4.nc \
dynf006.tile5.nc \
dynf006.tile6.nc"

export_fv3

Expand Down
18 changes: 16 additions & 2 deletions tests/tests/fv3_ccpp_stretched_nest_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,22 @@

export TEST_DESCR="Compare FV3 CCPP control results with previous trunk version"

export CNTL_DIR=fv3_stretched_nest
export LIST_FILES=
export CNTL_DIR=fv3_stretched_nest_debug

export LIST_FILES="fv3_history2d.nest02.tile7.nc \
fv3_history2d.tile1.nc \
fv3_history2d.tile2.nc \
fv3_history2d.tile3.nc \
fv3_history2d.tile4.nc \
fv3_history2d.tile5.nc \
fv3_history2d.tile6.nc \
fv3_history.nest02.tile7.nc \
fv3_history.tile1.nc \
fv3_history.tile2.nc \
fv3_history.tile3.nc \
fv3_history.tile4.nc \
fv3_history.tile5.nc \
fv3_history.tile6.nc"

export_fv3

Expand Down