-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GRIDEDIT-1552 Moved orthogonalisation and smooting calculation to sep…
…arate calculators
- Loading branch information
1 parent
d5b4f29
commit f489c3f
Showing
10 changed files
with
311 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| //---- GPL --------------------------------------------------------------------- | ||
| // | ||
| // Copyright (C) Stichting Deltares, 2011-2025. | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation version 3. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| // | ||
| // contact: delft3d.support@deltares.nl | ||
| // Stichting Deltares | ||
| // P.O. Box 177 | ||
| // 2600 MH Delft, The Netherlands | ||
| // | ||
| // All indications and logos of, and references to, "Delft3D" and "Deltares" | ||
| // are registered trademarks of Stichting Deltares, and remain the property of | ||
| // Stichting Deltares. All rights reserved. | ||
| // | ||
| //------------------------------------------------------------------------------ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <span> | ||
| #include <vector> | ||
|
|
||
| #include "MeshKernel/Mesh2D.hpp" | ||
|
|
||
| namespace meshkernel | ||
| { | ||
| /// @brief Compute the orthogonality value for the edges | ||
| class MeshOrthogonality | ||
| { | ||
| public: | ||
| /// @brief Compute the orthogonality values returning values in a vector | ||
| std::vector<double> Compute(const Mesh2D& mesh) const; | ||
|
|
||
| /// @brief Compute the orthogonality values overwriting the values in an array | ||
| void Compute(const Mesh2D& mesh, std::span<double> orthogonality) const; | ||
| }; | ||
|
|
||
| } // namespace meshkernel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| //---- GPL --------------------------------------------------------------------- | ||
| // | ||
| // Copyright (C) Stichting Deltares, 2011-2025. | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation version 3. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| // | ||
| // contact: delft3d.support@deltares.nl | ||
| // Stichting Deltares | ||
| // P.O. Box 177 | ||
| // 2600 MH Delft, The Netherlands | ||
| // | ||
| // All indications and logos of, and references to, "Delft3D" and "Deltares" | ||
| // are registered trademarks of Stichting Deltares, and remain the property of | ||
| // Stichting Deltares. All rights reserved. | ||
| // | ||
| //------------------------------------------------------------------------------ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <span> | ||
| #include <vector> | ||
|
|
||
| #include "MeshKernel/Mesh2D.hpp" | ||
|
|
||
| namespace meshkernel | ||
| { | ||
| /// @brief Compute the smoothness value for the edges | ||
| class MeshSmoothness | ||
| { | ||
| public: | ||
| /// @brief Compute the smoothness values returning values in a vector | ||
| std::vector<double> Compute(const Mesh2D& mesh) const; | ||
|
|
||
| /// @brief Compute the smoothness values overwriting the values in an array | ||
| void Compute(const Mesh2D& mesh, std::span<double> smoothness) const; | ||
|
|
||
| private: | ||
| static constexpr double m_minimumCellArea = 1e-12; ///< Minimum cell area | ||
| }; | ||
|
|
||
| } // namespace meshkernel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| //---- GPL --------------------------------------------------------------------- | ||
| // | ||
| // Copyright (C) Stichting Deltares, 2011-2025. | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation version 3. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| // | ||
| // contact: delft3d.support@deltares.nl | ||
| // Stichting Deltares | ||
| // P.O. Box 177 | ||
| // 2600 MH Delft, The Netherlands | ||
| // | ||
| // All indications and logos of, and references to, "Delft3D" and "Deltares" | ||
| // are registered trademarks of Stichting Deltares, and remain the property of | ||
| // Stichting Deltares. All rights reserved. | ||
| // | ||
| //------------------------------------------------------------------------------ | ||
|
|
||
| #include "MeshKernel/MeshOrthogonality.hpp" | ||
| #include "MeshKernel/Constants.hpp" | ||
| #include "MeshKernel/Exceptions.hpp" | ||
| #include "MeshKernel/Operations.hpp" | ||
|
|
||
| std::vector<double> meshkernel::MeshOrthogonality::Compute(const Mesh2D& mesh) const | ||
| { | ||
| std::vector<double> orthogonality(mesh.GetNumEdges(), constants::missing::doubleValue); | ||
| Compute(mesh, orthogonality); | ||
|
|
||
| return orthogonality; | ||
| } | ||
|
|
||
| void meshkernel::MeshOrthogonality::Compute(const Mesh2D& mesh, std::span<double> orthogonality) const | ||
| { | ||
| if (orthogonality.size() != mesh.GetNumEdges()) | ||
| { | ||
| throw ConstraintError("array for orthogonality values is not the correct size"); | ||
| } | ||
|
|
||
| const auto numEdges = mesh.GetNumEdges(); | ||
|
|
||
| for (UInt e = 0; e < numEdges; e++) | ||
| { | ||
| auto val = constants::missing::doubleValue; | ||
|
|
||
| const auto [firstNode, secondNode] = mesh.GetEdge(e); | ||
|
|
||
| const auto firstFaceIndex = mesh.m_edgesFaces[e][0]; | ||
| const auto secondFaceIndex = mesh.m_edgesFaces[e][1]; | ||
|
|
||
| if (firstNode != constants::missing::uintValue && | ||
| secondNode != constants::missing::uintValue && | ||
| firstFaceIndex != constants::missing::uintValue && | ||
| secondFaceIndex != constants::missing::uintValue && !mesh.IsEdgeOnBoundary(e)) | ||
| { | ||
| val = NormalizedInnerProductTwoSegments(mesh.Node(firstNode), | ||
| mesh.Node(secondNode), | ||
| mesh.m_facesCircumcenters[firstFaceIndex], | ||
| mesh.m_facesCircumcenters[secondFaceIndex], | ||
| mesh.m_projection); | ||
|
|
||
| if (val != constants::missing::doubleValue) | ||
| { | ||
| val = std::abs(val); | ||
| } | ||
| } | ||
|
|
||
| orthogonality[e] = val; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| //---- GPL --------------------------------------------------------------------- | ||
| // | ||
| // Copyright (C) Stichting Deltares, 2011-2025. | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation version 3. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| // | ||
| // contact: delft3d.support@deltares.nl | ||
| // Stichting Deltares | ||
| // P.O. Box 177 | ||
| // 2600 MH Delft, The Netherlands | ||
| // | ||
| // All indications and logos of, and references to, "Delft3D" and "Deltares" | ||
| // are registered trademarks of Stichting Deltares, and remain the property of | ||
| // Stichting Deltares. All rights reserved. | ||
| // | ||
| //------------------------------------------------------------------------------ | ||
|
|
||
| #include "MeshKernel/MeshSmoothness.hpp" | ||
| #include "MeshKernel/Constants.hpp" | ||
| #include "MeshKernel/Exceptions.hpp" | ||
|
|
||
| std::vector<double> meshkernel::MeshSmoothness::Compute(const Mesh2D& mesh) const | ||
| { | ||
|
|
||
| std::vector<double> smoothness(mesh.GetNumEdges(), constants::missing::doubleValue); | ||
| Compute(mesh, smoothness); | ||
|
|
||
| return smoothness; | ||
| } | ||
|
|
||
| void meshkernel::MeshSmoothness::Compute(const Mesh2D& mesh, std::span<double> smoothness) const | ||
| { | ||
|
|
||
| if (smoothness.size() != mesh.GetNumEdges()) | ||
| { | ||
| throw ConstraintError("array for smoothness values is not the correct size"); | ||
| } | ||
|
|
||
| const UInt numEdges = mesh.GetNumEdges(); | ||
|
|
||
| for (UInt e = 0; e < numEdges; e++) | ||
| { | ||
| auto val = constants::missing::doubleValue; | ||
|
|
||
| const auto [firstNode, secondNode] = mesh.GetEdge(e); | ||
|
|
||
| const auto firstFaceIndex = mesh.m_edgesFaces[e][0]; | ||
| const auto secondFaceIndex = mesh.m_edgesFaces[e][1]; | ||
|
|
||
| if (firstNode != constants::missing::uintValue && | ||
| secondNode != constants::missing::uintValue && | ||
| firstFaceIndex != constants::missing::uintValue && | ||
| secondFaceIndex != constants::missing::uintValue && !mesh.IsEdgeOnBoundary(e)) | ||
| { | ||
| const auto leftFaceArea = mesh.m_faceArea[firstFaceIndex]; | ||
| const auto rightFaceArea = mesh.m_faceArea[secondFaceIndex]; | ||
|
|
||
| if (leftFaceArea > m_minimumCellArea && rightFaceArea > m_minimumCellArea) | ||
| { | ||
| val = rightFaceArea / leftFaceArea; | ||
|
|
||
| if (val < 1.0) | ||
| { | ||
| val = 1.0 / val; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| smoothness[e] = val; | ||
| } | ||
| } |
Oops, something went wrong.