Loading cpp_src/Containers/UnstructuredMesh.h +1 −1 Original line number Diff line number Diff line Loading @@ -75,7 +75,7 @@ public: void AddNodalTag(std::string& name, T& arg1); template<typename T, typename T2> void AddElemens(std::string& elementType, T& arg1, T2& arg2); void AddElements(std::string& elementType, T& arg1, T2& arg2); template<typename T> void AddElementTag(std::string& elementType, std::string& tagname, T& arg1); Loading cpp_src/Containers/UnstructuredMesh.hpp +2 −2 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ void UnstructuredMesh::AddNodalTag(std::string& name, T& arg1){ }; template<typename T, typename T2> void UnstructuredMesh::AddElemens(std::string& elementType, T& arg1, T2& arg2){ void UnstructuredMesh::AddElements(std::string& elementType, T& arg1, T2& arg2){ ElementsContainer& ec = this->elements.GetElementsOfType(elementType); ec.SetConnectivity(arg1); ec.SetOriginalIds(arg2); Loading src/BasicTools/Containers/NativeUnstructuredMesh.pxd +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ cdef extern from "Containers/UnstructuredMesh.h" namespace "BasicTools": void SetOriginalIds(FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1]& ) void SetNodes(FlattenedMapWithOrder[Matrix, CBasicFloatType, Dynamic, Dynamic, RowMajor]& ) void AddNodalTag(string& name, FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1] &arg1) void AddElemens(string& name, void AddElements(string& name, FlattenedMapWithOrder[Matrix, CBasicIndexType, Dynamic, Dynamic, RowMajor] &conn , FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1] &ids) Loading src/BasicTools/Containers/NativeUnstructuredMesh.pyx +4 −1 Original line number Diff line number Diff line Loading @@ -34,15 +34,18 @@ cdef class CUnstructuredMesh(): self.cpp_object.AddNodalTag(name, FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1](ids)) def SetDataFromPython(self,pyUM): pyUM.GetPosOfNodes() self.SetNodes(pyUM.nodes) self.SetOriginalIds(pyUM.originalIDNodes) pyUM.nodesTags.Tighten() for k in pyUM.nodesTags.keys(): self.AddNodalTag(k.encode(),pyUM.nodesTags[k].GetIds()) for k,v in pyUM.elements.items(): self.cpp_object.AddElemens(k.encode(), self.cpp_object.AddElements(k.encode(), FlattenedMapWithOrder[Matrix, CBasicIndexType, Dynamic, Dynamic, RowMajor](v.connectivity), FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1](v.originalIds) ) Loading Loading
cpp_src/Containers/UnstructuredMesh.h +1 −1 Original line number Diff line number Diff line Loading @@ -75,7 +75,7 @@ public: void AddNodalTag(std::string& name, T& arg1); template<typename T, typename T2> void AddElemens(std::string& elementType, T& arg1, T2& arg2); void AddElements(std::string& elementType, T& arg1, T2& arg2); template<typename T> void AddElementTag(std::string& elementType, std::string& tagname, T& arg1); Loading
cpp_src/Containers/UnstructuredMesh.hpp +2 −2 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ void UnstructuredMesh::AddNodalTag(std::string& name, T& arg1){ }; template<typename T, typename T2> void UnstructuredMesh::AddElemens(std::string& elementType, T& arg1, T2& arg2){ void UnstructuredMesh::AddElements(std::string& elementType, T& arg1, T2& arg2){ ElementsContainer& ec = this->elements.GetElementsOfType(elementType); ec.SetConnectivity(arg1); ec.SetOriginalIds(arg2); Loading
src/BasicTools/Containers/NativeUnstructuredMesh.pxd +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ cdef extern from "Containers/UnstructuredMesh.h" namespace "BasicTools": void SetOriginalIds(FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1]& ) void SetNodes(FlattenedMapWithOrder[Matrix, CBasicFloatType, Dynamic, Dynamic, RowMajor]& ) void AddNodalTag(string& name, FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1] &arg1) void AddElemens(string& name, void AddElements(string& name, FlattenedMapWithOrder[Matrix, CBasicIndexType, Dynamic, Dynamic, RowMajor] &conn , FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1] &ids) Loading
src/BasicTools/Containers/NativeUnstructuredMesh.pyx +4 −1 Original line number Diff line number Diff line Loading @@ -34,15 +34,18 @@ cdef class CUnstructuredMesh(): self.cpp_object.AddNodalTag(name, FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1](ids)) def SetDataFromPython(self,pyUM): pyUM.GetPosOfNodes() self.SetNodes(pyUM.nodes) self.SetOriginalIds(pyUM.originalIDNodes) pyUM.nodesTags.Tighten() for k in pyUM.nodesTags.keys(): self.AddNodalTag(k.encode(),pyUM.nodesTags[k].GetIds()) for k,v in pyUM.elements.items(): self.cpp_object.AddElemens(k.encode(), self.cpp_object.AddElements(k.encode(), FlattenedMapWithOrder[Matrix, CBasicIndexType, Dynamic, Dynamic, RowMajor](v.connectivity), FlattenedMap[Matrix, CBasicIndexType, Dynamic, _1](v.originalIds) ) Loading