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

Update MALI to use new Albany basal friction law #3032

Merged
merged 3 commits into from
Sep 23, 2019

Conversation

matthewhoffman
Copy link
Contributor

@matthewhoffman matthewhoffman commented Jun 28, 2019

This merge updates MPAS source code to use the updated basal friction
law from Albany. This is a Schoof-type basal friction law that accounts
for subglacial water pressure.

[BFB] for compsets without active ice sheet
[Non-BFB] for compsets with active MALI component
[NML]

@rljacob
Copy link
Member

rljacob commented Jul 1, 2019

Is this really BFB? even with an ice-sheet test?

@matthewhoffman
Copy link
Contributor Author

@rljacob , no, this is only BFB for "standard" compsets that do not include active ice sheets. I've updated the description to be more explicit - it wasn't clear to me how to handle this sort of situation.

@rljacob rljacob added the non-BFB PR makes roundoff changes to answers. label Jul 2, 2019
@rljacob
Copy link
Member

rljacob commented Jul 2, 2019

If its non-BFB for any test or case, I like to label the PR as non-BFB but you can add a comment with details as you did above. When we later search for non-BFB PRs, its good to have ones with any change included.

@rljacob rljacob added this to the v2.0alpha milestone Jul 11, 2019
@rljacob
Copy link
Member

rljacob commented Jul 25, 2019

Is this a v2 feature? If so, it needs a code review document on confluence.

@jonbob
Copy link
Contributor

jonbob commented Jul 25, 2019

@matthewhoffman - I think this PR will require a code review document

@matthewhoffman matthewhoffman force-pushed the matthewhoffman/mali/update_basal_friction branch from 4afb439 to 1c01388 Compare August 19, 2019 19:48
@rljacob
Copy link
Member

rljacob commented Aug 26, 2019

matthewhoffman and others added 3 commits September 16, 2019 15:17
This commit updates MPAS source code to use the updated basal friction
law from Albany.  This is a Schoof-type basal friction law that accounts
for subglacial water pressure.

[Non-BFB] for compsets with active MALI component
[NML]
@matthewhoffman matthewhoffman force-pushed the matthewhoffman/mali/update_basal_friction branch from 89b09fe to a6ced9d Compare September 16, 2019 21:19
@jonbob
Copy link
Contributor

jonbob commented Sep 19, 2019

A MALI test is included in the e3sm_integration suite, which is tested for baselines on sandiatoss3 and for machine coverage on anvil, compy, bebop and theta. Note that the MALI test currently passes only on sandiatoss3 and bebop. This PR updates the version of MALI on sandiatoss3 and cori, so for purposes of testing I've focused on cori. A test merge shows these results:

  • SMS.f09_g16_a.MALI.cori-knl_intel PASS
  • ERS.f09_g16_g.MALISIA.cori-knl_intel PASS
  • SMS.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_intel PASS
  • SMS.f09_g16_a.MALI.cori-knl_gnu FAIL (no library for gnu)

@rljacob - we would still like to merge this PR today. MALI is not part of any upcoming simulation plans, so its absence on some platforms will not hold up progress.

Copy link
Contributor

@jonbob jonbob left a comment

Choose a reason for hiding this comment

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

OK'd from visual inspection and cori-knl testing

@rljacob
Copy link
Member

rljacob commented Sep 19, 2019

Go ahead.

jonbob added a commit that referenced this pull request Sep 19, 2019
…#3032)

Update MALI to use new Albany basal friction law

This merge updates MPAS source code to use the updated basal friction
law from Albany. This is a Schoof-type basal friction law that accounts
for subglacial water pressure.

[NML]
[BFB] for compsets without active ice sheet
[Non-BFB] for compsets with active MALI component
@jonbob
Copy link
Contributor

jonbob commented Sep 19, 2019

merged to next

jonbob added a commit that referenced this pull request Sep 23, 2019
Update MALI to use new Albany basal friction law

This merge updates MPAS source code to use the updated basal friction
law from Albany. This is a Schoof-type basal friction law that accounts
for subglacial water pressure.

[NML]
[BFB] for compsets without active ice sheet
[Non-BFB] for compsets with active MALI component
@jonbob jonbob merged commit a6ced9d into master Sep 23, 2019
@jonbob
Copy link
Contributor

jonbob commented Sep 23, 2019

merged to master and expected NML DIFF's blessed

@jonbob jonbob deleted the matthewhoffman/mali/update_basal_friction branch September 23, 2019 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mpas-albany-landice non-BFB PR makes roundoff changes to answers.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants