Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature 779 add support for MODE and PointStat configs #888

Merged
merged 45 commits into from
Apr 26, 2021
Merged

Feature 779 add support for MODE and PointStat configs #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
df4458b
modified handle_mask function to use new approach to setting env vars…
georgemccabe Apr 13, 2021
7d0f1d6
try moving fcst/obs options to FCST/OBS_VAR<n>_OPTIONS, ci-run-diff
georgemccabe Apr 13, 2021
849c41d
started adding support for new env vars for the wrapped MET configs
georgemccabe Apr 13, 2021
292d974
change use case conf back because the fix did not work
georgemccabe Apr 13, 2021
cc647a6
Merge branch 'develop' into feature_779_common_met_configs
georgemccabe Apr 15, 2021
3f02781
added support for many MODEConfig variables
georgemccabe Apr 15, 2021
d02a487
removed MODE_MET_CONFIG_OVERRIDES and replaced the values with the ne…
georgemccabe Apr 15, 2021
ea7dd43
fixed typo in functiona argument, ci-run-diff
georgemccabe Apr 15, 2021
3b2d919
started pytests for mode to test new configs
georgemccabe Apr 15, 2021
5e5dc3d
Merge branch 'develop' into feature_779_common_met_configs
georgemccabe Apr 19, 2021
6d84cf0
added support for rest of MODE config vars that reference grid_res, r…
georgemccabe Apr 19, 2021
b2f9265
added variables that reference grid_res since grid_res value is chang…
georgemccabe Apr 19, 2021
4d36737
no longer set MODE_GRID_RES in wrapped MET config since it should be …
georgemccabe Apr 19, 2021
cb5fa61
added support to set default value for string or list MET config valu…
georgemccabe Apr 20, 2021
49ae35a
set METPLUS_GRID_RES again and set default value for variables that r…
georgemccabe Apr 20, 2021
b898899
removed unnecessary default values, ci-run-diff
georgemccabe Apr 20, 2021
898fd0a
added optional argument to set env var name if it differs from the up…
georgemccabe Apr 20, 2021
40a0eb0
read env_var_name and prepend METPLUS_ if it is not found to use as d…
georgemccabe Apr 20, 2021
f2d22e6
clean up formatting
georgemccabe Apr 20, 2021
5e06a03
added default values for variables that reference grid_res so they wi…
georgemccabe Apr 20, 2021
6e04137
make mask grid_flag and poly_flag uppercase
georgemccabe Apr 20, 2021
f9d2771
no need to set isOK to false because log_error does that automatically
georgemccabe Apr 20, 2021
c7ada93
rearrange list of env vars that are set by wrapper for organization sake
georgemccabe Apr 20, 2021
e36034f
add synonyms for METplus config variables like FCST_MODE_X and MODE_F…
georgemccabe Apr 20, 2021
5fb79c6
auto set uppercase for flag variables
georgemccabe Apr 20, 2021
880efe4
if MODE_GRID_RES is set, set default values for any MET config variab…
georgemccabe Apr 20, 2021
b6571c8
wrote unit tests for mode to check that commands are generated for 2 …
georgemccabe Apr 20, 2021
76b4041
formatting and ci-run-diff
georgemccabe Apr 20, 2021
a5cf482
removed unused variable and reordered variables
georgemccabe Apr 20, 2021
91c24b1
added missing METplus config variables
georgemccabe Apr 20, 2021
58a9ab1
rearranged config variables to group related items for clarify, remov…
georgemccabe Apr 20, 2021
1d78596
added support for setting obs_quality in PointStat wrapped config
georgemccabe Apr 21, 2021
1d886b8
added new config to basic use case
georgemccabe Apr 21, 2021
bc01b40
removed obs_quality from POINT_STAT_MET_CONFIG_OVERRIDES because it i…
georgemccabe Apr 21, 2021
91d163b
added support for all output_flag dictionary values in PointStat, rem…
georgemccabe Apr 21, 2021
f2389de
added name of variable above env var
georgemccabe Apr 21, 2021
28f5074
add output flags that were set to STAT in wrapped config file previou…
georgemccabe Apr 21, 2021
81728c2
changed values in wrapped PointStat config to match default PointStat…
georgemccabe Apr 21, 2021
ba139b1
install cartopy 0.18 because new version won't install properly using…
georgemccabe Apr 21, 2021
5b1e1e0
revert back changes to match default MET config to ensure no differen…
georgemccabe Apr 21, 2021
690d254
changes to support handling MET config variables in a common way incl…
georgemccabe Apr 22, 2021
921053b
added support for climo_mean.time_interp_method, climo_stdev.time_int…
georgemccabe Apr 22, 2021
a415a4e
added old defaults from wrapped config, ci-run-diff
georgemccabe Apr 22, 2021
63e4233
specify version of cartopy to avoid failure
georgemccabe Apr 22, 2021
bcc1cca
Merge branch 'feature_779_point_stat_configs' into feature_779_mode_c…
georgemccabe Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/jobs/python_requirements/get_cartopy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ yum -y install geos
yum -y install geos-devel
pip3 install --upgrade cython numpy pyshp six
pip3 install shapely --no-binary shapely
pip3 install cartopy
pip3 install cartopy==0.18.0

#some cartopy functionality fails without scipy
pip3 install scipy
315 changes: 315 additions & 0 deletions docs/Users_Guide/glossary.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6354,3 +6354,318 @@ METplus Configuration Glossary
Specify the value for 'ops_hit_window.end' in the MET configuration file for TCGen.

