Use unique pointer for mesh refinement interpolant

Deltares · Dec 20, 2023 · 56be2eb · 56be2eb
1 parent 4ea07a9
commit 56be2eb
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 108 deletions.
diff --git a/libs/MeshKernel/benchmark/src/perf_mesh_refinement.cpp b/libs/MeshKernel/benchmark/src/perf_mesh_refinement.cpp
@@ -33,14 +33,14 @@ static void BM_MeshRefinementBasedOnSamples(benchmark::State& state)
             }
         }
 
-        auto const interpolator = std::make_shared<AveragingInterpolation>(*mesh,
-                                                                           samples,
-                                                                           AveragingInterpolation::Method::MinAbsValue,
-                                                                           Location::Faces,
-                                                                           1.0,
-                                                                           false,
-                                                                           false,
-                                                                           1);
+        auto interpolator = std::make_unique<AveragingInterpolation>(*mesh,
+                                                                     samples,
+                                                                     AveragingInterpolation::Method::MinAbsValue,
+                                                                     Location::Faces,
+                                                                     1.0,
+                                                                     false,
+                                                                     false,
+                                                                     1);
 
         MeshRefinementParameters mesh_refinement_parameters;
         mesh_refinement_parameters.max_num_refinement_iterations = 1;
@@ -55,7 +55,7 @@ static void BM_MeshRefinementBasedOnSamples(benchmark::State& state)
         state.ResumeTiming();
 
         MeshRefinement meshRefinement(*mesh,
-                                      interpolator,
+                                      std::move(interpolator),
                                       mesh_refinement_parameters);
 
         meshRefinement.Compute();

diff --git a/libs/MeshKernel/include/MeshKernel/MeshRefinement.hpp b/libs/MeshKernel/include/MeshKernel/MeshRefinement.hpp
@@ -95,7 +95,7 @@ namespace meshkernel
         /// @param[in] interpolant The averaging interpolation to use
         /// @param[in] meshRefinementParameters The mesh refinement parameters
         MeshRefinement(Mesh2D& mesh,
-                       std::shared_ptr<MeshInterpolation> interpolant,
+                       std::unique_ptr<MeshInterpolation> interpolant,
                        const MeshRefinementParameters& meshRefinementParameters);
 
         /// @brief The constructor for refining based on samples
@@ -104,7 +104,7 @@ namespace meshkernel
         /// @param[in] meshRefinementParameters The mesh refinement parameters
         /// @param[in] useNodalRefinement Use nodal refinement
         MeshRefinement(Mesh2D& mesh,
-                       std::shared_ptr<MeshInterpolation> interpolant,
+                       std::unique_ptr<MeshInterpolation> interpolant,
                        const MeshRefinementParameters& meshRefinementParameters,
                        bool useNodalRefinement);
 
@@ -240,7 +240,7 @@ namespace meshkernel
         bool m_directionalRefinement = false;                          ///< Whether there is directional refinement
 
         Mesh2D& m_mesh;                                      ///< A reference to the mesh
-        std::shared_ptr<MeshInterpolation> m_interpolant;    ///< Pointer to the AveragingInterpolation instance
+        std::unique_ptr<MeshInterpolation> m_interpolant;    ///< Pointer to the AveragingInterpolation instance
         Polygons m_polygons;                                 ///< Polygons
         MeshRefinementParameters m_meshRefinementParameters; ///< The mesh refinement parameters
         bool m_useNodalRefinement = false;                   ///< Use refinement based on interpolated values at nodes

diff --git a/libs/MeshKernel/src/MeshRefinement.cpp b/libs/MeshKernel/src/MeshRefinement.cpp
@@ -38,10 +38,10 @@ using meshkernel::Mesh2D;
 using meshkernel::MeshRefinement;
 
 MeshRefinement::MeshRefinement(Mesh2D& mesh,
-                               std::shared_ptr<MeshInterpolation> interpolant,
+                               std::unique_ptr<MeshInterpolation> interpolant,
                                const MeshRefinementParameters& meshRefinementParameters) : m_samplesRTree(RTreeFactory::Create(mesh.m_projection)),
                                                                                            m_mesh(mesh),
-                                                                                           m_interpolant(interpolant)
+                                                                                           m_interpolant(std::move(interpolant))
 {
     CheckMeshRefinementParameters(meshRefinementParameters);
     m_isRefinementBasedOnSamples = true;
@@ -50,11 +50,11 @@ MeshRefinement::MeshRefinement(Mesh2D& mesh,
 }
 
 MeshRefinement::MeshRefinement(Mesh2D& mesh,
-                               std::shared_ptr<MeshInterpolation> interpolant,
+                               std::unique_ptr<MeshInterpolation> interpolant,
                                const MeshRefinementParameters& meshRefinementParameters,
                                bool useNodalRefinement) : m_samplesRTree(RTreeFactory::Create(mesh.m_projection)),
                                                           m_mesh(mesh),
-                                                          m_interpolant(interpolant),
+                                                          m_interpolant(std::move(interpolant)),
                                                           m_useNodalRefinement(useNodalRefinement)
 {
     CheckMeshRefinementParameters(meshRefinementParameters);