Skip to content

Commit

Permalink
Merge pull request #134 from tanyasmirnova/rrfs_diagnostics
Browse files Browse the repository at this point in the history 
Added HRRR method for 2-m diagnostics, added several diagnostics variables to the history files
  • Loading branch information
@middlecoff
middlecoff authored Jun 2, 2022
2 parents 109a39f + 56964f0 commit fed6b39
Show file tree
Hide file tree
Showing 7 changed files with 1,197 additions and 1,177 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 5 files
+58 −23 ccpp/data/GFS_typedefs.F90
+72 −32 ccpp/data/GFS_typedefs.meta
+132 −19 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
322 changes: 161 additions & 161 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,020 changes: 510 additions & 510 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

942 changes: 471 additions & 471 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

47 changes: 29 additions & 18 deletions tests/parm/diag_table/diag_table_hrrr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2

"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "totprcp_ave", "prate_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "totprcpb_ave", "prateb_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "DLWRF", "dlwrf_ave", "fv3_history2d", "all", .false., "none", 2
Expand All @@ -158,9 +158,9 @@
"gfs_phys", "TCDC_avehcl", "tcdc_avehcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avelcl", "tcdc_avelcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avemcl", "tcdc_avemcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDCcnvcl", "tcdccnvcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PREScnvclt", "prescnvclt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PREScnvclb", "prescnvclb", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "TCDCcnvcl", "tcdccnvcl", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "PREScnvclt", "prescnvclt", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "PREScnvclb", "prescnvclb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PRES_avehct", "pres_avehct", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PRES_avehcb", "pres_avehcb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TEMP_avehct", "tmp_avehct", "fv3_history2d", "all", .false., "none", 2
Expand All @@ -186,11 +186,13 @@
"gfs_sfc", "f10m", "f10m", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "q2m", "spfh2m", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "t2m", "tmp2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dpt2m", "dpt2m", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "tsfc", "tmpsfc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "vtype", "vtype", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "stype", "sotyp", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "slmsksfc", "land", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "vfracsfc", "veg", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "wetness", "wetness", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "zorlsfc", "sfcr", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "uustar", "fricv", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "soilt1", "soilt1" "fv3_history2d", "all", .false., "none", 2
Expand Down Expand Up @@ -265,10 +267,8 @@
"gfs_phys", "csdsf_ave", "csdsf", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "csulf_ave", "csulf", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "csulf_avetoa", "csulftoa", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cwork_ave", "cwork_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evbs_ave", "evbs_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evcw_ave", "evcw_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "fldcp", "fldcp", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cwork_ave", "cwork_aveclm", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "fldcp", "fldcp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "hgt_hyblev1", "hgt_hyblev1", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "spfh_hyblev1", "spfh_hyblev1", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ugrd_hyblev1", "ugrd_hyblev1", "fv3_history2d", "all", .false., "none", 2
Expand All @@ -282,20 +282,28 @@
"gfs_phys", "sbsno_ave", "sbsno_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sfexc", "sfexc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snohf", "snohf", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowc_ave", "snowc_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowc", "snowc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "spfhmax2m", "spfhmax_max2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "spfhmin2m", "spfhmin_min2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tmpmax2m", "tmax_max2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tmpmin2m", "tmin_min2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssrun_acc", "ssrun_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sunsd_acc", "sunsd_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "watr_acc", "watr_acc", "fv3_history2d", "all", .false., "none", 2
# "gfs_phys", "watr_acc", "watr_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "wilt", "wilt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "vbdsf_ave", "vbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "vddsf_ave", "vddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "transp_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evbs_ave", "direvap_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evcw_ave", "canevap_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sbsno", "sublim", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evbs", "direvap", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evcw", "canevap", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans", "transp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowmt_land", "snom_land", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowmt_ice", "snom_ice", "fv3_history2d", "all", .false., "none", 2
# Aerosols (CCN, IN) from Thompson microphysics
"gfs_phys", "nwfa", "nwfa", "fv3_history", "all", .false., "none", 2
"gfs_phys", "nifa", "nifa", "fv3_history", "all", .false., "none", 2
Expand All @@ -317,13 +325,16 @@
"gfs_sfc", "flhc", "flhc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "flqc", "flqc", "fv3_history2d", "all", .false., "none", 2
# Prognostic/diagnostic variables from RUC LSM
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "snowfall_acc_land", "snacc_land", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "acsnow_land", "accswe_land", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "snowfall_acc_ice", "snacc_ice", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "acsnow_ice", "accswe_ice", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2
#"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
#"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
#"gfs_phys", "skebv_wts", "skebv_wts", "fv3_history", "all", .false., "none", 2
#"dynamics", "diss_est", "diss_est", "fv3_history", "all", .false., "none", 2
#"gfs_phys", "shum_wts", "shum_wts", "fv3_history", "all", .false., "none", 2

