Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add extended diagnostic output from Thompson MP + regression test, includes "Add optional scaling to RRTMGP flux adjustment" (#605), bug fix in several suite definition files #658

Closed
wants to merge 22 commits into from
Closed

Add extended diagnostic output from Thompson MP + regression test, includes "Add optional scaling to RRTMGP flux adjustment" (#605), bug fix in several suite definition files #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b02d3d8
Added more safeguards against out-of-bounds temperature to GP inputs.…
dustinswales May 10, 2021
a3cae10
Updated FV3/ccpp-physics.
dustinswales May 11, 2021
d23b701
Add vetical decay to impact of flux adjustment above threshold.
dustinswales May 11, 2021
e76dd2c
Added logistic function to damp the LW flux adjustment with height. A…
dustinswales May 24, 2021
d1693ba
Reorganized RRTMGP aerosol optics.
dustinswales May 24, 2021
3f8b1d5
Bug fix. Add transition to HR adjustment.
dustinswales May 25, 2021
637e857
Updated default nml values for c192l127 GP RT.
dustinswales May 27, 2021
9c44cf0
Cleanup for PR review
dustinswales May 27, 2021
c3e5abe
update fv3
ericaligo-NOAA Jun 15, 2021
1635b5a
Update .gitmodules and submodule pointer for fv3atm for code review a…
DomHeinzeller Jun 22, 2021
9719841
Add new regression test control_thompson_extdiag_debug
climbfuji Jun 22, 2021
0b515b9
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jun 22, 2021
5fabb97
Update submodule pointer for fv3atm
climbfuji Jun 23, 2021
d2545b1
Update submodule pointer for fv3atm
climbfuji Jun 23, 2021
c440f2e
Update submodule pointer for fv3atm
climbfuji Jun 23, 2021
1645acd
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jul 1, 2021
90a699b
Update submodule pointer for fv3atm
climbfuji Jul 1, 2021
49619b9
Comment out extended diagnostics vts1, txri, txrc
climbfuji Jul 2, 2021
8345e50
Merge branch 'hotfix_AddPLimitToLWJacAdj' of https://github.com/dusti…
climbfuji Jul 2, 2021
f536405
Regression test updates for regional RRTMGP runs
climbfuji Jul 2, 2021
e887bae
Temporary update of tests/fv3_conf/control_run.IN to copy correct dia…
climbfuji Jul 2, 2021
e43012e
Update submodule pointer for fv3atm
climbfuji Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/climbfuji/fv3atm
branch = thompson_ext_diag_dom
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 9 files
+2 −2 .gitmodules
+46 −5 ccpp/data/GFS_typedefs.F90
+54 −1 ccpp/data/GFS_typedefs.meta
+26 −0 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+1 −0 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
+1 −0 ccpp/suites/suite_FV3_GFS_v16_coupled_noahmp.xml
+1 −0 ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmp.xml
+1 −0 ccpp/suites/suite_FV3_RRFS_v1alpha.xml
1 change: 1 addition & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 8 additions & 1 deletion tests/fv3_conf/control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,14 @@ 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
# 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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is temporary until the new file diag_table_gfsv16_thompson_extdiag has been added to the input data directory.

# *DH
fi

if [ $NEW_FIELDTABLE != '' ]; then
Expand Down
1 change: 1 addition & 0 deletions tests/fv3_conf/gfs_v16_run_c192L127.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions tests/fv3_conf/regional_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 8 additions & 4 deletions tests/parm/control_rrtmgp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ deflate_level=1
fhlwr = 3600.
ialb = 1
iems = 1
iaer = 5111
iaer = @[IAER]
icliq_sw = 2
iovr = 3
ico2 = 2
Expand Down Expand Up @@ -164,7 +164,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
Expand All @@ -189,8 +189,12 @@ 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.
damp_LW_fluxadj = .true.
lfnc_k = 3125.
lfnc_p0 = 60000.
lsoil_lsm = 4
do_mynnedmf = .false.
do_mynnsfclay = .false.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_thompson.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion tests/parm/regional_rrtmgp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
fhlwr = 900.
ialb = 1
iems = 1
IAER = 111
IAER = 5111
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
Expand All @@ -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 | | |
Expand Down Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down
49 changes: 49 additions & 0 deletions tests/tests/control_thompson_extdiag_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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