From 2d91cff7d58fda0407b0d6d1ec817137dd7af7a6 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Thu, 16 Mar 2023 15:55:46 +0000
Subject: [PATCH] Fix another memory leak
---
src/gpu/GridGenerator/grid/GridFactory.h | 2 +-
src/gpu/GridGenerator/grid/GridImp.cpp | 4 ++--
src/gpu/GridGenerator/grid/GridImp.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/gpu/GridGenerator/grid/GridFactory.h b/src/gpu/GridGenerator/grid/GridFactory.h
index 7a6b92942..7998e70d3 100644
--- a/src/gpu/GridGenerator/grid/GridFactory.h
+++ b/src/gpu/GridGenerator/grid/GridFactory.h
@@ -59,7 +59,7 @@ public:
grid = GridImp::makeShared(gridShape, startX, startY, startZ, endX, endY, endZ, delta, d3Qxx, level);
- grid->setTriangularMeshDiscretizationStrategy(new PointInObjectDiscretizationStrategy());
+ grid->setTriangularMeshDiscretizationStrategy(std::make_shared<PointInObjectDiscretizationStrategy>());
return grid;
}
diff --git a/src/gpu/GridGenerator/grid/GridImp.cpp b/src/gpu/GridGenerator/grid/GridImp.cpp
index 36810e5f6..3ca142750 100644
--- a/src/gpu/GridGenerator/grid/GridImp.cpp
+++ b/src/gpu/GridGenerator/grid/GridImp.cpp
@@ -812,12 +812,12 @@ uint GridImp::getLevel() const
return this->level;
}
-void GridImp::setTriangularMeshDiscretizationStrategy(TriangularMeshDiscretizationStrategy* triangularMeshDiscretizationStrategy)
+void GridImp::setTriangularMeshDiscretizationStrategy(SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy)
{
this->triangularMeshDiscretizationStrategy = triangularMeshDiscretizationStrategy;
}
-TriangularMeshDiscretizationStrategy * GridImp::getTriangularMeshDiscretizationStrategy()
+SPtr<TriangularMeshDiscretizationStrategy> GridImp::getTriangularMeshDiscretizationStrategy()
{
return this->triangularMeshDiscretizationStrategy;
}
diff --git a/src/gpu/GridGenerator/grid/GridImp.h b/src/gpu/GridGenerator/grid/GridImp.h
index 1ecea79c9..b88e99448 100644
--- a/src/gpu/GridGenerator/grid/GridImp.h
+++ b/src/gpu/GridGenerator/grid/GridImp.h
@@ -132,7 +132,7 @@ private:
uint numberOfLayers;
- TriangularMeshDiscretizationStrategy *triangularMeshDiscretizationStrategy;
+ SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy;
uint numberOfSolidBoundaryNodes = 0;
@@ -177,8 +177,8 @@ public:
uint getLevel(real levelNull) const;
uint getLevel() const;
- void setTriangularMeshDiscretizationStrategy(TriangularMeshDiscretizationStrategy *triangularMeshDiscretizationStrategy);
- TriangularMeshDiscretizationStrategy *getTriangularMeshDiscretizationStrategy();
+ void setTriangularMeshDiscretizationStrategy(SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy);
+ SPtr<TriangularMeshDiscretizationStrategy> getTriangularMeshDiscretizationStrategy();
uint getNumberOfSolidBoundaryNodes() const override;
void setNumberOfSolidBoundaryNodes(uint numberOfSolidBoundaryNodes) override;
--
GitLab