diff --git a/.gitmodules b/.gitmodules index a1c6502330..86909a4205 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/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 ad7bddc3fb..b22eb7ee15 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit ad7bddc3fbe0b25914fb28439337603ca5d0f3bf +Subproject commit b22eb7ee15b326769c2d9e55baca91845085aa4d diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 7d4f94e7ce..bf0de99725 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 898fd25c7c..1243b168ba 100644 --- a/tests/fv3_conf/control_run.IN +++ b/tests/fv3_conf/control_run.IN @@ -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 + # *DH fi if [ $NEW_FIELDTABLE != '' ]; then 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/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/control_rrtmgp.nml.IN b/tests/parm/control_rrtmgp.nml.IN index 469aee8113..efd1eb3f8e 100644 --- a/tests/parm/control_rrtmgp.nml.IN +++ b/tests/parm/control_rrtmgp.nml.IN @@ -120,7 +120,7 @@ deflate_level=1 fhlwr = 3600. ialb = 1 iems = 1 - iaer = 5111 + iaer = @[IAER] icliq_sw = 2 iovr = 3 ico2 = 2 @@ -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 @@ -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. 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/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 diff --git a/tests/rt.conf b/tests/rt.conf index 6f7c87a8a4..8d8bddb10f 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