From d247dbb5ea33958d7431fbf7e939f3e6137eb59c Mon Sep 17 00:00:00 2001 From: danieldouglas92 Date: Wed, 20 Mar 2024 12:22:22 -0600 Subject: [PATCH] Change default value of Peierls strain rate residual tolerance, update doc --- doc/sphinx/parameters/Material_20model.md | 4 ++-- source/material_model/diffusion_dislocation.cc | 7 ++++++- source/material_model/rheology/peierls_creep.cc | 6 ++++-- tests/visco_plastic_peierls_idrissi_exact.prm | 4 ++-- tests/visco_plastic_peierls_mei_exact.prm | 4 ++-- tests/visco_plastic_phases_peierls_mei_exact.prm | 4 ++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/doc/sphinx/parameters/Material_20model.md b/doc/sphinx/parameters/Material_20model.md index 6c68ce7537d..ebd60e58bbc 100644 --- a/doc/sphinx/parameters/Material_20model.md +++ b/doc/sphinx/parameters/Material_20model.md @@ -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 diff --git a/source/material_model/diffusion_dislocation.cc b/source/material_model/diffusion_dislocation.cc index 7790424907c..34d589725aa 100644 --- a/source/material_model/diffusion_dislocation.cc +++ b/source/material_model/diffusion_dislocation.cc @@ -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."); diff --git a/source/material_model/rheology/peierls_creep.cc b/source/material_model/rheology/peierls_creep.cc index a69520e43a3..ab1fa70666e 100644 --- a/source/material_model/rheology/peierls_creep.cc +++ b/source/material_model/rheology/peierls_creep.cc @@ -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."); diff --git a/tests/visco_plastic_peierls_idrissi_exact.prm b/tests/visco_plastic_peierls_idrissi_exact.prm index edaf238f373..400d651f3b8 100644 --- a/tests/visco_plastic_peierls_idrissi_exact.prm +++ b/tests/visco_plastic_peierls_idrissi_exact.prm @@ -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 diff --git a/tests/visco_plastic_peierls_mei_exact.prm b/tests/visco_plastic_peierls_mei_exact.prm index 29abe009952..f4ef1471c41 100644 --- a/tests/visco_plastic_peierls_mei_exact.prm +++ b/tests/visco_plastic_peierls_mei_exact.prm @@ -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 diff --git a/tests/visco_plastic_phases_peierls_mei_exact.prm b/tests/visco_plastic_phases_peierls_mei_exact.prm index a53ea08bafb..3804c4fab33 100644 --- a/tests/visco_plastic_phases_peierls_mei_exact.prm +++ b/tests/visco_plastic_phases_peierls_mei_exact.prm @@ -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