From c475dfa79b1220db055084252633f20004399e79 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 10 Feb 2020 23:50:37 +0000 Subject: [PATCH 1/3] Working except mpi_bcast(). --- FV3 | 2 +- WW3 | 2 +- tests/rt.sh | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/FV3 b/FV3 index 756ef51a99..1e05a16ac4 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 756ef51a99efefac0db3f9fe53da207ca9306ee1 +Subproject commit 1e05a16ac48101064e46937552355e0751ca09ce diff --git a/WW3 b/WW3 index f6ebf95ff3..b873a7acb1 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit f6ebf95ff3bfa0bcbde1e5dbddf5a3e7760c6965 +Subproject commit b873a7acb1e6795bc05d73ca03b1387aa8c293bf diff --git a/tests/rt.sh b/tests/rt.sh index 4e0ade8cf5..643ccc63af 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -193,12 +193,16 @@ elif [[ $MACHINE_ID = hera.* ]]; then ECFLOW_START=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin/ecflow_start.sh ECF_PORT=$(( $(id -u) + 1500 )) QUEUE=debug -# ACCNR=fv3-cpu + ACCNR=gsienkf PARTITION= # # DTC baseline dprefix=/scratch1/BMC/gmtb DISKNM=$dprefix/ufs-weather-model/RT +<<<<<<< HEAD + STMP=/scratch2/BMC/gsienkf + PTMP=/scratch2/BMC/gsienkf +======= STMP=$dprefix PTMP=$dprefix # EMC baseline @@ -207,6 +211,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then #STMP=$dprefix/stmp4 #PTMP=$dprefix/stmp2 # +>>>>>>> 2919f28a56fb3127fca33976c4840cad156be4d1 SCHEDULER=slurm cp fv3_conf/fv3_slurm.IN_hera fv3_conf/fv3_slurm.IN @@ -326,7 +331,7 @@ mkdir -p ${RUNDIR_ROOT} CREATE_BASELINE=false ROCOTO=false ECFLOW=false -KEEP_RUNDIR=false +KEEP_RUNDIR=true TESTS_FILE='rt.conf' # Switch to special regression test config on wcoss_cray: From a6fd92aa26572136c0e0cc6ca5b6c7c8180668a6 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 10 Feb 2020 23:56:45 +0000 Subject: [PATCH 2/3] Updated submodule --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index b873a7acb1..f6ebf95ff3 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit b873a7acb1e6795bc05d73ca03b1387aa8c293bf +Subproject commit f6ebf95ff3bfa0bcbde1e5dbddf5a3e7760c6965 From c22639f1254e92492739607572da934def3dd2ad Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 19 Feb 2020 18:17:32 +0000 Subject: [PATCH 3/3] Updated submodules. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 1e05a16ac4..14be13f19f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 1e05a16ac48101064e46937552355e0751ca09ce +Subproject commit 14be13f19f93f3b22aa76503fc9ed208a65364a2