Add cutoff for dry/wet creep in water fugacity calculation #5808
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/rebuild |
danieldouglas92
force-pushed
the
add_cutoff_for_water_fugacity
branch
3 times, most recently
from
bd6c75c to
8b97479
Compare
naliboff
reviewed
Jun 6, 2024
There was a problem hiding this comment.
@danieldouglas92 - thanks for the fix. Only one small suggested change (capitalization change). If it would help to get this merged for other PRs you are working on today, I'm happy to approve and then just submit a follow-up PR fixing the capitalization (everything else looks correct).
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
danieldouglas92
force-pushed
the
add_cutoff_for_water_fugacity
branch
from
8b97479 to
0ae29c6
Compare
naliboff
approved these changes
Jun 6, 2024
|
@bobmyhill - this looks good from my end if you would like to take a final look before merging. |
bobmyhill
requested changes
Jun 6, 2024
There was a problem hiding this comment.
@danieldouglas92 the code is fine, but I think the user variable name is incorrect.
Also, the source code would be easier to read if the variable names followed the user variable names more closely. I've given some suggestions.
include/aspect/material_model/rheology/compositional_viscosity_prefactors.h
Outdated
Show resolved
Hide resolved
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
source/material_model/rheology/compositional_viscosity_prefactors.cc
Outdated
Show resolved
Hide resolved
danieldouglas92
force-pushed
the
add_cutoff_for_water_fugacity
branch
from
0ae29c6 to
bb0103d
Compare
danieldouglas92
force-pushed
the
add_cutoff_for_water_fugacity
branch
from
bb0103d to
dbaf378
Compare
bobmyhill
approved these changes
Jun 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that this PR is an extension of PR #5805, it takes the test implemented in that PR and modifies it slightly to serve as a test for the functionality implemented in this PR.
If there is 0 bound water in the model domain and the user tries using the HK04 olivine hydration viscosity prefactor scheme there is a divide by 0 error. In Hirth & Kohlstaedt 2004, they discuss that when the hydration state of olivine is below 50 H/Si ppm (6.15e-4 wt% water), olivine deformation is consistent with dry conditions, and above 6.15e-4 wt% water olivine deformation is consistent with wet conditions. This PR adds a user parameter that defines this cutoff between dry and wet deformation, with the default value representing the value discussed in Hirth & Kohlstaedt 2004.