From 35b26690d38b40b29ad340b944cee5f1564e538e Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 1 Aug 2023 23:05:29 +0000 Subject: [PATCH 1/2] Fix hrrr qutlting restart tests. --- .gitmodules | 6 ++++-- FV3 | 2 +- tests/rt.conf | 8 ++++---- tests/tests/hrrr_control_qr_dyn32_phy32 | 2 +- tests/tests/hrrr_control_restart_qr_dyn32_phy32 | 2 +- tests/tests/rrfs_smoke_conus13km_fast_phy32_qr | 2 +- tests/tests/rrfs_smoke_conus13km_phy32_qr | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3775fc12d..78b75631ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + # url = https://github.com/NOAA-EMC/fv3atm + # branch = develop + url = https://github.com/DusanJovic-NOAA/fv3atm + branch = fix_qr_tests [submodule "WW3"] path = WW3 url = https://github.com/NOAA-EMC/WW3 diff --git a/FV3 b/FV3 index f595b972ab..29efa9424a 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit f595b972ab0a099a8ef13ddad313ec2c0d8672d4 +Subproject commit 29efa9424ae5391fef13708437c079b1ad51b6b4 diff --git a/tests/rt.conf b/tests/rt.conf index edcd7cf644..776c6c2ec4 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -196,7 +196,7 @@ COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D RUN | regional_spp_sppt_shum_skeb_dyn32_phy32 | | baseline | RUN | rap_control_dyn32_phy32 | | baseline | RUN | hrrr_control_dyn32_phy32 | | baseline | -RUN | hrrr_control_qr_dyn32_phy32 | | baseline | +RUN | hrrr_control_qr_dyn32_phy32 | | | RUN | rap_2threads_dyn32_phy32 | | | RUN | hrrr_control_2threads_dyn32_phy32 | | | RUN | hrrr_control_decomp_dyn32_phy32 | | | @@ -206,7 +206,7 @@ RUN | hrrr_control_restart_qr_dyn32_phy32 | COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DFASTER=ON | | fv3 | RUN | rrfs_smoke_conus13km_fast_phy32 | | baseline | -RUN | rrfs_smoke_conus13km_fast_phy32_qr | | baseline | +RUN | rrfs_smoke_conus13km_fast_phy32_qr | | | RUN | rrfs_smoke_conus13km_fast_phy32_restart_mismatch | | baseline | rrfs_smoke_conus13km_fast_phy32 RUN | rrfs_smoke_conus13km_fast_phy32_restart_qr_mismatch | | | rrfs_smoke_conus13km_fast_phy32_qr @@ -375,7 +375,7 @@ RUN | control_wam_debug | + hera cheyenne COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera cheyenne | fv3 | RUN | rap_control_dyn32_phy32 | + hera cheyenne | baseline | RUN | hrrr_control_dyn32_phy32 | + hera cheyenne | baseline | -RUN | hrrr_control_qr_dyn32_phy32 | + hera cheyenne | baseline | +RUN | hrrr_control_qr_dyn32_phy32 | + hera cheyenne | | RUN | rap_2threads_dyn32_phy32 | + hera cheyenne | | RUN | hrrr_control_2threads_dyn32_phy32 | + hera cheyenne | | RUN | hrrr_control_decomp_dyn32_phy32 | + hera cheyenne | | @@ -383,7 +383,7 @@ RUN | rap_restart_dyn32_phy32 | + hera cheyenne RUN | hrrr_control_restart_dyn32_phy32 | + hera cheyenne | | hrrr_control_dyn32_phy32 RUN | hrrr_control_restart_qr_dyn32_phy32 | + hera cheyenne | | hrrr_control_qr_dyn32_phy32 RUN | rrfs_smoke_conus13km_phy32 | + hera cheyenne | baseline | -RUN | rrfs_smoke_conus13km_phy32_qr | + hera cheyenne | baseline | +RUN | rrfs_smoke_conus13km_phy32_qr | + hera cheyenne | | RUN | rrfs_smoke_conus13km_phy32_restart_mismatch | + hera cheyenne | baseline | rrfs_smoke_conus13km_phy32 RUN | rrfs_smoke_conus13km_phy32_restart_qr_mismatch | + hera cheyenne | | rrfs_smoke_conus13km_phy32_qr diff --git a/tests/tests/hrrr_control_qr_dyn32_phy32 b/tests/tests/hrrr_control_qr_dyn32_phy32 index 6c47bd7966..d4a27afa77 100644 --- a/tests/tests/hrrr_control_qr_dyn32_phy32 +++ b/tests/tests/hrrr_control_qr_dyn32_phy32 @@ -6,7 +6,7 @@ export TEST_DESCR="Compare HRRR CLM Lake results with previous trunk version" -export CNTL_DIR=hrrr_control_qr_dyn32_phy32 +export CNTL_DIR=hrrr_control_dyn32_phy32 export LIST_FILES="sfcf000.nc \ sfcf009.nc \ diff --git a/tests/tests/hrrr_control_restart_qr_dyn32_phy32 b/tests/tests/hrrr_control_restart_qr_dyn32_phy32 index e43e586302..ee1204eccb 100644 --- a/tests/tests/hrrr_control_restart_qr_dyn32_phy32 +++ b/tests/tests/hrrr_control_restart_qr_dyn32_phy32 @@ -6,7 +6,7 @@ export TEST_DESCR="Compare HRRR CLM Lake restart results with control" -export CNTL_DIR=hrrr_control_qr_dyn32_phy32 +export CNTL_DIR=hrrr_control_dyn32_phy32 export LIST_FILES="sfcf012.nc \ atmf012.nc \ diff --git a/tests/tests/rrfs_smoke_conus13km_fast_phy32_qr b/tests/tests/rrfs_smoke_conus13km_fast_phy32_qr index 9795ef8fba..a6d52f76c0 100644 --- a/tests/tests/rrfs_smoke_conus13km_fast_phy32_qr +++ b/tests/tests/rrfs_smoke_conus13km_fast_phy32_qr @@ -9,7 +9,7 @@ export TEST_DESCR="HRRR smoke physics on 13km domain, quilt 32-bit FASTER=ON" -export CNTL_DIR=rrfs_smoke_conus13km_fast_phy32_qr +export CNTL_DIR=rrfs_smoke_conus13km_fast_phy32 export LIST_FILES="sfcf000.nc \ sfcf001.nc \ diff --git a/tests/tests/rrfs_smoke_conus13km_phy32_qr b/tests/tests/rrfs_smoke_conus13km_phy32_qr index 46b2794c05..616ad2561b 100644 --- a/tests/tests/rrfs_smoke_conus13km_phy32_qr +++ b/tests/tests/rrfs_smoke_conus13km_phy32_qr @@ -9,7 +9,7 @@ export TEST_DESCR="HRRR smoke physics on 13km domain, quilt FASTER=ON" -export CNTL_DIR=rrfs_smoke_conus13km_phy32_qr +export CNTL_DIR=rrfs_smoke_conus13km_phy32 export LIST_FILES="sfcf000.nc \ sfcf001.nc \ From ff6dbe8c3d478fb05f358914d50bd3e747407f37 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 29 Aug 2023 18:01:27 +0000 Subject: [PATCH 2/2] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 29efa9424a..3b318a6308 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 29efa9424ae5391fef13708437c079b1ad51b6b4 +Subproject commit 3b318a63083e43384af8f5d63fd5c110ed52b2a2