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

Fix base model initialization for depth dependent material model #2253

Merged

Conversation

gassmoeller
Copy link
Member

This should fix #2250. The depth dependent material model did not initialize or update its base model, which is fine for most material models, but not for the ones that require initialization (like ascii reference profile). This is now done correctly, and at the same time allows to prescribe time-dependent viscosity functions.

Copy link
Contributor

@jdannberg jdannberg left a comment

Choose a reason for hiding this comment

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

Very nice, thank you! If you update the comments in the test files as indicated, you can merge yourself as soon as the tests pass.

# Test depth-dependent material model using simple material model as
# base model with depth-dependence specified by user-provided function

# A description of convection in a 2d box. See the manual for more information.
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like this is copied from somewhere. Can you either remove it, or just say which test/benchmark you copied?

@@ -0,0 +1,175 @@
# Test depth-dependent material model using simple material model as
# base model with depth-dependence specified by user-provided function
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you say that this tests the time dependence of the function in the depth dependent material model?

# A test using adiabatic conditions and a gravity
# profile generated by a mineral physics toolkit and read in
# through an ascii data file. In this example, material properties
# are based on a Birch-Murnaghan equation of state.
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you update this comment?

@bangerth
Copy link
Contributor

+1 -- obscure bug not easy to figure out!

@gassmoeller gassmoeller force-pushed the fix_depth_dependent_initialization branch from cf87602 to d29daa4 Compare May 21, 2018 17:25
@gassmoeller gassmoeller merged commit 1490ab4 into geodynamics:master May 21, 2018
@gassmoeller gassmoeller deleted the fix_depth_dependent_initialization branch May 21, 2018 18:42
@gassmoeller gassmoeller mentioned this pull request May 22, 2018
gassmoeller added a commit that referenced this pull request Jun 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AsciiDataLookup error when using the 'Ascii reference profile' and 'Depth dependent' material models
3 participants