Merge pull request #7 from gismo/pybind11

hverhelst · web-flow · commit db667ba90416 · 2022-01-06T11:24:45.000+01:00
Binding shell assembler and material matrices to Python
diff --git a/examples/example_shell3D.cpp b/examples/example_shell3D.cpp
@@ -107,6 +107,7 @@ int main(int argc, char *argv[])
     gsInfo << "Patches: "<< mp.nPatches() <<", degree: "<< dbasis.minCwiseDegree() <<"\n";
     gsInfo << dbasis.basis(0)<<"\n";
 
+
     //! [Set boundary conditions]
     gsBoundaryConditions<> bc;
     bc.setGeoMap(mp);
@@ -136,9 +137,9 @@ int main(int argc, char *argv[])
             bc.addCondition(boundary::west, condition_type::dirichlet, 0, 0 ,false,i);
         }
 
-        pressure = -1;
+        // pressure = -1;
         refPoint<<0.5,0.5;
-        // tmp << 0,0,-1;
+        tmp << 0,0,-1;
 
     }
     else if (testCase == 1)
diff --git a/gsKLShell.h b/gsKLShell.h
@@ -0,0 +1,56 @@
+#include <gsCore/gsTemplateTools.h>
+
+#include <gsKLShell/gsMaterialMatrixBase.h>
+#include <gsKLShell/gsMaterialMatrixBaseDim.h>
+
+#include <gsKLShell/gsMaterialMatrixLinear.h>
+#include <gsKLShell/gsMaterialMatrix.h>
+
+#include <gsKLShell/gsThinShellAssembler.h>
+
+
+namespace gismo
+{
+
+#ifdef GISMO_BUILD_PYBIND11
+
+  namespace py = pybind11;
+
+  void pybind11_init_gsKLShell(py::module &m)
+  {
+    gismo::pybind11_init_gsMaterialMatrixBase( m );
+
+    gismo::pybind11_init_gsMaterialMatrixBaseDim2( m );
+    gismo::pybind11_init_gsMaterialMatrixBaseDim3( m );
+
+    gismo::pybind11_init_gsMaterialMatrixLinear2( m );
+    gismo::pybind11_init_gsMaterialMatrixLinear3( m );
+
+    gismo::pybind11_init_gsMaterialMatrixNH2i( m );
+    gismo::pybind11_init_gsMaterialMatrixNH2c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixNH3i( m );
+    gismo::pybind11_init_gsMaterialMatrixNH3c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixMR2i( m );
+    gismo::pybind11_init_gsMaterialMatrixMR2c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixMR3i( m );
+    gismo::pybind11_init_gsMaterialMatrixMR3c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixOG2i( m );
+    gismo::pybind11_init_gsMaterialMatrixOG2c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixOG3i( m );
+    gismo::pybind11_init_gsMaterialMatrixOG3c( m );
+
+    gismo::pybind11_init_gsThinShellAssemblerBase( m );
+
+    gismo::pybind11_init_gsThinShellAssembler2( m );
+    gismo::pybind11_init_gsThinShellAssembler3( m );
+    gismo::pybind11_init_gsThinShellAssembler3nb( m );
+  }
+
+#endif
+}
+
diff --git a/gsMaterialMatrix.h b/gsMaterialMatrix.h
@@ -1194,6 +1194,31 @@ class gsMaterialMatrix :    public gsMaterialMatrixBaseDim<dim,T>
     }
 };
 
