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.

Sign up for GitHub

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

Use Solid Material Models from MFront #2259

Merged
merged 11 commits into from
Nov 12, 2018
Merged

Use Solid Material Models from MFront #2259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a90b896
[scr] improve test wrapper script
chleh Nov 7, 2018
1b3f726
[scr] find MGIS package
chleh Nov 7, 2018
424b0ec
Added MFront option to CMake config
chleh Nov 7, 2018
573e2b4
[Mat] added a solid model interfacing with MFront
chleh Nov 7, 2018
0f0e20b
[Mat] register the MFront material model
chleh Nov 7, 2018
9b27e5c
Made project directory accessible via global functions.
chleh Nov 7, 2018
9a77709
[Doc] project file parameter documentation
chleh Nov 7, 2018
c5a0654
[scr] basic ArchLinux PKGBUILDS for MFront and MGIS
chleh Nov 7, 2018
d68fa6f
Tests for small deformation
chleh Nov 7, 2018
cefb044
Tests for TM
chleh Nov 7, 2018
ca62b9e
[doc] added doc for internal var initialization
chleh Nov 12, 2018
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
Prev Previous commit
Next Next commit
[Mat] register the MFront material model
  • Loading branch information
@chleh
chleh committed Nov 12, 2018
commit 0f0e20b1c2579b9e9d17ca6a2ae1ffcdf80c8d54
8 changes: 6 additions & 2 deletions MaterialLib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@ append_source_files(SOURCES PorousMedium/UnsaturatedProperty/CapillaryPressure)
append_source_files(SOURCES PorousMedium/UnsaturatedProperty/RelativePermeability)
append_source_files(SOURCES TwoPhaseModels)

add_subdirectory(SolidModels/MFront)

add_library(MaterialLib ${SOURCES})
if(BUILD_SHARED_LIBS)
install(TARGETS MaterialLib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

include(GenerateExportHeader)
generate_export_header(MaterialLib)
target_include_directories(MaterialLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(MaterialLib
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
)

target_link_libraries(MaterialLib
PUBLIC BaseLib NumLib logog # ProcessLib
PUBLIC MaterialLib_SolidModels_MFront # ProcessLib
PRIVATE MathLib MeshLib
)

Expand Down
6 changes: 6 additions & 0 deletions MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "CreateEhlers.h"
#include "CreateLinearElasticIsotropic.h"
#include "CreateLubby2.h"
#include "MFront/CreateMFront.h"

#include "MechanicsBase.h"

Expand Down Expand Up @@ -58,6 +59,11 @@ createConstitutiveRelation(
return MaterialLib::Solids::Creep::createCreepBGRa<DisplacementDim>(
parameters, config);
}
if (type == "MFront")
{
return MaterialLib::Solids::MFront::createMFront<DisplacementDim>(
parameters, config);
}
OGS_FATAL("Cannot construct constitutive relation of given type \'%s\'.",
type.c_str());
}
Expand Down