From 3d3e0ea4486c424b6cfb159ff31a72c0a128a7e6 Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Thu, 28 Feb 2019 15:49:59 +0100 Subject: [PATCH] [MatL] Make MFront's library tag optional. Some basic behaviour will be available in the ogs compiled behaviour library. --- MaterialLib/SolidModels/MFront/CreateMFront.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/MaterialLib/SolidModels/MFront/CreateMFront.cpp b/MaterialLib/SolidModels/MFront/CreateMFront.cpp index c4af60b0fbb..a03a12349a5 100644 --- a/MaterialLib/SolidModels/MFront/CreateMFront.cpp +++ b/MaterialLib/SolidModels/MFront/CreateMFront.cpp @@ -51,10 +51,14 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront( //! \ogs_file_param{material__solid__constitutive_relation__type} config.checkConfigParameter("type", "MFront"); - auto const lib_path = BaseLib::joinPaths( - BaseLib::getProjectDirectory(), - //! \ogs_file_param{material__solid__constitutive_relation__MFront__library} - config.getConfigParameter<std::string>("library")); + //! \ogs_file_param{material__solid__constitutive_relation__MFront__library} + auto const library_name = + config.getConfigParameterOptional<std::string>("library"); + auto const lib_path = + library_name + ? BaseLib::joinPaths(BaseLib::getProjectDirectory(), *library_name) + : "libOgsMFrontBehaviour.so"; + auto const behaviour_name = //! \ogs_file_param{material__solid__constitutive_relation__MFront__behaviour} config.getConfigParameter<std::string>("behaviour"); -- GitLab