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

Bugfix #2082 develop regrid.convert/censor_thresh/censor_val #2140

Merged
merged 11 commits into from
Apr 26, 2023
Merged

Bugfix #2082 develop regrid.convert/censor_thresh/censor_val #2140

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba647d2
Bugfix #2082 main_v5.0 regrid.convert/censor_thresh/censor_val (#2101)
georgemccabe Apr 4, 2023
42db9ef
removed unused variable from test
georgemccabe Apr 25, 2023
9ddb9c2
allow filename templates in grid definition and ADP, require input fi…
georgemccabe Apr 25, 2023
ffa5c3e
write more complete Point2Grid unit tests
georgemccabe Apr 25, 2023
0ec1374
turn on use case group to confirm diff tests now pass, ci-run-diff
georgemccabe Apr 25, 2023
b65b5d9
removed the new config variables that aren't actually used and correc…
georgemccabe Apr 25, 2023
bddd7fc
removed config variables that were added accidentally
georgemccabe Apr 26, 2023
6702b0e
turn off use case that appears to be failing the diff test due to a M…
georgemccabe Apr 26, 2023
66c9158
added fix to discern POINT2GRID_QC_FLAGS=0 from unset
georgemccabe Apr 26, 2023
57c807a
remove QC flags = 0 from config because it removes useful output and …
georgemccabe Apr 26, 2023
2d70bc5
removed config variable that now causes diffs
georgemccabe Apr 26, 2023
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
6 changes: 4 additions & 2 deletions .github/jobs/setup_and_run_diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import sys
import subprocess
import shlex
import re

from docker_utils import VERSION_EXT, get_branch_name

Expand Down Expand Up @@ -33,8 +34,9 @@
output_data_branch = os.environ.get('GITHUB_BASE_REF')
else:
branch_name = get_branch_name()
if branch_name.startswith('main_v'):
output_data_branch = branch_name
match = re.match(r'.*(main_v\d+\.\d+).*', branch_name)
if match:
output_data_branch = match.group(1)
else:
output_data_branch = 'develop'

Expand Down
137 changes: 136 additions & 1 deletion docs/Users_Guide/glossary.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ METplus Configuration Glossary
| *Used by:* GridStat

POINT2GRID_REGRID_TO_GRID
Used to set the regrid dictionary item 'to_grid' in the MET Point2Grid config file. See the `MET User's Guide <https://dtcenter.org/community-code/model-evaluation-tools-met/documentation>`_ for more information.
Used to set the grid definition for point2grid.

| *Used by:* Point2Grid

Expand Down Expand Up @@ -10253,3 +10253,138 @@ METplus Configuration Glossary
Specify the value for 'seeps_p1_thresh' in the MET configuration file for PointStat.

| *Used by:* PointStat

ENSEMBLE_STAT_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for EnsembleStat.

| *Used by:* EnsembleStat

ENSEMBLE_STAT_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for EnsembleStat.

| *Used by:* EnsembleStat

ENSEMBLE_STAT_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for EnsembleStat.

| *Used by:* EnsembleStat

GEN_ENS_PROD_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for GenEnsProd.

| *Used by:* GenEnsProd

GEN_ENS_PROD_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for GenEnsProd.

| *Used by:* GenEnsProd

GEN_ENS_PROD_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for GenEnsProd.

| *Used by:* GenEnsProd

GRID_DIAG_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for GridDiag.

| *Used by:* GridDiag

GRID_DIAG_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for GridDiag.

| *Used by:* GridDiag

GRID_DIAG_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for GridDiag.

| *Used by:* GridDiag

GRID_STAT_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for GridStat.

| *Used by:* GridStat

GRID_STAT_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for GridStat.

| *Used by:* GridStat

GRID_STAT_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for GridStat.

| *Used by:* GridStat

MODE_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for MODE.

| *Used by:* MODE

MODE_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for MODE.

| *Used by:* MODE

MTD_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for MTD.

| *Used by:* MTD

MTD_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for MTD.

| *Used by:* MTD

MTD_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for MTD.

| *Used by:* MTD

POINT_STAT_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for PointStat.

| *Used by:* PointStat

POINT_STAT_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for PointStat.

| *Used by:* PointStat

SERIES_ANALYSIS_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for SeriesAnalysis.

| *Used by:* SeriesAnalysis

SERIES_ANALYSIS_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for SeriesAnalysis.

| *Used by:* SeriesAnalysis

SERIES_ANALYSIS_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for SeriesAnalysis.

| *Used by:* SeriesAnalysis

TC_RMW_REGRID_CONVERT
Specify the value for 'regrid.convert' in the MET configuration file for TCRMW.

| *Used by:* TCRMW

