From e591488b942481b786dda1744d1a25f63c993101 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 28 Oct 2024 09:27:36 -0400 Subject: [PATCH] ENH: Remove support for Unshared lists from Node Geometries. - Remove Unshared Edge List from Triangle and Quad - Remove Unshared Face List from Hex and Tet Signed-off-by: Michael Jackson --- .../ComputeGBCD-GBPDMetricBased.d3dpipeline | 2 +- .../(02) Small IN100 Smooth Mesh.d3dpipeline | 2 +- ...3) Small IN100 Mesh Statistics.d3dpipeline | 4 +- .../(04) Small IN100 GBCD.d3dpipeline | 4 +- .../(05) Small IN100 GBCD Metric.d3dpipeline | 4 +- .../test/QuickSurfaceMeshFilterTest.cpp | 2 +- .../SimplnxCore/test/SurfaceNetsTest.cpp | 4 +- .../DataStructure/Geometry/HexahedralGeom.cpp | 16 +-- .../DataStructure/Geometry/HexahedralGeom.hpp | 14 --- .../Geometry/INodeGeometry2D.cpp | 23 +--- .../Geometry/INodeGeometry2D.hpp | 28 +---- .../Geometry/INodeGeometry3D.cpp | 25 +--- .../Geometry/INodeGeometry3D.hpp | 31 +---- .../DataStructure/Geometry/QuadGeom.cpp | 26 +--- .../DataStructure/Geometry/QuadGeom.hpp | 8 +- .../Geometry/TetrahedralGeom.cpp | 17 +-- .../Geometry/TetrahedralGeom.hpp | 15 +-- .../DataStructure/Geometry/TriangleGeom.cpp | 30 +---- .../DataStructure/Geometry/TriangleGeom.hpp | 8 -- .../DataStructure/IO/HDF5/INodeGeom2dIO.cpp | 7 -- .../DataStructure/IO/HDF5/INodeGeom3dIO.cpp | 7 -- .../Filter/Actions/CreateGeometry2DAction.hpp | 2 +- test/DataStructTest.cpp | 114 +++++------------- 23 files changed, 63 insertions(+), 330 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline index 141abfd9b3..5612479009 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline @@ -58,7 +58,7 @@ "TriangleDataContainer/Vertex Data", "TriangleDataContainer/Face Data/FaceLabels", "TriangleDataContainer/Vertex Data/NodeType", - "TriangleDataContainer/Edge List", + "TriangleDataContainer/SharedEdgeList", "TriangleDataContainer/Face Data/FaceAreas", "TriangleDataContainer/Face Data/FaceNormals", "TriangleDataContainer/Face Data/FaceDihedralAngles", diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline index fa29156682..cda675609e 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline @@ -50,7 +50,7 @@ "DataContainer/Cell Feature Data/SlipSystems", "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedFaceList", "TriangleDataContainer/SharedVertexList", "TriangleDataContainer/Face Data", "TriangleDataContainer/Vertex Data", diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline index fe0128a028..1ae90f615f 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline @@ -50,14 +50,14 @@ "DataContainer/Cell Feature Data/SlipSystems", "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedFaceList", "TriangleDataContainer/SharedVertexList", "TriangleDataContainer/Face Data", "TriangleDataContainer/Vertex Data", "TriangleDataContainer/Vertex Data/NodeType", "TriangleDataContainer/Face Data/FaceLabels", "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List" + "TriangleDataContainer/SharedEdgeList" ], "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d" }, diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline index 1c4a2f25cc..8826f4c116 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline @@ -50,14 +50,14 @@ "DataContainer/Cell Feature Data/SlipSystems", "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedFaceList", "TriangleDataContainer/SharedVertexList", "TriangleDataContainer/Face Data", "TriangleDataContainer/Vertex Data", "TriangleDataContainer/Vertex Data/NodeType", "TriangleDataContainer/Face Data/FaceLabels", "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List", + "TriangleDataContainer/SharedEdgeList", "TriangleDataContainer/Face Data/FaceAreas", "TriangleDataContainer/Face Data/FaceNormals", "TriangleDataContainer/Face Data/FaceDihedralAngles", diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline index fe15dd2a49..aee34d2656 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline @@ -50,14 +50,14 @@ "DataContainer/Cell Feature Data/SlipSystems", "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio", "TriangleDataContainer", - "TriangleDataContainer/SharedTriList", + "TriangleDataContainer/SharedFaceList", "TriangleDataContainer/SharedVertexList", "TriangleDataContainer/Face Data", "TriangleDataContainer/Vertex Data", "TriangleDataContainer/Vertex Data/NodeType", "TriangleDataContainer/Face Data/FaceLabels", "TriangleDataContainer/QM Face Feature Data", - "TriangleDataContainer/Edge List", + "TriangleDataContainer/SharedEdgeList", "TriangleDataContainer/Face Data/FaceAreas", "TriangleDataContainer/Face Data/FaceNormals", "TriangleDataContainer/Face Data/FaceDihedralAngles", diff --git a/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp b/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp index 339a22608f..3db3428b34 100644 --- a/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp @@ -78,7 +78,7 @@ TEST_CASE("SimplnxCore::QuickSurfaceMeshFilter", "[SimplnxCore][QuickSurfaceMesh REQUIRE(vertices->getNumberOfTuples() == 28894); // Compare the shift values - CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedTriList"), DataPath({exemplarGeometryPath, "SharedTriList"})); + CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedFaceList"), DataPath({exemplarGeometryPath, "SharedTriList"})); CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedVertexList"), DataPath({exemplarGeometryPath, "SharedVertexList"})); } diff --git a/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp b/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp index d6a29f56d8..11754e7e5e 100644 --- a/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp +++ b/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp @@ -78,7 +78,7 @@ TEST_CASE("SimplnxCore::SurfaceNetsFilter: NO Smoothing", "[SimplnxCore][Surface REQUIRE(verticesPtr->getNumberOfTuples() == 28894); // Compare the shift values - CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedTriList"), DataPath({exemplarGeometryPath, "SharedTriList"})); + CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedFaceList"), DataPath({exemplarGeometryPath, "SharedTriList"})); CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedVertexList"), DataPath({exemplarGeometryPath, "SharedVertexList"})); } @@ -155,7 +155,7 @@ TEST_CASE("SimplnxCore::SurfaceNetsFilter: With Smoothing", "[SimplnxCore][Surfa REQUIRE(verticesPtr->getNumberOfTuples() == 28894); // Compare the shift values - CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedTriList"), DataPath({exemplarGeometryPath, "SharedTriList"})); + CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedFaceList"), DataPath({exemplarGeometryPath, "SharedTriList"})); CompareArrays(dataStructure, triangleGeometryPath.createChildPath("SharedVertexList"), DataPath({exemplarGeometryPath, "SharedVertexList"})); } diff --git a/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp b/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp index a8843cef82..0a95ce1961 100644 --- a/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp @@ -159,19 +159,13 @@ 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 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 facesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry3D::k_SharedFaceList)); facesCopy != nullptr) { copy->m_FaceListId = facesCopy->getId(); } @@ -377,6 +371,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 +415,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..69db4ccf06 100644 --- a/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp @@ -21,8 +21,6 @@ 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_TypeName = "HexahedralGeom"; /** @@ -169,18 +167,6 @@ class SIMPLNX_EXPORT HexahedralGeom : public INodeGeometry3D */ StatusCode findFaces(bool recalculate) override; - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedEdges(bool recalculate) override; - - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedFaces(bool recalculate) override; - protected: /** * @brief diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp index 9653f35b66..f176b61967 100644 --- a/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp @@ -127,27 +127,6 @@ void INodeGeometry2D::deleteEdges() m_EdgeDataArrayId.reset(); } -const std::optional& INodeGeometry2D::getUnsharedEdgesId() const -{ - return m_UnsharedEdgeListId; -} - -void INodeGeometry2D::setUnsharedEdgesId(const OptionalId& unsharedEdgesId) -{ - m_UnsharedEdgeListId = unsharedEdgesId; -} - -const INodeGeometry2D::SharedEdgeList* INodeGeometry2D::getUnsharedEdges() const -{ - return getDataStructureRef().getDataAs(m_UnsharedEdgeListId); -} - -void INodeGeometry2D::deleteUnsharedEdges() -{ - getDataStructureRef().removeData(m_UnsharedEdgeListId); - m_UnsharedEdgeListId.reset(); -} - const std::optional& INodeGeometry2D::getFaceAttributeMatrixId() const { return m_FaceAttributeMatrixId; @@ -208,7 +187,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..665f72fe45 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,32 +114,6 @@ class SIMPLNX_EXPORT INodeGeometry2D : public INodeGeometry1D */ void deleteEdges(); - /** - * @brief - * @return - */ - const std::optional& getUnsharedEdgesId() const; - - void setUnsharedEdgesId(const OptionalId& unsharedEdgesId); - - /** - * @brief - * @return StatusCode - */ - virtual StatusCode findUnsharedEdges(bool recalculate) = 0; - - /** - * @brief Returns a const pointer to the unshared edge list. Returns nullptr - * if no unshared edge list could be found. - * @return const SharedEdgeList* - */ - const SharedEdgeList* getUnsharedEdges() const; - - /** - * @brief Deletes the unshared edge list and removes it from the DataStructure. - */ - void deleteUnsharedEdges(); - /**************************************************************************** * These functions get values related to where the Vertex Coordinates are * stored in the DataStructure diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp index cfb58309cb..b1dfeef62b 100644 --- a/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp @@ -130,27 +130,6 @@ void INodeGeometry3D::deleteFaces() m_FaceListId.reset(); } -const std::optional& INodeGeometry3D::getUnsharedFacesId() const -{ - return m_UnsharedFaceListId; -} - -void INodeGeometry3D::setUnsharedFacedId(const OptionalId& id) -{ - m_UnsharedFaceListId = id; -} - -const INodeGeometry3D::SharedFaceList* INodeGeometry3D::getUnsharedFaces() const -{ - return getDataStructureRef().getDataAs(m_UnsharedFaceListId); -} - -void INodeGeometry3D::deleteUnsharedFaces() -{ - getDataStructureRef().removeData(m_UnsharedFaceListId); - m_UnsharedFaceListId.reset(); -} - const std::optional& INodeGeometry3D::getPolyhedraAttributeMatrixId() const { return m_PolyhedronAttributeMatrixId; @@ -211,14 +190,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..69fd9050ed 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; @@ -78,34 +77,6 @@ class SIMPLNX_EXPORT INodeGeometry3D : public INodeGeometry2D */ void deleteFaces(); - /** - * @brief - * @return - */ - const std::optional& getUnsharedFacesId() const; - - /** - * @brief - * @return - */ - void setUnsharedFacedId(const OptionalId& id); - - /** - * @brief Creates and assigns the unshared face list array for the current values. - */ - virtual StatusCode findUnsharedFaces(bool recalculate) = 0; - - /** - * @brief Returns a pointer to the unshared face list array. - * @return - */ - const SharedFaceList* getUnsharedFaces() const; - - /** - * @brief Deletes the current unshared face list array. - */ - void deleteUnsharedFaces(); - /** * @brief Returns the number of vertices in the cell. * @return diff --git a/src/simplnx/DataStructure/Geometry/QuadGeom.cpp b/src/simplnx/DataStructure/Geometry/QuadGeom.cpp index 950097ed13..7f6b5ec7da 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(); } @@ -310,25 +310,3 @@ IGeometry::StatusCode QuadGeom::findEdges(bool recalculate) m_EdgeDataArrayId = edgeList->getId(); return 1; } - -IGeometry::StatusCode QuadGeom::findUnsharedEdges(bool recalculate) -{ - auto* unsharedEdgeList = getDataStructureRef().getDataAsUnsafe>(m_UnsharedEdgeListId); - if(unsharedEdgeList != nullptr && !recalculate) - { - return 0; - } - 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()); - } - if(unsharedEdgeList == nullptr) - { - m_UnsharedEdgeListId.reset(); - return -1; - } - GeometryHelpers::Connectivity::Find2DUnsharedEdges(getFaces(), unsharedEdgeList); - m_UnsharedEdgeListId = unsharedEdgeList->getId(); - return 1; -} diff --git a/src/simplnx/DataStructure/Geometry/QuadGeom.hpp b/src/simplnx/DataStructure/Geometry/QuadGeom.hpp index a821d39b6b..0d69a9537f 100644 --- a/src/simplnx/DataStructure/Geometry/QuadGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/QuadGeom.hpp @@ -21,8 +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_TypeName = "QuadGeom"; + /** * @brief * @param dataStructure @@ -156,12 +156,6 @@ class SIMPLNX_EXPORT QuadGeom : public INodeGeometry2D */ StatusCode findEdges(bool recalculate) override; - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedEdges(bool recalculate) override; - protected: /** * @brief diff --git a/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp index 1075f15b08..5550acd0a3 100644 --- a/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp @@ -159,19 +159,11 @@ 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 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 facesCopy = dataStruct.getDataAs>(copyPath.createChildPath(INodeGeometry3D::k_SharedFaceList)); facesCopy != nullptr) { copy->m_FaceListId = facesCopy->getId(); } @@ -360,7 +352,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 +385,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 +396,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..96eea18650 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,18 +169,6 @@ class SIMPLNX_EXPORT TetrahedralGeom : public INodeGeometry3D */ StatusCode findFaces(bool recalculate) override; - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedEdges(bool recalculate) override; - - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedFaces(bool recalculate) override; - protected: /** * @brief diff --git a/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp b/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp index a50654e434..99e84a6e1e 100644 --- a/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp @@ -151,11 +151,7 @@ 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 edgesCopy = dataStruct.getDataAs(copyPath.createChildPath(k_SharedEdgeList)); edgesCopy != nullptr) { copy->m_EdgeDataArrayId = edgesCopy->getId(); } @@ -299,7 +295,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,25 +306,3 @@ IGeometry::StatusCode TriangleGeom::findEdges(bool recalculate) m_EdgeDataArrayId = edgeList->getId(); return 1; } - -IGeometry::StatusCode TriangleGeom::findUnsharedEdges(bool recalculate) -{ - auto* unsharedEdgeList = getDataStructureRef().getDataAsUnsafe>(m_UnsharedEdgeListId); - if(unsharedEdgeList != nullptr && !recalculate) - { - return 0; - } - 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()); - } - if(unsharedEdgeList == nullptr) - { - m_UnsharedEdgeListId.reset(); - return -1; - } - GeometryHelpers::Connectivity::Find2DUnsharedEdges(getFaces(), unsharedEdgeList); - m_UnsharedEdgeListId = unsharedEdgeList->getId(); - return 1; -} diff --git a/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp b/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp index 880d747ee7..bdfb9363e5 100644 --- a/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp @@ -23,8 +23,6 @@ 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_TypeName = "TriangleGeom"; /** @@ -160,12 +158,6 @@ class SIMPLNX_EXPORT TriangleGeom : public INodeGeometry2D */ StatusCode findEdges(bool recalculate) override; - /** - * @brief - * @return StatusCode - */ - StatusCode findUnsharedEdges(bool recalculate) override; - protected: /** * @brief diff --git a/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp index c52943e2fd..8e90018750 100644 --- a/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp @@ -21,7 +21,6 @@ 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)); return {}; } @@ -47,12 +46,6 @@ Result<> INodeGeom2dIO::WriteNodeGeom2dData(DataStructureWriter& dataStructureWr return result; } - result = WriteDataId(groupWriter, geometry.getUnsharedEdgesId(), IOConstants::k_UnsharedEdgeListTag); - if(result.invalid()) - { - return result; - } - return {}; } } // namespace nx::core::HDF5 diff --git a/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp index dd943c64d0..6973052d73 100644 --- a/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp @@ -22,7 +22,6 @@ 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)); return {}; } @@ -47,12 +46,6 @@ Result<> INodeGeom3dIO::WriteNodeGeom3dData(DataStructureWriter& dataStructureWr return result; } - result = WriteDataId(groupWriter, geom.getUnsharedFacesId(), IOConstants::k_UnsharedFaceListTag); - if(result.invalid()) - { - return result; - } - return {}; } } // namespace nx::core::HDF5 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..e0425213cb 100644 --- a/test/DataStructTest.cpp +++ b/test/DataStructTest.cpp @@ -307,7 +307,6 @@ DataStructure createTestDataStructure() triangleGeom->findElementsContainingVert(false); triangleGeom->findElementNeighbors(false); triangleGeom->findElementCentroids(false); - triangleGeom->findUnsharedEdges(false); } // Quad Geometry @@ -356,7 +355,6 @@ DataStructure createTestDataStructure() quadGeom->findElementsContainingVert(false); quadGeom->findElementNeighbors(false); quadGeom->findElementCentroids(false); - quadGeom->findUnsharedEdges(false); } // Tetrahedral Geometry @@ -403,8 +401,6 @@ DataStructure createTestDataStructure() tetGeom->findElementsContainingVert(false); tetGeom->findElementNeighbors(false); tetGeom->findElementCentroids(false); - tetGeom->findUnsharedEdges(false); - tetGeom->findUnsharedFaces(false); } // Hexahedral Geometry @@ -480,8 +476,6 @@ DataStructure createTestDataStructure() hexGeom->findElementsContainingVert(false); hexGeom->findElementNeighbors(false); hexGeom->findElementCentroids(false); - hexGeom->findUnsharedEdges(false); - hexGeom->findUnsharedFaces(false); } return dataStruct; @@ -1106,8 +1100,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 +1122,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 +1165,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 +1187,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 +1230,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); @@ -1262,16 +1256,6 @@ TEST_CASE("DataObjectsDeepCopyTest") const DataPath destEltCentroidsPath = destGeoPath.createChildPath(TetrahedralGeom::k_EltCentroids); 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); } SECTION("Hexahedral Geometry") @@ -1311,16 +1295,6 @@ 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 srcEltsContVertPath = srcGeoPath.createChildPath(HexahedralGeom::k_EltsContainingVert); const DataPath destEltsContVertPath = destGeoPath.createChildPath(HexahedralGeom::k_EltsContainingVert); REQUIRE(dataStruct.getDataAs>(srcEltsContVertPath) != @@ -1337,16 +1311,6 @@ TEST_CASE("DataObjectsDeepCopyTest") const DataPath destEltCentroidsPath = destGeoPath.createChildPath(HexahedralGeom::k_EltCentroids); 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); } SECTION("Invalid copies") @@ -1468,10 +1432,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 +1470,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") @@ -1542,20 +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->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); } SECTION("Hexahedral Geometry") @@ -1588,19 +1542,9 @@ 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->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); } }