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

Merge latest development from main_v11.1 into develop #2623

Merged
merged 29 commits into from
Aug 1, 2023
Merged

Merge latest development from main_v11.1 into develop #2623

merged 29 commits into from
Aug 1, 2023

Conversation

JohnHalleyGotway
Copy link
Collaborator

Expected Differences

Development toward the MET 11.1.0 release has been occurring on the main_v11.1 branch. Development toward the MET 12.0.0 release has remained on the develop branch. The plan has been to periodically merge changes from the main_v11.1 branch into develop to ensure that 11.1.0 changes are included in the 12.0.0 release. This PR does that, merging the latest changes from main_v11.1.0 into develop.

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

    If yes, please describe:

  • 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:

    None.

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

    Inspect the output of the GHA testing and confirm that all differences flagged are expected based on 11.1.0 development.

  • Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? [Yes]

  • Do these changes include sufficient testing updates? [Yes]

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

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

    A couple of PR's for main_v11.1 did change the unit test output. Merging these changes into develop will also change the unit test output for develop. So we'll need to update develop-ref with these changes as well.

  • Please complete this pull request review by [Tuesday 7/25/23].

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.

jprestop and others added 23 commits June 27, 2023 12:01
@jprestop
Updating (#2586)
65cc39c
@jprestop
Adding module use line
839aead
#2578 Sets swap_to_north flag for rotated lat/lon
9bf17be
#2578 Allow to swap_to_north flag for rotated lat/lon
add953d
#2578 Allow spaces around since
4e884ab
@jprestop
Feature 2597 disk space (#2598)
e4ba356 
* Adding free disk space script

* Added lines for free disk space

* Take 2 Adding to each job instead of job_controls

* Added fake space as to include ci-run-unit in this commit message

* Added fake space as to include ci-run-unit in this commit message and to resolve syntax error

* Added fake space as to include ci-run-unit in this commit message and to resolve syntax error

* Copied and pasted from METplus to resolve syntax error ci-run-unit

* Added extra space to trigger tests ci-run-unit

* Added extra space to trigger tests and attempted to fix all syntax error ci-run-unit

* Removing free disk space from check for differences

* Added bogus space ci-run-unit

* Removing unnecessary spaces
@jprestop
Merge branch 'main_v10.1' of github.com:dtcenter/MET into bugfix_2578…
d644fdc 
…_rotated_latlon_main_v11.1
Merge remote-tracking branch 'origin/main_v11.1' into bugfix_2578_rot…
1eb227d 
…ated_latlon_main_v11.1
Merge branch 'bugfix_2578_rotated_latlon_main_v11.1' of github.com:dt…
df36ebe 
…center/MET into bugfix_2578_rotated_latlon_main_v11.1
@hsoh-u
Merge pull request #2595 from dtcenter/bugfix_2578_rotated_latlon_mai…
79f6afd 
…n_v11.1

Bugfix 2578 rotated latlon main v11.1
@hertneky
Update installation.rst (#2602)
8708b43 
Update UPP website link in 2 places from DTC to EPIC owned website.
@hertneky
Feature update 2603 mode.rst (#2604)
ff6bf47 
Update mode.rst to modify multivar_intensity to multivar_intensity_flag
#2603
@davidalbo
Feature 2511 ndbc locations update (#2605)
9614f28 
* Modified parsing to handle changed webpage format, added command line option to specify the existing stations file to use, general cleanup

* Modified documentation to show the new command line option '-e <file>' for the script build_ndbc_stations_from_web.py

* Stations file created on July 10, 2023.  The web content seems to be changing on a daily basis (drifting bouys most likely)
@JohnHalleyGotway
Feature #2558 tc_diag_docs (#2580)
f10845a 
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: hsoh-u <hsoh@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>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
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)
@github-actions
Update main_v11.1-ref after #2605 (#2606)
fe1bb67 
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: hsoh-u <hsoh@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>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com>
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)
@jprestop
Bugfix 2596 main v11.1 rpath compilation (#2614)
1320e54 
* Removing disable-new-tags rpath option for GNU compilers 12.3 and above as this option produces an unknown option error

* Adding configuration file for narya

* Resolving sed error 'invalid command code m'

* Modified code to determine OS and take action to build NetCDF-CXX and MET accordingly

* Added documentation about the MAKE_ARGS option

* Made suggested changes by George

* Adding back inadvertently removed LIB_Z to LDFLAGS in HDF5 compilation

* Remove unnecessary indentation
@jprestop
Adding an include statement for array to allow compilation using gcc12 (
6a06f18 
#2617)
@jprestop
Added documentation about the new MAKE_ARGS option that wasn't added …
94162cc 
…when MAKE_ARGS was added (#2619)
@JohnHalleyGotway
Feature #2565 nccf_laea (#2616)
44cb1d4
@JohnHalleyGotway
Merge branch 'main_v11.1-ref' into main_v11.1
4edf278
@JohnHalleyGotway
Update main_v11.1-ref after #2612 (#2621)
b5562ad 
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: hsoh-u <hsoh@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>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com>
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)
fix 2596 main v11.1 rpath compilation (#2614)
@jprestop
Updating development instructions
1c4014f
@JohnHalleyGotway
Feature #2620 v11.1.0-rc2 (#2622)
390ec32
@JohnHalleyGotway JohnHalleyGotway added this to the MET 12.0.0 milestone Jul 24, 2023
@JohnHalleyGotway JohnHalleyGotway changed the title Merge latest development from the main_v11.0 branch into develop Merge latest development from main_v11.0 into develop Jul 24, 2023
@jprestop jprestop changed the title Merge latest development from main_v11.0 into develop Merge latest development from main_v11.1 into develop Jul 24, 2023
JohnHalleyGotway and others added 4 commits July 25, 2023 12:18
@JohnHalleyGotway
Feature #2558 tc_diag_docs edits (#2625)
c32f4ed 
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: hsoh-u <hsoh@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>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
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)
@JohnHalleyGotway
Bugfix #2514 main_v11.1 clang (#2628)
76b7468
@DanielAdriaansen
Updates release notes for v11.1 for function removal. (#2630)
6674522 
* Updates release notes for v11.1 for  function removal.

* RST tweaks.

* Fixes bad hyperlink and tries to align code block with bullet.

* One more time to fix hyperlink.
@JohnHalleyGotway
Feature #2627 v11.1.0 (#2632)
cea2839
hsoh-u and others added 2 commits July 31, 2023 17:11
@hsoh-u @github-actions
@metplus-bot @JohnHalleyGotway @davidalbo
Feature #2633 seeps default p1 threshold (#2634)
4137ccb 
* Update develop-ref after #2555 and #2561 (#2568)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: hsoh-u <hsoh@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>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
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)

* Per #2582, update unit_plot_tc.xml to use the -save_data option.

* modified the config for mode regarding multivar_intensity_flag

* #2633 Set the default seeps_p1_thresh to >=0.1&&<=0.85

* #2633 Added default setting of seeps_p1_thresh

* Per #2633, small tweaks to the config file comments and documentation

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: David Albo <dave@ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
@JohnHalleyGotway
Merge branch 'main_v11.1-ref' into main_v11.1
46756cd
@JohnHalleyGotway JohnHalleyGotway merged commit 2339ad4 into develop Aug 1, 2023
31 checks passed
@JohnHalleyGotway JohnHalleyGotway mentioned this pull request Aug 1, 2023
Merged
JohnHalleyGotway pushed a commit that referenced this pull request Aug 1, 2023
@github-actions
Update develop-ref after #2623 (#2636)
04a6f30 
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local>
Co-authored-by: rgbullock <bullock@ucar.edu>
Co-authored-by: Randy Bullock <bullock@seneca.rap.ucar.edu>
Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: hsoh-u <hsoh@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>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com>
Co-authored-by: David Albo <dave@ucar.edu>
Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
fix #2426 develop buoy (#2475)
fix 2518 dtypes appf docs (#2519)
fix 2531 compilation errors (#2533)
fix #2531 compilation_errors_configure (#2535)
fix #2514 develop clang (#2563)
fix #2575 develop python_convert (#2576)
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 2596 main v11.1 rpath compilation (#2614)
fix #2514 main_v11.1 clang (#2628)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
No open projects
MET-11.1.0 Development
Status: ✅ Done
Milestone
MET 11.1.0
Development

Successfully merging this pull request may close these issues.
6 participants
@JohnHalleyGotway @jprestop @hsoh-u @hertneky @davidalbo @DanielAdriaansen