From dea86af2933cbe5d82693f920fa4a98a3e3611b8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 29 Dec 2020 14:25:23 -0700 Subject: [PATCH 1/6] Update .gitmodules and submodule pointers for fv3atm and stochastic_physics for code review and testing --- .gitmodules | 6 ++++-- FV3 | 2 +- stochastic_physics | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9acca404b5..3713f69101 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/climbfuji/fv3atm + branch = land-stoch-pert-dom [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index b1e98cf2b9..24a654d8f2 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit b1e98cf2b91a593203637115b85882c0ba198aa4 +Subproject commit 24a654d8f2e9288d82ab5989767c6f9469d3a04b diff --git a/stochastic_physics b/stochastic_physics index e4913c062b..57afa4d42b 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit e4913c062b520cf8d76d9c82f90636aee19cbddb +Subproject commit 57afa4d42b5cb9c2225b83def22f54bbcb9eba4d From 18074a68b99e1030abeda87d2edd72148e175fcb Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 30 Dec 2020 08:28:50 -0700 Subject: [PATCH 2/6] Add regression tests with stochastic land perturbations for suites FV3_GSD_v0 and FV3_GSD_noah --- .gitmodules | 6 +- FV3 | 2 +- stochastic_physics | 2 +- tests/parm/ccpp_gsd.nml.IN | 2 + tests/rt_ccpp_dev.conf | 2 + tests/tests/fv3_ccpp_gsd_lndp | 99 ++++++++++++++++++++++++++++++ tests/tests/fv3_ccpp_gsd_noah_lndp | 98 +++++++++++++++++++++++++++++ 7 files changed, 207 insertions(+), 4 deletions(-) create mode 100644 tests/tests/fv3_ccpp_gsd_lndp create mode 100644 tests/tests/fv3_ccpp_gsd_noah_lndp diff --git a/.gitmodules b/.gitmodules index 3713f69101..7696446733 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,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_landstoch_withruc [submodule "CMakeModules"] path = CMakeModules url = https://github.com/NOAA-EMC/CMakeModules diff --git a/FV3 b/FV3 index 24a654d8f2..273b893311 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 24a654d8f2e9288d82ab5989767c6f9469d3a04b +Subproject commit 273b893311914f0158ad3d3b9ba26eec49ece66f diff --git a/stochastic_physics b/stochastic_physics index 57afa4d42b..d6ed5990fe 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 57afa4d42b5cb9c2225b83def22f54bbcb9eba4d +Subproject commit d6ed5990fe2006766bd3e5d647ca6caa7c3d83a7 diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN index 67e880a656..cef82e2759 100644 --- a/tests/parm/ccpp_gsd.nml.IN +++ b/tests/parm/ccpp_gsd.nml.IN @@ -325,6 +325,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 / &cires_ugwp_nml diff --git a/tests/rt_ccpp_dev.conf b/tests/rt_ccpp_dev.conf index 89c9eadb34..47633dc20c 100644 --- a/tests/rt_ccpp_dev.conf +++ b/tests/rt_ccpp_dev.conf @@ -9,7 +9,9 @@ RUN | fv3_ccpp_gf_thompson RUN | fv3_ccpp_gsd | standard | | fv3 | RUN | fv3_ccpp_gsd_coldstart | standard | | | RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart +RUN | fv3_ccpp_gsd_lndp | standard | | fv3 | RUN | fv3_ccpp_gsd_noah | standard | | fv3 | +RUN | fv3_ccpp_gsd_noah_lndp | standard | | fv3 | COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | | fv3 | diff --git a/tests/tests/fv3_ccpp_gsd_lndp b/tests/tests/fv3_ccpp_gsd_lndp new file mode 100644 index 0000000000..1f7bfc98a3 --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_lndp @@ -0,0 +1,99 @@ +######################################################################################### +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM) with land stochastic pert test +# +######################################################################################### + +export TEST_DESCR="Compare FV3 CCPP GSD lndp results with previous trunk version" + +export CNTL_DIR=fv3_gsd_lndp + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_v0 +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 +export LSM=3 +export LSOIL_LSM=9 +export KICE=9 + +export LNDP_TYPE=2 +export N_VAR_LNDP=3 + +#export WLCLK=30 diff --git a/tests/tests/fv3_ccpp_gsd_noah_lndp b/tests/tests/fv3_ccpp_gsd_noah_lndp new file mode 100644 index 0000000000..cf696f4a3f --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_noah_lndp @@ -0,0 +1,98 @@ +########################################################################################## +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM) with land stochastic pert test +# +########################################################################################## + +export TEST_DESCR="Compare FV3 CCPP GSD lndp results with previous trunk version" + +export CNTL_DIR=fv3_gsd_noah_lndp + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_noah +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 +export LSM=1 +export LSOIL_LSM=4 + +export LNDP_TYPE=2 +export N_VAR_LNDP=3 + +#export WLCLK=30 From d866bef34c1a8116978c9e4834b2c2c7d6dcd613 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 30 Dec 2020 15:07:26 -0700 Subject: [PATCH 3/6] Add logic to regression tests to apply land surface perturbations at every time step --- FV3 | 2 +- stochastic_physics | 2 +- tests/default_vars.sh | 1 + tests/parm/ccpp_gsd.nml.IN | 1 + tests/parm/ccpp_lndp.nml.IN | 1 + tests/tests/fv3_ccpp_gsd_lndp | 1 + tests/tests/fv3_ccpp_gsd_noah_lndp | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/FV3 b/FV3 index 273b893311..9623b14519 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 273b893311914f0158ad3d3b9ba26eec49ece66f +Subproject commit 9623b145197bcfae5c06b76fc0b0a0c74ff8b015 diff --git a/stochastic_physics b/stochastic_physics index d6ed5990fe..81d091f00c 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit d6ed5990fe2006766bd3e5d647ca6caa7c3d83a7 +Subproject commit 81d091f00cf1a46d31e21dfaa10abec780358fec diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 19f4fc20de..4764fa1fdd 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -322,6 +322,7 @@ export DO_SHUM=.F. export DO_SKEB=.F. export LNDP_TYPE=0 export N_VAR_LNDP=0 +export LNDP_EACH_STEP=.F. export SKEB=-999. export SPPT=-999. export SHUM=-999. diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN index cef82e2759..f4a2713f07 100644 --- a/tests/parm/ccpp_gsd.nml.IN +++ b/tests/parm/ccpp_gsd.nml.IN @@ -174,6 +174,7 @@ do_skeb = @[DO_SKEB] lndp_type = @[LNDP_TYPE] n_var_lndp = @[N_VAR_LNDP] + lndp_each_step = @[LNDP_EACH_STEP] lsm = @[LSM] lsoil_lsm = @[LSOIL_LSM] kice = @[KICE] diff --git a/tests/parm/ccpp_lndp.nml.IN b/tests/parm/ccpp_lndp.nml.IN index 428be0fc23..8b6c0e2881 100644 --- a/tests/parm/ccpp_lndp.nml.IN +++ b/tests/parm/ccpp_lndp.nml.IN @@ -194,6 +194,7 @@ do_skeb = @[DO_SKEB] lndp_type = @[LNDP_TYPE] n_var_lndp = @[N_VAR_LNDP] + lndp_each_step = @[LNDP_EACH_STEP] do_ca = .false. ca_sgs = .false. nca = 1 diff --git a/tests/tests/fv3_ccpp_gsd_lndp b/tests/tests/fv3_ccpp_gsd_lndp index 1f7bfc98a3..1f2ee29b9b 100644 --- a/tests/tests/fv3_ccpp_gsd_lndp +++ b/tests/tests/fv3_ccpp_gsd_lndp @@ -95,5 +95,6 @@ export KICE=9 export LNDP_TYPE=2 export N_VAR_LNDP=3 +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 cf696f4a3f..deb060e09e 100644 --- a/tests/tests/fv3_ccpp_gsd_noah_lndp +++ b/tests/tests/fv3_ccpp_gsd_noah_lndp @@ -94,5 +94,6 @@ export LSOIL_LSM=4 export LNDP_TYPE=2 export N_VAR_LNDP=3 +export LNDP_EACH_STEP=.T. #export WLCLK=30 From 87c8843bba0238f2900cb9878f2906e577810c91 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 30 Dec 2020 15:29:58 -0700 Subject: [PATCH 4/6] Update submodule pointer for stochastic_physics --- stochastic_physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stochastic_physics b/stochastic_physics index 81d091f00c..ac5e2415ae 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 81d091f00cf1a46d31e21dfaa10abec780358fec +Subproject commit ac5e2415ae04fcc8196a19d239cbcfd840a397e7 From 56051ef6b9133591c1a67b041548c54e4bc2af9e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 7 Jan 2021 20:04:49 -0700 Subject: [PATCH 5/6] Update submodule pointers for stochastic_physics and fv3atm --- FV3 | 2 +- stochastic_physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FV3 b/FV3 index 9623b14519..4da0c4e71f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 9623b145197bcfae5c06b76fc0b0a0c74ff8b015 +Subproject commit 4da0c4e71fb0569fd45bba63a25385a22339ad65 diff --git a/stochastic_physics b/stochastic_physics index ac5e2415ae..4391df4555 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit ac5e2415ae04fcc8196a19d239cbcfd840a397e7 +Subproject commit 4391df4555470d3497c184bd4c64b5be999d3d9d From 5aff581b977a4f8634ae875634e940b65bd29162 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 8 Jan 2021 19:52:21 -0700 Subject: [PATCH 6/6] Revert change to .gitmdoules and update submodule pointers for fv3atm and stochastic_physics --- .gitmodules | 12 ++++-------- FV3 | 2 +- stochastic_physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7696446733..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/climbfuji/fv3atm - branch = land-stoch-pert-dom + 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_landstoch_withruc + 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 4da0c4e71f..6ecee94d0c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 4da0c4e71fb0569fd45bba63a25385a22339ad65 +Subproject commit 6ecee94d0cdc82def576d56633a8a1ec93da39bd diff --git a/stochastic_physics b/stochastic_physics index 4391df4555..aeb543dbc4 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 4391df4555470d3497c184bd4c64b5be999d3d9d +Subproject commit aeb543dbc4eadb3e140db8246dee96877b69576f