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

Some improvement in SolidModels #2160

Merged
merged 3 commits into from Jul 11, 2018

Conversation

Projects
None yet
3 participants
@wenqing
Copy link
Member

wenqing commented Jul 10, 2018

  • Moved createNewtonRaphsonSolverParameters to new files to avoid code duplication.
  • Introduced createConstitutiveRelation to remove code duplication.
  • Removed three unnecessarily defined -impl.h files.

@wenqing wenqing force-pushed the wenqing:m_solid branch from a991337 to 4bf5d43 Jul 10, 2018

@chleh

chleh approved these changes Jul 10, 2018

Copy link
Collaborator

chleh left a comment

Only minor things. I assume, the last commit only moves code.

BaseLib::ConfigTree const& config)
{
// Constitutive relation.
// read type;

This comment has been minimized.

@chleh

chleh Jul 10, 2018

Collaborator

not necessary.

This comment has been minimized.

@wenqing

wenqing Jul 10, 2018

Author Member

removed.

constitutive_relation_config.peekConfigParameter<std::string>("type");

std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>
material = nullptr;

This comment has been minimized.

@chleh

chleh Jul 10, 2018

Collaborator

nullptr as already the default.

material = nullptr;
if (type == "Ehlers")
{
material = MaterialLib::Solids::Ehlers::createEhlers<DisplacementDim>(

This comment has been minimized.

@chleh

chleh Jul 10, 2018

Collaborator

Minor: You could just return MaterialLib::Solids::Ehlers::createEhlers<DisplacementDim>(...

This comment has been minimized.

@wenqing

wenqing Jul 10, 2018

Author Member

Changed according by amending the second commit.

"Cannot construct constitutive relation of given type \'%s\'.",
type.c_str());
}
return nullptr;

This comment has been minimized.

@chleh

chleh Jul 10, 2018

Collaborator

That's never reached.

This comment has been minimized.

@wenqing

wenqing Jul 10, 2018

Author Member

@chleh Yes, the last commit just moves code and dumps three -impl.h files.

@wenqing wenqing force-pushed the wenqing:m_solid branch 4 times, most recently from 7549882 to 54c3419 Jul 10, 2018

@@ -0,0 +1,49 @@
/**
* \copyright
* Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org)

This comment has been minimized.

@endJunction

This comment has been minimized.

@wenqing

wenqing Jul 11, 2018

Author Member

Corrected by amending the 2nd commit.

@@ -0,0 +1,28 @@
/**
* \copyright
* Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org)

This comment has been minimized.

@endJunction

This comment has been minimized.

@wenqing

wenqing Jul 11, 2018

Author Member

Corrected by amending the 1st commit

@wenqing wenqing force-pushed the wenqing:m_solid branch 2 times, most recently from fa8520f to fb0e86d Jul 11, 2018

@wenqing wenqing force-pushed the wenqing:m_solid branch from fb0e86d to fff0d18 Jul 11, 2018

@endJunction endJunction merged commit 078f26c into ufz:master Jul 11, 2018

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
deploy/netlify Deploy preview ready!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.