Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature_2882_seeps_qa
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnHalleyGotway committed Sep 20, 2024
2 parents 59b83e5 + 6053404 commit b4338a2
Show file tree
Hide file tree
Showing 265 changed files with 7,210 additions and 5,715 deletions.
2 changes: 1 addition & 1 deletion .github/jobs/set_job_controls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ run_unit_tests=false
run_diff=false
run_update_truth=false
met_base_repo=met-base
met_base_tag=v3.2
met_base_tag=v3.3
input_data_version=develop
truth_data_version=develop

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_docker_and_trigger_metplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- develop
paths-ignore:
- 'met/docs/**'
- 'docs/**'

workflow_dispatch:

Expand All @@ -29,7 +29,7 @@ jobs:
env:
SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
MET_BASE_REPO: met-base
MET_BASE_TAG: v3.2
MET_BASE_TAG: v3.3

- name: Push Docker Image
run: .github/jobs/push_docker_image.sh
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/compilation_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ jobs:
config: '--enable-mode_graphics'
- jobid: 'job8'
config: '--enable-modis'
- jobid: 'job9'
config: '--enable-all MET_CXX_STANDARD=11'
- jobid: 'job10'
config: '--enable-all MET_CXX_STANDARD=14'
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
run: .github/jobs/build_sonarqube_image.sh
env:
MET_BASE_REPO: met-base
MET_BASE_TAG: v3.2
MET_BASE_TAG: v3.3
SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}
WD_REFERENCE_BRANCH: ${{ github.event.inputs.reference_branch }}
SONAR_SCANNER_VERSION: 5.0.1.3006
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@ jobs:
- jobid: 'job3'
tests: 'climatology_2.5deg'
- jobid: 'job4'
tests: 'climatology_mixed'
- jobid: 'job5'
tests: 'python point2grid plot_data_plane mode mode_analysis perc_thresh hira plot_point_obs quality_filter obs_summary duplicate_flag'
fail-fast: false
steps:
Expand Down
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
27 changes: 26 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,7 @@ MET_ATLAS
MET_PROJLIB
MET_PROJINC
MET_PROJ
MET_CXX_STANDARD
OPENMP_CFLAGS
am__fastdepCC_FALSE
am__fastdepCC_TRUE
Expand Down Expand Up @@ -933,6 +934,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
MET_CXX_STANDARD
MET_PROJ
MET_PROJINC
MET_PROJLIB
Expand Down Expand Up @@ -1667,6 +1669,9 @@ Some influential environment variables:
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
MET_CXX_STANDARD
Specify the version of the supported C++ standard. Values may be
11, 14, or 17. Default value is 17.
MET_PROJ Where proj lib and include subdirectories are located. If they
are installed in /usr/local, you don't have to specify them.
MET_PROJINC Where proj include files are located. Use if the libraries and
Expand Down Expand Up @@ -5317,6 +5322,26 @@ printf "%s\n" "$ac_cv_prog_c_openmp" >&6; }
CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"

#
# Look for a specified C++ Standard
#

# Configure the variable. The help text will appear if the user uses "configure --help".



# Set a default value

if (test -z "$MET_CXX_STANDARD"); then
MET_CXX_STANDARD=17
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: c++17 will be used as the C++ standard" >&5
printf "%s\n" "$as_me: c++17 will be used as the C++ standard" >&6;}
elif (test -n "$MET_CXX_STANDARD"); then
MET_CXX_STANDARD=${MET_CXX_STANDARD}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: MET_CXX_STANDARD will be set" >&5
printf "%s\n" "$as_me: MET_CXX_STANDARD will be set" >&6;}
fi

#
# Look for the Proj library.
#
Expand Down Expand Up @@ -6988,7 +7013,7 @@ fi
CPPFLAGS=$CPPFLAGS' -DMET_BASE="\"$(pkgdatadir)\""'

# Add -std=c++11 to CXXFLAGS
CXXFLAGS=$CXXFLAGS' -std=c++11'
CXXFLAGS=$CXXFLAGS' -std=c++'$MET_CXX_STANDARD

# Define other variables for the makefiles

Expand Down
20 changes: 19 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,24 @@ AC_OPENMP()
CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"

#
# Look for a specified C++ Standard
#

# Configure the variable. The help text will appear if the user uses "configure --help".

AC_ARG_VAR([MET_CXX_STANDARD], [Specify the version of the supported C++ standard. Values may be 11, 14, or 17. Default value is 17.])

# Set a default value

