Skip to content

Adds drying slope test case #335

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
Closed
pwolfram wants to merge 0 commits into from
Closed

Adds drying slope test case #335

pwolfram wants to merge 0 commits into from

Conversation

@pwolfram
Copy link
Contributor

@pwolfram pwolfram commented Aug 12, 2019

Includes comparison against data for
drying slope case from

Warner, J. C., Defne, Z., Haas, K., & Arango, H. G. (2013). A wetting
and drying scheme for ROMS. Computers & geosciences, 58, 54-61.

for r=0.0025 and r=0.01

Ensure appropriate tidal boundary forcing for wetting/drying.
Previously, tidal forcing could be used to artifically evacuate
a cell. Now, tidal forcing cannot be applied in such a way
to evacuate a cell. This requires, however, one to make sure the
tidal forcing applied is as expected.

Has a hybrid zstar/sigma coordinates for drying slope test case and
includes 1km and 250m resolutions.

sbrus89
sbrus89 reviewed Aug 13, 2019
View reviewed changes
@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 13, 2019

Quick note-- there is a bug related to 'weights_only' needing to be set. Will update in a few moments.

@pwolfram pwolfram force-pushed the coastal/add_drying_slope branch from 9e88dbb to 6f85b42 Compare August 13, 2019 14:53
@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 13, 2019

Done, update should work now.

@pwolfram pwolfram force-pushed the coastal/add_drying_slope branch from 6f85b42 to 49b3885 Compare August 13, 2019 15:38
@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 13, 2019

Testing

250m sigma

dryingslopecomparison

250m zstar

dryingslopecomparison

250m hybrid

Note, hybrid uses sigma near the shore for 10 layers.
dryingslopecomparison

@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 13, 2019

Note, thanks to @sbrus89 for setting up the hybrid case (commit history somehow got lost in rebasing).

@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 13, 2019

@sbrus89, can you please test on IC to make sure it works for you?

After that, @mark-petersen, this should be ready to merge pending your review.

@pwolfram pwolfram force-pushed the coastal/add_drying_slope branch from 49b3885 to 5e8f8ad Compare August 16, 2019 21:29
@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 16, 2019

Push was a typo in the setup of the sigma cases, which has now been fixed.

@pwolfram
Copy link
Contributor Author

pwolfram commented Aug 30, 2019

@mark-petersen, can you please review so we can get this merged in next week? I'd like to use this to test a variable drag implementation. We could also test the completed set there and just do a prelim merge here in the meantime, fixing any issue that arises on coastal as it may be found. Thanks!

mark-petersen
mark-petersen reviewed Sep 3, 2019
View reviewed changes
@mark-petersen
Copy link
Contributor

mark-petersen commented Sep 3, 2019

Other than the comment above, everything looks fine. I'm not testing your init_mode or COMPASS case. If you have tested it, that is fine with me.

@mark-petersen mark-petersen self-requested a review September 3, 2019 16:38
mark-petersen
mark-petersen approved these changes Sep 3, 2019
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.

looks good. Thanks.

@pwolfram pwolfram force-pushed the coastal/add_drying_slope branch from 5e8f8ad to 7bf61f6 Compare September 3, 2019 18:13
pwolfram added a commit that referenced this pull request Sep 3, 2019
@pwolfram
Merge #335 'coastal/add_drying_slope' into ocean/coastal
d4b7c17 
Adds drying slope test cases
@pwolfram pwolfram closed this Sep 3, 2019
@pwolfram pwolfram force-pushed the coastal/add_drying_slope branch from 7bf61f6 to cedcbd3 Compare September 3, 2019 19:21
@pwolfram
Copy link
Contributor Author

pwolfram commented Sep 3, 2019

Accidentally didn't update the PR before the merge, but ocean/coastal was correct and tested before being pushed.

The correct code was merged in but isn't listed as merged because pwolfram:coastal/add_drying_slope wasn't pushed following a rebase prior to the merge with ocean/coastal.

@pwolfram pwolfram deleted the coastal/add_drying_slope branch September 3, 2019 19:25
@mark-petersen mark-petersen mentioned this pull request Oct 18, 2019
Merged
mark-petersen added a commit that referenced this pull request Oct 19, 2019
@mark-petersen
Merge branch 'ocean/coastal' into ocean/develop
aec7316 
This PR is an accumulation of PRs into the ocean/coastal branch. We are
bringing them in at once for efficiency:
 #285, #289, #284, #295, #310, #311, #312, #335, #354, #356, #358, #359,
 #365, #371
mark-petersen added a commit that referenced this pull request Oct 19, 2019
@mark-petersen
Merge branch 'ocean/develop' into e3sm/develop
75d4cd0 
This PR is an accumulation of PRs into the ocean/coastal branch. We are
bringing them in at once for efficiency.
 #285, #289, #284, #295, #310, #311, #312, #335, #354, #356, #358, #359,
 #365, #371
ashwathsv pushed a commit to ashwathsv/MPAS-Model that referenced this pull request Jul 21, 2020
@pwolfram
Merge MPAS-Dev#335 'coastal/add_drying_slope' into ocean/coastal
3c10210 
Adds drying slope test cases
ashwathsv pushed a commit to ashwathsv/MPAS-Model that referenced this pull request Jul 21, 2020
@mark-petersen
Merge branch 'ocean/coastal' into ocean/develop
5663fac 
This PR is an accumulation of PRs into the ocean/coastal branch. We are
bringing them in at once for efficiency:
 MPAS-Dev#285, MPAS-Dev#289, MPAS-Dev#284, MPAS-Dev#295, MPAS-Dev#310, MPAS-Dev#311, MPAS-Dev#312, MPAS-Dev#335, MPAS-Dev#354, MPAS-Dev#356, MPAS-Dev#358, MPAS-Dev#359,
 MPAS-Dev#365, MPAS-Dev#371
mark-petersen added a commit to mark-petersen/MPAS-Model that referenced this pull request Jan 11, 2021
@mark-petersen
Merge branch 'ocean/coastal' into ocean/develop
3a4dc06 
This PR is an accumulation of PRs into the ocean/coastal branch. We are
bringing them in at once for efficiency:
 MPAS-Dev#285, MPAS-Dev#289, MPAS-Dev#284, MPAS-Dev#295, MPAS-Dev#310, MPAS-Dev#311, MPAS-Dev#312, MPAS-Dev#335, MPAS-Dev#354, MPAS-Dev#356, MPAS-Dev#358, MPAS-Dev#359,
 MPAS-Dev#365, MPAS-Dev#371
caozd999 pushed a commit to caozd999/MPAS-Model that referenced this pull request Jan 14, 2021
@mark-petersen
Merge branch 'ocean/coastal' into ocean/develop
18c60ee 
This PR is an accumulation of PRs into the ocean/coastal branch. We are
bringing them in at once for efficiency:
 MPAS-Dev#285, MPAS-Dev#289, MPAS-Dev#284, MPAS-Dev#295, MPAS-Dev#310, MPAS-Dev#311, MPAS-Dev#312, MPAS-Dev#335, MPAS-Dev#354, MPAS-Dev#356, MPAS-Dev#358, MPAS-Dev#359,
 MPAS-Dev#365, MPAS-Dev#371
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

@sbrus89 sbrus89 sbrus89 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

coastal COMPASS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pwolfram @mark-petersen @sbrus89 @matthewhoffman