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.

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

Replace viscoplastic parameter with Enable elasticity #5225

Merged
merged 5 commits into from
Jul 9, 2023
Merged

Replace viscoplastic parameter with Enable elasticity #5225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
603a802
Replace viscoplastic input prm with Enable elasticity
anne-glerum Jul 9, 2023
2d3aea5
Remove parameter from prms
anne-glerum Jul 9, 2023
8de84ea
Remove internal material model parameter
anne-glerum Jul 9, 2023
9aaa8a5
Add changelog
anne-glerum Jul 9, 2023
297bcc3
Indent
anne-glerum Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions source/material_model/rheology/visco_plastic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,10 +592,6 @@ namespace aspect
"Using a pressure gradient of 32436 Pa/m, then a value of "
"0.3 K/km = 0.0003 K/m = 9.24e-09 K/Pa gives an earth-like adiabat."
"Units: \\si{\\kelvin\\per\\pascal}.");

prm.declare_entry ("Include viscoelasticity", "false",
Patterns::Bool (),
"Whether to include elastic effects in the rheological formulation.");
}


Expand All @@ -617,7 +613,7 @@ namespace aspect
friction_models.initialize_simulator (this->get_simulator());
friction_models.parse_parameters(prm);

use_elasticity = prm.get_bool ("Include viscoelasticity");
use_elasticity = this->get_parameters().enable_elasticity;
anne-glerum marked this conversation as resolved.
Show resolved Hide resolved

if (use_elasticity)
{
Expand Down
3 changes: 2 additions & 1 deletion source/material_model/visco_plastic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,8 @@ namespace aspect
"An implementation of an incompressible visco(elastic)-plastic rheology "
"with options for selecting dislocation creep, diffusion creep or "
"composite viscous flow laws. Prior to yielding, one may select to "
"modify the viscosity to account for viscoelastic effects. Plasticity "
"modify the viscosity to account for viscoelastic effects by setting the "
"parameter 'Enable elasticity' in subsection Formulation to true. Plasticity "
"limits viscous stresses through a Drucker Prager yield criterion. "
"The implementation of this material model is based heavily on the "
"`DiffusionDislocation' (Bob Myhill), `DruckerPrager' "
Expand Down