Skip to content

Commit

Permalink
Add RRFS-Smoke and regression tests.
Browse files Browse the repository at this point in the history 
* "update .gitmodules to point to the gsl/develop-smoke"

* "push tests/tests/rrfs_smoke_conus13km_hrrr_warm"

* Point to gsl/develop-smoke for ccpp-physics

* "update .gitmodules"

* "point to gsl/develop-smoke branch"

* "point to gsl/develop-smoke with active flag updates"

* "upload the hera.intel and hera.gnu regression test log files"

* Add the rrfs_smoke_conus13km_hrrr_warm regression test.

* Remove an extra read that went out of bounds

* hera.gnu tests passed

* hera.intel tests passed

* jet.intel tests passed

* Point to gsl/develop for FV3

* Point .gitmodules to NOAA-GSL

Co-authored-by: samuel.trahan <[email protected]>
  • Loading branch information
@haiqinli @SamuelTrahanNOAA
haiqinli and SamuelTrahanNOAA authored Apr 21, 2022
1 parent c31f633 commit f314f25
Show file tree
Hide file tree
Showing 12 changed files with 2,194 additions and 1,120 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 7 files
+4 −0 ccpp/config/ccpp_prebuild_config.py
+151 −2 ccpp/data/GFS_typedefs.F90
+294 −0 ccpp/data/GFS_typedefs.meta
+160 −0 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+83 −0 ccpp/suites/suite_FV3_HRRR_smoke.xml
+162 −1 io/FV3GFS_io.F90
336 changes: 176 additions & 160 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,776 changes: 1,300 additions & 476 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

976 changes: 496 additions & 480 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,10 @@ export EXT_DIAG_THOMPSON=.false.
export sedi_semi=.false.
export decfl=8

# Smoke
export RRFS_SMOKE=.false.
export SEAS_OPT=2

# GWD
export LDIAG_UGWP=.false.
export DO_UGWP=.false.
Expand Down
21 changes: 21 additions & 0 deletions tests/parm/diag_table/diag_additional_rrfs_smoke
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This file contains diag_table entries for the RRFS smoke.
# It should be appended to the end of the diag_table before execution of the test.

# Tracers
"gfs_dyn", "smoke", "smoke", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "dust", "dust", "fv3_history", "all", .false., "none", 2

# Aerosols emission for smoke
"gfs_sfc", "emdust", "emdust", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "emseas", "emseas", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "emanoc", "emanoc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "coef_bb_dc", "coef_bb_c", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "min_fplume", "min_fplume", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "max_fplume", "max_fplume", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "hwp", "hwp", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "ebb_smoke_hr", "ebb_smoke_hr", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "frp_hr", "frp_hr", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "frp_std_hr", "frp_std_hr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ebu_smoke", "ebu_smoke", "fv3_history", "all", .false., "none", 2
"gfs_phys", "smoke_ext", "smoke_ext", "fv3_history", "all", .false., "none", 2
"gfs_phys", "dust_ext", "dust_ext", "fv3_history", "all", .false., "none", 2
75 changes: 75 additions & 0 deletions tests/parm/field_table/field_table_thompson_aero_tke_smoke
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# 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 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 ozone mixing ratio tracer
"TRACER", "atmos_mod", "o3mr"
"longname", "ozone mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# water- and ice-friendly aerosols (Thompson)
"TRACER", "atmos_mod", "liq_aero"
"longname", "water-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "ice_aero"
"longname", "ice-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# 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" /
# prognostic smoke mixing ratio tracer
"TRACER", "atmos_mod", "smoke"
"longname", "smoke mixing ratio"
"units", "ug/kg"
"profile_type", "fixed", "surface_value=1.e-7" /
# prognostic dust mixing ratio tracer
"TRACER", "atmos_mod", "dust"
"longname", "dust mixing ratio"
"units", "ug/kg"
"profile_type", "fixed", "surface_value=1.e-7" /
15 changes: 15 additions & 0 deletions tests/parm/rrfs_conus13km_hrrr.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,21 @@
bl_mynn_edmf = 1
bl_mynn_edmf_mom = 1
bl_mynn_tkeadvect = .true.
rrfs_smoke = @[RRFS_SMOKE]
rrfs_smoke_debug = .false.
seas_opt = @[SEAS_OPT]
mix_chem = @[RRFS_SMOKE]
fire_turb = @[RRFS_SMOKE]
dust_opt = 5
drydep_opt = 1
smoke_forecast = @[RRFS_SMOKE]
aero_ind_fdb = .false.
aero_dir_fdb = .false.
addsmoke_flag = 1
biomass_burn_opt = 1
wetdep_ls_opt = 1
do_plumerise = @[RRFS_SMOKE]
plumerisefire_frq = 60
cal_pre = .false.
cdmbgwd = @[CDMBWD]
cnvcld = .false.
Expand Down
3 changes: 2 additions & 1 deletion tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON | | fv3 |
RUN | rap_control | | fv3 |
RUN | regional_spp_sppt_shum_skeb | | fv3 |
# This test is not giving the same results (also not in REPRO mode) - needs to be fixed
Expand All @@ -82,6 +82,7 @@ RUN | rrfs_v1beta

RUN | rrfs_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_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
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/gsl-develop-${BL_DATE}}
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20211210}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-gsl-develop-20220414}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20211113
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210717}

Expand Down
3 changes: 2 additions & 1 deletion tests/rt_gnu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN | control_thompson_no_aero
RUN | control_ras | | fv3 |
RUN | control_p8 | | 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_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON | | fv3 |

RUN | rap_control | | fv3 |
# This test is not giving the same results (also not in REPRO mode) - needs to be fixed
Expand All @@ -30,6 +30,7 @@ RUN | hrrr_control
RUN | rrfs_v1beta | | fv3 |
RUN | rrfs_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm | | fv3 |

##################################################################################################################################################################
# CCPP DEBUG tests #
Expand Down
101 changes: 101 additions & 0 deletions tests/tests/rrfs_smoke_conus13km_hrrr_warm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
###############################################################################
#
# HRRR smoke physics on 13km domain, control run
#
###############################################################################

export TEST_DESCR="HRRR smoke physics on 13km domain, control run"

export CNTL_DIR=rrfs_smoke_conus13km_hrrr_warm

export LIST_FILES="sfcf000.nc \
sfcf001.nc \
sfcf002.nc \
atmf000.nc \
atmf001.nc \
atmf002.nc"

export_fv3

export SYEAR=2021
export SMONTH=5
export SDAY=12
export SHOUR=16
export FHMAX=2
export DT_ATMOS=60
export RESTART_INTERVAL=1
export QUILTING=.true.
export WRITE_GROUP=1
export WRTTASK_PER_GROUP=6
export WRITE_DOPOST=.false.
export OUTPUT_HISTORY=.true.
export OUTPUT_GRID=lambert_conformal
export OUTPUT_FILE="'netcdf'"

export RRFS_SMOKE=.true.
export SEAS_OPT=0

export IALB=2
export ICLIQ_SW=2
export IEMS=2
export IOVR=3
export KICE=9
export LSM=3
export LSOIL_LSM=9
export DO_MYNNSFCLAY=.true.
export DO_MYNNEDMF=.true.
export DO_MYJPBL=.true
export HYBEDMF=.false.
export SHAL_CNV=.false.
export DO_SAT_ADJ=.false.
export DO_DEEP=.false.
export CCPP_SUITE='FV3_HRRR_smoke'
export INPES=12
export JNPES=12
export NPX=397
export NPY=233
export NPZ=65
export MAKE_NH=.false.
export NA_INIT=0
export DNATS=0
export EXTERNAL_IC=.false.
export NGGPS_IC=.false.
export MOUNTAIN=.true.
export WARM_START=.true.
export READ_INCREMENT=.false.
export RES_LATLON_DYNAMICS="'fv3_increment.nc'"
export NPZP=66
export FHZERO=1.0
export IMP_PHYSICS=8
export LDIAG3D=.false.
export QDIAG3D=.false.
export PRINT_DIFF_PGR=.false.
export FHCYC=0.0
export IAER=5111
export LHEATSTRG=.false.
export RANDOM_CLDS=.false.
export CNVCLD=.false.
export IMFSHALCNV=-1
export IMFDEEPCNV=-1
export CDMBWD='3.5,1.0'
export DO_SPPT=.false.
export DO_SHUM=.false.
export DO_SKEB=.false.
export LNDP_TYPE=0
export N_VAR_LNDP=0

export GWD_OPT=3
export DO_UGWP_V0=.false.
export DO_UGWP_V0_OROG_ONLY=.false.
export DO_GSL_DRAG_LS_BL=.true.
export DO_GSL_DRAG_SS=.true.
export DO_GSL_DRAG_TOFD=.true.
export DO_UGWP_V1=.false.
export DO_UGWP_V1_OROG_ONLY=.false.

export FV3_RUN=rrfs_warm_run.IN
export INPUT_NML=rrfs_conus13km_hrrr.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke_smoke
export DIAG_TABLE=diag_table_hrrr
export MODEL_CONFIGURE=model_configure_rrfs_conus13km.IN
export DIAG_TABLE_ADDITIONAL=diag_additional_rrfs_smoke

0 comments on commit f314f25

Please sign in to comment.