diff --git a/FV3 b/FV3 index 4e5457980b..67c8b06418 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 4e5457980b817588c185f457d714d9ce9d162225 +Subproject commit 67c8b06418730d2672b68562dc111c0b48271822 diff --git a/compsets/hera.input b/compsets/hera.input index 3b11bc396d..f8ae2baa0f 100644 --- a/compsets/hera.input +++ b/compsets/hera.input @@ -31,8 +31,8 @@ platform hera.intel { # INPUTS is the input directory, which should contain fix and parm # files, plus any restarts or other inputs. - BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" - BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" + BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" + BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" INPUTS="@[BASELINE]" default_resources={ diff --git a/compsets/wcoss.input b/compsets/wcoss.input index db1b4a25c4..de07434e05 100644 --- a/compsets/wcoss.input +++ b/compsets/wcoss.input @@ -28,8 +28,8 @@ platform wcoss.phase2 { LONG_TEST_QUEUE='&LONGQ;' BUILD_QUEUE='&BUILDQ;' MACHINE_ID='wcoss.phase2' - BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" - BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" + BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" + BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" default_resources={ TASKS=156 @@ -126,8 +126,8 @@ platform wcoss.phase1 { C768_THRD=4 MACHINE_ID='wcoss.phase1' - BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" - BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" + BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" + BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" # WCOSS Phase 2 has been slow of late. DEFAULT_TEST_WALLTIME=2700 @@ -213,8 +213,8 @@ platform wcoss_dell_p3 { LONG_TEST_QUEUE='&LONGQ;' BUILD_QUEUE='&BUILDQ;' - BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227/" - BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227/" + BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313/" + BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313/" default_resources={ TASKS=156 @@ -314,8 +314,8 @@ platform wcoss.cray { BUILD_WALLTIME="3600" DEFAULT_TEST_WALLTIME=1800 - BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" - BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200227" + BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" + BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20200313" execution_time_modules=[[[ module load alps diff --git a/tests/rt.sh b/tests/rt.sh index b43570aad0..5fe6360a0e 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -382,9 +382,9 @@ while getopts ":cfsl:mkreh" opt; do done if [[ $MACHINE_ID = cheyenne.* ]]; then - RTPWD=${RTPWD:-$DISKNM/develop-20200210/${COMPILER^^}} + RTPWD=${RTPWD:-$DISKNM/develop-20200313/${COMPILER^^}} else - RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200227} + RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200313} fi shift $((OPTIND-1))