if (test -z "$MET_CXX_STANDARD"); then
MET_CXX_STANDARD=17
AC_MSG_NOTICE([c++17 will be used as the C++ standard])
elif (test -n "$MET_CXX_STANDARD"); then
MET_CXX_STANDARD=${MET_CXX_STANDARD}
AC_MSG_NOTICE([MET_CXX_STANDARD will be set])
fi

#
# Look for the Proj library.
#
Expand Down Expand Up @@ -1160,7 +1178,7 @@ AM_CONDITIONAL([ENABLE_DEVELOPMENT], [test -n "$MET_DEVELOPMENT"])
CPPFLAGS=$CPPFLAGS' -DMET_BASE="\"$(pkgdatadir)\""'

# Add -std=c++11 to CXXFLAGS
CXXFLAGS=$CXXFLAGS' -std=c++11'
CXXFLAGS=$CXXFLAGS' -std=c++'$MET_CXX_STANDARD

# Define other variables for the makefiles

Expand Down
1 change: 1 addition & 0 deletions data/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/climo/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/climo/seeps/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/colortables/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/colortables/NCL_colortables/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 0 additions & 1 deletion data/config/GenEnsProdConfig_default
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ model = "FCST";

//
// Output description to be written
// May be set separately in each "obs.field" entry
//
desc = "NA";

Expand Down
1 change: 1 addition & 0 deletions data/config/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/map/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/map/admin_by_country/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/poly/HMT_masks/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/poly/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/poly/NCEP_masks/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/ps/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
1 change: 1 addition & 0 deletions data/table_files/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
4 changes: 2 additions & 2 deletions data/table_files/met_header_columns_V12.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ V12.0 : STAT : FHO : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID
V12.0 : STAT : ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL TILE_DIM TILE_XLL TILE_YLL NSCALE ISCALE MSE ISC FENERGY2 OENERGY2 BASER FBIAS
V12.0 : STAT : MCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_CAT) F[0-9]*_O[0-9]* EC_VALUE
V12.0 : STAT : MCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU HK HK_BCL HK_BCU HSS HSS_BCL HSS_BCU GER GER_BCL GER_BCU HSS_EC HSS_EC_BCL HSS_EC_BCU EC_VALUE
V12.0 : STAT : MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC CLIMO_MEAN CLIMO_STDEV CLIMO_CDF
V12.0 : STAT : MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC OBS_CLIMO_MEAN OBS_CLIMO_STDEV OBS_CLIMO_CDF FCST_CLIMO_MEAN FCST_CLIMO_STDEV
V12.0 : STAT : SEEPS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL S12 S13 S21 S23 S31 S32 PF1 PF2 PF3 PV1 PV2 PV3 MEAN_FCST MEAN_OBS SEEPS
V12.0 : STAT : SEEPS_MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE OBS_SID OBS_LAT OBS_LON FCST OBS OBS_QC FCST_CAT OBS_CAT P1 P2 T1 T2 SEEPS
V12.0 : STAT : NBRCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBS FBS_BCL FBS_BCU FSS FSS_BCL FSS_BCU AFSS AFSS_BCL AFSS_BCU UFSS UFSS_BCL UFSS_BCU F_RATE F_RATE_BCL F_RATE_BCU O_RATE O_RATE_BCL O_RATE_BCU
V12.0 : STAT : NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON
V12.0 : STAT : NBRCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU
V12.0 : STAT : GRAD : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FGBAR OGBAR MGBAR EGBAR S1 S1_OG FGOG_RATIO DX DY
V12.0 : STAT : DMAP : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY OY FBIAS BADDELEY HAUSDORFF MED_FO MED_OF MED_MIN MED_MAX MED_MEAN FOM_FO FOM_OF FOM_MIN FOM_MAX FOM_MEAN ZHU_FO ZHU_OF ZHU_MIN ZHU_MAX ZHU_MEAN G GBETA BETA_VALUE
V12.0 : STAT : ORANK : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV OBS PIT RANK N_ENS_VLD (N_ENS) ENS_[0-9]* OBS_QC ENS_MEAN CLIMO_MEAN SPREAD ENS_MEAN_OERR SPREAD_OERR SPREAD_PLUS_OERR CLIMO_STDEV
V12.0 : STAT : ORANK : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV OBS PIT RANK N_ENS_VLD (N_ENS) ENS_[0-9]* OBS_QC ENS_MEAN OBS_CLIMO_MEAN SPREAD ENS_MEAN_OERR SPREAD_OERR SPREAD_PLUS_OERR OBS_CLIMO_STDEV FCST_CLIMO_MEAN FCST_CLIMO_STDEV
V12.0 : STAT : PCT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) THRESH_[0-9]* OY_[0-9]* ON_[0-9]*
V12.0 : STAT : PJC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) THRESH_[0-9]* OY_TP_[0-9]* ON_TP_[0-9]* CALIBRATION_[0-9]* REFINEMENT_[0-9]* LIKELIHOOD_[0-9]* BASER_[0-9]*
V12.0 : STAT : PRC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL (N_THRESH) THRESH_[0-9]* PODY_[0-9]* POFD_[0-9]*
Expand Down
1 change: 1 addition & 0 deletions data/tc_data/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_CXX_STANDARD = @MET_CXX_STANDARD@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
Expand Down
9 changes: 6 additions & 3 deletions docs/Users_Guide/appendixA.rst
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ Q. What is an example of using Grid-Stat with regridding and masking turned on?
This tells Grid-Stat to do verification on the "observation" grid.
Grid-Stat reads the GFS and Stage4 data and then automatically regrids
the GFS data to the Stage4 domain using budget interpolation.
Use "FCST" to verify the forecast domain. And use either a named
Use FCST to verify the forecast domain. And use either a named
grid or a grid specification string to regrid both the forecast and
observation to a common grid. For example, to_grid = "G212"; will
regrid both to NCEP Grid 212 before comparing them.
Expand Down Expand Up @@ -1801,8 +1801,11 @@ Q. What are MET's conventions for latitude, longitude, azimuth and bearing angle