TC_RMW_REGRID_CENSOR_THRESH
Specify the value for 'regrid.censor_thresh' in the MET configuration file for TCRMW.

| *Used by:* TCRMW

TC_RMW_REGRID_CENSOR_VAL
Specify the value for 'regrid.censor_val' in the MET configuration file for TCRMW.

| *Used by:* TCRMW
81 changes: 81 additions & 0 deletions docs/Users_Guide/wrappers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ METplus Configuration
| :term:`ENSEMBLE_STAT_REGRID_WIDTH`
| :term:`ENSEMBLE_STAT_REGRID_VLD_THRESH`
| :term:`ENSEMBLE_STAT_REGRID_SHAPE`
| :term:`ENSEMBLE_STAT_REGRID_CONVERT`
| :term:`ENSEMBLE_STAT_REGRID_CENSOR_THRESH`
| :term:`ENSEMBLE_STAT_REGRID_CENSOR_VAL`
| :term:`ENSEMBLE_STAT_CONFIG_FILE`
| :term:`ENSEMBLE_STAT_MET_OBS_ERR_TABLE`
| :term:`ENSEMBLE_STAT_N_MEMBERS`
Expand Down Expand Up @@ -394,6 +397,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`ENSEMBLE_STAT_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`ENSEMBLE_STAT_REGRID_CONVERT`
- regrid.convert
* - :term:`ENSEMBLE_STAT_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`ENSEMBLE_STAT_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_CENSOR_THRESH}**

Expand Down Expand Up @@ -1050,6 +1059,9 @@ METplus Configuration
| :term:`GEN_ENS_PROD_REGRID_WIDTH`
| :term:`GEN_ENS_PROD_REGRID_VLD_THRESH`
| :term:`GEN_ENS_PROD_REGRID_SHAPE`
| :term:`GEN_ENS_PROD_REGRID_CONVERT`
| :term:`GEN_ENS_PROD_REGRID_CENSOR_THRESH`
| :term:`GEN_ENS_PROD_REGRID_CENSOR_VAL`
| :term:`GEN_ENS_PROD_CENSOR_THRESH`
| :term:`GEN_ENS_PROD_CENSOR_VAL`
| :term:`GEN_ENS_PROD_CAT_THRESH`
Expand Down Expand Up @@ -1174,6 +1186,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`GEN_ENS_PROD_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`GEN_ENS_PROD_REGRID_CONVERT`
- regrid.convert
* - :term:`GEN_ENS_PROD_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`GEN_ENS_PROD_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_CENSOR_THRESH}**

Expand Down Expand Up @@ -2669,6 +2687,9 @@ METplus Configuration
| :term:`GRID_DIAG_REGRID_VLD_THRESH`
| :term:`GRID_DIAG_REGRID_SHAPE`
| :term:`GRID_DIAG_REGRID_TO_GRID`
| :term:`GRID_DIAG_REGRID_CONVERT`
| :term:`GRID_DIAG_REGRID_CENSOR_THRESH`
| :term:`GRID_DIAG_REGRID_CENSOR_VAL`
| :term:`GRID_DIAG_DESC`
| :term:`GRID_DIAG_SKIP_IF_OUTPUT_EXISTS`
| :term:`GRID_DIAG_RUNTIME_FREQ`
Expand Down Expand Up @@ -2725,6 +2746,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`GRID_DIAG_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`GRID_DIAG_REGRID_CONVERT`
- regrid.convert
* - :term:`GRID_DIAG_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`GRID_DIAG_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_CENSOR_THRESH}**

Expand Down Expand Up @@ -2826,6 +2853,9 @@ METplus Configuration
| :term:`GRID_STAT_REGRID_WIDTH`
| :term:`GRID_STAT_REGRID_VLD_THRESH`
| :term:`GRID_STAT_REGRID_SHAPE`
| :term:`GRID_STAT_REGRID_CONVERT`
| :term:`GRID_STAT_REGRID_CENSOR_THRESH`
| :term:`GRID_STAT_REGRID_CENSOR_VAL`
| :term:`GRID_STAT_CLIMO_CDF_BINS`
| :term:`GRID_STAT_CLIMO_CDF_CENTER_BINS`
| :term:`GRID_STAT_CLIMO_CDF_WRITE_BINS`
Expand Down Expand Up @@ -3025,6 +3055,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`GRID_STAT_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`GRID_STAT_REGRID_CONVERT`
- regrid.convert
* - :term:`GRID_STAT_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`GRID_STAT_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_FCST_FIELD}**

