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 'Peierls strain rate residual tolerance' #5609

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/sphinx/parameters/Material_20model.md
Original file line number Diff line number Diff line change
Expand Up @@ -3914,11 +3914,11 @@ If the function you are describing represents a vector-valued function with mult

(parameters:Material_20model/Visco_20Plastic/Peierls_20strain_20rate_20residual_20tolerance)=
### __Parameter name:__ Peierls strain rate residual tolerance
**Default value:** 1e-22
**Default value:** 1e-10

**Pattern:** [Double 0...MAX_DOUBLE (inclusive)]

**Documentation:** Tolerance for the iterative solve to find the correct Peierls creep strain rate.
**Documentation:** Tolerance for the iterative solve to find the correct Peierls creep strain rate. The tolerance is expressed as the difference between the natural logarithm of the input strain rate and the strain rate at the current iteration.

(parameters:Material_20model/Visco_20Plastic/Peierls_20stresses)=
### __Parameter name:__ Peierls stresses
Expand Down
7 changes: 6 additions & 1 deletion source/material_model/diffusion_dislocation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,12 @@ namespace aspect

// Viscosity iteration parameters
prm.declare_entry ("Strain rate residual tolerance", "1e-10", Patterns::Double(0.),
"Tolerance for determining the correct stress and viscosity from the strain rate by internal iteration. The tolerance is expressed as the difference between the natural logarithm of the input strain rate and the strain rate at the current iteration. This determines that strain rate is correctly partitioned between diffusion and dislocation creep assuming that both mechanisms experience the same stress.");
"Tolerance for determining the correct stress and viscosity from the "
"strain rate by internal iteration. The tolerance is expressed as the "
"difference between the natural logarithm of the input strain rate and "
"the strain rate at the current iteration. This determines that strain "
"rate is correctly partitioned between diffusion and dislocation creep "
"assuming that both mechanisms experience the same stress.");
prm.declare_entry ("Maximum strain rate ratio iterations", "40", Patterns::Integer(0),
"Maximum number of iterations to find the correct "
"diffusion/dislocation strain rate ratio.");
Expand Down
6 changes: 4 additions & 2 deletions source/material_model/rheology/peierls_creep.cc
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,10 @@ namespace aspect
"rather than stress. ");

// Viscosity iteration parameters
prm.declare_entry ("Peierls strain rate residual tolerance", "1e-22", Patterns::Double(0.),
"Tolerance for the iterative solve to find the correct Peierls creep strain rate.");
prm.declare_entry ("Peierls strain rate residual tolerance", "1e-10", Patterns::Double(0.),
"Tolerance for the iterative solve to find the correct Peierls creep strain rate. "
"The tolerance is expressed as the difference between the natural logarithm of the "
"input strain rate and the strain rate at the current iteration.");
prm.declare_entry ("Maximum Peierls strain rate iterations", "40", Patterns::Integer(0),
"Maximum number of iterations to find the correct "
"Peierls strain rate.");
Expand Down
4 changes: 2 additions & 2 deletions tests/visco_plastic_peierls_idrissi_exact.prm
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ subsection Material model
set Peierls fitting parameters = 0.15
set Peierls glide parameters p = 0.5
set Peierls glide parameters q = 2.0
set Peierls strain rate residual tolerance = 1e-6
set Maximum Peierls strain rate iterations = 40
set Peierls strain rate residual tolerance = 1e-6
set Maximum Peierls strain rate iterations = 40
end
end

Expand Down
4 changes: 2 additions & 2 deletions tests/visco_plastic_peierls_mei_exact.prm
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ subsection Material model
set Peierls fitting parameters = 0.15
set Peierls glide parameters p = 0.5
set Peierls glide parameters q = 1.0
set Peierls strain rate residual tolerance = 1e-12
set Maximum Peierls strain rate iterations = 40
set Peierls strain rate residual tolerance = 1e-12
set Maximum Peierls strain rate iterations = 40
end
end

Expand Down
4 changes: 2 additions & 2 deletions tests/visco_plastic_phases_peierls_mei_exact.prm
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ subsection Material model
set Peierls fitting parameters = 0.15
set Peierls glide parameters p = 0.5
set Peierls glide parameters q = 1.0
set Peierls strain rate residual tolerance = 1e-12
set Maximum Peierls strain rate iterations = 40
set Peierls strain rate residual tolerance = 1e-12
set Maximum Peierls strain rate iterations = 40
end
end

Expand Down
Loading