fix for materials namespace

ikarus-project · Nov 12, 2024 · 312ce21 · 312ce21
1 parent eaea696
commit 312ce21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/iks006_nonlinear2DSolid.cpp b/src/iks006_nonlinear2DSolid.cpp
@@ -15,8 +15,6 @@
 #include <dune/iga/nurbsbasis.hh>
 #include <dune/iga/nurbsgrid.hh>
 
-#include "spdlog/spdlog.h"
-
 #include <Eigen/Core>
 
 #include <ikarus/assembler/simpleassemblers.hh>
@@ -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
@@ -25,6 +25,7 @@
 #include <ikarus/finiteelements/mechanics/linearelastic.hh>
 #include <ikarus/finiteelements/mechanics/loads.hh>
 #include <ikarus/finiteelements/mechanics/materials/linearelasticity.hh>
+#include <ikarus/finiteelements/mechanics/materials/vanishingstress.hh>
 #include <ikarus/solver/linearsolver/linearsolver.hh>
 #include <ikarus/utils/basis.hh>
 #include <ikarus/utils/dirichletvalues.hh>
@@ -136,9 +137,9 @@ int main(int argc, char** argv) {
 
       BoundaryPatch<decltype(gridView)> 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<FEType> fes;
       for (auto&& ge : elements(gridView)) {