diff --git a/FV3 b/FV3 index 7901983426..bb1207fc09 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 79019834263cbe31ad9a4ea05beeb2f68af5a5b1 +Subproject commit bb1207fc09922954df62c11497230074f51c5dea diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 00c377fb20..0aedb6f767 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -804,6 +804,13 @@ export LTAEROSOL=.true. export EXT_DIAG_THOMPSON=.false. export sedi_semi=.false. export decfl=8 +# NSSL MP +export NSSL_CCCN=0.6e9 +export NSSL_ALPHAH=0.0 +export NSSL_ALPHAL=1.0 +export NSSL_HAIL_ON=.false. +export NSSL_CCN_ON=.true. +export NSSL_INVERTCCN=.true. # GWD export LDIAG_UGWP=.false. diff --git a/tests/parm/field_table/field_table_nssl_tke b/tests/parm/field_table/field_table_nssl_tke new file mode 100644 index 0000000000..d922ecb755 --- /dev/null +++ b/tests/parm/field_table/field_table_nssl_tke @@ -0,0 +1,91 @@ +# added by FRE: sphum must be present in atmos +# specific humidity for moist runs + "TRACER", "atmos_mod", "sphum" + "longname", "specific humidity" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=3.e-6" / +# prognostic cloud water mixing ratio + "TRACER", "atmos_mod", "liq_wat" + "longname", "cloud water mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic ice water mixing ratio + "TRACER", "atmos_mod", "ice_wat" + "longname", "cloud ice mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic rain water mixing ratio + "TRACER", "atmos_mod", "rainwat" + "longname", "rain water mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic snow water mixing ratio + "TRACER", "atmos_mod", "snowwat" + "longname", "snow water mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic Grau water mixing ratio + "TRACER", "atmos_mod", "graupel" + "longname", "graupel mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic hail water mixing ratio +"TRACER", "atmos_mod", "hailwat" + "longname", "hail mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic cloud water number concentration + "TRACER", "atmos_mod", "water_nc" + "longname", "cloud liquid water number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic cloud ice number concentration + "TRACER", "atmos_mod", "ice_nc" + "longname", "cloud ice water number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic rain number concentration + "TRACER", "atmos_mod", "rain_nc" + "longname", "rain number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic snow number concentration + "TRACER", "atmos_mod", "snow_nc" + "longname", "snow number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic graupel number concentration + "TRACER", "atmos_mod", "graupel_nc" + "longname", "graupel number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic hail number concentration + "TRACER", "atmos_mod", "hail_nc" + "longname", "hail number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic graupel volume + "TRACER", "atmos_mod", "graupel_vol" + "longname", "graupel volume" + "units", "m3/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic hail volume + "TRACER", "atmos_mod", "hail_vol" + "longname", "hail volume" + "units", "m3/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic CCN number concentration + "TRACER", "atmos_mod", "ccn_nc" + "longname", "CCN number concentration" + "units", "/kg" + "profile_type", "fixed", "surface_value=0.0" / +# prognostic ozone mixing ratio tracer + "TRACER", "atmos_mod", "o3mr" + "longname", "ozone mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic subgrid scale turbulent kinetic energy + "TRACER", "atmos_mod", "sgs_tke" + "longname", "subgrid scale turbulent kinetic energy" + "units", "m2/s2" + "profile_type", "fixed", "surface_value=0.0" / diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN index 8fc5114315..707e74e833 100644 --- a/tests/parm/rap.nml.IN +++ b/tests/parm/rap.nml.IN @@ -118,6 +118,12 @@ deflate_level=1 imp_physics = @[IMP_PHYSICS] ltaerosol = @[LTAEROSOL] lradar = @[LRADAR] + nssl_ccnn = @[NSSL_CCCN] + nssl_alphah = @[NSSL_ALPHAH] + nssl_alphal = @[NSSL_ALPHAL] + nssl_hail_on = @[NSSL_HAIL_ON] + nssl_ccn_on = @[NSSL_CCN_ON] + nssl_invertccn = @[NSSL_INVERTCCN] dt_inner = 60 ttendlim = -999 pdfcld = .false. @@ -377,4 +383,3 @@ deflate_level=1 knob_ugwp_version = 0 launch_level = 54 / - diff --git a/tests/rt.conf b/tests/rt.conf index 3c5d83462f..c5b95a3c34 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -62,7 +62,7 @@ RUN | regional_hafs RUN | regional_netcdf_parallel | - wcoss2 | fv3 | RUN | regional_RRTMGP | | fv3 | -COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | | fv3 | +COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 | RUN | rap_control | | fv3 | # This test is not giving the same results (also not in REPRO mode) - needs to be fixed @@ -75,6 +75,7 @@ RUN | rap_sfcdiff RUN | rap_sfcdiff_restart | | | rap_sfcdiff RUN | hrrr_control | | fv3 | RUN | rrfs_v1beta | | fv3 | +RUN | rrfs_v1nssl | | fv3 | RUN | rrfs_conus13km_hrrr_warm | | fv3 | RUN | rrfs_conus13km_radar_tten_warm | | fv3 | diff --git a/tests/tests/rrfs_v1nssl b/tests/tests/rrfs_v1nssl new file mode 100644 index 0000000000..13eef5545c --- /dev/null +++ b/tests/tests/rrfs_v1nssl @@ -0,0 +1,62 @@ +############################################################################### +# +# RRFS v1 NSSL test atmosphere only at C96L127 +# +############################################################################### + +export TEST_DESCR="Compare RRFS_v1nssl results with previous trunk version" + +export CNTL_DIR=rrfs_v1nssl + +export LIST_FILES="sfcf000.nc \ + sfcf021.nc \ + sfcf024.nc \ + atmf000.nc \ + atmf021.nc \ + atmf024.nc \ + GFSFLX.GrbF00 \ + GFSFLX.GrbF21 \ + GFSFLX.GrbF24 \ + GFSPRS.GrbF00 \ + GFSPRS.GrbF21 \ + GFSPRS.GrbF24" + +export_fv3 +export NPZ=127 +export NPZP=128 +export DT_ATMOS=300 +export SYEAR=2021 +export SMONTH=03 +export SDAY=22 +export SHOUR=06 +export RESTART_INTERVAL="12 -1" +export OUTPUT_GRID='gaussian_grid' +export NSTF_NAME='2,0,0,0,0' +export WRITE_DOPOST=.true. +export IAER=5111 +export OUTPUT_FH='0 21 24' + +export FV3_RUN=control_run.IN +export CCPP_SUITE=FV3_RRFS_v1nssl +export INPUT_NML=rap.nml.IN +export FIELD_TABLE=field_table_nssl_tke +export NEW_DIAGTABLE=diag_table_rap_noah + +export IMP_PHYSICS=17 +export DNATS=0 +export NWAT=7 +export NSSL_CCN_ON = .true. +export NSSL_HAIL_ON = .true. +export NSSL_INVERTCCN = .true. +export LTAEROSOL=.false. +export IALB=2 +export IEMS=2 +export HYBEDMF=.false. +export DO_MYNNEDMF=.true. +export DO_MYNNSFCLAY=.true. +export DO_DEEP=.false. +export SHAL_CNV=.false. +export IMFSHALCNV=-1 +export IMFDEEPCNV=-1 +export LSM=2 +export LSOIL_LSM=4