Skip to content
Snippets Groups Projects
Commit d4a11e06 authored by Anna Wellmann's avatar Anna Wellmann
Browse files

Fix yet another memory leak

parent 2d91cff7
No related branches found
No related tags found
1 merge request!216Fix memory leaks
......@@ -59,7 +59,7 @@ public:
grid = GridImp::makeShared(gridShape, startX, startY, startZ, endX, endY, endZ, delta, d3Qxx, level);
grid->setTriangularMeshDiscretizationStrategy(std::make_shared<PointInObjectDiscretizationStrategy>());
grid->setTriangularMeshDiscretizationStrategy(std::make_shared<PointInObjectDiscretizationStrategy>()); // Probably a bug, as this->triangularMeshDiscretizationStrategy is never used. Until ad5efd332a1d6808fccdf8e54fa547630eff401b this line was ``grid->setTriangularMeshDiscretizationStrategy(this->triangularMeshDiscretizationStrategy);``
return grid;
}
......@@ -69,19 +69,19 @@ public:
switch (triangularMeshDiscretizationMethod)
{
case TriangularMeshDiscretizationMethod::POINT_UNDER_TRIANGLE:
triangularMeshDiscretizationStrategy = new PointUnderTriangleStrategy();
triangularMeshDiscretizationStrategy = std::make_shared<PointUnderTriangleStrategy>();
break;
case TriangularMeshDiscretizationMethod::RAYCASTING:
triangularMeshDiscretizationStrategy = new RayCastingDiscretizationStrategy();
triangularMeshDiscretizationStrategy = std::make_shared<RayCastingDiscretizationStrategy>();
break;
case TriangularMeshDiscretizationMethod::POINT_IN_OBJECT:
triangularMeshDiscretizationStrategy = new PointInObjectDiscretizationStrategy();
triangularMeshDiscretizationStrategy = std::make_shared<PointInObjectDiscretizationStrategy>();
break;
}
}
private:
TriangularMeshDiscretizationStrategy* triangularMeshDiscretizationStrategy;
SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy;
};
......
......@@ -169,6 +169,7 @@ class findNeighborsIntegrationTest : public ::testing::Test
{
protected:
SPtr<MultipleGridBuilder> gridBuilder;
void SetUp() override
{
auto gridFactory = GridFactory::make();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment