Skip to content

small pybind conflict fixes in unittests #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2025
+87 −61
Merged

small pybind conflict fixes in unittests #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion filedata/pde/2p_cornerSimo_bvp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

<!-- Boundary conditions and loads -->
<boundaryConditions id="20" multipatch="1">
<Function type="FunctionExpr" dim="3" index="0">0</Function>
<Function type="FunctionExpr" dim="3" index="0">
<c>0</c>
<c>0</c>
<c>0</c>
</Function>
<Function type="FunctionExpr" dim="3" index="1">
<c>0.0495</c> <!-- 1.485/30-->
<c>0</c>
Expand Down
45 changes: 1 addition & 44 deletions gsKLShell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,54 +22,11 @@

namespace gismo
{

#ifdef GISMO_WITH_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_enum_gsThinShellAssemblerStatus( m );

gismo::pybind11_init_gsThinShellAssembler2( m );
gismo::pybind11_init_gsThinShellAssembler3( m );
gismo::pybind11_init_gsThinShellAssembler3nb( m );

gismo::pybind11_enum_GoalFunction( m );

gismo::pybind11_init_gsThinShellAssemblerDWRBase( m );

gismo::pybind11_init_gsThinShellAssemblerDWR2( m );
gismo::pybind11_init_gsThinShellAssemblerDWR3( m );
gismo::pybind11_init_gsThinShellAssemblerDWR3nb( m );
}
void pybind11_init_gsKLShell(py::module &m);

#endif
}
Expand Down
59 changes: 59 additions & 0 deletions gsKLShell_.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#include <gsCore/gsTemplateTools.h>


namespace gismo
{

#ifdef GISMO_WITH_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_enum_gsThinShellAssemblerStatus( m );

gismo::pybind11_init_gsThinShellAssembler2( m );
gismo::pybind11_init_gsThinShellAssembler3( m );
gismo::pybind11_init_gsThinShellAssembler3nb( m );

gismo::pybind11_enum_GoalFunction( m );

gismo::pybind11_init_gsThinShellAssemblerDWRBase( m );

gismo::pybind11_init_gsThinShellAssemblerDWR2( m );
gismo::pybind11_init_gsThinShellAssemblerDWR3( m );
gismo::pybind11_init_gsThinShellAssemblerDWR3nb( m );
}

#endif


}

22 changes: 22 additions & 0 deletions src/gsMaterialMatrixBaseDim_.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,27 @@ namespace gismo
CLASS_TEMPLATE_INST gsMaterialMatrixBaseDim<2,real_t>;
CLASS_TEMPLATE_INST gsMaterialMatrixBaseDim<3,real_t>;

#ifdef GISMO_WITH_PYBIND11

namespace py = pybind11;

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

}

16 changes: 0 additions & 16 deletions src/gsMaterialMatrixBase_.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,6 @@ namespace gismo
;
}

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

}
Expand Down
Loading