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 348 dmap reformat #354

Merged
merged 79 commits into from
Dec 13, 2024
Merged

Feature 348 dmap reformat #354

merged 79 commits into from
Dec 13, 2024

Conversation

bikegeek
Copy link
Collaborator

@bikegeek bikegeek commented Dec 9, 2024

Pull Request Testing

  • Describe testing already performed for these changes:

  • manually compiled docs and verified no warnings, errors and content is as expected

  • ran all the METreformat tests for DMAP and verified all tests pass

  • generated simple scatter, line, and contour plots using METplotpy using DMAP output

verified that current tests are passing as a result of updates:

  • updated the ECNT tests and data (now using latest ensemble stat output)

  • fixed any affected tests

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

For @jprestop:

  • verify all tests pass
  • evaluate documentation for clarity of instructions

For @CPKalb:

  • verify all tests pass
  • reformat DMAP output for generating a line plot
  • reformat DMAP output for generating a scatter plot
  • generate one or both plot types using the appropriate reformatted data:
    - verify line plot can be generated (limited data, so not much to plot)
    - verify scatter plot can be generated (limited data, not much to plot)

Reformatting

Run the code on 'seneca':
METdataio (feature_348_dmap_reformat)
METcalcpy (develop)
METplotpy (feature_23_scatter) - not yet merged, refactored for Land Project

conda environment used
(permissions on conda and env are set up for anyone to use)
/d1/personal/mwin/miniconda3/condabin/conda activate /d1/personal/mwin/miniconda3/envs/mp_analysis_env

setting up PYTHONPATH

(also sets $DATAIO_BASE, $CALCPY_BASE, and $PLOTPY_BASE env vars)

  • cd /d1/projects/NRL_DMAP
  • switch to bash shell
  • source setup_env.bash

Location:
/d1/projects/NRL_DMAP/

Reformat the DMAP linetype data for scatter plot and line plot:

For scatter plot format:
python $DATAIO_BASE/METreformat/write_stat_ascii.py $DATAIO_BASE/METreformat/reformat_dmap_for_scatter.yaml

File called reformat_dmap_for_scatter.data is created in the $DATAIO_BASE/METreformat/output directory

For line plot format:
**python $DATAIO_BASE/METreformat/write_stat_ascii.py $DATAIO_BASE/METreformat/reformat_dmap_for_line.yaml**

File called reformat_dmap_for_line.scatter is created in the $DATAIO_BASE/METreformat/output directory

Generate line or scatter plot to verify that reformatted files can be used by METplotpy

line plot:

python $PLOTPY_BASE/metplotpy/plots/line/line.py $PLOTPY_BASE/metplotpy/plots/line/custom_line.yaml

Creates the line_from_dmap.png file in $PLOTPY_BASE/metplotpy/plots/line

scatter plot:

python $PLOTPY_BASE/metplotpy/plots/scatter/scatter.py $PLOTPY_BASE/metplotpy/plots/scatter/dmap_scatter.yaml

Creates the scatter_dmap.png file in $PLOTPY_BASE/metplotpy/plots/scatter

  • 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? [NA]

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

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

  • Do these changes introduce new SonarQube findings? [No]

    If yes, please describe:

  • Please complete this pull request review by earliest convenience.

Pull Request Checklist

See the METplus Workflow for details.

  • Add any new Python packages to the METplus Components Python Requirements table.
  • 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) and Development issue
    Select: Milestone as the version that will include these changes
    Select: Coordinated METplus-X.Y Support project for bugfix releases or METdataio-X.Y.Z Development project for official releases
  • After submitting the PR, select the ⚙️ icon in the Development section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
  • 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.

bikegeek and others added 30 commits November 14, 2024 13:23
…e tests when changes are pushed to main_vX.Y and develop branches
…an be used for scatter plots, line plots, and contour plots
… TCMPR data, and aggregation statistics data
…000V.stat

no longer relevant due to additional columns introduced in one of the beta releases
bikegeek and others added 16 commits December 10, 2024 16:43
updated MET tool names from lower case to camel case with '-' in between the two words
Replace text version of table references to links to the MET User's Guide
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.

@bikegeek Thanks for getting that cleaned up! I approve this request with regard to the documentation. Thanks for all of your work on this task!

@CPKalb
Copy link

CPKalb commented Dec 12, 2024

Do you have examples of what the output graphics should look like? I was able to generate the images but want to make sure I'm getting the expected results.

@bikegeek
Copy link
Collaborator Author

bikegeek commented Dec 12, 2024 via email

Copy link

@CPKalb CPKalb left a comment

Choose a reason for hiding this comment

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

Ran the reformatter and plots, and was able to successfully generate the expected results.

@bikegeek bikegeek changed the base branch from develop to main_v3.1 December 13, 2024 15:11
@bikegeek bikegeek merged commit 74d1443 into main_v3.1 Dec 13, 2024
10 checks passed
@bikegeek bikegeek deleted the feature_348_dmap_reformat branch December 13, 2024 15:11
@jprestop
Copy link
Collaborator

@bikegeek I see this issue was merged into a main_v3.1 branch. Should that have been the main_v3.0 branch and the develop branch? I'm confused because I think we shouldn't have a main_v3.1 branch yet. Maybe I do not fully understand the process?

@bikegeek
Copy link
Collaborator Author

bikegeek commented Dec 13, 2024 via email

@jprestop
Copy link
Collaborator

jprestop commented Dec 13, 2024

@bikegeek I believe there should only be a develop branch at this time and not a main_v3.1 branch.

According to the release instructions, main_v3.1 should be created only when we're creating the 3.1.0-rc1 release and not prior to. These instructions are all new since this last 3.0.0-rc1 release and I know it's a bit confusing.

I believe we need to merge main_v3.1 into develop and delete main_v3.1 now.

@bikegeek
Copy link
Collaborator Author

bikegeek commented Dec 13, 2024 via email

@bikegeek bikegeek restored the feature_348_dmap_reformat branch December 13, 2024 17:22
@jprestop
Copy link
Collaborator

@bikegeek Thanks for the question. The main_v3.0 branch is the branch that will become the coordinated release. The current develop branch is intended for development for v3.1.0. Anything that you want to go into v3.1.0 should go into develop. Anything you want in BOTH the coordinated release AND 3.1.0 should go into both main_v3.0 and develop. Hopefully, this feature branch feature_348_dmap_reformat was created off of develop. It sounds like you do not want these changes in the 3.0.0 coordinated release, but into the 3.1.0 coordinated release, so they should be merged into develop. I'll schedule a quick call for now for you, me, @JohnHalleyGotway, and @georgemccabe to ensure we're all on the same page and work through any questions. It's a bit confusing having switched our methods in the last rc1 release.

@bikegeek bikegeek deleted the feature_348_dmap_reformat branch December 19, 2024 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🏁 Done
Development

Successfully merging this pull request may close these issues.

Provide reformatting for the DMAP line type and any associated plots
4 participants