diff --git a/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp b/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp index a8843cef82..cd191b936d 100644 --- a/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp @@ -159,19 +159,19 @@ std::shared_ptr HexahedralGeom::deepCopy(const DataPath& copyPath) { copy->m_CellCentroidsDataArrayId = eltCentroidsCopy->getId(); } - if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) - { - copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); - } - if(const auto edgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_Edges)); edgesCopy != nullptr) + // if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) + // { + // copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); + // } + if(const auto edgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_SharedEdgeList)); edgesCopy != nullptr) { copy->m_EdgeDataArrayId = edgesCopy->getId(); } - if(const auto unsharedFacesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedFaces)); unsharedFacesCopy != nullptr) - { - copy->m_UnsharedFaceListId = unsharedFacesCopy->getId(); - } - if(const auto facesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry3D::k_QuadFaceList)); facesCopy != nullptr) + // if(const auto unsharedFacesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedFaces)); unsharedFacesCopy != nullptr) + // { + // copy->m_UnsharedFaceListId = unsharedFacesCopy->getId(); + // } + if(const auto facesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry3D::k_SharedFaceList)); facesCopy != nullptr) { copy->m_FaceListId = facesCopy->getId(); } @@ -377,6 +377,7 @@ IGeometry::StatusCode HexahedralGeom::findFaces(bool recalculate) return 1; } +#if 0 IGeometry::StatusCode HexahedralGeom::findUnsharedEdges(bool recalculate) { auto* unsharedEdgeList = getDataStructureRef().getDataAsUnsafe>(m_UnsharedEdgeListId); @@ -420,3 +421,4 @@ IGeometry::StatusCode HexahedralGeom::findUnsharedFaces(bool recalculate) m_UnsharedFaceListId = unsharedQuadList->getId(); return 1; } +#endif diff --git a/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp b/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp index c9194bfe4e..b5157f0a05 100644 --- a/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp @@ -21,8 +21,8 @@ class SIMPLNX_EXPORT HexahedralGeom : public INodeGeometry3D static inline constexpr StringLiteral k_EltsContainingVert = "Hex Containing Vertices"; static inline constexpr StringLiteral k_EltNeighbors = "Hex Neighbors"; static inline constexpr StringLiteral k_EltCentroids = "Hex Centroids"; - static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; - static inline constexpr StringLiteral k_UnsharedFaces = "Unshared Face List"; + // static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; + // static inline constexpr StringLiteral k_UnsharedFaces = "Unshared Face List"; static inline constexpr StringLiteral k_TypeName = "HexahedralGeom"; /** @@ -168,7 +168,7 @@ class SIMPLNX_EXPORT HexahedralGeom : public INodeGeometry3D * @return StatusCode */ StatusCode findFaces(bool recalculate) override; - +#if 0 /** * @brief * @return StatusCode @@ -180,6 +180,7 @@ class SIMPLNX_EXPORT HexahedralGeom : public INodeGeometry3D * @return StatusCode */ StatusCode findUnsharedFaces(bool recalculate) override; +#endif protected: /** diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp index 9653f35b66..2b5a26bf61 100644 --- a/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp @@ -126,7 +126,7 @@ void INodeGeometry2D::deleteEdges() getDataStructureRef().removeData(m_EdgeDataArrayId); m_EdgeDataArrayId.reset(); } - +#if 0 const std::optional& INodeGeometry2D::getUnsharedEdgesId() const { return m_UnsharedEdgeListId; @@ -147,6 +147,7 @@ void INodeGeometry2D::deleteUnsharedEdges() getDataStructureRef().removeData(m_UnsharedEdgeListId); m_UnsharedEdgeListId.reset(); } +#endif const std::optional& INodeGeometry2D::getFaceAttributeMatrixId() const { @@ -208,7 +209,7 @@ void INodeGeometry2D::setFaceAttributeMatrix(const AttributeMatrix& attributeMat INodeGeometry2D::SharedEdgeList* INodeGeometry2D::createSharedEdgeList(usize numEdges) { auto dataStore = std::make_unique>(std::vector{numEdges}, std::vector{2}, 0); - SharedEdgeList* edges = DataArray::Create(*getDataStructure(), k_Edges, std::move(dataStore), getId()); + SharedEdgeList* edges = DataArray::Create(*getDataStructure(), k_SharedEdgeList, std::move(dataStore), getId()); return edges; } diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry2D.hpp b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.hpp index 3f39208fa4..7ebd8792de 100644 --- a/src/simplnx/DataStructure/Geometry/INodeGeometry2D.hpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.hpp @@ -19,7 +19,7 @@ class SIMPLNX_EXPORT INodeGeometry2D : public INodeGeometry1D { public: static inline constexpr StringLiteral k_FaceDataName = "Face Data"; - static inline constexpr StringLiteral k_Edges = "Shared Edge List"; + static inline constexpr StringLiteral k_SharedEdgeList = "SharedEdgeList"; static inline constexpr StringLiteral k_TypeName = "INodeGeometry2D"; INodeGeometry2D() = delete; @@ -114,6 +114,7 @@ class SIMPLNX_EXPORT INodeGeometry2D : public INodeGeometry1D */ void deleteEdges(); +#if 0 /** * @brief * @return @@ -122,6 +123,7 @@ class SIMPLNX_EXPORT INodeGeometry2D : public INodeGeometry1D void setUnsharedEdgesId(const OptionalId& unsharedEdgesId); + /** * @brief * @return StatusCode @@ -139,6 +141,7 @@ class SIMPLNX_EXPORT INodeGeometry2D : public INodeGeometry1D * @brief Deletes the unshared edge list and removes it from the DataStructure. */ void deleteUnsharedEdges(); +#endif /**************************************************************************** * These functions get values related to where the Vertex Coordinates are diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp index cfb58309cb..35991a5ade 100644 --- a/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp @@ -130,6 +130,7 @@ void INodeGeometry3D::deleteFaces() m_FaceListId.reset(); } +#if 0 const std::optional& INodeGeometry3D::getUnsharedFacesId() const { return m_UnsharedFaceListId; @@ -150,6 +151,7 @@ void INodeGeometry3D::deleteUnsharedFaces() getDataStructureRef().removeData(m_UnsharedFaceListId); m_UnsharedFaceListId.reset(); } +#endif const std::optional& INodeGeometry3D::getPolyhedraAttributeMatrixId() const { @@ -211,14 +213,14 @@ void INodeGeometry3D::setPolyhedraAttributeMatrix(const AttributeMatrix& attribu INodeGeometry3D::SharedQuadList* INodeGeometry3D::createSharedQuadList(usize numQuads) { auto dataStore = std::make_unique>(std::vector{numQuads}, std::vector{4}, 0); - SharedQuadList* quads = DataArray::Create(*getDataStructure(), k_QuadFaceList, std::move(dataStore), getId()); + SharedQuadList* quads = DataArray::Create(*getDataStructure(), k_SharedFaceList, std::move(dataStore), getId()); return quads; } INodeGeometry3D::SharedTriList* INodeGeometry3D::createSharedTriList(usize numTris) { auto dataStore = std::make_unique>(std::vector{numTris}, std::vector{3}, 0); - SharedTriList* triangles = DataArray::Create(*getDataStructure(), k_TriangleFaceList, std::move(dataStore), getId()); + SharedTriList* triangles = DataArray::Create(*getDataStructure(), k_SharedFaceList, std::move(dataStore), getId()); return triangles; } diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry3D.hpp b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.hpp index d63b5c96b7..5aacd09586 100644 --- a/src/simplnx/DataStructure/Geometry/INodeGeometry3D.hpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.hpp @@ -8,9 +8,8 @@ class SIMPLNX_EXPORT INodeGeometry3D : public INodeGeometry2D { public: static inline constexpr StringLiteral k_PolyhedronDataName = "Polyhedron Data"; - static inline constexpr StringLiteral k_TriangleFaceList = "Shared Tri List"; - static inline constexpr StringLiteral k_QuadFaceList = "Shared Quad List"; static inline constexpr StringLiteral k_TypeName = "INodeGeometry3D"; + static inline constexpr StringLiteral k_SharedFaceList = "SharedFaceList"; INodeGeometry3D() = delete; INodeGeometry3D(const INodeGeometry3D&) = default; @@ -77,7 +76,7 @@ class SIMPLNX_EXPORT INodeGeometry3D : public INodeGeometry2D * @brief Deletes the current face list array. */ void deleteFaces(); - +#if 0 /** * @brief * @return @@ -105,6 +104,7 @@ class SIMPLNX_EXPORT INodeGeometry3D : public INodeGeometry2D * @brief Deletes the current unshared face list array. */ void deleteUnsharedFaces(); +#endif /** * @brief Returns the number of vertices in the cell. diff --git a/src/simplnx/DataStructure/Geometry/QuadGeom.cpp b/src/simplnx/DataStructure/Geometry/QuadGeom.cpp index 950097ed13..48e10228e5 100644 --- a/src/simplnx/DataStructure/Geometry/QuadGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/QuadGeom.cpp @@ -145,11 +145,11 @@ std::shared_ptr QuadGeom::deepCopy(const DataPath& copyPath) { copy->m_CellCentroidsDataArrayId = eltCentroidsCopy->getId(); } - if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) + if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_SharedEdgeList)); unsharedEdgesCopy != nullptr) { copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); } - if(const auto edgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_Edges)); edgesCopy != nullptr) + if(const auto edgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_SharedEdgeList)); edgesCopy != nullptr) { copy->m_EdgeDataArrayId = edgesCopy->getId(); } @@ -311,6 +311,7 @@ IGeometry::StatusCode QuadGeom::findEdges(bool recalculate) return 1; } +#if 0 IGeometry::StatusCode QuadGeom::findUnsharedEdges(bool recalculate) { auto* unsharedEdgeList = getDataStructureRef().getDataAsUnsafe>(m_UnsharedEdgeListId); @@ -321,7 +322,7 @@ IGeometry::StatusCode QuadGeom::findUnsharedEdges(bool recalculate) if(unsharedEdgeList == nullptr) { auto dataStore = std::make_unique>(std::vector{0}, std::vector{2}, 0); - unsharedEdgeList = DataArray::Create(*getDataStructure(), k_UnsharedEdges, std::move(dataStore), getId()); + unsharedEdgeList = DataArray::Create(*getDataStructure(), k_SharedEdgeList, std::move(dataStore), getId()); } if(unsharedEdgeList == nullptr) { @@ -332,3 +333,4 @@ IGeometry::StatusCode QuadGeom::findUnsharedEdges(bool recalculate) m_UnsharedEdgeListId = unsharedEdgeList->getId(); return 1; } +#endif diff --git a/src/simplnx/DataStructure/Geometry/QuadGeom.hpp b/src/simplnx/DataStructure/Geometry/QuadGeom.hpp index a821d39b6b..ba82d89f34 100644 --- a/src/simplnx/DataStructure/Geometry/QuadGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/QuadGeom.hpp @@ -21,7 +21,8 @@ class SIMPLNX_EXPORT QuadGeom : public INodeGeometry2D static inline constexpr StringLiteral k_EltsContainingVert = "Quads Containing Vert"; static inline constexpr StringLiteral k_EltNeighbors = "Quad Neighbors"; static inline constexpr StringLiteral k_EltCentroids = "Quad Centroids"; - static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; + // static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; + // static inline constexpr StringLiteral k_SharedEdgeList = "SharedEdgeList"; static inline constexpr StringLiteral k_TypeName = "QuadGeom"; /** * @brief @@ -156,11 +157,13 @@ class SIMPLNX_EXPORT QuadGeom : public INodeGeometry2D */ StatusCode findEdges(bool recalculate) override; +#if 0 /** * @brief * @return StatusCode */ StatusCode findUnsharedEdges(bool recalculate) override; +#endif protected: /** diff --git a/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp index 1075f15b08..23f529ec26 100644 --- a/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp @@ -159,19 +159,19 @@ std::shared_ptr TetrahedralGeom::deepCopy(const DataPath& copyPath) { copy->m_CellCentroidsDataArrayId = eltCentroidsCopy->getId(); } - if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) - { - copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); - } - if(const auto edgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_Edges)); edgesCopy != nullptr) + // if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) + // { + // copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); + // } + if(const auto edgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_SharedEdgeList)); edgesCopy != nullptr) { copy->m_EdgeDataArrayId = edgesCopy->getId(); } - if(const auto unsharedFacesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedFaces)); unsharedFacesCopy != nullptr) - { - copy->m_UnsharedFaceListId = unsharedFacesCopy->getId(); - } - if(const auto facesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry3D::k_TriangleFaceList)); facesCopy != nullptr) + // if(const auto unsharedFacesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry2D::k_UnsharedFaces)); unsharedFacesCopy != nullptr) + // { + // copy->m_UnsharedFaceListId = unsharedFacesCopy->getId(); + // } + if(const auto facesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry3D::k_SharedFaceList)); facesCopy != nullptr) { copy->m_FaceListId = facesCopy->getId(); } @@ -360,7 +360,7 @@ IGeometry::StatusCode TetrahedralGeom::findFaces(bool recalculate) m_FaceListId = triList->getId(); return 1; } - +#if 0 IGeometry::StatusCode TetrahedralGeom::findUnsharedEdges(bool recalculate) { auto* unsharedEdgeList = getDataStructureRef().getDataAsUnsafe>(m_UnsharedEdgeListId); @@ -393,7 +393,7 @@ IGeometry::StatusCode TetrahedralGeom::findUnsharedFaces(bool recalculate) if(unsharedTriList == nullptr) { auto dataStore = std::make_unique>(std::vector{0}, std::vector{3}, 0); - unsharedTriList = DataArray::Create(*getDataStructure(), k_UnsharedFaces, std::move(dataStore), getId()); + unsharedTriList = DataArray::Create(*getDataStructure(), INodeGeometry3D::k_UnsharedFaces, std::move(dataStore), getId()); } if(unsharedTriList == nullptr) { @@ -404,3 +404,4 @@ IGeometry::StatusCode TetrahedralGeom::findUnsharedFaces(bool recalculate) m_UnsharedFaceListId = unsharedTriList->getId(); return 1; } +#endif diff --git a/src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp index 612d3201d3..674cb8bf35 100644 --- a/src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp @@ -21,8 +21,7 @@ class SIMPLNX_EXPORT TetrahedralGeom : public INodeGeometry3D static inline constexpr StringLiteral k_EltsContainingVert = "Elements Containing Vert"; static inline constexpr StringLiteral k_EltNeighbors = "Tet Neighbors"; static inline constexpr StringLiteral k_EltCentroids = "Tet Centroids"; - static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; - static inline constexpr StringLiteral k_UnsharedFaces = "Unshared Face List"; + static inline constexpr StringLiteral k_TypeName = "TetrahedralGeom"; /** @@ -170,6 +169,7 @@ class SIMPLNX_EXPORT TetrahedralGeom : public INodeGeometry3D */ StatusCode findFaces(bool recalculate) override; +#if 0 /** * @brief * @return StatusCode @@ -181,6 +181,7 @@ class SIMPLNX_EXPORT TetrahedralGeom : public INodeGeometry3D * @return StatusCode */ StatusCode findUnsharedFaces(bool recalculate) override; +#endif protected: /** diff --git a/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp b/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp index a50654e434..eabdb7f093 100644 --- a/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp @@ -151,11 +151,11 @@ std::shared_ptr TriangleGeom::deepCopy(const DataPath& copyPath) { copy->m_CellCentroidsDataArrayId = eltCentroidsCopy->getId(); } - if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) - { - copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); - } - if(const auto edgesCopy = dataStruct.getDataAs(copyPath.createChildPath(k_Edges)); edgesCopy != nullptr) + // if(const auto unsharedEdgesCopy = dataStruct.getDataAs>(copyPath.createChildPath(k_UnsharedEdges)); unsharedEdgesCopy != nullptr) + // { + // copy->m_UnsharedEdgeListId = unsharedEdgesCopy->getId(); + // } + if(const auto edgesCopy = dataStruct.getDataAs(copyPath.createChildPath(k_SharedEdgeList)); edgesCopy != nullptr) { copy->m_EdgeDataArrayId = edgesCopy->getId(); } @@ -299,7 +299,7 @@ IGeometry::StatusCode TriangleGeom::findEdges(bool recalculate) if(edgeList == nullptr) { auto dataStore = std::make_unique>(std::vector{0}, std::vector{2}, 0); - edgeList = DataArray::Create(*getDataStructure(), k_Edges, std::move(dataStore), getId()); + edgeList = DataArray::Create(*getDataStructure(), k_SharedEdgeList, std::move(dataStore), getId()); } if(edgeList == nullptr) { @@ -310,7 +310,7 @@ IGeometry::StatusCode TriangleGeom::findEdges(bool recalculate) m_EdgeDataArrayId = edgeList->getId(); return 1; } - +#if 0 IGeometry::StatusCode TriangleGeom::findUnsharedEdges(bool recalculate) { auto* unsharedEdgeList = getDataStructureRef().getDataAsUnsafe>(m_UnsharedEdgeListId); @@ -332,3 +332,4 @@ IGeometry::StatusCode TriangleGeom::findUnsharedEdges(bool recalculate) m_UnsharedEdgeListId = unsharedEdgeList->getId(); return 1; } +#endif diff --git a/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp b/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp index 880d747ee7..9ac837ec0b 100644 --- a/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp @@ -23,8 +23,8 @@ class SIMPLNX_EXPORT TriangleGeom : public INodeGeometry2D static inline constexpr StringLiteral k_EltsContainingVert = "Triangles Containing Vert"; static inline constexpr StringLiteral k_EltNeighbors = "Triangle Neighbors"; static inline constexpr StringLiteral k_EltCentroids = "Triangle Centroids"; - static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; - static inline constexpr StringLiteral k_Edges = "Edge List"; + // static inline constexpr StringLiteral k_UnsharedEdges = "Unshared Edge List"; + // static inline constexpr StringLiteral k_SharedEdgeList = "SharedEdgeList"; static inline constexpr StringLiteral k_TypeName = "TriangleGeom"; /** @@ -160,11 +160,13 @@ class SIMPLNX_EXPORT TriangleGeom : public INodeGeometry2D */ StatusCode findEdges(bool recalculate) override; - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedEdges(bool recalculate) override; +#if 0 + /** + * @brief + * @return StatusCode + */ + StatusCode findUnsharedEdges(bool recalculate) override; +#endif protected: /** diff --git a/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp index c52943e2fd..4cc6b4745f 100644 --- a/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp @@ -21,7 +21,7 @@ Result<> INodeGeom2dIO::ReadNodeGeom2dData(DataStructureReader& dataStructureRea auto groupReader = parentGroup.openGroup(objectName); geometry.setFaceListId(ReadDataId(groupReader, IOConstants::k_FaceListTag)); geometry.setFaceDataId(ReadDataId(groupReader, IOConstants::k_FaceDataTag)); - geometry.setUnsharedEdgesId(ReadDataId(groupReader, IOConstants::k_UnsharedEdgeListTag)); + // geometry.setUnsharedEdgesId(ReadDataId(groupReader, IOConstants::k_UnsharedEdgeListTag)); return {}; } @@ -47,11 +47,11 @@ Result<> INodeGeom2dIO::WriteNodeGeom2dData(DataStructureWriter& dataStructureWr return result; } - result = WriteDataId(groupWriter, geometry.getUnsharedEdgesId(), IOConstants::k_UnsharedEdgeListTag); - if(result.invalid()) - { - return result; - } + // result = WriteDataId(groupWriter, geometry.getUnsharedEdgesId(), IOConstants::k_UnsharedEdgeListTag); + // if(result.invalid()) + // { + // return result; + // } return {}; } diff --git a/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp index dd943c64d0..b5a7cb306e 100644 --- a/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp @@ -22,7 +22,7 @@ Result<> INodeGeom3dIO::ReadNodeGeom3dData(DataStructureReader& dataStructureRea geom.setPolyhedronListId(ReadDataId(groupReader, IOConstants::k_PolyhedronListTag)); geom.setPolyhedraDataId(ReadDataId(groupReader, IOConstants::k_PolyhedronDataTag)); - geom.setUnsharedFacedId(ReadDataId(groupReader, IOConstants::k_UnsharedFaceListTag)); + // geom.setUnsharedFacedId(ReadDataId(groupReader, IOConstants::k_UnsharedFaceListTag)); return {}; } @@ -47,11 +47,11 @@ Result<> INodeGeom3dIO::WriteNodeGeom3dData(DataStructureWriter& dataStructureWr return result; } - result = WriteDataId(groupWriter, geom.getUnsharedFacesId(), IOConstants::k_UnsharedFaceListTag); - if(result.invalid()) - { - return result; - } + // result = WriteDataId(groupWriter, geom.getUnsharedFacesId(), IOConstants::k_UnsharedFaceListTag); + // if(result.invalid()) + // { + // return result; + // } return {}; } diff --git a/src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp b/src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp index aaab14a8fa..5790cda2e5 100644 --- a/src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp +++ b/src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp @@ -26,7 +26,7 @@ class CreateGeometry2DAction : public IDataCreationAction using DimensionType = std::vector; static constexpr StringLiteral k_DefaultVerticesName = "SharedVertexList"; - static constexpr StringLiteral k_DefaultFacesName = "SharedTriList"; + static constexpr StringLiteral k_DefaultFacesName = "SharedFaceList"; /** * @brief Constructor to create the 2D geometry and allocate a default arrays for the shared vertex & shared face lists diff --git a/test/DataStructTest.cpp b/test/DataStructTest.cpp index e294f5ac60..7a992cee09 100644 --- a/test/DataStructTest.cpp +++ b/test/DataStructTest.cpp @@ -307,7 +307,7 @@ DataStructure createTestDataStructure() triangleGeom->findElementsContainingVert(false); triangleGeom->findElementNeighbors(false); triangleGeom->findElementCentroids(false); - triangleGeom->findUnsharedEdges(false); + // triangleGeom->findUnsharedEdges(false); } // Quad Geometry @@ -356,7 +356,7 @@ DataStructure createTestDataStructure() quadGeom->findElementsContainingVert(false); quadGeom->findElementNeighbors(false); quadGeom->findElementCentroids(false); - quadGeom->findUnsharedEdges(false); + // quadGeom->findUnsharedEdges(false); } // Tetrahedral Geometry @@ -403,8 +403,8 @@ DataStructure createTestDataStructure() tetGeom->findElementsContainingVert(false); tetGeom->findElementNeighbors(false); tetGeom->findElementCentroids(false); - tetGeom->findUnsharedEdges(false); - tetGeom->findUnsharedFaces(false); + // tetGeom->findUnsharedEdges(false); + // tetGeom->findUnsharedFaces(false); } // Hexahedral Geometry @@ -480,8 +480,8 @@ DataStructure createTestDataStructure() hexGeom->findElementsContainingVert(false); hexGeom->findElementNeighbors(false); hexGeom->findElementCentroids(false); - hexGeom->findUnsharedEdges(false); - hexGeom->findUnsharedFaces(false); + // hexGeom->findUnsharedEdges(false); + // hexGeom->findUnsharedFaces(false); } return dataStruct; @@ -1106,8 +1106,8 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs>(srcCellArrayPath) != dataStruct.getDataAs>(destCellArrayPath)); UnitTest::CompareArrays(dataStruct, srcCellArrayPath, destCellArrayPath); - const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(TriangleGeom::k_Edges); - const DataPath destEdgesArrayPath = destGeoPath.createChildPath(TriangleGeom::k_Edges); + const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(TriangleGeom::k_SharedEdgeList); + const DataPath destEdgesArrayPath = destGeoPath.createChildPath(TriangleGeom::k_SharedEdgeList); REQUIRE(dataStruct.getDataAs(srcEdgesArrayPath) != dataStruct.getDataAs(destEdgesArrayPath)); UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); @@ -1128,10 +1128,10 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs(srcEltCentroidsPath) != dataStruct.getDataAs(destEltCentroidsPath)); UnitTest::CompareArrays(dataStruct, srcEltCentroidsPath, destEltCentroidsPath); - const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(TriangleGeom::k_UnsharedEdges); - const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(TriangleGeom::k_UnsharedEdges); - REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); + // const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(TriangleGeom::k_UnsharedEdges); + // const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(TriangleGeom::k_UnsharedEdges); + // REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); } SECTION("Quad Geometry") @@ -1171,10 +1171,10 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs>(srcCellArrayPath) != dataStruct.getDataAs>(destCellArrayPath)); UnitTest::CompareArrays(dataStruct, srcCellArrayPath, destCellArrayPath); - const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(QuadGeom::k_Edges); - const DataPath destEdgesArrayPath = destGeoPath.createChildPath(QuadGeom::k_Edges); - REQUIRE(dataStruct.getDataAs>(srcEdgesArrayPath) != dataStruct.getDataAs>(destEdgesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); + // const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(QuadGeom::k_Edges); + // const DataPath destEdgesArrayPath = destGeoPath.createChildPath(QuadGeom::k_Edges); + // REQUIRE(dataStruct.getDataAs>(srcEdgesArrayPath) != dataStruct.getDataAs>(destEdgesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); const DataPath srcEltsContVertPath = srcGeoPath.createChildPath(QuadGeom::k_EltsContainingVert); const DataPath destEltsContVertPath = destGeoPath.createChildPath(QuadGeom::k_EltsContainingVert); @@ -1193,8 +1193,8 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs(srcEltCentroidsPath) != dataStruct.getDataAs(destEltCentroidsPath)); UnitTest::CompareArrays(dataStruct, srcEltCentroidsPath, destEltCentroidsPath); - const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(QuadGeom::k_UnsharedEdges); - const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(QuadGeom::k_UnsharedEdges); + const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(QuadGeom::k_SharedEdgeList); + const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(QuadGeom::k_SharedEdgeList); REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); } @@ -1236,15 +1236,15 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs>(srcCellArrayPath) != dataStruct.getDataAs>(destCellArrayPath)); UnitTest::CompareArrays(dataStruct, srcCellArrayPath, destCellArrayPath); - const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_Edges); - const DataPath destEdgesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_Edges); - REQUIRE(dataStruct.getDataAs>(srcEdgesArrayPath) != dataStruct.getDataAs>(destEdgesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); - - const DataPath srcFaceArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_TriangleFaceList); - const DataPath destFacesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_TriangleFaceList); - REQUIRE(dataStruct.getDataAs>(srcFaceArrayPath) != dataStruct.getDataAs>(destFacesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcFaceArrayPath, destFacesArrayPath); + // const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_Edges); + // const DataPath destEdgesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_Edges); + // REQUIRE(dataStruct.getDataAs>(srcEdgesArrayPath) != dataStruct.getDataAs>(destEdgesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); + // + // const DataPath srcFaceArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_TriangleFaceList); + // const DataPath destFacesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_TriangleFaceList); + // REQUIRE(dataStruct.getDataAs>(srcFaceArrayPath) != dataStruct.getDataAs>(destFacesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcFaceArrayPath, destFacesArrayPath); const DataPath srcEltsContVertPath = srcGeoPath.createChildPath(TetrahedralGeom::k_EltsContainingVert); const DataPath destEltsContVertPath = destGeoPath.createChildPath(TetrahedralGeom::k_EltsContainingVert); @@ -1263,15 +1263,15 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs(srcEltCentroidsPath) != dataStruct.getDataAs(destEltCentroidsPath)); UnitTest::CompareArrays(dataStruct, srcEltCentroidsPath, destEltCentroidsPath); - const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_UnsharedEdges); - const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_UnsharedEdges); - REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); - - const DataPath srcUnsharedFacesArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_UnsharedFaces); - const DataPath destUnsharedFacesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_UnsharedFaces); - REQUIRE(dataStruct.getDataAs>(srcUnsharedFacesArrayPath) != dataStruct.getDataAs>(destUnsharedFacesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcUnsharedFacesArrayPath, destUnsharedFacesArrayPath); + // const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_UnsharedEdges); + // const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_UnsharedEdges); + // REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); + // + // const DataPath srcUnsharedFacesArrayPath = srcGeoPath.createChildPath(TetrahedralGeom::k_UnsharedFaces); + // const DataPath destUnsharedFacesArrayPath = destGeoPath.createChildPath(TetrahedralGeom::k_UnsharedFaces); + // REQUIRE(dataStruct.getDataAs>(srcUnsharedFacesArrayPath) != dataStruct.getDataAs>(destUnsharedFacesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcUnsharedFacesArrayPath, destUnsharedFacesArrayPath); } SECTION("Hexahedral Geometry") @@ -1311,15 +1311,15 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs>(srcCellArrayPath) != dataStruct.getDataAs>(destCellArrayPath)); UnitTest::CompareArrays(dataStruct, srcCellArrayPath, destCellArrayPath); - const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_Edges); - const DataPath destEdgesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_Edges); - REQUIRE(dataStruct.getDataAs>(srcEdgesArrayPath) != dataStruct.getDataAs>(destEdgesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); - - const DataPath srcFaceArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_QuadFaceList); - const DataPath destFacesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_QuadFaceList); - REQUIRE(dataStruct.getDataAs>(srcFaceArrayPath) != dataStruct.getDataAs>(destFacesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcFaceArrayPath, destFacesArrayPath); + // const DataPath srcEdgesArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_Edges); + // const DataPath destEdgesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_Edges); + // REQUIRE(dataStruct.getDataAs>(srcEdgesArrayPath) != dataStruct.getDataAs>(destEdgesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcEdgesArrayPath, destEdgesArrayPath); + // + // const DataPath srcFaceArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_QuadFaceList); + // const DataPath destFacesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_QuadFaceList); + // REQUIRE(dataStruct.getDataAs>(srcFaceArrayPath) != dataStruct.getDataAs>(destFacesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcFaceArrayPath, destFacesArrayPath); const DataPath srcEltsContVertPath = srcGeoPath.createChildPath(HexahedralGeom::k_EltsContainingVert); const DataPath destEltsContVertPath = destGeoPath.createChildPath(HexahedralGeom::k_EltsContainingVert); @@ -1338,15 +1338,15 @@ TEST_CASE("DataObjectsDeepCopyTest") REQUIRE(dataStruct.getDataAs(srcEltCentroidsPath) != dataStruct.getDataAs(destEltCentroidsPath)); UnitTest::CompareArrays(dataStruct, srcEltCentroidsPath, destEltCentroidsPath); - const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_UnsharedEdges); - const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_UnsharedEdges); - REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); - - const DataPath srcUnsharedFacesArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_UnsharedFaces); - const DataPath destUnsharedFacesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_UnsharedFaces); - REQUIRE(dataStruct.getDataAs>(srcUnsharedFacesArrayPath) != dataStruct.getDataAs>(destUnsharedFacesArrayPath)); - UnitTest::CompareArrays(dataStruct, srcUnsharedFacesArrayPath, destUnsharedFacesArrayPath); + // const DataPath srcUnsharedEdgesArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_UnsharedEdges); + // const DataPath destUnsharedEdgesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_UnsharedEdges); + // REQUIRE(dataStruct.getDataAs>(srcUnsharedEdgesArrayPath) != dataStruct.getDataAs>(destUnsharedEdgesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcUnsharedEdgesArrayPath, destUnsharedEdgesArrayPath); + // + // const DataPath srcUnsharedFacesArrayPath = srcGeoPath.createChildPath(HexahedralGeom::k_UnsharedFaces); + // const DataPath destUnsharedFacesArrayPath = destGeoPath.createChildPath(HexahedralGeom::k_UnsharedFaces); + // REQUIRE(dataStruct.getDataAs>(srcUnsharedFacesArrayPath) != dataStruct.getDataAs>(destUnsharedFacesArrayPath)); + // UnitTest::CompareArrays(dataStruct, srcUnsharedFacesArrayPath, destUnsharedFacesArrayPath); } SECTION("Invalid copies") @@ -1468,10 +1468,10 @@ TEST_CASE("NodeBasedGeometryFindElementsTest") status = geom->findEdges(true); REQUIRE(status == 1); - status = geom->findUnsharedEdges(false); - REQUIRE(status == 0); - status = geom->findUnsharedEdges(true); - REQUIRE(status == 1); + // status = geom->findUnsharedEdges(false); + // REQUIRE(status == 0); + // status = geom->findUnsharedEdges(true); + // REQUIRE(status == 1); } SECTION("Quad Geometry") @@ -1506,10 +1506,10 @@ TEST_CASE("NodeBasedGeometryFindElementsTest") status = geom->findEdges(true); REQUIRE(status == 1); - status = geom->findUnsharedEdges(false); - REQUIRE(status == 0); - status = geom->findUnsharedEdges(true); - REQUIRE(status == 1); + // status = geom->findUnsharedEdges(false); + // REQUIRE(status == 0); + // status = geom->findUnsharedEdges(true); + // REQUIRE(status == 1); } SECTION("Tetrahedral Geometry") @@ -1541,21 +1541,21 @@ TEST_CASE("NodeBasedGeometryFindElementsTest") REQUIRE(status == 0); status = geom->findEdges(true); REQUIRE(status == 1); - - status = geom->findUnsharedEdges(false); - REQUIRE(status == 0); - status = geom->findUnsharedEdges(true); - REQUIRE(status == 1); + // + // status = geom->findUnsharedEdges(false); + // REQUIRE(status == 0); + // status = geom->findUnsharedEdges(true); + // REQUIRE(status == 1); status = geom->findFaces(false); REQUIRE(status == 0); status = geom->findFaces(true); REQUIRE(status == 1); - - status = geom->findUnsharedFaces(false); - REQUIRE(status == 0); - status = geom->findUnsharedFaces(true); - REQUIRE(status == 1); + // + // status = geom->findUnsharedFaces(false); + // REQUIRE(status == 0); + // status = geom->findUnsharedFaces(true); + // REQUIRE(status == 1); } SECTION("Hexahedral Geometry") @@ -1588,19 +1588,19 @@ TEST_CASE("NodeBasedGeometryFindElementsTest") status = geom->findEdges(true); REQUIRE(status == 1); - status = geom->findUnsharedEdges(false); - REQUIRE(status == 0); - status = geom->findUnsharedEdges(true); - REQUIRE(status == 1); + // status = geom->findUnsharedEdges(false); + // REQUIRE(status == 0); + // status = geom->findUnsharedEdges(true); + // REQUIRE(status == 1); status = geom->findFaces(false); REQUIRE(status == 0); status = geom->findFaces(true); REQUIRE(status == 1); - status = geom->findUnsharedFaces(false); - REQUIRE(status == 0); - status = geom->findUnsharedFaces(true); - REQUIRE(status == 1); + // status = geom->findUnsharedFaces(false); + // REQUIRE(status == 0); + // status = geom->findUnsharedFaces(true); + // REQUIRE(status == 1); } }