From b02d3d8be9f20d093294bde2ace77727fd658c21 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 10 May 2021 00:00:27 +0000 Subject: [PATCH 1/8] Added more safeguards against out-of-bounds temperature to GP inputs. Limit Jacobian Flux adjustment to below 100hPa. --- FV3 | 2 +- tests/fv3_conf/gfs_v16_run_c192L127.IN | 1 + tests/parm/v16_c192L127_rrtmgp.nml.IN | 9 +++++---- tests/tests/fv3_gfs_v16_RRTMGP_c192L127 | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/FV3 b/FV3 index ce81602fd1..df7028b249 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit ce81602fd1cb6be1cfb79689f9aaf9a6a00458c7 +Subproject commit df7028b249afd4232a21a4b571ff97c9b4a8cc81 diff --git a/tests/fv3_conf/gfs_v16_run_c192L127.IN b/tests/fv3_conf/gfs_v16_run_c192L127.IN index d552738fe9..d708b52072 100644 --- a/tests/fv3_conf/gfs_v16_run_c192L127.IN +++ b/tests/fv3_conf/gfs_v16_run_c192L127.IN @@ -20,4 +20,5 @@ cp @[INPUTDATA_ROOT]/FV3_input_data_c192L127/*configure . if [ $DO_RRTMGP = .T. ]; then cp @[INPUTDATA_ROOT]/FV3_input_data_c192L127/rrtmgp* . + cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* . fi diff --git a/tests/parm/v16_c192L127_rrtmgp.nml.IN b/tests/parm/v16_c192L127_rrtmgp.nml.IN index a2daf40edc..5cdab19438 100644 --- a/tests/parm/v16_c192L127_rrtmgp.nml.IN +++ b/tests/parm/v16_c192L127_rrtmgp.nml.IN @@ -133,7 +133,7 @@ deflate_level=1 fhlwr = 3600. ialb = 1 iems = 1 - iaer = 5111 + iaer = @[IAER] icliq_sw = 2 iovr = 3 ico2 = 2 @@ -177,7 +177,7 @@ deflate_level=1 debug = .false. oz_phys = .F. oz_phys_2015 = .T. - nstf_name = 2,0,0,0,0 + nstf_name = @[NSTF_NAME] nst_anl = .true. psautco = 0.0008,0.0005 prautco = 0.00015,0.00015 @@ -202,8 +202,9 @@ deflate_level=1 rrtmgp_nGptsLW = 128 rrtmgp_nBandsLW = 16 rrtmgp_nBandsSW = 14 - doG_cldoptics = .true. - rrtmgp_nrghice = 3 + doGP_cldoptics_LUT = .true. + doGP_lwscat = .true. + use_LW_jacobian = .true. lsoil_lsm = 4 do_mynnedmf = .false. do_mynnsfclay = .false. diff --git a/tests/tests/fv3_gfs_v16_RRTMGP_c192L127 b/tests/tests/fv3_gfs_v16_RRTMGP_c192L127 index b542ede33b..26f8f4058e 100644 --- a/tests/tests/fv3_gfs_v16_RRTMGP_c192L127 +++ b/tests/tests/fv3_gfs_v16_RRTMGP_c192L127 @@ -69,6 +69,8 @@ export LIST_FILES="phyf000.tile1.nc \ export_fv3 export DO_RRTMGP=.T. +export NSTF_NAME=2,1,0,0,0 +export IAER=5111 export TASKS=150 export INPES=3 export JNPES=8 From a3cae104e3a01c36dcff22327695a14dea765136 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 11 May 2021 18:41:35 +0000 Subject: [PATCH 2/8] Updated FV3/ccpp-physics. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index df7028b249..971dd900a6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit df7028b249afd4232a21a4b571ff97c9b4a8cc81 +Subproject commit 971dd900a6f062da7500639f2e0731cd8de3809a From d23b701a5198bd1baae30e1c6b8e37fcef71e66f Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 11 May 2021 19:48:06 +0000 Subject: [PATCH 3/8] Add vetical decay to impact of flux adjustment above threshold. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 971dd900a6..86c3050320 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 971dd900a6f062da7500639f2e0731cd8de3809a +Subproject commit 86c3050320b75e47212b9819dc421f58c629e8ab From e76dd2c3684eeb5e656bd56a7e7bf77a62902cc0 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 24 May 2021 16:58:44 +0000 Subject: [PATCH 4/8] Added logistic function to damp the LW flux adjustment with height. Added default values to c192l127 GP RT --- FV3 | 2 +- tests/parm/v16_c192L127_rrtmgp.nml.IN | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 86c3050320..dca609d89c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 86c3050320b75e47212b9819dc421f58c629e8ab +Subproject commit dca609d89c850ac8e32b057a27d752e0343b0054 diff --git a/tests/parm/v16_c192L127_rrtmgp.nml.IN b/tests/parm/v16_c192L127_rrtmgp.nml.IN index 5cdab19438..ddbb5159bd 100644 --- a/tests/parm/v16_c192L127_rrtmgp.nml.IN +++ b/tests/parm/v16_c192L127_rrtmgp.nml.IN @@ -205,6 +205,9 @@ deflate_level=1 doGP_cldoptics_LUT = .true. doGP_lwscat = .true. use_LW_jacobian = .true. + damp_LW_fluxadj = .true. + lfnc_k_grad = 4. + lfnc_p0 = 50000. lsoil_lsm = 4 do_mynnedmf = .false. do_mynnsfclay = .false. From d1693bad94731cdd6d09f844d0dba9291872165b Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 24 May 2021 17:40:06 +0000 Subject: [PATCH 5/8] Reorganized RRTMGP aerosol optics. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index dca609d89c..c323a06f5c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit dca609d89c850ac8e32b057a27d752e0343b0054 +Subproject commit c323a06f5c0a408c84910a36f79eb8344382825f From 3f8b1d53824581a4c41ee2c715be3e9956037944 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 25 May 2021 20:06:14 +0000 Subject: [PATCH 6/8] Bug fix. Add transition to HR adjustment. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index c323a06f5c..58d269cfce 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c323a06f5c0a408c84910a36f79eb8344382825f +Subproject commit 58d269cfcebc6587a1c4091d44bea127ed31b0fa From 637e8579e809cf38efc35969bbfdca3b06b93808 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 27 May 2021 15:32:55 +0000 Subject: [PATCH 7/8] Updated default nml values for c192l127 GP RT. --- tests/parm/v16_c192L127_rrtmgp.nml.IN | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/parm/v16_c192L127_rrtmgp.nml.IN b/tests/parm/v16_c192L127_rrtmgp.nml.IN index ddbb5159bd..152bae9c85 100644 --- a/tests/parm/v16_c192L127_rrtmgp.nml.IN +++ b/tests/parm/v16_c192L127_rrtmgp.nml.IN @@ -206,8 +206,8 @@ deflate_level=1 doGP_lwscat = .true. use_LW_jacobian = .true. damp_LW_fluxadj = .true. - lfnc_k_grad = 4. - lfnc_p0 = 50000. + lfnc_k = 3125. + lfnc_p0 = 60000. lsoil_lsm = 4 do_mynnedmf = .false. do_mynnsfclay = .false. From 9c44cf028030febb06cf85e8a8d69260ba27ccfa Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 27 May 2021 17:04:13 +0000 Subject: [PATCH 8/8] Cleanup for PR review --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 58d269cfce..295c53c189 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 58d269cfcebc6587a1c4091d44bea127ed31b0fa +Subproject commit 295c53c18969866d3a578ee58fa8ad7ab35f700e