From 540e9978ca02ad0ab49e7c651cba539ea4712820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
Date: Wed, 25 Dec 2019 21:36:11 +0100
Subject: [PATCH] Remove Grid.HeapSize
---
CHANGELOG.md | 2 ++
doc/doxygen/extradoc/parameterlist.txt | 1 -
dumux/io/grid/gridmanager_ug.hh | 6 +-----
.../2p/sequential/grids/test_3d2p_12_ug.dgf | 1 -
.../2p/sequential/grids/test_3d2p_3_ug1.dgf | 1 -
5 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59e37b6510..61f2f22c97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ Differences Between DuMuX 3.2 and DuMuX 3.1
### Immediate interface changes not allowing/requiring a deprecation period
+- Remove `Grid.HeapSize` as dune-ugrid removed the according feature as well.
+
### Deprecated properties, to be removed after 3.2:
### Deprecated classes/files, to be removed after 3.2:
diff --git a/doc/doxygen/extradoc/parameterlist.txt b/doc/doxygen/extradoc/parameterlist.txt
index 034757a083..48a55c6b2c 100644
--- a/doc/doxygen/extradoc/parameterlist.txt
+++ b/doc/doxygen/extradoc/parameterlist.txt
@@ -85,7 +85,6 @@ Adaptive | MaxLevel | std::size_t | 0 | |
* | | GmshPhysicalEntityThreshold | std::size_t | 0 | |
* | | Gradingstd::to_string(i) | Scalar | grading[i] | |
* | | Gradingstd::to_string(i) | std::vector<ctype> | grading[i] | |
-* | | HeapSize | int | | |
* | | Image | std::string | | |
* | | KeepPhysicalOverlap | bool | true | |
* | | LeftBoundary | CoordinateType | 0.0 | |
diff --git a/dumux/io/grid/gridmanager_ug.hh b/dumux/io/grid/gridmanager_ug.hh
index e006f99cc0..ceee8055af 100644
--- a/dumux/io/grid/gridmanager_ug.hh
+++ b/dumux/io/grid/gridmanager_ug.hh
@@ -51,7 +51,6 @@ namespace Dumux {
* - CellType : "Cube" or "Simplex" to be used for structured grids
* - Refinement : the number of global refines to perform
* - Verbosity : whether the grid construction should output to standard out
- * - HeapSize: The heapsize used to allocate memory
* - BoundarySegments : whether to insert boundary segments into the grid
*
*/
@@ -143,10 +142,7 @@ private:
* \brief Do some operations before making the grid
*/
void preProcessing_(const std::string& modelParamGroup)
- {
- if(hasParamInGroup(modelParamGroup, "Grid.HeapSize"))
- Grid::setDefaultHeapSize(getParamFromGroup<unsigned>(modelParamGroup, "Grid.HeapSize"));
- }
+ {}
/*!
* \brief Do some operatrion after making the grid, like global refinement
diff --git a/test/porousmediumflow/2p/sequential/grids/test_3d2p_12_ug.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_12_ug.dgf
index cb12c9d446..becba03e64 100644
--- a/test/porousmediumflow/2p/sequential/grids/test_3d2p_12_ug.dgf
+++ b/test/porousmediumflow/2p/sequential/grids/test_3d2p_12_ug.dgf
@@ -129,7 +129,6 @@ Cube
#
GridParameter
closure none
-heapsize 1000
#
Boundarydomain
default 1
diff --git a/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug1.dgf b/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug1.dgf
index 2ff2535004..c120065ad6 100644
--- a/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug1.dgf
+++ b/test/porousmediumflow/2p/sequential/grids/test_3d2p_3_ug1.dgf
@@ -40,7 +40,6 @@ Cube
#
GridParameter
closure none
-heapsize 1000
#
Boundarydomain
default 1
--
GitLab