#=============================================================================================
#
Expand Down
37 changes: 23 additions & 14 deletions tests/parm/diag_table/diag_table_hrrr_stoch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
"gfs_dyn", "maxvorthy1", "maxvorthy1", "fv3_history", "all", .false., "none", 2

"gfs_phys", "ALBDO_ave", "albdo_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cnvprcp_ave", "cprat_ave", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cnvprcpb_ave", "cpratb_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "totprcp_ave", "prate_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "totprcpb_ave", "prateb_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "DLWRF", "dlwrf_ave", "fv3_history2d", "all", .false., "none", 2
Expand All @@ -158,9 +158,9 @@
"gfs_phys", "TCDC_avehcl", "tcdc_avehcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avelcl", "tcdc_avelcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avemcl", "tcdc_avemcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDCcnvcl", "tcdccnvcl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PREScnvclt", "prescnvclt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PREScnvclb", "prescnvclb", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "TCDCcnvcl", "tcdccnvcl", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "PREScnvclt", "prescnvclt", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "PREScnvclb", "prescnvclb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PRES_avehct", "pres_avehct", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "PRES_avehcb", "pres_avehcb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TEMP_avehct", "tmp_avehct", "fv3_history2d", "all", .false., "none", 2
Expand All @@ -186,6 +186,7 @@
"gfs_sfc", "f10m", "f10m", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "q2m", "spfh2m", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "t2m", "tmp2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dpt2m", "dpt2m", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "tsfc", "tmpsfc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "vtype", "vtype", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "stype", "sotyp", "fv3_history2d", "all", .false., "none", 2
Expand Down Expand Up @@ -265,10 +266,8 @@
"gfs_phys", "csdsf_ave", "csdsf", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "csulf_ave", "csulf", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "csulf_avetoa", "csulftoa", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "cwork_ave", "cwork_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evbs_ave", "evbs_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evcw_ave", "evcw_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "fldcp", "fldcp", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cwork_ave", "cwork_aveclm", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "fldcp", "fldcp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "hgt_hyblev1", "hgt_hyblev1", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "spfh_hyblev1", "spfh_hyblev1", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ugrd_hyblev1", "ugrd_hyblev1", "fv3_history2d", "all", .false., "none", 2
Expand All @@ -282,20 +281,28 @@
"gfs_phys", "sbsno_ave", "sbsno_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sfexc", "sfexc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snohf", "snohf", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowc_ave", "snowc_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowc", "snowc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "spfhmax2m", "spfhmax_max2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "spfhmin2m", "spfhmin_min2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tmpmax2m", "tmax_max2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tmpmin2m", "tmin_min2m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ssrun_acc", "ssrun_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sunsd_acc", "sunsd_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "watr_acc", "watr_acc", "fv3_history2d", "all", .false., "none", 2
# "gfs_phys", "watr_acc", "watr_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "wilt", "wilt", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "vbdsf_ave", "vbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "vddsf_ave", "vddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "transp_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evbs_ave", "direvap_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evcw_ave", "canevap_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "sbsno", "sublim", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evbs", "direvap", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "evcw", "canevap", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans", "transp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowmt_land", "snom_land", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "snowmt_ice", "snom_ice", "fv3_history2d", "all", .false., "none", 2
# Aerosols (CCN, IN) from Thompson microphysics
"gfs_phys", "nwfa", "nwfa", "fv3_history", "all", .false., "none", 2
"gfs_phys", "nifa", "nifa", "fv3_history", "all", .false., "none", 2
Expand All @@ -317,8 +324,10 @@
"gfs_sfc", "flhc", "flhc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "flqc", "flqc", "fv3_history2d", "all", .false., "none", 2
# Prognostic/diagnostic variables from RUC LSM
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "snowfall_acc_land", "snacc_land", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "acsnow_land", "accswe_land", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "snowfall_acc_ice", "snacc_ice", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "acsnow_ice", "accswe_ice", "fv3_history2d", "all", .false., "none", 2
# Stochastic physics
"gfs_phys", "sppt_wts", "sppt_wts", "fv3_history", "all", .false., "none", 2
"gfs_phys", "skebu_wts", "skebu_wts", "fv3_history", "all", .false., "none", 2
Expand Down
4 changes: 2 additions & 2 deletions tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then

#ACCNR="${ACCNR:-fv3-cpu}
PARTITION=
dprefix=/scratch1/NCEPDEV
dprefix=${dprefix:-/scratch1/NCEPDEV}
DISKNM=/scratch2/BMC/wrfruc/RT
#DISKNM=$dprefix/nems/emc.nemspara/RT
STMP=$dprefix/stmp4
Expand Down Expand Up @@ -486,7 +486,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220329
BL_DATE=20220527
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/RRFS_dev-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down

0 comments on commit fed6b39

Please sign in to comment.