From b02d3d8be9f20d093294bde2ace77727fd658c21 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 10 May 2021 00:00:27 +0000 Subject: [PATCH 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 From c3e5abee8297d1237a17182e7c32d42701abf82b Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Tue, 15 Jun 2021 23:52:52 +0000 Subject: [PATCH 09/19] update fv3 --- .gitmodules | 4 ++-- FV3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 30bac3386e..ef8daa4b60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + url = https://github.com/ericaligo-NOAA/fv3atm + branch = feature/diag [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 0a47bd13ab..0034c5081e 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0a47bd13ab49a785e9731eb8d59a46b429f26720 +Subproject commit 0034c5081e4537c4dfdf7565a2eee564447fdaa9 From 1635b5a7de0e55ab6b2dec523b48d923da66ae63 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 22 Jun 2021 08:36:00 -0600 Subject: [PATCH 10/19] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 4 ++-- FV3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ef8daa4b60..dcb4cedcdb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/ericaligo-NOAA/fv3atm - branch = feature/diag + url = https://github.com/climbfuji/fv3atm + branch = thompson_ext_diag_dom [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 0034c5081e..41e61e70f1 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0034c5081e4537c4dfdf7565a2eee564447fdaa9 +Subproject commit 41e61e70f17122af345d0948e2fe34b53e671ed2 From 971984185c55b965fc030e3398d3bc8aae1a45e4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 22 Jun 2021 14:35:29 -0600 Subject: [PATCH 11/19] Add new regression test control_thompson_extdiag_debug --- FV3 | 2 +- tests/default_vars.sh | 1 + tests/fv3_conf/control_run.IN | 3 +- tests/parm/control_thompson.nml.IN | 1 + tests/rt.conf | 11 ++--- tests/rt_gnu.conf | 2 +- tests/tests/control_thompson_extdiag_debug | 49 ++++++++++++++++++++++ 7 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 tests/tests/control_thompson_extdiag_debug diff --git a/FV3 b/FV3 index 41e61e70f1..67cc084f0c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 41e61e70f17122af345d0948e2fe34b53e671ed2 +Subproject commit 67cc084f0c2832733f54ae45dd4b35dff428ba17 diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 261ec0a40c..44aca07334 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -473,6 +473,7 @@ export EFFR_IN=.F. # Thompson MP export LRADAR=.T. export LTAEROSOL=.T. +export EXT_DIAG_THOMPSON=.F. # GWD export LDIAG_UGWP=.F. diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN index 45b98159b5..0db513274c 100644 --- a/tests/fv3_conf/control_run.IN +++ b/tests/fv3_conf/control_run.IN @@ -80,7 +80,8 @@ cp @[INPUTDATA_ROOT]/${inputdir}/field_table_gfsv16 ./field_table cp @[INPUTDATA_ROOT]/${inputdir}/*configure . if [ $NEW_DIAGTABLE != '' ]; then - cp @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table + #cp @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table + cp /scratch1/BMC/gmtb/Dom.Heinzeller/TMP_THOMPSON_EXTDIAG/diag_table_gfsv16_thompson_extdiag ./diag_table fi if [ $NEW_FIELDTABLE != '' ]; then diff --git a/tests/parm/control_thompson.nml.IN b/tests/parm/control_thompson.nml.IN index bf3c26120b..1171cc8b1e 100644 --- a/tests/parm/control_thompson.nml.IN +++ b/tests/parm/control_thompson.nml.IN @@ -118,6 +118,7 @@ deflate_level=1 ltaerosol = @[LTAEROSOL] lradar = @[LRADAR] ttendlim = 0.004 + ext_diag_thompson = @[EXT_DIAG_THOMPSON] pdfcld = .false. fhswr = 3600. fhlwr = 3600. diff --git a/tests/rt.conf b/tests/rt.conf index 4aec8fa0e3..d44121bda0 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -34,7 +34,7 @@ RUN | cpld_debug # PROD tests # ################################################################################################################################################################################### -COMPILE | APP=ATM SUITES=FV3_GFS_v16 32BIT=Y | | fv3 | +COMPILE | APP=ATM SUITES=FV3_GFS_v16 32BIT=Y | | fv3 | RUN | control | | fv3 | RUN | control_decomp | - jet.intel | | @@ -51,7 +51,7 @@ RUN | control_lndp RUN | control_lheatstrg | | fv3 | RUN | control_merra2 | | fv3 | -COMPILE | APP=ATM SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 | +COMPILE | APP=ATM SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 | # fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0 RUN | control_rrtmgp | | fv3 | #RUN | control_rrtmgp_2threads | | | @@ -107,7 +107,7 @@ RUN | fv3_esg_HAFS_v0_hwrf_thompson # DEBUG tests # ################################################################################################################################################################################### -COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp 32BIT=Y | | fv3 | +COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp 32BIT=Y | | fv3 | RUN | control_debug | | fv3 | RUN | control_2threads_debug | - wcoss_cray | fv3 | RUN | control_CubedSphereGrid_debug | | fv3 | @@ -124,11 +124,12 @@ RUN | control_ugwpv1_debug RUN | control_ras_debug | | fv3 | #RUN | control_noahmp_debug | | fv3 | -COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16_thompson 32BIT=Y | | fv3 | +COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16_thompson 32BIT=Y | | fv3 | RUN | control_thompson_debug | | fv3 | RUN | control_thompson_no_aero_debug | | fv3 | +RUN | control_thompson_extdiag_debug | | fv3 | -COMPILE | APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_RRFS_v1beta,FV3_RRFS_v1alpha 32BIT=Y DEBUG=Y | | fv3 | +COMPILE | APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_RRFS_v1beta,FV3_RRFS_v1alpha 32BIT=Y DEBUG=Y | | fv3 | RUN | regional_control_debug | | fv3 | RUN | fv3_gsd_debug | | fv3 | RUN | fv3_gsd_diag3d_debug | | fv3 | diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf index 994cb56792..d58e9e497e 100644 --- a/tests/rt_gnu.conf +++ b/tests/rt_gnu.conf @@ -14,7 +14,6 @@ RUN | control_thompson_no_aero RUN | control_ugwpv1 | | fv3 | RUN | control_ras | | fv3 | - COMPILE | APP=ATM SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1alpha,FV3_RRFS_v1beta 32BIT=Y | | fv3 | RUN | fv3_gsd | | fv3 | RUN | fv3_rrfs_v1alpha | | fv3 | @@ -42,6 +41,7 @@ RUN | fv3_rrfs_v1beta_debug RUN | fv3_gsd_debug | | fv3 | RUN | control_thompson_debug | | fv3 | RUN | control_thompson_no_aero_debug | | fv3 | +RUN | control_thompson_extdiag_debug | | fv3 | RUN | control_rrtmgp_debug | | fv3 | RUN | control_ugwpv1_debug | | fv3 | RUN | control_ras_debug | | fv3 | diff --git a/tests/tests/control_thompson_extdiag_debug b/tests/tests/control_thompson_extdiag_debug new file mode 100644 index 0000000000..ff5627dcba --- /dev/null +++ b/tests/tests/control_thompson_extdiag_debug @@ -0,0 +1,49 @@ +############################################################################### +# +# Global control with Thompson debug test with extended diagnostics +# +############################################################################### + +export TEST_DESCR="Compare global control Thompson debug results with extended diagnostics with previous trunk version" + +export CNTL_DIR=control_thompson_debug_extdiag + +export LIST_FILES="sfcf000.nc \ + sfcf001.nc \ + atmf000.nc \ + atmf001.nc" + +export_fv3 +export NPZ=127 +export NPZP=128 +export DT_ATMOS=600 +export SYEAR=2021 +export SMONTH=03 +export SDAY=22 +export SHOUR=06 +export OUTPUT_GRID='gaussian_grid' +export NSTF_NAME='2,0,0,0,0' +export FHMAX=1 + +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. +export EXT_DIAG_THOMPSON=.T. +export HYBEDMF=.F. +export SATMEDMF=.T. +export DO_MYNNEDMF=.F. +export IMFSHALCNV=2 +export IMFDEEPCNV=2 +export IAER=5111 +export ICLIQ_SW=2 +export IOVR=3 +export LHEATSTRG=.T. +export DO_TOFD=.T. + +export NEW_DIAGTABLE='diag_table_gfsv16_thompson_extdiag' + +export FV3_RUN=control_run.IN +export CCPP_SUITE=FV3_GFS_v16_thompson +export INPUT_NML=control_thompson.nml.IN From 5fabb97e1d779df6a32e6c470514a84d70d01355 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 23 Jun 2021 14:32:03 -0600 Subject: [PATCH 12/19] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index d12742b8b5..b7abc43df8 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit d12742b8b5733fcd0ed8543cfbae4a78bcd597cc +Subproject commit b7abc43df85aee2f2e7c30ec867ebfdc4afc814e From d2545b160e335e9ad26d4db159000aaf225f2d8d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 23 Jun 2021 15:39:23 -0600 Subject: [PATCH 13/19] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index b7abc43df8..d41dbc5edf 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit b7abc43df85aee2f2e7c30ec867ebfdc4afc814e +Subproject commit d41dbc5edf9f5a114a777e8f8acfa6e844e8ba36 From c440f2e4a942d9269f2719d0956089f32bc65454 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 23 Jun 2021 17:26:57 -0600 Subject: [PATCH 14/19] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index d41dbc5edf..4189feb9ca 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit d41dbc5edf9f5a114a777e8f8acfa6e844e8ba36 +Subproject commit 4189feb9ca8568d4a9c3a0dd6857b0dafde16ce7 From 90a699b186566d3d9283ff8bbf2e1a90b740a6ca Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 1 Jul 2021 11:03:14 -0600 Subject: [PATCH 15/19] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 43a54db7d1..048df7f80f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 43a54db7d1478aa5cc874f6061d4cac48f4220ea +Subproject commit 048df7f80f637b4a3f57ab733656135d89e0c069 From 49619b99ec22f533bd890061f55b7ddd2385e540 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 2 Jul 2021 12:06:29 -0600 Subject: [PATCH 16/19] Comment out extended diagnostics vts1, txri, txrc --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 048df7f80f..6d5bab8c6b 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 048df7f80f637b4a3f57ab733656135d89e0c069 +Subproject commit 6d5bab8c6bf42556754d82148a37b2e7391326fa From f53640521976c21f374a5bc52f7a20e554c6e9ad Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 2 Jul 2021 16:46:00 -0600 Subject: [PATCH 17/19] Regression test updates for regional RRTMGP runs --- FV3 | 2 +- tests/fv3_conf/regional_run.IN | 1 + tests/parm/regional_rrtmgp.nml.IN | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/FV3 b/FV3 index dc16869f4c..3a5f3065f5 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit dc16869f4c8769e27ae741f19aba54a6769c8f91 +Subproject commit 3a5f3065f57e0a8779da204791b1af82b3f96256 diff --git a/tests/fv3_conf/regional_run.IN b/tests/fv3_conf/regional_run.IN index 7756bb6c32..6b7c4565ca 100644 --- a/tests/fv3_conf/regional_run.IN +++ b/tests/fv3_conf/regional_run.IN @@ -44,5 +44,6 @@ elif [[ $POSTAPP = 'hafs' ]]; then fi 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/regional_rrtmgp.nml.IN b/tests/parm/regional_rrtmgp.nml.IN index 55c0c58050..7aa3091dc2 100644 --- a/tests/parm/regional_rrtmgp.nml.IN +++ b/tests/parm/regional_rrtmgp.nml.IN @@ -138,7 +138,7 @@ fhlwr = 900. ialb = 1 iems = 1 - IAER = 111 + IAER = 5111 ico2 = 2 isubc_sw = 2 isubc_lw = 2 @@ -213,6 +213,9 @@ doGP_cldoptics_LUT = .true. doGP_lwscat = .true. use_LW_jacobian = .true. + damp_LW_fluxadj = .true. + lfnc_k = 3125. + lfnc_p0 = 60000. / &interpolator_nml From e887bae4650f651f9504d9bf8d5ede66d3620c88 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 2 Jul 2021 16:50:54 -0600 Subject: [PATCH 18/19] Temporary update of tests/fv3_conf/control_run.IN to copy correct diag table for Thompson extended diagnostic runs --- tests/fv3_conf/control_run.IN | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN index f939229705..1243b168ba 100644 --- a/tests/fv3_conf/control_run.IN +++ b/tests/fv3_conf/control_run.IN @@ -80,8 +80,14 @@ cp @[INPUTDATA_ROOT]/${inputdir}/field_table_gfsv16 ./field_table cp @[INPUTDATA_ROOT]/${inputdir}/*configure . if [ $NEW_DIAGTABLE != '' ]; then + # DH* TEMPORARY! + if [ $NEW_DIAGTABLE == 'diag_table_gfsv16_thompson_extdiag' ]; then + cp /scratch1/BMC/gmtb/Dom.Heinzeller/TMP_THOMPSON_EXTDIAG/diag_table_gfsv16_thompson_extdiag ./diag_table + else + cp @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table + fi #cp @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table - cp /scratch1/BMC/gmtb/Dom.Heinzeller/TMP_THOMPSON_EXTDIAG/diag_table_gfsv16_thompson_extdiag ./diag_table + # *DH fi if [ $NEW_FIELDTABLE != '' ]; then From e43012e9362b541b88944ae6869931e6b2071808 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 2 Jul 2021 17:42:23 -0600 Subject: [PATCH 19/19] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3a5f3065f5..b22eb7ee15 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3a5f3065f57e0a8779da204791b1af82b3f96256 +Subproject commit b22eb7ee15b326769c2d9e55baca91845085aa4d