| *Used by:* TCGen

MODE_FCST_FILTER_ATTR_NAME
Specify the value for 'fcst.filter_attr_name' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_FCST_FILTER_ATTR_THRESH
Specify the value for 'fcst.filter_attr_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_FCST_CENSOR_THRESH
Specify the value for 'fcst.censor_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_FCST_CENSOR_VAL
Specify the value for 'fcst.censor_val' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_FCST_VLD_THRESH
Specify the value for 'fcst.vld_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_OBS_FILTER_ATTR_NAME
Specify the value for 'obs.filter_attr_name' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_OBS_FILTER_ATTR_THRESH
Specify the value for 'obs.filter_attr_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_OBS_CENSOR_THRESH
Specify the value for 'obs.censor_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_OBS_CENSOR_VAL
Specify the value for 'obs.censor_val' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_OBS_VLD_THRESH
Specify the value for 'obs.vld_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_CENTROID_DIST
Specify the value for 'weight.centroid_dist' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_BOUNDARY_DIST
Specify the value for 'weight.boundary_dist' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_CONVEX_HULL_DIST
Specify the value for 'weight.convex_hull_dist' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_ANGLE_DIFF
Specify the value for 'weight.angle_diff' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_ASPECT_DIFF
Specify the value for 'weight.aspect_diff' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_AREA_RATIO
Specify the value for 'weight.area_ratio' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_INT_AREA_RATIO
Specify the value for 'weight.int_area_ratio' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_CURVATURE_RATIO
Specify the value for 'weight.curvature_ratio' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_COMPLEXITY_RATIO
Specify the value for 'weight.complexity_ratio' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_INTEN_PERC_RATIO
Specify the value for 'weight.inten_perc_ratio' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_WEIGHT_INTEN_PERC_VALUE
Specify the value for 'weight.inten_perc_value' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_NC_PAIRS_FLAG_LATLON
Specify the value for 'nc_pairs_flag.latlon' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_NC_PAIRS_FLAG_RAW
Specify the value for 'nc_pairs_flag.raw' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_NC_PAIRS_FLAG_OBJECT_RAW
Specify the value for 'nc_pairs_flag.object_raw' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_NC_PAIRS_FLAG_OBJECT_ID
Specify the value for 'nc_pairs_flag.object_id' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_NC_PAIRS_FLAG_CLUSTER_ID
Specify the value for 'nc_pairs_flag.cluster_id' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_NC_PAIRS_FLAG_POLYLINES
Specify the value for 'nc_pairs_flag.polylines' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_MASK_GRID
Specify the value for 'mask.grid' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_MASK_GRID_FLAG
Specify the value for 'mask.grid_flag' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_MASK_POLY
Specify the value for 'mask.poly' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_MASK_POLY_FLAG
Specify the value for 'mask.poly_flag' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_MATCH_FLAG
Specify the value for 'match_flag' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_MAX_CENTROID_DIST
Specify the value for 'max_centroid_dist' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_TOTAL_INTEREST_THRESH
Specify the value for 'total_interest_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_INTEREST_FUNCTION_CENTROID_DIST
Specify the value for 'interest_function.centroid_dist' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_INTEREST_FUNCTION_BOUNDARY_DIST
Specify the value for 'interest_function.boundary_dist' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_INTEREST_FUNCTION_CONVEX_HULL_DIST
Specify the value for 'interest_function.convex_hull_dist' in the MET configuration file for MODE.

| *Used by:* MODE

POINT_STAT_OBS_QUALITY
Specify the value for 'obs_quality' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_FHO
Specify the value for 'output_flag.fho' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_CTC
Specify the value for 'output_flag.ctc' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_CTS
Specify the value for 'output_flag.cts' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_MCTC
Specify the value for 'output_flag.mctc' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_MCTS
Specify the value for 'output_flag.mcts' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_CNT
Specify the value for 'output_flag.cnt' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_SL1L2
Specify the value for 'output_flag.sl1l2' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_SAL1L2
Specify the value for 'output_flag.sal1l2' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_VL1L2
Specify the value for 'output_flag.vl1l2' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_VAL1L2
Specify the value for 'output_flag.val1l2' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_VCNT
Specify the value for 'output_flag.vcnt' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_PCT
Specify the value for 'output_flag.pct' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_PSTD
Specify the value for 'output_flag.pstd' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_PJC
Specify the value for 'output_flag.pjc' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_PRC
Specify the value for 'output_flag.prc' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_ECNT
Specify the value for 'output_flag.ecnt' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_RPS
Specify the value for 'output_flag.rps' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_ECLV
Specify the value for 'output_flag.eclv' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_OUTPUT_FLAG_MPR
Specify the value for 'output_flag.mpr' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_INTERP_VLD_THRESH
Specify the value for 'interp.vld_thresh' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_INTERP_SHAPE
Specify the value for 'interp.shape' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_INTERP_TYPE_METHOD
Specify the value for 'interp.type.method' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_INTERP_TYPE_WIDTH
Specify the value for 'interp.type.width' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_CLIMO_MEAN_TIME_INTERP_METHOD
Specify the value for 'climo_mean.time_interp_method' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_CLIMO_STDEV_TIME_INTERP_METHOD
Specify the value for 'climo_stdev.time_interp_method' in the MET configuration file for PointStat.

| *Used by:* PointStat
Loading