From 0f0e20b1c2579b9e9d17ca6a2ae1ffcdf80c8d54 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Wed, 7 Nov 2018 10:44:53 +0100
Subject: [PATCH] [Mat] register the MFront material model
---
MaterialLib/CMakeLists.txt | 8 ++++++--
MaterialLib/SolidModels/CreateConstitutiveRelation.cpp | 6 ++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/MaterialLib/CMakeLists.txt b/MaterialLib/CMakeLists.txt
index 4c7c4d266e5..2275711f39a 100644
--- a/MaterialLib/CMakeLists.txt
+++ b/MaterialLib/CMakeLists.txt
@@ -21,6 +21,8 @@ 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})
@@ -28,10 +30,12 @@ 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
)
diff --git a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
index e48d26d6687..72f3babc14d 100644
--- a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
+++ b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
@@ -15,6 +15,7 @@
#include "CreateEhlers.h"
#include "CreateLinearElasticIsotropic.h"
#include "CreateLubby2.h"
+#include "MFront/CreateMFront.h"
#include "MechanicsBase.h"
@@ -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());
}
--
GitLab