Expand Down Expand Up @@ -3944,6 +3980,9 @@ METplus Configuration
| :term:`MODE_REGRID_WIDTH`
| :term:`MODE_REGRID_VLD_THRESH`
| :term:`MODE_REGRID_SHAPE`
| :term:`MODE_REGRID_CONVERT`
| :term:`MODE_REGRID_CENSOR_THRESH`
| :term:`MODE_REGRID_CENSOR_VAL`
| :term:`MODE_CONFIG_FILE`
| :term:`FCST_MODE_INPUT_DATATYPE`
| :term:`OBS_MODE_INPUT_DATATYPE`
Expand Down Expand Up @@ -4105,6 +4144,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`MODE_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`MODE_REGRID_CONVERT`
- regrid.convert
* - :term:`MODE_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`MODE_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_GRID_RES}**

Expand Down Expand Up @@ -4639,6 +4684,9 @@ METplus Configuration
| :term:`MTD_REGRID_WIDTH`
| :term:`MTD_REGRID_VLD_THRESH`
| :term:`MTD_REGRID_SHAPE`
| :term:`MTD_REGRID_CONVERT`
| :term:`MTD_REGRID_CENSOR_THRESH`
| :term:`MTD_REGRID_CENSOR_VAL`
| :term:`MTD_MET_CONFIG_OVERRIDES`
| :term:`FCST_MTD_IS_PROB`
| :term:`FCST_MTD_PROB_IN_GRIB_PDS`
Expand Down Expand Up @@ -4730,6 +4778,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`MTD_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`MTD_REGRID_CONVERT`
- regrid.convert
* - :term:`MTD_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`MTD_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_FCST_FILE_TYPE}**

Expand Down Expand Up @@ -5728,6 +5782,9 @@ Configuration
| :term:`POINT_STAT_REGRID_WIDTH`
| :term:`POINT_STAT_REGRID_VLD_THRESH`
| :term:`POINT_STAT_REGRID_SHAPE`
| :term:`POINT_STAT_REGRID_CONVERT`
| :term:`POINT_STAT_REGRID_CENSOR_THRESH`
| :term:`POINT_STAT_REGRID_CENSOR_VAL`
| :term:`POINT_STAT_MASK_GRID`
| :term:`POINT_STAT_MASK_POLY`
| :term:`POINT_STAT_MASK_SID`
Expand Down Expand Up @@ -5913,6 +5970,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`POINT_STAT_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`POINT_STAT_REGRID_CONVERT`
- regrid.convert
* - :term:`POINT_STAT_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`POINT_STAT_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_FCST_FIELD}**

Expand Down Expand Up @@ -6400,6 +6463,9 @@ METplus Configuration
| :term:`SERIES_ANALYSIS_REGRID_WIDTH`
| :term:`SERIES_ANALYSIS_REGRID_VLD_THRESH`
| :term:`SERIES_ANALYSIS_REGRID_SHAPE`
| :term:`SERIES_ANALYSIS_REGRID_CONVERT`
| :term:`SERIES_ANALYSIS_REGRID_CENSOR_THRESH`
| :term:`SERIES_ANALYSIS_REGRID_CENSOR_VAL`
| :term:`SERIES_ANALYSIS_STAT_LIST`
| :term:`SERIES_ANALYSIS_IS_PAIRED`
| :term:`SERIES_ANALYSIS_CUSTOM_LOOP_LIST`
Expand Down Expand Up @@ -6563,6 +6629,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.vld_thresh
* - :term:`SERIES_ANALYSIS_REGRID_TO_GRID`
- regrid.to_grid
* - :term:`SERIES_ANALYSIS_REGRID_CONVERT`
- regrid.convert
* - :term:`SERIES_ANALYSIS_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`SERIES_ANALYSIS_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_CAT_THRESH}**

Expand Down Expand Up @@ -8678,6 +8750,9 @@ METplus Configuration
| :term:`TC_RMW_REGRID_WIDTH`
| :term:`TC_RMW_REGRID_VLD_THRESH`
| :term:`TC_RMW_REGRID_SHAPE`
| :term:`TC_RMW_REGRID_CONVERT`
| :term:`TC_RMW_REGRID_CENSOR_THRESH`
| :term:`TC_RMW_REGRID_CENSOR_VAL`
| :term:`TC_RMW_N_RANGE`
| :term:`TC_RMW_N_AZIMUTH`
| :term:`TC_RMW_MAX_RANGE_KM`
Expand Down Expand Up @@ -8885,6 +8960,12 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
- regrid.width
* - :term:`TC_RMW_REGRID_VLD_THRESH`
- regrid.vld_thresh
* - :term:`TC_RMW_REGRID_CONVERT`
- regrid.convert
* - :term:`TC_RMW_REGRID_CENSOR_THRESH`
- regrid.censor_thresh
* - :term:`TC_RMW_REGRID_CENSOR_VAL`
- regrid.censor_val

**${METPLUS_N_RANGE}**

Expand Down
Loading