From 312ce21033241d416fb27a2ed4c939ecd037276b Mon Sep 17 00:00:00 2001 From: Henrik Jakob Date: Tue, 12 Nov 2024 18:45:10 +0100 Subject: [PATCH] fix for materials namespace --- src/iks006_nonlinear2DSolid.cpp | 6 ++---- src/iks008_cooksMembrane.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/iks006_nonlinear2DSolid.cpp b/src/iks006_nonlinear2DSolid.cpp index bfd1fd0..b883f39 100644 --- a/src/iks006_nonlinear2DSolid.cpp +++ b/src/iks006_nonlinear2DSolid.cpp @@ -15,8 +15,6 @@ #include #include -#include "spdlog/spdlog.h" - #include #include @@ -151,8 +149,8 @@ auto run() { auto matParameter = Ikarus::toLamesFirstParameterAndShearModulus({.emodul = 1000, .nu = 0.3}); - Ikarus::StVenantKirchhoff matSVK(matParameter); - auto reducedMat = planeStress(matSVK, 1e-8); + Materials::StVenantKirchhoff matSVK(matParameter); + auto reducedMat = Materials::planeStress(matSVK, 1e-8); auto vL = [](auto& globalCoord, auto& lamb) { Eigen::Vector2d fext; diff --git a/src/iks008_cooksMembrane.cpp b/src/iks008_cooksMembrane.cpp index b6c21e5..07fb776 100644 --- a/src/iks008_cooksMembrane.cpp +++ b/src/iks008_cooksMembrane.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -136,9 +137,9 @@ int main(int argc, char** argv) { BoundaryPatch neumannBoundary(gridView, neumannVertices); - auto linMat = Ikarus::LinearElasticity(Ikarus::toLamesFirstParameterAndShearModulus({.emodul = E, .nu = nu})); - auto sk = skills(linearElastic(planeStress(linMat)), eas(numberOfEASParameters), volumeLoad<2>(vL), - neumannBoundaryLoad(&neumannBoundary, neumannBl)); + auto linMat = Materials::LinearElasticity(Ikarus::toLamesFirstParameterAndShearModulus({.emodul = E, .nu = nu})); + auto sk = skills(linearElastic(Materials::planeStress(linMat)), eas(numberOfEASParameters), Ikarus::volumeLoad<2>(vL), + neumannBoundaryLoad(&neumannBoundary, neumannBl)); using FEType = decltype(makeFE(basis, sk)); std::vector fes; for (auto&& ge : elements(gridView)) {