From 5e6a698bc17206a5de576d45756e80625e67e5da Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 16 Jan 2021 06:18:05 -0700 Subject: [PATCH 1/5] Updates to regression tests fv3_ccpp_gsd_lndp and fv3_ccpp_gsd_noah_lndp; bugfix for tests/parm/ccpp_gsd_sar.nml.IN --- tests/parm/ccpp_gsd.nml.IN | 4 ++-- tests/parm/ccpp_gsd_sar.nml.IN | 2 ++ tests/rt_ccpp_dev.conf | 2 ++ tests/tests/fv3_ccpp_gsd_lndp | 2 +- tests/tests/fv3_ccpp_gsd_noah_lndp | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN index f4a2713f07..7d2a9e7782 100644 --- a/tests/parm/ccpp_gsd.nml.IN +++ b/tests/parm/ccpp_gsd.nml.IN @@ -326,8 +326,8 @@ LNDP_TAU=21600, LNDP_LSCALE=500000, ISEED_LNDP=2010, - lndp_var_list = 'vgf','alb','sal' - lndp_prt_list = 0.02,0.01,0.01 + lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol' + lndp_prt_list = 0.200, 0.001, 0.001, 0.001, 0.001, 0.001 / &cires_ugwp_nml diff --git a/tests/parm/ccpp_gsd_sar.nml.IN b/tests/parm/ccpp_gsd_sar.nml.IN index ec5c0869f2..d101d6f84f 100644 --- a/tests/parm/ccpp_gsd_sar.nml.IN +++ b/tests/parm/ccpp_gsd_sar.nml.IN @@ -277,6 +277,7 @@ FABSL = 99999, FSNOS = 99999, FSICS = 99999, +/ &nam_stochy lon_s=768, @@ -300,6 +301,7 @@ ISEED_SKEB=2, ISEED_SPPT=3, / + &nam_sfcperts lndp_type = @[LNDP_TYPE] LNDP_TAU=21600, diff --git a/tests/rt_ccpp_dev.conf b/tests/rt_ccpp_dev.conf index 47633dc20c..109c9b0e44 100644 --- a/tests/rt_ccpp_dev.conf +++ b/tests/rt_ccpp_dev.conf @@ -1,4 +1,6 @@ ################################################################################################################################################################################# +# Note: this file has been used for testing additional physics on Hera and Cheyenne with both Intel and GNU # +# # # CCPP REPRO tests # ################################################################################################################################################################################# diff --git a/tests/tests/fv3_ccpp_gsd_lndp b/tests/tests/fv3_ccpp_gsd_lndp index 1f2ee29b9b..ab71cc1fb5 100644 --- a/tests/tests/fv3_ccpp_gsd_lndp +++ b/tests/tests/fv3_ccpp_gsd_lndp @@ -94,7 +94,7 @@ export LSOIL_LSM=9 export KICE=9 export LNDP_TYPE=2 -export N_VAR_LNDP=3 +export N_VAR_LNDP=6 export LNDP_EACH_STEP=.T. #export WLCLK=30 diff --git a/tests/tests/fv3_ccpp_gsd_noah_lndp b/tests/tests/fv3_ccpp_gsd_noah_lndp index deb060e09e..777c159993 100644 --- a/tests/tests/fv3_ccpp_gsd_noah_lndp +++ b/tests/tests/fv3_ccpp_gsd_noah_lndp @@ -93,7 +93,7 @@ export LSM=1 export LSOIL_LSM=4 export LNDP_TYPE=2 -export N_VAR_LNDP=3 +export N_VAR_LNDP=6 export LNDP_EACH_STEP=.T. #export WLCLK=30 From 41b5794c1ecab3ecde597f608754b2d3d80a72ab Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 16 Jan 2021 06:25:52 -0700 Subject: [PATCH 2/5] Update .gitmodules and submodule pointers for fv3atm and stochastic_physics for code review and testing --- .gitmodules | 12 ++++++++---- FV3 | 2 +- stochastic_physics | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9acca404b5..85444e34ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSL/fv3atm - branch = gsl/develop + #url = https://github.com/NOAA-GSL/fv3atm + #branch = gsl/develop + url = https://github.com/tanyasmirnova/fv3atm + branch = gsl_stoch_zorl [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS @@ -16,8 +18,10 @@ branch = develop [submodule "stochastic_physics"] path = stochastic_physics - url = https://github.com/noaa-gsl/stochastic_physics - branch = gsl/develop + #url = https://github.com/noaa-gsl/stochastic_physics + #branch = gsl/develop + url = https://github.com/tanyasmirnova/stochastic_physics + branch = gsl_stoch_zorl [submodule "CMakeModules"] path = CMakeModules url = https://github.com/NOAA-EMC/CMakeModules diff --git a/FV3 b/FV3 index 6ecee94d0c..e75cca0686 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 6ecee94d0cdc82def576d56633a8a1ec93da39bd +Subproject commit e75cca0686964fe6b45c76f06d4a1b9c0c0c4c42 diff --git a/stochastic_physics b/stochastic_physics index aeb543dbc4..a4ac1335d0 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit aeb543dbc4eadb3e140db8246dee96877b69576f +Subproject commit a4ac1335d00290f93e1460e01dd9b95346bc9490 From f85b261d8bf31f358291c42da36f3f0f86d77a48 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 16 Jan 2021 20:22:44 -0700 Subject: [PATCH 3/5] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index e75cca0686..abc6eba383 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit e75cca0686964fe6b45c76f06d4a1b9c0c0c4c42 +Subproject commit abc6eba383ce9dda09aa19c425bab4381cde1040 From ed4fa069d462eaa8cf8bba8ce42a01d05ac5a5b5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 18 Jan 2021 19:52:30 -0700 Subject: [PATCH 4/5] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index abc6eba383..f85d9b5db6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit abc6eba383ce9dda09aa19c425bab4381cde1040 +Subproject commit f85d9b5db683f9447dafef8b996c5b32376f21c0 From 804138ceea0a8c2722fb09ea70f8fd75bb51cd07 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 19 Jan 2021 11:29:40 -0700 Subject: [PATCH 5/5] Revert change to .gitmodules and update submodule pointers for stochastic_physics and fv3atm --- .gitmodules | 12 ++++-------- FV3 | 2 +- stochastic_physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 85444e34ed..9acca404b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-GSL/fv3atm - #branch = gsl/develop - url = https://github.com/tanyasmirnova/fv3atm - branch = gsl_stoch_zorl + url = https://github.com/NOAA-GSL/fv3atm + branch = gsl/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS @@ -18,10 +16,8 @@ branch = develop [submodule "stochastic_physics"] path = stochastic_physics - #url = https://github.com/noaa-gsl/stochastic_physics - #branch = gsl/develop - url = https://github.com/tanyasmirnova/stochastic_physics - branch = gsl_stoch_zorl + url = https://github.com/noaa-gsl/stochastic_physics + branch = gsl/develop [submodule "CMakeModules"] path = CMakeModules url = https://github.com/NOAA-EMC/CMakeModules diff --git a/FV3 b/FV3 index f85d9b5db6..fa070c8349 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit f85d9b5db683f9447dafef8b996c5b32376f21c0 +Subproject commit fa070c83497debb2c34e310f7f6cdb767d282a80 diff --git a/stochastic_physics b/stochastic_physics index a4ac1335d0..b6c12628d6 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit a4ac1335d00290f93e1460e01dd9b95346bc9490 +Subproject commit b6c12628d64266134d39066d6e65ec8ddd5b5a22