Some improvement in SolidModels #2160
Merged
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
Member
wenqing
commented
Jul 10, 2018
•
wenqing
commented
- Moved createNewtonRaphsonSolverParameters to new files to avoid code duplication.
- Introduced createConstitutiveRelation to remove code duplication.
- Removed three unnecessarily defined -impl.h files.
chleh
approved these changes
Jul 10, 2018
| BaseLib::ConfigTree const& config) | ||
| { | ||
| // Constitutive relation. | ||
| // read type; |
| constitutive_relation_config.peekConfigParameter<std::string>("type"); | ||
|
|
||
| std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>> | ||
| material = nullptr; |
There was a problem hiding this comment.
nullptr as already the default.
| material = nullptr; | ||
| if (type == "Ehlers") | ||
| { | ||
| material = MaterialLib::Solids::Ehlers::createEhlers<DisplacementDim>( |
There was a problem hiding this comment.
Minor: You could just return MaterialLib::Solids::Ehlers::createEhlers<DisplacementDim>(...
There was a problem hiding this comment.
Changed according by amending the second commit.
| "Cannot construct constitutive relation of given type \'%s\'.", | ||
| type.c_str()); | ||
| } | ||
| return nullptr; |
There was a problem hiding this comment.
@chleh Yes, the last commit just moves code and dumps three -impl.h files.
wenqing
force-pushed
the
m_solid
branch
4 times, most recently
from
7549882 to
54c3419
Compare
endJunction
reviewed
Jul 10, 2018
| @@ -0,0 +1,49 @@ | |||
| /** | |||
| * \copyright | |||
| * Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org) | |||
There was a problem hiding this comment.
Corrected by amending the 2nd commit.
endJunction
reviewed
Jul 10, 2018
| @@ -0,0 +1,28 @@ | |||
| /** | |||
| * \copyright | |||
| * Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org) | |||
There was a problem hiding this comment.
Corrected by amending the 1st commit
…avoid code duplication
wenqing
force-pushed
the
m_solid
branch
2 times, most recently
from
fa8520f to
fb0e86d
Compare
|
OpenGeoSys development has been moved to GitLab. |
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.