Skip to content

Commit

Permalink
Smoke, dust, and MYNN updates (#1658)
Browse files Browse the repository at this point in the history 
* "merge RRFS-SD to the community repository"

* "include the MYNN-EDMF update PR #1636"

* add new control_p8_mynn test to exercise the FV3_GFS_v17_p8_mynn suite

* change some variables to environment-controlled in cpld_control.nml.IN; add satmedmf=T for export_cpl() in default_vars.sh; add satmedmf=T for tests that use cpld_control.nml.IN, but not export_cpl

* add new smoke_dir_fdb_coef to rrfs test namelist

Co-authored-by: joeolson42 <Joseph.B.Olson@noaa.gov>
Co-authored-by: Haiqin.Li <Haiqin.Li@noaa.gov>
Co-authored-by: Grant Firl <grant.firl@noaa.gov>
  • Loading branch information
@SamuelTrahanNOAA @joeolson42
@haiqinli @grantfirl
4 people authored Mar 27, 2023
1 parent 36d6e16 commit 889254a
Show file tree
Hide file tree
Showing 49 changed files with 8,088 additions and 6,679 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 10 files
+2 −3 ccpp/config/ccpp_prebuild_config.py
+120 −83 ccpp/data/GFS_typedefs.F90
+154 −101 ccpp/data/GFS_typedefs.meta
+30 −23 ccpp/driver/GFS_diagnostics.F90
+73 −0 ccpp/driver/GFS_restart.F90
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+29 −14 ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+2 −0 ccpp/suites/suite_FV3_HRRR.xml
+301 −42 io/FV3GFS_io.F90
1,782 changes: 917 additions & 865 deletions tests/RegressionTests_acorn.intel.log
View file

Large diffs are not rendered by default.

526 changes: 270 additions & 256 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

1,872 changes: 984 additions & 888 deletions tests/RegressionTests_cheyenne.intel.log
View file

Large diffs are not rendered by default.

1,932 changes: 986 additions & 946 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

524 changes: 269 additions & 255 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,826 changes: 939 additions & 887 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

1,678 changes: 865 additions & 813 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

1,848 changes: 950 additions & 898 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

1,655 changes: 848 additions & 807 deletions tests/RegressionTests_wcoss2.intel.log
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ export NSSL_INVERTCCN=.true.

# Smoke
export RRFS_SMOKE=.false.
export SMOKE_FORECAST=0
export RRFS_RESTART=NO
export SEAS_OPT=2

Expand Down Expand Up @@ -761,6 +762,7 @@ export DNATS=2
export IMP_PHYSICS=8
export LGFDLMPRAD=.false.
export DO_SAT_ADJ=.false.
export SATMEDMF=.true.

# P7 default mushy thermo
export KTHERM=2
Expand Down
33 changes: 17 additions & 16 deletions tests/fv3_conf/rrfs_warm_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ mkdir INPUT RESTART
OPNREQ_TEST=${OPNREQ_TEST:-false}
SUFFIX=${RT_SUFFIX}

cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/

if [[ "${RRFS_RESTART:-NO}" == YES ]] ; then
# cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
# rm -f INPUT/fv_core.res.*
# rm -f INPUT/fv_srf_wnd.res.*
# rm -f INPUT/fv_tracer.res.*
# rm -f INPUT/phy_data.*
# rm -f INPUT/sfc_data.*
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
rm -f INPUT/fv_core.res.*
rm -f INPUT/fv_srf_wnd.res.*
rm -f INPUT/fv_tracer.res.*
rm -f INPUT/phy_data.*
rm -f INPUT/sfc_data.*
# cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
# cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
# cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
[ -e $RFILE ] || exit 1
RFILE_OLD=$(basename $RFILE)
RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
cp $RFILE "INPUT/$RFILE_NEW"
done
for x in emi_data.nc SMOKE_GBBEPx_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
grid.tile7.halo4.nc ; do
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
done
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
else
cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
# for x in emi_data.nc SMOKE_RRFS_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
# grid.tile7.halo4.nc SMOKE_GBBEPx_data.nc ; do
# cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
# done
# cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
fi

for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
Expand All @@ -35,6 +35,7 @@ for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
cp -f @[INPUTDATA_ROOT]/FV3_fix/"$x" .
done

cp @[INPUTDATA_ROOT]/FV3_aeroclim/* .
cp @[INPUTDATA_ROOT]/FV3_input_data/global_soilmgldas.t126.384.190.grb .
cp @[INPUTDATA_ROOT]/FV3_fix/seaice_newland.grb .

Expand Down
6 changes: 3 additions & 3 deletions tests/parm/cpld_control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ deflate_level=1
oz_phys = .false.
oz_phys_2015 = .true.
lsoil_lsm = 4
do_mynnedmf = .false.
do_mynnedmf = @[DO_MYNNEDMF]
do_mynnsfclay = .false.
icloud_bl = 1
bl_mynn_edmf = 1
Expand Down Expand Up @@ -163,12 +163,12 @@ deflate_level=1
lwhtr = .true.
swhtr = .true.
cnvgwd = .true.
shal_cnv = .true.
shal_cnv = @[SHAL_CNV]
cal_pre = .false.
redrag = .true.
dspheat = .true.
hybedmf = .false.
satmedmf = .true.
satmedmf = @[SATMEDMF]
isatmedmf = 1
lheatstrg = @[LHEATSTRG]
lseaspray = @[LSEASPRAY]
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/diag_table/diag_additional_rrfs_smoke
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@
"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
"gfs_dyn", "coarsepm", "coarsepm", "fv3_history", "all", .false., "none", 2
"gfs_phys", "ext550", "ext550", "fv3_history", "all", .false., "none", 2
5 changes: 5 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
Expand Up @@ -73,3 +73,8 @@
"longname", "dust mixing ratio"
"units", "ug/kg"
"profile_type", "fixed", "surface_value=1.e-7" /
# prognostic coarsepm mixing ratio tracer
"TRACER", "atmos_mod", "coarsepm"
"longname", "coarsepm mixing ratio"
"units", "ug/kg"
"profile_type", "fixed", "surface_value=1.e-7" /
12 changes: 8 additions & 4 deletions tests/parm/rrfs_conus13km_hrrr.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,25 @@
bl_mynn_edmf = 1
bl_mynn_edmf_mom = 1
bl_mynn_tkeadvect = .true.
rrfs_smoke = @[RRFS_SMOKE]
rrfs_sd = @[RRFS_SMOKE]
rrfs_smoke_debug = .false.
seas_opt = @[SEAS_OPT]
mix_chem = @[RRFS_SMOKE]
fire_turb = @[RRFS_SMOKE]
enh_mix = @[RRFS_SMOKE]
dust_opt = 5
drydep_opt = 1
smoke_forecast = @[RRFS_SMOKE]
coarsepm_settling = 1
smoke_forecast = @[SMOKE_FORECAST]
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
dust_alpha = 0.01
dust_gamma = 1.3
wetdep_ls_alpha = 0.5
smoke_dir_fdb_coef = 0.33, 0.67, 0.02, 0.13, 0.85, 0.05, 0.95
cal_pre = .false.
cdmbgwd = @[CDMBWD]
cnvcld = .false.
Expand Down
29 changes: 13 additions & 16 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN | cpld_control_p8_faster
# ATM tests #
###################################################################################################################################################################################

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0 -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
RUN | control_CubedSphereGrid | | fv3 |
RUN | control_CubedSphereGrid_parallel | - wcoss2.intel acorn.intel | fv3 |
RUN | control_latlon | | fv3 |
Expand All @@ -68,6 +68,7 @@ RUN | control_decomp_p8
RUN | control_2threads_p8 | | |

RUN | control_p8_rrtmgp | | fv3 |
RUN | control_p8_mynn | | fv3 |

RUN | merra2_thompson | | fv3 |

Expand All @@ -85,8 +86,7 @@ RUN | regional_ifi_control
RUN | regional_ifi_decomp | + acorn.intel | |
RUN | regional_ifi_2threads | + acorn.intel | |


COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -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 |
RUN | regional_spp_sppt_shum_skeb | | fv3 |
Expand All @@ -104,20 +104,14 @@ RUN | rrfs_v1beta
RUN | rrfs_v1nssl | | fv3 |
RUN | rrfs_v1nssl_nohailnoccn | | fv3 |

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

# These do not match the control yet:
# RUN | rrfs_conus13km_hrrr_warm_decomp | | |
# RUN | rrfs_conus13km_radar_tten_warm_decomp | | |

RUN | rrfs_conus13km_hrrr_warm_2threads | | |
RUN | rrfs_conus13km_radar_tten_warm_2threads | | |
RUN | rrfs_smoke_conus13km_hrrr_warm_2threads | | |
RUN | rrfs_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_smoke_conus13km_radar_tten_warm | | fv3 |

# These do not match the control yet:
# RUN | rrfs_conus13km_hrrr_warm_restart | | | rrfs_conus13km_hrrr_warm
# RUN | rrfs_conus13km_radar_tten_warm_restart | | | rrfs_conus13km_radar_tten_warm
# These two should run and not crash, but they do not match their baselines:
#RUN | rrfs_smoke_conus13km_hrrr_warm_decomp | | |
#RUN | rrfs_smoke_conus13km_hrrr_warm_restart | | | rrfs_smoke_conus13km_hrrr_warm

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp | | fv3 |
RUN | control_csawmg | - gaea.intel | fv3 |
Expand All @@ -138,8 +132,11 @@ RUN | regional_control_faster

COMPILE | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_HRRR,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta | | fv3 |

RUN | rrfs_smoke_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm_debug_2threads | | |
RUN | rrfs_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm_debug | | fv3 |
# This should run and not crash, but does not match its baseline
#RUN | rrfs_smoke_conus13km_hrrr_warm_debug_decomp | | |

RUN | control_CubedSphereGrid_debug | | fv3 |
RUN | control_wrtGauss_netcdf_parallel_debug | | fv3 |
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 @@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
fi


BL_DATE=20230321
BL_DATE=20230324

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
24 changes: 13 additions & 11 deletions tests/rt_gnu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN | control_stochy
RUN | control_ras | | fv3 |
RUN | control_p8 | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | | fv3 |

RUN | rap_control | | fv3 |
RUN | rap_decomp | | |
Expand All @@ -24,15 +24,14 @@ RUN | hrrr_control_decomp
RUN | hrrr_control_restart | | | hrrr_control
RUN | rrfs_v1beta | | fv3 |

RUN | rrfs_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm_2threads | | |
RUN | rrfs_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_smoke_conus13km_radar_tten_warm | | fv3 |

RUN | rrfs_conus13km_radar_tten_warm | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm_2threads | | |

# These two are known to not match the control:
#RUN | rrfs_conus13km_radar_tten_warm_decomp | | |
#RUN | rrfs_conus13km_radar_tten_warm_restart | | | rrfs_conus13km_radar_tten_warm
# These two will run and not crash, but they do not match their baselines:
#RUN | rrfs_smoke_conus13km_hrrr_warm_decomp | | |
#RUN | rrfs_smoke_conus13km_hrrr_warm_restart | | | rrfs_smoke_conus13km_hrrr_warm

##################################################################################################################################################################
# CCPP DEBUG tests #
Expand All @@ -52,8 +51,11 @@ RUN | control_ras_debug
RUN | control_stochy_debug | | fv3 |
RUN | control_debug_p8 | | fv3 |

RUN | rrfs_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm_debug | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm_debug_2threads | | |
RUN | rrfs_conus13km_hrrr_warm_debug | | fv3 |
# This will run and not crash, but will not match its baseline:
#RUN | rrfs_smoke_conus13km_hrrr_warm_debug_decomp | | |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | | fv3 |
RUN | control_wam_debug | | fv3 |
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/atmaero_control_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/atmaero_control_p8_rad
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
Loading

0 comments on commit 889254a

Please sign in to comment.