[GeoMechanicsApplication] Support residual_criterion in c++ interface #11833
Conversation
… usable in the factory (and other factories)
|
|
||
| for (const std::string& entry : rNamesOfParametersToCopy) | ||
| { | ||
| if (rSourceParameters.Has(entry)) | ||
| { | ||
| result.AddValue(entry, rSourceParameters[entry]); | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| } |
There was a problem hiding this comment.
Good that this is now shared i.s.o. copied.
applications/GeoMechanicsApplication/custom_utilities/convergence_criteria_factory.hpp
Outdated
Show resolved
Hide resolved
| const std::vector<std::string> entries_to_copy = { | ||
| "displacement_absolute_tolerance", | ||
| "displacement_relative_tolerance"}; | ||
| Parameters convergence_inputs = ParametersUtilities::ExtractParameters(rSolverSettings, entries_to_copy); |
There was a problem hiding this comment.
I would make this variable const:
| Parameters convergence_inputs = ParametersUtilities::ExtractParameters(rSolverSettings, entries_to_copy); | |
| const auto convergence_inputs = ParametersUtilities::ExtractParameters(rSolverSettings, entries_to_copy); |
There was a problem hiding this comment.
Done, for some other constructors this was not possible, but here it seems okay
applications/GeoMechanicsApplication/custom_utilities/convergence_criteria_factory.hpp
Outdated
Show resolved
Hide resolved
applications/GeoMechanicsApplication/custom_utilities/convergence_criteria_factory.hpp
Outdated
Show resolved
Hide resolved
|
|
||
| for (const std::string& entry : rNamesOfParametersToCopy) | ||
| { | ||
| if (rSourceParameters.Has(entry)) | ||
| { | ||
| result.AddValue(entry, rSourceParameters[entry]); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Now that we have changed the behavior of this function, I'm pondering whether we should rename it to indicate that it will only copy parameters that exist in rSourceParameters. The supplied parameter names don't have to be present there and they are silently skipped if they don't. The only suggestion that comes to my mind now is CopyOptionalParameters. (Its counterpart could then be named CopyRequiredParameters.) What do you think?
There was a problem hiding this comment.
Good suggestion, I brought back the old function so we can use both
This PR adds support for another convergence criterion, including the following changes: