Skip to content

Commit

Permalink
develop: Verification changes from the RRFS_baseline branch that are …
Browse files Browse the repository at this point in the history 
…also requ… (#565)
  • Loading branch information
@JeffBeck-NOAA
JeffBeck-NOAA authored Aug 3, 2021
1 parent 178d375 commit 4c7c41b
Show file tree
Hide file tree
Showing 19 changed files with 161 additions and 229 deletions.
4 changes: 4 additions & 0 deletions modulefiles/tasks/hera/get_obs.local
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ module purge

module load hpss

module use -a /contrib/miniconda3/modulefiles
module load miniconda3

setenv SRW_ENV pygraf
8 changes: 6 additions & 2 deletions scripts/exregional_get_mrms_files.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# This script pulls MRMS data from the NOAA HPSS
# Top-level MRMS directory
set -x
mrms_dir=${OBS_DIR}/..
if [[ ! -d "$mrms_dir" ]]; then
mkdir -p $mrms_dir
Expand Down Expand Up @@ -63,8 +64,10 @@ while [[ ${cur_ut} -le ${end_valid_ut} ]]; do

# Set field of interest from the MRMS products, including name and level information.
if [ "${field}" = "REFC" ]; then
field_base_name="MergedReflectivityQComposite"
level="_00.00_"
#field_base_name="MergedReflectivityQComposite"
#level="_00.00_"
field_base_name="MergedReflectivityQCComposite"
level="_00.50_"
elif [ "${field}" = "RETOP" ]; then
field_base_name="EchoTop"
level="_18_00.50_"
Expand Down Expand Up @@ -110,6 +113,7 @@ while [[ ${cur_ut} -le ${end_valid_ut} ]]; do
if [[ ${Status} != 0 ]]; then
echo "WARNING: Bad return status (${Status}) for date \"${CurDate}\". Did you forget to run \"module load hpss\"?"
echo "WARNING: ${TarCommand}"
exit ${Status}
else
if [[ ! -d "$mrms_proc/${vyyyymmdd}" ]]; then
mkdir -p $mrms_proc/${vyyyymmdd}
Expand Down
2 changes: 1 addition & 1 deletion ush/config_defaults.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ WRITE_DOPOST="FALSE"
# use of predetermined directory structure and file names. Therefore, if
# the MRMS files are user provided, they need to follow the anticipated
# naming structure:
# {YYYYMMDD}/MergedReflectivityQComposite_00.00_{YYYYMMDD}-{HH}{mm}{SS}.grib2,
# {YYYYMMDD}/MergedReflectivityQCComposite_00.50_{YYYYMMDD}-{HH}{mm}{SS}.grib2,
# where YYYY is the 4-digit valid year, MM the 2-digit valid month, DD
# the 2-digit valid day of the month, HH the 2-digit valid hour of the
# day, mm the 2-digit valid minutes of the hour, and SS is the two-digit
Expand Down
3 changes: 3 additions & 0 deletions ush/templates/diag_table.FV3_GFS_2017_gfdlmp_regional
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@
# Reflectivity from GFDL microphysics
"gfs_phys", "refl_10cm", "refl_10cm", "fv3_history2d", "all", .false., "none", 2

#Cloud fraction
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2

#Max/Min must be kept in separate files. Time is controlled by diag_table
# "dynamics", "uh25", "MXUPHL2_5km", "maxmin2D", "all", max, "none", 2
# "dynamics", "uh25", "MNUPHL2_5km", "maxmin2D", "all", min, "none", 2
Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_GSD_SAR
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_GSD_SAR_v1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_GSD_v0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_HRRR
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_RRFS_v0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_RRFS_v1alpha
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions ush/templates/diag_table.FV3_RRFS_v1beta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm" "refl_10cm" "fv3_history", "all", .false., "none", 2
"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "ice_nc", "nicp", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "rain_nc", "ntrnc", "fv3_history", "all", .false., "none", 2

Expand Down
42 changes: 42 additions & 0 deletions ush/templates/parm/met/GridDiagConfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Grid-Diag configuration file.
//
// For additional information, please see the MET User's Guide.
//
////////////////////////////////////////////////////////////////////////////////

//
// Data description
//
${METPLUS_DESC}

////////////////////////////////////////////////////////////////////////////////

//
// Output grid
//
${METPLUS_REGRID_DICT}

////////////////////////////////////////////////////////////////////////////////

//
// May be set separately in each "field" entry
//
${METPLUS_CENSOR_THRESH}
${METPLUS_CENSOR_VAL}

//
// Data fields
//
${METPLUS_DATA_DICT}

${METPLUS_MASK_DICT}

${METPLUS_MET_CONFIG_OVERRIDES}

////////////////////////////////////////////////////////////////////////////////

version = "V10.0.0";

////////////////////////////////////////////////////////////////////////////////
108 changes: 0 additions & 108 deletions ush/templates/parm/metplus/APCP_03h.conf_3hCCPA
View file

This file was deleted.

108 changes: 0 additions & 108 deletions ush/templates/parm/metplus/APCP_06h.conf_6hCCPA
View file

This file was deleted.

Loading

0 comments on commit 4c7c41b

Please sign in to comment.