Skip to content

Fix several broken COMPASS test cases #514

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
mark-petersen merged 5 commits into from
Apr 10, 2020
Merged

Fix several broken COMPASS test cases #514

mark-petersen merged 5 commits into from
Apr 10, 2020

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Apr 8, 2020 •
edited
Loading

Several ocean test cases were not setting up successfully from COMPASS. Some of these are due to recent changes, while others are due to the test cases not being updated as the switch was made from the old JIGSAW-Matlab interface to the new conda environment with jigsawpy. With this merge, all available ocean test cases should set up successfully in COMPASS, while those that are broken have been moved into a broken subdirectory so the COMPASS tools no longer detect them.

Test cases that have been fixed:

 40: -o ocean -c Gaussian_hump -r USDEQU120cr10rr2 -t build_mesh
 49: -o ocean -c coastal -r Maine -t init
 50: -o ocean -c coastal -r USDEQU120cr10rr2 -t build_mesh
 85: -o ocean -c hurricane -r USDEQU120at30cr10rr2 -t build_mesh
 87: -o ocean -c hurricane -r USDEQU60at15cr5rr1 -t build_mesh

 53: -o ocean -c drying_slope -r hybrid -t 1km
 54: -o ocean -c drying_slope -r hybrid -t 250m
 57: -o ocean -c drying_slope -r sigma -t 1km
 58: -o ocean -c drying_slope -r sigma -t 250m
 59: -o ocean -c drying_slope -r zstar -t 1km
 60: -o ocean -c drying_slope -r zstar -t 250m
 131: -o ocean -c surface_waves -r direct -t 1km
 132: -o ocean -c surface_waves -r thickness_source -t 1km

Tests that have been marked as "broken":

  • soma/8km/32to8km --> soma/8km/broken/32to8km/
  • soma/4km/32to4km --> soma/4km/broken/32to4km/

closes #517

xylar added 3 commits April 8, 2020 09:08
@xylar
Move soma/Xkm/32toXkm test cases to "broken"
76da530 
This merge moves soma/4km/32to4km and soma/8km/32to8km test cases
into a new subdirectory called "broken" since these test cases are
not working and won't be fixed anytime soon.  With this change,
`./list_testcases.py` and `./setup_testcases.py` won't pick up
these tests because their driver config files aren't at the
expected directory level.
@xylar
Add missing define_vertical_trid.py links
925da04 
The Maine, QU60 and SOQU60to15 test cases now have the links to
the python script for defining their vertical grids that they need
to be set up successfully.
@xylar
Use conda env gpmetis for surface_waves/thickness_source/1km
933ec42 
We no longer define a path to metis in the config file, so the
version from the conda environment needs to be used instead.
@xylar xylar requested review from mark-petersen and pwolfram April 8, 2020 15:23
@xylar
Copy link
Collaborator Author

xylar commented Apr 8, 2020

This PR is a temporary fix to #233 in that it "disables" these test cases.

@xylar
Copy link
Collaborator Author

xylar commented Apr 8, 2020 •
edited
Loading

Doing a little detective work, it looks like surface_waves/thickness_source/1km was fixed 11 months ago in #229 but then broken again 10 months ago as part of #284.

@xylar
Copy link
Collaborator Author

xylar commented Apr 8, 2020

@pwolfram, could you approve this PR just saying that you're okay with me moving those 2 test cases to broken that we already discussed, and let me know if you're good with the metis/gpmetis fix to surface_waves/thickness_source/1km?

pwolfram
pwolfram approved these changes Apr 8, 2020
View reviewed changes
Copy link
Contributor

@pwolfram pwolfram left a comment

Choose a reason for hiding this comment

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

Accepted by inspection-- I agree with @xylar about moving broken test cases until they can be fixed.

@xylar xylar mentioned this pull request Apr 8, 2020
Closed
@xylar xylar changed the title Ocean/fix compass setup Fix COMPASS test cases that were failing during setup Apr 8, 2020
@pwolfram
Copy link
Contributor

pwolfram commented Apr 8, 2020

To clarify, as I understand it, the issue breaking things in #284 was use of ./metis vs gpmetis.

@xylar
Copy link
Collaborator Author

xylar commented Apr 8, 2020

Correct, and the attempt to get metis from the config file.

xylar added 2 commits April 9, 2020 17:01
@xylar xylar changed the title Fix COMPASS test cases that were failing during setup Fix several broken COMPASS test cases Apr 9, 2020
@xylar xylar mentioned this pull request Apr 9, 2020
Merged
mark-petersen
mark-petersen approved these changes Apr 10, 2020
View reviewed changes
Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Thanks for the clean-up.

@mark-petersen mark-petersen merged commit 60470a0 into MPAS-Dev:ocean/develop Apr 10, 2020
@xylar xylar deleted the ocean/fix_compass_setup branch April 10, 2020 18:39
@xylar xylar mentioned this pull request May 7, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mark-petersen mark-petersen mark-petersen approved these changes

+1 more reviewer

@pwolfram pwolfram pwolfram approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mark-petersen mark-petersen

Labels

bug COMPASS Ocean

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@xylar @pwolfram @mark-petersen @matthewhoffman