.. dropdown:: Answer

MET considers north latitude and east longitude positive. Latitudes
have range from :math:`-90^\circ` to :math:`+90^\circ`. Longitudes have
MET considers north latitude and east longitude positive. However,
internally MET considers east longitude negative so users may encounter
DEBUG statements with longitude of a different sign than they provided
(e.g. for observation locations or grid metadata). Latitudes have
range from :math:`-90^\circ` to :math:`+90^\circ`. Longitudes have
range from :math:`-180^\circ` to :math:`+180^\circ`. Plane angles such
as azimuths and bearing (example: horizontal wind direction) have
range :math:`0^\circ` to :math:`360^\circ` and are measured clockwise
Expand Down
2 changes: 1 addition & 1 deletion docs/Users_Guide/appendixF.rst
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ The Ensemble-Stat, Series-Analysis, MTD and Gen-Ens-Prod tools all have the abil
gen_ens_prod ens1.nc ens2.nc ens3.nc ens4.nc -out ens_prod.nc -config GenEnsProd_config
In this case, a user is passing 4 ensemble members to Gen-Ens-Prod to be evaluated, and each member is in a separate file. If a user wishes to use Python embedding to process the ensemble input files, then the same exact command is used however special modifications inside the GenEnsProd_config file are needed. In the config file dictionary, the user must set the **file_type** entry to either **PYTHON_NUMPY** or **PYTHON_XARRAY** to activate the Python embedding for these tools. Then, in the **name** entry of the config file dictionaries for the forecast or observation data, the user must list the **full path** to the Python script to be run. However, in the Python command, replace the name of the input gridded data file to the Python script with the constant string **MET_PYTHON_INPUT_ARG**. When looping over all of the input files, the MET tools will replace that constant **MET_PYTHON_INPUT_ARG** with the path to the input file currently being processed and optionally, any command line arguments for the Python script. Here is what this looks like in the GenEnsProd_config file for the above example:
In this case, a user is passing 4 ensemble members to Gen-Ens-Prod to be evaluated, and each member is in a separate file. If a user wishes to use Python embedding to process the ensemble input files, then the same exact command is used; however special modifications inside the GenEnsProd_config file are needed. In the config file dictionary, the user must set the **file_type** entry to either **PYTHON_NUMPY** or **PYTHON_XARRAY** to activate the Python embedding for these tools. Then, in the **name** entry of the config file dictionaries for the forecast or observation data, the user must list the **full path** to the Python script to be run. However, in the Python command, replace the name of the input gridded data file to the Python script with the constant string **MET_PYTHON_INPUT_ARG**. When looping over all of the input files, the MET tools will replace that constant **MET_PYTHON_INPUT_ARG** with the path to the input file currently being processed and optionally, any command line arguments for the Python script. Here is what this looks like in the GenEnsProd_config file for the above example:
.. code-block::
:caption: Gen-Ens-Prod MET_PYTHON_INPUT_ARG Config
Expand Down
Loading

0 comments on commit b4338a2

Please sign in to comment.