diff --git a/makenemo b/makenemo
index 0d6486795396bb9b4312a4b30605cfb453ee17e6..d2f9c0304111e2049a72c3427dc4f9879e25b4b9 100755
--- a/makenemo
+++ b/makenemo
@@ -283,8 +283,8 @@ if [ $incfg -eq 1 ] ; then
. ${COMPIL_DIR}/Fclean_config.sh
exit 0
elif [ ${#x_c} -ne 0 ]; then
- read -p "Are you sure that you want to clean $NEW_CONF configuration ? " -n 1 -r; echo
- if [[ $REPLY =~ ^[Yy]$ ]]; then
+ #read -p "Are you sure that you want to clean $NEW_CONF configuration ? " -n 1 -r; echo
+ #if [[ $REPLY =~ ^[Yy]$ ]]; then
# We coose the default light file
[ $x_nocdf -eq 1 ] && export USEBLD=bldxagxcdf.cfg || export USEBLD=bldxag.cfg
# We look after agrif
@@ -300,10 +300,10 @@ if [ $incfg -eq 1 ] ; then
rm -f ${NEMO_TDIR}/${NEW_CONF}/BLD/$file
done
exit 0
- else
- echo "cleaning cancelled"
- exit 2
- fi
+ #else
+ # echo "cleaning cancelled"
+ # exit 2
+ #fi
fi
if [[ -n "$x_n" && -n "$REF_CONF" ]]; then echo -e "\nWARNING: $x_n configuration is already existing, we ignore \"-r $REF_CONF\"\n"; REF_CONF=""; fi
if [[ -n "$x_n" && -n "$DEMO_CONF" ]]; then echo -e "\nWARNING: $x_n configuration is already existing, we ignore \"-a $DEMO_CONF\"\n"; DEMO_CONF=""; fi
diff --git a/sette/README.rst b/sette/README.rst
index dbc1d5d0b24605ad7a271279bfe6d30bd69cd479..5292e23311ef2910542c94e42ed68b2d920bf4e0 100644
--- a/sette/README.rst
+++ b/sette/README.rst
@@ -56,10 +56,6 @@ USER SETUP (recommended)
| USING_MPI3 : flag to control the activation of key_mpi3
"yes" to use the MPI3 neighbourhood collectives for halo exchange
"no" to use standard point-to-point communications for halo exchange
- # loop fusion management
- | USING_LOOP_FUSION : flag to control the activation of key_loop_fusion
- "yes" to use the loop fusion adv routines when halo = 2
- "no" to use standard adv routine
# generique batch scrip prefix name if MPMD set to true/false
| JOB_PREFIX_MPMD
diff --git a/sette/prepare_exe_dir.sh b/sette/prepare_exe_dir.sh
index 3ae9d1950c3bd35ded9218332ab529f9bef8d52c..a1d93fb65a11d3847424155480689a6d51be35dd 100755
--- a/sette/prepare_exe_dir.sh
+++ b/sette/prepare_exe_dir.sh
@@ -97,7 +97,6 @@ printf "%-33s : %s\n" USING_EXTRA_HALO $USING_EXTRA_HALO >> ./sette_con
printf "%-33s : %s\n" USING_TILING $USING_TILING >> ./sette_config
printf "%-33s : %s\n" USING_COLLECTIVES $USING_COLLECTIVES >> ./sette_config
printf "%-33s : %s\n" USING_QCO $USING_QCO >> ./sette_config
-printf "%-33s : %s\n" USING_LOOP_FUSION $USING_LOOP_FUSION >> ./sette_config
printf "%-33s : %s\n" USING_XIOS $USING_XIOS >> ./sette_config
printf "%-33s : %s\n" USING_MPMD $USING_MPMD >> ./sette_config
printf "%-33s : %s\n" USING_RK3 $USING_RK3 >> ./sette_config
diff --git a/sette/sette.sh b/sette/sette.sh
index 9aa98eb87d78f5e03e82491b5468275367db0c3a..96182e1677aa6e4d177d0d0805b1c3716cfca8f7 100755
--- a/sette/sette.sh
+++ b/sette/sette.sh
@@ -15,17 +15,15 @@ NO_REPORT=0
export USING_TIMING='yes' # Default: yes => set ln_timing=.true. ; use -T to disable
export USING_ICEBERGS='yes' # Default: yes => set ln_icebergs=.true. ; use -i to disable
export USING_ABL='no' # Default: no => set ln_abl=.false. ; use -a to set ln_abl=.true.
-export USING_EXTRA_HALO='yes' # Default: yes => set nn_hls=2 ; use -e to set nn_hls=1
+export USING_EXTRA_HALO='no' # Default: no => set nn_hls=2 ; use -e to set nn_hls=3 (not yet implemented)
export USING_COLLECTIVES='yes' # Default: yes => set nn_comm=2 ; use -C to set nn_comm=1
export USING_NOGATHER='yes' # Default: yes => set ln_nnogather=.true.; use -N to set ln_nnogather=.false.
export USING_TILING='yes' # Default: yes => set ln_tile=.true. ; use -t to disable
- # Note: yes also ensures nn_hls=2 but -t will not alter nn_hls
#
# controls for some common compile-time keys:
#
export USING_QCO='yes' # Default: yes => add key_qco ; use -q to delete key_qco
export USING_RK3='no' # Default: yes => add key_RK3 & key_qco ; use -Q to delete key_RK3
-export USING_LOOP_FUSION='yes' # Default: yes => add key_loop_fusion ; use -F to delete key_loop_fusion
export USING_XIOS='yes' # Default: yes => add key_xios ; use -X to delete key_xios
# Note: changing USING_XIOS may require a change in arch file
#
@@ -112,8 +110,8 @@ if [ $# -gt 0 ]; then
t) export USING_TILING='no'
echo "-t: ln_tile will be set to false"
echo "";;
- e) export USING_EXTRA_HALO='no'
- echo "-e: nn_hls will be set to 1"
+ e) export USING_EXTRA_HALO='yes'
+ echo "-e: nn_hls will be set to 3"
echo "";;
i) export USING_ICEBERGS='no'
echo "-i: ln_icebergs will be set to false"
@@ -134,9 +132,6 @@ if [ $# -gt 0 ]; then
echo "-Q: key_qco and key_RK3 will not be activated"
echo " This is the curent default for now since RK3 is not ready"
echo "";;
- F) export USING_LOOP_FUSION='no'
- echo "-F: key_loop_fusion will not be activated"
- echo "";;
X) export USING_XIOS='no'
echo "-X: key_xios will not be activated"
echo "";;
@@ -149,14 +144,13 @@ if [ $# -gt 0 ]; then
h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested with default options)'
echo '-T to set ln_timing false for all non-AGRIF configurations (default: true)'
echo '-t set ln_tile false in all tests that support it (default: true)'
- echo '-e set nn_hls=1 (default: nn_hls=2)'
+ echo '-e set nn_hls=3 but it is not yet supported (default: nn_hls=2)'
echo '-i set ln_icebergs false (default: true)'
echo '-a set ln_abl true (default: false)'
echo '-C set nn_comm=1 (default: nn_comm=2 ==> use MPI3 collective comms)'
echo '-N set ln_nnogather false for ORCA2 configurations (default: true)'
echo '-q to remove the key_qco key (default: added)'
echo '-X to remove the key_xios key (default: added)'
- echo '-F to remove the key_loop_fusion key (default: added)'
echo '-Q to remove the key_RK3 key (currently a null-op since key_RK3 is not used)'
echo '-A to run tests in attached (SPMD) mode (default: MPMD with key_xios)'
echo '-n "CFG1_to_test CFG2_to_test ..." to test some specific configurations'
@@ -177,45 +171,6 @@ if [ $# -gt 0 ]; then
shift $((OPTIND - 1))
fi
#
-# Option dependency tests
-#
-if [ ${USING_TILING} == "yes" ] ; then
- if [ ${USING_EXTRA_HALO} == "no" ] ; then
- if [ ${USER_INPUT} == "yes" ] ; then
- while true; do
- read -p "Tiling requires the extra halo but you have used -e to deselect it. Would you like to reselect it? (y/n)?: " yn
- case $yn in
- [Yy]* ) echo "Ok, ignoring the -e option"; USING_EXTRA_HALO="yes"; break;;
- [Nn]* ) echo "Ok, exiting instead"; exit 42;;
- * ) echo "Please answer yes or no.";;
- esac
- done
- else
- # Without user input, the best option is to disable tiling
- echo "Tiling requires the extra halo but you have used -e to deselect it. Tiling will not be used."
- USING_TILING="no"
- fi
- fi
-fi
-if [ ${USING_LOOP_FUSION} == "yes" ] ; then
- if [ ${USING_EXTRA_HALO} == "no" ] ; then
- if [ ${USER_INPUT} == "yes" ] ; then
- while true; do
- read -p "Loop fusion requires the extra halo but you have used -e to deselect it. Would you like to reselect it? (y/n)?: " yn
- case $yn in
- [Yy]* ) echo "Ok, ignoring the -e option"; USING_EXTRA_HALO="yes"; break;;
- [Nn]* ) echo "Ok, exiting instead"; exit 42;;
- * ) echo "Please answer yes or no.";;
- esac
- done
- else
- # Without user input, the best option is to disable loop fusion
- echo "Loop fusion requires the extra halo but you have used -e to deselect it. Loop fusion will not be used."
- USING_LOOP_FUSION="no"
- fi
- fi
-fi
-#
# Get SETTE parameters
. ./param.cfg
@@ -226,9 +181,6 @@ export ADD_KEYS="" ; export DEL_KEYS=""
if [ ${USING_XIOS} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_xios " ; fi
if [ ${USING_XIOS} == "no" ] ; then export DEL_KEYS="${DEL_KEYS}key_xios " ; fi
#
-if [ ${USING_LOOP_FUSION} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_loop_fusion " ; fi
-if [ ${USING_LOOP_FUSION} == "no" ] ; then export DEL_KEYS="${DEL_KEYS}key_loop_fusion " ; fi
-#
if [ ${USING_QCO} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_qco " ; fi
if [ ${USING_QCO} == "no" ] ; then export DEL_KEYS="${DEL_KEYS}key_qco key_linssh " ; fi
#
@@ -281,7 +233,6 @@ printf "%-33s : %s\n" USING_TILING $USING_TILING
printf "%-33s : %s\n" USING_COLLECTIVES $USING_COLLECTIVES
printf "%-33s : %s\n" USING_NOGATHER $USING_NOGATHER
printf "%-33s : %s\n" USING_QCO $USING_QCO
-printf "%-33s : %s\n" USING_LOOP_FUSION $USING_LOOP_FUSION
printf "%-33s : %s\n" USING_XIOS $USING_XIOS
printf "%-33s : %s\n" USING_MPMD $USING_MPMD
printf "%-33s : %s\n" USING_RK3 $USING_RK3
diff --git a/sette/sette_reference-configurations.sh b/sette/sette_reference-configurations.sh
index 88536464e363e0f9437e07d3b5f1c522a01fc34e..f77bb0ffc48bd1490bb7021cbc1d1398f03f1d7f 100755
--- a/sette/sette_reference-configurations.sh
+++ b/sette/sette_reference-configurations.sh
@@ -182,7 +182,7 @@ if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -211,7 +211,7 @@ if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_${ITRST}_restart\"
set_namelist namelist_top_cfg cn_trcrst_in \"GYREPIS_LONG_${ITRST}_restart_trc\"
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -249,7 +249,7 @@ if [ ${config} == "GYRE_PISCES" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -276,7 +276,7 @@ if [ ${config} == "GYRE_PISCES" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -347,7 +347,7 @@ if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then
fi
#
set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_nnogather ${USING_NOGATHER} .true. .false.
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -407,7 +407,7 @@ if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then
fi
#
set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_nnogather ${USING_NOGATHER} .true. .false.
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -491,7 +491,7 @@ if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_REPRO} == "1" ] ; then
/sn_humi/s/true/false/; /sn_humi/s/yearly/monthly/; /sn_humi/s/weights_core2_orca2_bilin//" namelist_cfg
fi
set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_nnogather ${USING_NOGATHER} .true. .false.
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -550,7 +550,7 @@ if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_REPRO} == "1" ] ; then
fi
set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_nnogather ${USING_NOGATHER} .true. .false.
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -626,7 +626,7 @@ if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then
# put ln_pisdmp to false : no restoring to global mean value
set_namelist namelist_pisces_cfg ln_pisdmp .false.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_xio_using_server iodef.xml ${USING_MPMD}
cd ${SETTE_DIR}
@@ -665,7 +665,7 @@ if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then
# put ln_pisdmp to false : no restoring to global mean value
set_namelist namelist_pisces_cfg ln_pisdmp .false.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_xio_using_server iodef.xml ${USING_MPMD}
cd ${SETTE_DIR}
@@ -706,7 +706,7 @@ if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_REPRO} == "1" ] ; then
# put ln_pisdmp to false : no restoring to global mean value
set_namelist namelist_pisces_cfg ln_pisdmp .false.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_xio_using_server iodef.xml ${USING_MPMD}
cd ${SETTE_DIR}
@@ -742,7 +742,7 @@ if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_REPRO} == "1" ] ; then
# put ln_pisdmp to false : no restoring to global mean value
set_namelist namelist_pisces_cfg ln_pisdmp .false.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_xio_using_server iodef.xml ${USING_MPMD}
cd ${SETTE_DIR}
@@ -790,7 +790,7 @@ if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg jpnj 8
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -820,7 +820,7 @@ if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ; then
ln -sf ../LONG/AMM12_LONG_${ITRST}_restart_${L_NPROC}.nc .
done
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -850,7 +850,7 @@ if [ ${config} == "AMM12" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 4
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -874,7 +874,7 @@ if [ ${config} == "AMM12" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 8
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -926,7 +926,7 @@ if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_ice_cfg ln_icediachk .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -952,7 +952,7 @@ if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg cn_ocerst_in \"SAS_${ITRST}_restart\"
set_namelist namelist_ice_cfg cn_icerst_in \"SAS_${ITRST}_restart_ice\"
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -994,7 +994,7 @@ if [ ${config} == "SAS" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 8
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1019,7 +1019,7 @@ if [ ${config} == "SAS" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 4
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1094,7 +1094,7 @@ if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_pisces_cfg ln_ironice .false.
set_namelist namelist_pisces_cfg ln_hydrofe .false.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_nnogather ${USING_NOGATHER} .true. .false.
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1143,7 +1143,7 @@ if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_pisces_cfg ln_ironice .false.
set_namelist namelist_pisces_cfg ln_hydrofe .false.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_nnogather ${USING_NOGATHER} .true. .false.
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1175,8 +1175,6 @@ if [ ${config} == "AGRIF" ] ; then
clean_config ${CMP_DIR:-${CONFIG_DIR0}}/${SETTE_CONFIG}
sync_config ${CONFIG_DIR0}/${config} ${CMP_DIR:-${CONFIG_DIR0}}/${SETTE_CONFIG}
#
- # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used
-# . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}"
. ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO ${CUSTOM_DIR:+-t ${CMP_DIR}} -k 0 ${NEMO_DEBUG} -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"
fi
if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
@@ -1213,16 +1211,16 @@ if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist 3_namelist_cfg nn_stock $(( ${ITEND} * 4 * 3 / 2 ))
set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
- set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false.
- set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1290,16 +1288,16 @@ if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist 3_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_3}_restart_ice\"
set_namelist 3_namelist_top_cfg cn_trcrst_in \"AGRIF_LONG_${ITRST_3}_restart_trc\"
#
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
- set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false.
- set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1346,7 +1344,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 8
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
@@ -1356,7 +1354,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 1_namelist_cfg jpni 2
set_namelist 1_namelist_cfg jpnj 8
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_namelist 2_namelist_cfg cn_exp \"AGRIF_28\"
@@ -1365,7 +1363,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 2_namelist_cfg jpni 2
set_namelist 2_namelist_cfg jpnj 8
set_namelist 2_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_namelist 3_namelist_cfg cn_exp \"AGRIF_28\"
@@ -1374,7 +1372,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 3_namelist_cfg jpni 2
set_namelist 3_namelist_cfg jpnj 8
set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1400,7 +1398,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 4
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
@@ -1411,7 +1409,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 1_namelist_cfg jpni 4
set_namelist 1_namelist_cfg jpnj 4
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_namelist 2_namelist_cfg cn_exp \"AGRIF_44\"
@@ -1420,7 +1418,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 2_namelist_cfg jpni 4
set_namelist 2_namelist_cfg jpnj 4
set_namelist 2_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 2_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 2_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 2_namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_namelist 3_namelist_cfg cn_exp \"AGRIF_44\"
@@ -1429,7 +1427,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 3_namelist_cfg jpni 4
set_namelist 3_namelist_cfg jpnj 4
set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 3_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 3_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 3_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1466,7 +1464,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -1492,8 +1490,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ; then
clean_config ${CMP_DIR:-${CONFIG_DIR0}}/${SETTE_CONFIG}
sync_config ${CONFIG_DIR0}/${config} ${CMP_DIR:-${CONFIG_DIR0}}/${SETTE_CONFIG}
#
- # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used
- . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO ${CUSTOM_DIR:+-t ${CMP_DIR}} -k 0 ${NEMO_DEBUG} -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "key_agrif ${DEL_KEYS}"
+ . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO ${CUSTOM_DIR:+-t ${CMP_DIR}} -k 0 ${NEMO_DEBUG} -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "key_agrif ${DEL_KEYS}"
cd ${SETTE_DIR}
. ./prepare_exe_dir.sh
set_valid_dir
@@ -1510,7 +1507,7 @@ if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg sn_cfctl%l_trcstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
#
@@ -1564,7 +1561,7 @@ if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist namelist_ice_cfg ln_icediachk .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1595,7 +1592,7 @@ if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ; then
ln -sf ../LONG/WED025_LONG_${ITRST}_restart_ice_${L_NPROC}.nc .
done
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1626,7 +1623,7 @@ if [ ${config} == "WED025" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 7
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1652,7 +1649,7 @@ if [ ${config} == "WED025" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 4
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
diff --git a/sette/sette_test-cases.sh b/sette/sette_test-cases.sh
index e76ae95b9f15618fd7f9f88197a6ecc0d4c60bf9..542a36a56bf5260374f09033153776b60292b2b4 100755
--- a/sette/sette_test-cases.sh
+++ b/sette/sette_test-cases.sh
@@ -177,7 +177,7 @@ if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 ))
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -199,7 +199,7 @@ if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_rstctl 2
set_namelist namelist_cfg cn_ocerst_in \"OVF_LONG_${ITRST}_restart\"
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -243,7 +243,7 @@ if [ ${config} == "OVERFLOW" ] && [ ${DO_PHYOPTS} == "1" ] ; then
set_namelist namelist_cfg nn_it000 1
set_namelist namelist_cfg nn_itend ${ITEND}
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -293,7 +293,7 @@ if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 ))
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -315,7 +315,7 @@ if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_rstctl 2
set_namelist namelist_cfg cn_ocerst_in \"LOCK_LONG_${ITRST}_restart\"
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -360,7 +360,7 @@ if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_PHYOPTS} == "1" ] ; then
set_namelist namelist_cfg nn_it000 1
set_namelist namelist_cfg nn_itend ${ITEND}
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -412,7 +412,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 ))
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -421,7 +421,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 ))
set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 ))
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -444,7 +444,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_rstctl 2
set_namelist namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST}_restart\"
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -456,7 +456,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist 1_namelist_cfg ln_rstart .true.
set_namelist 1_namelist_cfg nn_rstctl 2
set_namelist 1_namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST_1}_restart\"
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -499,7 +499,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 3
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#if [ ${USING_TIMING} == "yes" ] ; then set_namelist namelist_cfg ln_timing .true. ; fi
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -510,7 +510,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 1_namelist_cfg jpni 2
set_namelist 1_namelist_cfg jpnj 3
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -542,7 +542,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 2
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -553,7 +553,7 @@ if [ ${config} == "VORTEX" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 1_namelist_cfg jpni 3
set_namelist 1_namelist_cfg jpnj 2
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -606,7 +606,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 ))
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -615,7 +615,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 ))
set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 ))
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -639,7 +639,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_${ITRST}_restart\"
set_namelist namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_${ITRST}_restart_ice\"
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -652,7 +652,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist 1_namelist_cfg nn_rstctl 2
set_namelist 1_namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_${ITRST_1}_restart\"
set_namelist 1_namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_${ITRST_1}_restart_ice\"
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -702,7 +702,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 3
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -713,7 +713,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 1_namelist_cfg jpni 2
set_namelist 1_namelist_cfg jpnj 3
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -741,7 +741,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 2
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -752,7 +752,7 @@ if [ ${config} == "ICE_AGRIF" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist 1_namelist_cfg jpni 3
set_namelist 1_namelist_cfg jpnj 2
set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true.
- set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt 1_namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt 1_namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt 1_namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -805,7 +805,7 @@ if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg jpnj 3
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -829,7 +829,7 @@ if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ; then
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_${ITRST}_restart\"
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -871,7 +871,7 @@ if [ ${config} == "ISOMIP+" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 3
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -896,7 +896,7 @@ if [ ${config} == "ISOMIP+" ] && [ ${DO_REPRO} == "1" ] ; then
set_namelist namelist_cfg jpnj 4
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -946,7 +946,7 @@ if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes"
set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 ))
set_namelist namelist_cfg sn_cfctl%l_runstat .true.
#set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
@@ -970,7 +970,7 @@ if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes"
set_namelist namelist_cfg cn_ocerst_in \"SWG_LONG_${ITRST}_restart\"
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1013,7 +1013,7 @@ if [ ${config} == "SWG" ] && [ ${DO_REPRO} == "1" ] && [ ${USING_QCO} == "yes" ]
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
@@ -1042,7 +1042,7 @@ if [ ${config} == "SWG" ] && [ ${DO_REPRO} == "1" ] && [ ${USING_QCO} == "yes" ]
set_namelist namelist_cfg sn_cfctl%l_prtctl .true.
set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false.
- set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1
+ set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 3
set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1
set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false.
set_xio_using_server iodef.xml ${USING_MPMD}
diff --git a/sette/super_sette.sh b/sette/super_sette.sh
index 2346dbbb65be490d092f88b6a69acd808d5d37d2..b28fd745f048d62481ef5f5c97eddf35ca7936ec 100755
--- a/sette/super_sette.sh
+++ b/sette/super_sette.sh
@@ -7,24 +7,22 @@
########################################
FULLSET=( ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF WED025 GYRE_PISCES SAS ORCA2_ICE_OBS SWG ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP+ )
#
-GROUP_SETS=( "-g 0 -r" "-e -F -t -g 1 -v HALO1 -r" "-q -g 2 -v NO_QCO -r" "-i -e -F -t -g 3 -v NO_ICB1 -r" "-i -g 4 -v NO_ICB2 -r" "-C -g 5 -v NO_COLL -r" )
+GROUP_SETS=( "-g 0 -r" "-q -g 2 -v NO_QCO -r" "-i -t -g 3 -v NO_ICB1 -r" "-C -g 5 -v NO_COLL -r" )
#
# These groups sets correspond to the following test regimes:
#
-# A. Three complete sets with various combinations of options:
+# A. 2 complete sets with various combinations of options:
#
printf "%-93s %s\n" "Full tests - MAIN with default options (using *_ST0 config dirs) : " "${GROUP_SETS[0]}"
- printf "%-93s %s\n" "Full tests - HALO1 with nn_hls=1 (no tiling or loop fusion) (using *_ST1 config dirs) : " "${GROUP_SETS[1]}"
- printf "%-93s %s\n" "Full tests - NO_QCO without qco (using *_ST2 config dirs) : " "${GROUP_SETS[2]}"
+ printf "%-93s %s\n" "Full tests - NO_QCO without qco (using *_ST1 config dirs) : " "${GROUP_SETS[1]}"
#
-# B. Three different option choices with ORCA2_ICE_PISCES only:
+# B. 2 different option choices with ORCA2_ICE_PISCES only:
#
- printf "%-93s %s\n" "ORCA2_ICE_PISCES tests - NO_ICB1 without icebergs, with nn_hls=1 (using *_ST3 config dirs) : " "${GROUP_SETS[3]}"
- printf "%-93s %s\n" "ORCA2_ICE_PISCES tests - NO_ICB2 without icebergs, with nn_hls=2 (using *_ST4 config dirs) : " "${GROUP_SETS[4]}"
- printf "%-93s %s\n" "ORCA2_ICE_PISCES tests - NO_COLL without collective comms (using *_ST5 config dirs) : " "${GROUP_SETS[5]}"
+ printf "%-93s %s\n" "ORCA2_ICE_PISCES tests - NO_ICB2 without icebergs (using *_ST2 config dirs) : " "${GROUP_SETS[2]}"
+ printf "%-93s %s\n" "ORCA2_ICE_PISCES tests - NO_COLL without collective comms (using *_ST3 config dirs) : " "${GROUP_SETS[3]}"
#
# A. Full tests
-for gs in 0 1 2
+for gs in 0 1
do
for n in `seq 0 1 $(( ${#FULLSET[@]} - 1 ))`
do
@@ -36,7 +34,7 @@ do
done
#
# B. ORCA2_ICE_PISCES special tests
-for gs in 3 4 5
+for gs in 2 3
do
# run the test
echo ./sette.sh ${GROUP_SETS[$gs]} -x "RESTART REPRO" -n ORCA2_ICE_PISCES