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.

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

Feature #1060 shapes #2537

Merged
merged 20 commits into from
May 10, 2023
Merged

Feature #1060 shapes #2537

merged 20 commits into from
May 10, 2023

Conversation

JohnHalleyGotway
Copy link
Collaborator

@JohnHalleyGotway JohnHalleyGotway commented May 5, 2023

Expected Differences

  • Do these changes introduce new tools, command line arguments, or configuration file options? [Yes]

    If yes, please describe:

This PR enhances the gen_vx_mask tool in two main ways:

  1. Adds support for multiple -shapeno values to be specified. When multiple shapes are used, the mask is defined as their union.
  2. Adds a new -shape_str command line option allow users to pick which shape(s) to use based on string matching with the corresponding .dbf file.
  • Do these changes modify the structure of existing or add new output data types (e.g. statistic line types or NetCDF variables)? [No]

    If yes, please describe:

Pull Request Testing

  • Describe testing already performed for these changes:

    Tested primarily using Natural Earth Shapefile data. Tested all sorts of failure conditions to make sure the Debug(3), Debug(4), Warning, and Error messages are useful. Can also see NOAA Shapefiles that include various warning areas.

  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

    Please find this code compiled on seneca in /d1/projects/MET/MET_pull_requests/met-11.1.0/met-11.1.0-rc1/feature_1060/MET for additional testing. You could test with the same natural earth shapefile data (in /d1/projects/MET/MET_test_data/unit_test/shapefile/ne_110m_admin_0_countries), download/test with different resolution data, or get shapefiles from some other source.

  • Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [Yes]
    Yes, updates to the chapter that includes gen_vx_mask, as well as a few enhancements recommended by @DanielAdriaansen.

  • Do these changes include sufficient testing updates? [Yes]
    Added 2 new calls to gen_vx_mask in unit_gen_vx_mask.xml.

  • Will this PR result in changes to the test suite? [Yes]

    If yes, describe the new output and/or changes to the existing output:

    Adds 2 new output files.

  1. South_America_mask.nc
    Screen Shot 2023-05-05 at 3 36 44 PM

  2. South_America_Spain_Portugal_mask.nc
    Screen Shot 2023-05-05 at 3 37 20 PM

  • Please complete this pull request review by [5/9/2023].

Pull Request Checklist

See the METplus Workflow for details.

  • Review the source issue metadata (required labels, projects, and milestone).
  • Complete the PR definition above.
  • Ensure the PR title matches the feature or bugfix branch name.
  • Define the PR metadata, as permissions allow.
    Select: Reviewer(s)
    Select: Organization level software support Project or Repository level development cycle Project
    Select: Milestone as the version that will include these changes
  • After submitting the PR, select Development issue with the original issue number.
  • After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
  • Close the linked issue and delete your feature or bugfix branch from GitHub.

Copy link
Contributor

@DanielAdriaansen DanielAdriaansen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JohnHalleyGotway demonstrated these changes and we discussed some questions I had. I made some final tweaks to the documentation, so please feel free to review @JohnHalleyGotway .

I did not attempt to test the new functionality, but it seems straightforward to me and the required tests and excellent logging messages are included for the user.

I approve.

@JohnHalleyGotway JohnHalleyGotway merged commit 682669e into develop May 10, 2023
@JohnHalleyGotway JohnHalleyGotway deleted the feature_1060_shapes branch May 10, 2023 19:52
JohnHalleyGotway pushed a commit that referenced this pull request May 11, 2023
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: hsoh-u <hsoh@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: johnhg <johnhg@ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
Co-authored-by: Seth Linden <linden@ucar.edu>
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: davidalbo <dave@ucar.edu>
Co-authored-by: Lisa Goodrich <lisag@ucar.edu>
Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com>
fix #2389 develop flowchart (#2392)
Fix Python environment issue (#2407)
fix definitions of G172 and G220 based on comments in NOAA-EMC/NCEPLIBS-w3emc#157. (#2406)
fix #2380 develop override (#2382)
fix #2408 develop empty config (#2410)
fix #2390 develop compile zlib (#2404)
fix #2412 develop climo (#2422)
fix #2437 develop convert (#2439)
fix for develop, for #2437, forgot one reference to the search_parent for a dictionary lookup.
fix #2452 develop airnow (#2454)
fix #2449 develop pdf (#2464)
fix #2402 develop sonarqube (#2468)
fix #2426 develop buoy (#2475)
fix 2518 dtypes appf docs (#2519)
fix 2531 compilation errors (#2533)
fix #2531 compilation_errors_configure (#2535)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Enhance Gen-Vx-Mask shapefile masking to support multiple shapes and specify shape metadata.
2 participants