-
Notifications
You must be signed in to change notification settings - Fork 338
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
Adds wetting and drying capabilities to RK4 with dam break #54
Adds wetting and drying capabilities to RK4 with dam break #54
Conversation
@mark-petersen, a good place to start is Some helpful notebooks are at Wetting and Drying, e.g., RK4: https://gist.github.com/bb25228c13a8034f0e882246c5040e2e |
Wetting and drying for RK4 is needed for #171. We should merge that commit here instead for the first PR of wetting and drying for simplicity. |
Note, RK4 has a bug that appears resolved by #137. |
Old archived branch is |
@xylar and @mark-petersen, the plan here is to bring in RK4 for the dam break problem as a first cut to keep the analysis and review cleaner and then progressively add more wetting and drying cases and features via new PRs. If there is a most time-efficient and clearer approach please recommend it! |
@pwolfram, this seems like a reasonable way to proceed to me. But it looks like this PR needs to be rebased and a lot of commits should be squashed or otherwise cleaned up before this is ready to review. Let me know when this needs further testing or attention. I'm away both this week and next so won't be able to review until the week of the 15th. |
Pushed previous work to |
e20db20
to
09f806c
Compare
@xylar and @mark-petersen, this demonstrates a simple element of wetting and drying and is a good starting point for a review and test of its minimal capabilities. The key thing here is that this test fails without wetting and drying and is compared against laboratory data and ROMS thanks to @caozd999 |
@caozd999 did a review and should be added to the reviewers' list so that he can confirm his review and post his results. @mark-petersen, can you please add him so that he can do a review? |
Note, at present the station 8A deviation is due to implementation of the boundary condition. Warner et al (2013) allow the flow to fall out of the domain so there is no pressure gradient on the boundary of the box whereas we use a large domain so water "bunches" up more at 8A outside the dam break region. |
@pwolfram, I believe we discussed that the oscillations in MPAS-O might be due to pressure-gradient errors, and we speculated that these might be reduced with a higher-order treatment. Is that still your best guess? They don't worry me at all, but it may suggest that we can't push the layers too thin with the current method for computing the pressure gradient. |
@xylar, you are correct. I'm thinking it is worth documenting this in this PR to note the following things:
@xylar, @mark-petersen, @caozd999 please comment on this page with any other comments and I'll incorporate this into the readme for the test case. I'm thinking it should go in the root level underneath |
@xylar and @mark-petersen, just want to be clear here that I would view this PR as sufficiently complete to be merged. Note, it does depend on #137 for long run times but that PR is almost complete as far as I can tell. Thanks! |
76c1339
to
8bb4f03
Compare
@xylar and @mark-petersen, I know you need this work for ProSPECT (cc @stephenprice) and it has been sitting way too long on account of me. I've pushed up clean changes (and verify it works) and it should be ready for you now. |
8bb4f03
to
6b3fc03
Compare
Digitized and script written by Zhendong Cao from Warner, J. C., Defne, Z., Haas, K., & Arango, H. G. (2013). A wetting and drying scheme for ROMS. Computers & geosciences, 58, 54-61. Comparisons are made against laboratory observations and ROMS output detailed in Warner et al (2013).
6b3fc03
to
4ac7cec
Compare
Please let me know if you would like any changes before a merge. |
@pwolfram, I would like to review this but I don't have time right now. Are you feeling an urgent need to merge this? Also, I think @mark-petersen is coordinating all merges into |
@mark-petersen, thank you. I've compiled and run the case with DEBUG=true and it produces the output as expected. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good thanks!
Adds simple RK4-based wetting and drying with testing via a dam break case against laboratory and ROMS data. The old stub description is below: Adds wetting and drying capabilities to MPAS-Ocean (work in progress). This is a work in progress.
Includes: 1. LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56 2. clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164 3. merge coastal branch: MPAS-Dev/MPAS-Model#54 4. CONUS mesh update: MPAS-Dev/MPAS-Model#201 5. Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229 6. Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156 7. PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212 These changes do not alter E3SM standard cases or testing on next. COMPASS is the MPAS testing infrastructure. LIGHT and coastal changes are protected by flags and not used in normal E3SM tests.
Update mpas source This PR update the mpas-source git submodule but only includes changes that will not impact E3SM. These changes include: * LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56 * clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164 * merge coastal branch: MPAS-Dev/MPAS-Model#54 * CONUS mesh update: MPAS-Dev/MPAS-Model#201 * Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229 * Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156 * PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212 These changes do not alter E3SM standard cases or tested configurations. COMPASS is the MPAS testing infrastructure. LIGHT and coastal changes are protected by flags and not used in normal E3SM tests. [NML] [BFB]
Update mpas source This PR update the mpas-source git submodule but only includes changes that will not impact E3SM. These changes include: * LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56 * clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164 * merge coastal branch: MPAS-Dev/MPAS-Model#54 * CONUS mesh update: MPAS-Dev/MPAS-Model#201 * Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229 * Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156 * PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212 These changes do not alter E3SM standard cases or tested configurations. COMPASS is the MPAS testing infrastructure. LIGHT and coastal changes are protected by flags and not used in normal E3SM tests. [NML] [BFB]
…astal Adds simple RK4-based wetting and drying with testing via a dam break case against laboratory and ROMS data. The old stub description is below: Adds wetting and drying capabilities to MPAS-Ocean (work in progress). This is a work in progress.
…astal Adds simple RK4-based wetting and drying with testing via a dam break case against laboratory and ROMS data. The old stub description is below: Adds wetting and drying capabilities to MPAS-Ocean (work in progress). This is a work in progress.
…astal Adds simple RK4-based wetting and drying with testing via a dam break case against laboratory and ROMS data. The old stub description is below: Adds wetting and drying capabilities to MPAS-Ocean (work in progress). This is a work in progress.
Adds simple RK4-based wetting and drying with testing via a dam break case against laboratory and ROMS data. This is a work in progress.