Skip to content

Bugfix 2578 rotated latlon main v11.1 #2595

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
Merged
merged 6 commits into from
Jul 3, 2023
Merged

Bugfix 2578 rotated latlon main v11.1 #2595

merged 6 commits into from
Jul 3, 2023

Conversation

hsoh-u
Copy link
Collaborator

@hsoh-u hsoh-u commented Jun 29, 2023 •
edited
Loading

Expected Differences

  • Support swap_to_north option for rotated lat/lon projection

  • Allow extra space character around "since" for the time reference string, for example "hours since 2022-02-17 00:00:00" (two spaces after since)

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

/d1/personal/hsoh/git/pull_request/MET_bugfix_2578_rotated_latlon_main_v11.1/bin/plot_data_plane /d1/personal/hsoh/data/MET-2578/test_lfric_lam.nc rotated_latlon.ps 'name="t1p5m"; level="(*,*)";' -v 7
display rotated_latlon.ps

log messages before

DEBUG 4: NcCfFile::open() -> parsing units for the forecast_reference_time variable "hours since  2022-02-17 00:00:00"
WARNING:
WARNING: parse_cf_time_string() -> unexpected NetCDF CF convention time unit "hours since  2022-02-17 00:00:00"
WARNING:

log messages after

DEBUG 4: parse_cf_time_string() -> parsed NetCDF CF convention time unit string "hours since  2022-02-17 00:00:00"
DEBUG 4:                 as a reference time of 20220217_000000 and 3600 second(s) per time step.
...
DEBUG 2: NcCfFile::getData(NcVar *, const LongArray &, DataPlane &) const -> data was flipped to north.
  • Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:

I don't have other sample files.

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

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

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

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

  • Please complete this pull request review by [7/05/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.

@hsoh-u hsoh-u added the component: CI/CD Continuous integration and deployment issues label Jun 29, 2023
@hsoh-u hsoh-u added this to the MET 11.1.0 milestone Jun 29, 2023
@hsoh-u hsoh-u requested a review from jprestop June 29, 2023 23:20
@hsoh-u hsoh-u linked an issue Jun 29, 2023 that may be closed by this pull request
Bugfix: Fix reading of upside-down CF-compliant NetCDF Rotated Lat/Lon data #2578
Closed
22 tasks
@jprestop
Copy link
Collaborator

@hsoh-u I just wanted to let you know that I see that you assigned this to me for review. I see that one of the tests is failing, likely due to space issues that we talked about at the MET meeting. I have a PR in to try to resolve those issues. Then, we can re-run these tests and see if they pass. I'd feel more comfortable approving this PR after showing that all tests pass.

@jprestop
Copy link
Collaborator

jprestop commented Jul 3, 2023

@hsoh-u I just pulled the changes in main_v11.1 from my disk space PR into this branch and am rerunning the tests to see if they will all pass now. I just wanted to keep you up-to-date since I am touching your branch.

@jprestop
Copy link
Collaborator

jprestop commented Jul 3, 2023 •
edited
Loading

Sorry to post here again, but I saw the GitHub generated comment above that says "@jprestop
Merge branch 'main_v10.1' of github.com:dtcenter/MET into bugfix_2578…", which worries me, because I did nothing with main_v10.1, as you can see from the output of my screen below:

(base) jpresto@narya MET_development % mkdir MET-bugfix_2578_rotated_latlon_main_v11.1
(base) jpresto@narya MET_development % cd MET-bugfix_2578_rotated_latlon_main_v11.1
(base) jpresto@narya MET-bugfix_2578_rotated_latlon_main_v11.1 % git clone git@github.com:dtcenter/MET.git
Cloning into 'MET'...
remote: Enumerating objects: 107374, done.
remote: Counting objects: 100% (3056/3056), done.
remote: Compressing objects: 100% (1255/1255), done.
remote: Total 107374 (delta 2102), reused 2670 (delta 1799), pack-reused 104318
Receiving objects: 100% (107374/107374), 213.72 MiB | 2.59 MiB/s, done.
Resolving deltas: 100% (79910/79910), done.
Updating files: 100% (2795/2795), done.
(base) jpresto@narya MET-bugfix_2578_rotated_latlon_main_v11.1 % ls
MET
(base) jpresto@narya MET-bugfix_2578_rotated_latlon_main_v11.1 % cd MET
(base) jpresto@narya MET % git checkout bugfix_2578_rotated_latlon_main_v11.1
Branch 'bugfix_2578_rotated_latlon_main_v11.1' set up to track remote branch 'bugfix_2578_rotated_latlon_main_v11.1' from 'origin'.
Switched to a new branch 'bugfix_2578_rotated_latlon_main_v11.1'
(base) jpresto@narya MET % git pull origin main_v11.1
From github.com:dtcenter/MET
 * branch                main_v11.1 -> FETCH_HEAD
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Merge made by the 'recursive' strategy.
 .github/jobs/free_disk_space.sh | 15 +++++++++++++++
 .github/workflows/testing.yml   | 23 ++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100755 .github/jobs/free_disk_space.sh

jprestop
jprestop approved these changes Jul 3, 2023
View reviewed changes
Copy link
Collaborator

@jprestop jprestop left a comment

Choose a reason for hiding this comment

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

@hsoh-u I have reviewed the code changes and the output from your before and after runs. All of the tests are now passing, after pulling in the disk space modifications from main_v11.1. I approve this PR.

@hsoh-u hsoh-u merged commit 79f6afd into main_v11.1 Jul 3, 2023
@hsoh-u hsoh-u deleted the bugfix_2578_rotated_latlon_main_v11.1 branch July 3, 2023 17:01
@JohnHalleyGotway JohnHalleyGotway mentioned this pull request Jul 11, 2023
Closed
22 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jprestop jprestop jprestop approved these changes

Assignees
No one assigned
Labels
component: CI/CD Continuous integration and deployment issues
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.

Bugfix: Fix reading of upside-down CF-compliant NetCDF Rotated Lat/Lon data
2 participants
@hsoh-u @jprestop