+#ifdef GISMO_BUILD_PYBIND11
+
+  /**
+   * @brief Initializes the Python wrapper for the class: gsMaterialMatrixLinear
+   */
+  void pybind11_init_gsMaterialMatrixNH2i(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixNH2c(pybind11::module &m);
+
+  void pybind11_init_gsMaterialMatrixNH3i(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixNH3c(pybind11::module &m);
+
+  void pybind11_init_gsMaterialMatrixMR2i(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixMR2c(pybind11::module &m);
+
+  void pybind11_init_gsMaterialMatrixMR3i(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixMR3c(pybind11::module &m);
+
+  void pybind11_init_gsMaterialMatrixOG2i(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixOG2c(pybind11::module &m);
+
+  void pybind11_init_gsMaterialMatrixOG3i(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixOG3c(pybind11::module &m);
+
+#endif // GISMO_BUILD_PYBIND11
+
 } // namespace
 
 
diff --git a/gsMaterialMatrix2dComp_.cpp b/gsMaterialMatrix2dComp_.cpp
@@ -24,5 +24,44 @@ namespace gismo
 
   // OG
   CLASS_TEMPLATE_INST gsMaterialMatrix<2,real_t,34,true>;
+
+  #ifdef GISMO_BUILD_PYBIND11
+
+    namespace py = pybind11;
+
+    void pybind11_init_gsMaterialMatrixNH2c(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<2,real_t>;
+      using Class = gsMaterialMatrix<2,real_t,11,true>;
+      py::class_<Class,Base>(m, "gsMaterialNH2c")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixMR2c(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<2,real_t>;
+      using Class = gsMaterialMatrix<2,real_t,13,true>;
+      py::class_<Class,Base>(m, "gsMaterialMR2c")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixOG2c(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<2,real_t>;
+      using Class = gsMaterialMatrix<2,real_t,34,true>;
+      py::class_<Class,Base>(m, "gsMaterialOG2c")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+  #endif
 }
 
diff --git a/gsMaterialMatrix2dIncomp_.cpp b/gsMaterialMatrix2dIncomp_.cpp
@@ -24,5 +24,45 @@ namespace gismo
 
   // OG
   CLASS_TEMPLATE_INST gsMaterialMatrix<2,real_t,34,false>;
+
+  #ifdef GISMO_BUILD_PYBIND11
+
+    namespace py = pybind11;
+
+    void pybind11_init_gsMaterialMatrixNH2i(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<2,real_t>;
+      using Class = gsMaterialMatrix<2,real_t,11,false>;
+      py::class_<Class,Base>(m, "gsMaterialNH2i")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixMR2i(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<2,real_t>;
+      using Class = gsMaterialMatrix<2,real_t,13,false>;
+      py::class_<Class,Base>(m, "gsMaterialMR2i")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixOG2i(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<2,real_t>;
+      using Class = gsMaterialMatrix<2,real_t,34,false>;
+      py::class_<Class,Base>(m, "gsMaterialOG2i")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+  #endif
+
 }
 
diff --git a/gsMaterialMatrix3dComp_.cpp b/gsMaterialMatrix3dComp_.cpp
@@ -25,5 +25,44 @@ namespace gismo
   // OG
   CLASS_TEMPLATE_INST gsMaterialMatrix<3,real_t,34,true>;
 
+  #ifdef GISMO_BUILD_PYBIND11
+
+    namespace py = pybind11;
+
+    void pybind11_init_gsMaterialMatrixNH3c(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<3,real_t>;
+      using Class = gsMaterialMatrix<3,real_t,11,true>;
+      py::class_<Class,Base>(m, "gsMaterialNH3c")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixMR3c(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<3,real_t>;
+      using Class = gsMaterialMatrix<3,real_t,13,true>;
+      py::class_<Class,Base>(m, "gsMaterialMR3c")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixOG3c(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<3,real_t>;
+      using Class = gsMaterialMatrix<3,real_t,34,true>;
+      py::class_<Class,Base>(m, "gsMaterialOG3c")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+  #endif
+
 }
 
diff --git a/gsMaterialMatrix3dIncomp_.cpp b/gsMaterialMatrix3dIncomp_.cpp
@@ -25,5 +25,44 @@ namespace gismo
   // OG
   CLASS_TEMPLATE_INST gsMaterialMatrix<3,real_t,34,false>;
 
+  #ifdef GISMO_BUILD_PYBIND11
+
+    namespace py = pybind11;
+
+    void pybind11_init_gsMaterialMatrixNH3i(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<3,real_t>;
+      using Class = gsMaterialMatrix<3,real_t,11,false>;
+      py::class_<Class,Base>(m, "gsMaterialNH3i")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixMR3i(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<3,real_t>;
+      using Class = gsMaterialMatrix<3,real_t,13,false>;
+      py::class_<Class,Base>(m, "gsMaterialMR3i")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+    void pybind11_init_gsMaterialMatrixOG3i(py::module &m)
+    {
+      using Base = gsMaterialMatrixBaseDim<3,real_t>;
+      using Class = gsMaterialMatrix<3,real_t,34,false>;
+      py::class_<Class,Base>(m, "gsMaterialOG3i")
+
+      // Constructors
+      .def(py::init<gsFunctionSet<real_t>&,gsFunction<real_t>&>())
+      ;
+    }
+
+  #endif
+
 }
 
diff --git a/gsMaterialMatrixBase.h b/gsMaterialMatrixBase.h
@@ -198,4 +198,13 @@ class gsMaterialMatrixBase
     const gsFunctionSet<T> * m_defpatches;
 };
 
+#ifdef GISMO_BUILD_PYBIND11
+
+  /**
+   * @brief Initializes the Python wrapper for the class: gsMaterialMatrixBase
+   */
+  void pybind11_init_gsMaterialMatrixBase(pybind11::module &m);
+
+#endif // GISMO_BUILD_PYBIND11
+
 } // namespace
diff --git a/gsMaterialMatrixBaseDim.h b/gsMaterialMatrixBaseDim.h
@@ -165,6 +165,16 @@ class gsMaterialMatrixBaseDim : public gsMaterialMatrixBase<T>
 
 };
 
+#ifdef GISMO_BUILD_PYBIND11
+
+  /**
+   * @brief Initializes the Python wrapper for the class: gsMaterialMatrixBaseDim
+   */
+  void pybind11_init_gsMaterialMatrixBaseDim2(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixBaseDim3(pybind11::module &m);
+
+#endif // GISMO_BUILD_PYBIND11
+
 } // namespace
 
 #ifndef GISMO_BUILD_LIB
diff --git a/gsMaterialMatrixBase_.cpp b/gsMaterialMatrixBase_.cpp
@@ -10,5 +10,53 @@ namespace gismo
 
   CLASS_TEMPLATE_INST gsMaterialMatrixBaseDim<2,real_t>;
   CLASS_TEMPLATE_INST gsMaterialMatrixBaseDim<3,real_t>;
+
+  #ifdef GISMO_BUILD_PYBIND11
+
+  namespace py = pybind11;
+
+  void pybind11_init_gsMaterialMatrixBase(py::module &m)
+  {
+    using Class = gsMaterialMatrixBase<real_t>;
+    py::class_<Class>(m, "gsMaterialMatrixBase")
+
+    // Member functions
+    .def("setOptions", &Class::setOptions, "Sets the options")
+    .def("density_into", &Class::density_into, "Computes the density into a matrix")
+    .def("stretch_into", &Class::stretch_into, "Computes the stretches into a matrix")
+    .def("stretchDir_into", &Class::stretchDir_into, "Computes the stretch directions into a matrix")
+    .def("thickness_into", &Class::thickness_into, "Computes the thickness into a matrix")
+    .def("transform_into", &Class::transform_into, "Computes the stretch transformation into a matrix")
+    .def("eval3D_matrix", &Class::eval3D_matrix, "Evaluates the material matrix")
+    .def("eval3D_vector", &Class::eval3D_vector, "Evaluates the stress vector")
+    .def("eval3D_pstress", &Class::eval3D_pstress, "Evaluates the principal stress vector")
+
+    .def("setYoungsModulus",  &Class::setYoungsModulus,   "Sets the Young's Modulus")
+    .def("setPoissonsRatio",  &Class::setPoissonsRatio,   "Sets the Poisson's Ratio")
+    .def("setRatio"        ,  &Class::setRatio        ,   "Sets the Ratio for MR model")
+    .def("setMu"           ,  &Class::setMu           ,   "Sets the Mu_i for OG model")
+    .def("setAlpha"        ,  &Class::setAlpha        ,   "Sets the Alpha_i for OG model")
+    .def("setDensity"      ,  &Class::setDensity      ,   "Sets the Density")
+    ;
+  }
+
+  void pybind11_init_gsMaterialMatrixBaseDim2(py::module &m)
+  {
+    using Base  = gsMaterialMatrixBase<real_t>;
+    using Class = gsMaterialMatrixBaseDim<2,real_t>;
+    py::class_<Class,Base>(m, "gsMaterialMatrixBaseDim2")
+    ;
+  }
+
+  void pybind11_init_gsMaterialMatrixBaseDim3(py::module &m)
+  {
+    using Base  = gsMaterialMatrixBase<real_t>;
+    using Class = gsMaterialMatrixBaseDim<3,real_t>;
+    py::class_<Class,Base>(m, "gsMaterialMatrixBaseDim3")
+    ;
+  }
+
+  #endif
+
 }
 
diff --git a/gsMaterialMatrixLinear.h b/gsMaterialMatrixLinear.h
@@ -315,6 +315,16 @@ class gsMaterialMatrixLinear : public gsMaterialMatrixBaseDim<dim,T>
 
 };
 
+#ifdef GISMO_BUILD_PYBIND11
+
+  /**
+   * @brief Initializes the Python wrapper for the class: gsMaterialMatrixLinear
+   */
+  void pybind11_init_gsMaterialMatrixLinear2(pybind11::module &m);
+  void pybind11_init_gsMaterialMatrixLinear3(pybind11::module &m);
+
+#endif // GISMO_BUILD_PYBIND11
+
 } // namespace
 
 
diff --git a/gsMaterialMatrixLinear_.cpp b/gsMaterialMatrixLinear_.cpp
diff --git a/gsThinShellAssembler.h b/gsThinShellAssembler.h
diff --git a/gsThinShellAssembler.hpp b/gsThinShellAssembler.hpp
diff --git a/gsThinShellAssembler_.cpp b/gsThinShellAssembler_.cpp
diff --git a/python_examples/example_shell3D.py b/python_examples/example_shell3D.py
