From 93701aec12d704fdf4fa8f445393670f6c880080 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 4 May 2020 19:59:11 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for fv3atm --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e1ca6efa77..80886ab626 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NCAR/fv3atm - branch = dtc/hwrf-physics + #url = https://github.com/NCAR/fv3atm + #branch = dtc/hwrf-physics + url = https://github.com/climbfuji/fv3atm + branch = dtc-hwrf-physics-man-bugfix-fa [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index fd9afd726d..fe607ea1dd 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit fd9afd726d00aa64ece3f5b2de8d66a1dd28d03b +Subproject commit fe607ea1dd2ebcf29bc1f05aeb0a070c01a745b1 From 4ee3b1bccd6432917abfd7b3358fcfc9466243af Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 4 May 2020 19:59:28 -0600 Subject: [PATCH 2/3] Update regression test baseline date tag in tests/rt.sh --- tests/rt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/rt.sh b/tests/rt.sh index 2f390bf0c3..824048895e 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -383,11 +383,11 @@ done # Fix me - make those definitions and DISKNM consistent if [[ $MACHINE_ID = hera.* ]]; then - RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200415/${COMPILER^^}} + RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200504/${COMPILER^^}} elif [[ $MACHINE_ID = cheyenne.* ]]; then - RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200415/${COMPILER^^}} + RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200504/${COMPILER^^}} else - RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200415} + RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200504} fi shift $((OPTIND-1)) From b1b32f8a10f3b9132b94c865ab24b69ad601d9d0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 5 May 2020 20:29:21 -0600 Subject: [PATCH 3/3] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- FV3 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 80886ab626..e1ca6efa77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NCAR/fv3atm - #branch = dtc/hwrf-physics - url = https://github.com/climbfuji/fv3atm - branch = dtc-hwrf-physics-man-bugfix-fa + url = https://github.com/NCAR/fv3atm + branch = dtc/hwrf-physics [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index fe607ea1dd..5d483d712a 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit fe607ea1dd2ebcf29bc1f05aeb0a070c01a745b1 +Subproject commit 5d483d712a5c93040bb694193cb8de4e83256968