From ac82853a2b36f533f6e62ea555a5a1cd7008710c Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 22 Mar 2016 14:56:52 +0100
Subject: [PATCH] [cleanup][tests] Use new standard grid creator for 2p2c
(implicit)
* Use input file for structured grids instead of dgf files for
2p2c implicit tests
---
.../2p2c/implicit/grids/test_2p2c.dgf | 10 ----------
.../2p2c/implicit/grids/test_2p2cni.dgf | 15 ---------------
.../2p2c/implicit/injectionproblem.hh | 5 +----
.../2p2c/implicit/test_box2p2c.input | 4 +++-
.../2p2c/implicit/test_box2p2cni.input | 4 +++-
.../2p2c/implicit/test_box2p2cni_reference.input | 4 +++-
.../2p2c/implicit/test_cc2p2c.input | 4 +++-
.../2p2c/implicit/test_cc2p2cni.input | 4 +++-
.../2p2c/implicit/test_cc2p2cni_reference.input | 4 +++-
.../2p2c/implicit/waterairproblem.hh | 2 --
10 files changed, 19 insertions(+), 37 deletions(-)
delete mode 100644 test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
delete mode 100644 test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
diff --git a/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf b/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
deleted file mode 100644
index f2df78b633..0000000000
--- a/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
+++ /dev/null
@@ -1,10 +0,0 @@
-DGF
-Interval
-0 0 % first corner
-60 40 % second corner
-24 16 % 24 cells in x and 16 in y direction
-#
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf b/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
deleted file mode 100644
index 058d853f66..0000000000
--- a/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0 % first corner
-40 40 % second corner
-64 64 % 24 cells in x and 16 in y direction
-#
-GridParameter
-overlap 0
-periodic
-closure green
-#GridParameter
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index e21ccb8258..ff1a318faf 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -24,8 +24,6 @@
#ifndef DUMUX_INJECTION_PROBLEM_HH
#define DUMUX_INJECTION_PROBLEM_HH
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
@@ -123,7 +121,6 @@ class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef typename GridView::Intersection Intersection;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
@@ -141,7 +138,7 @@ public:
*/
InjectionProblem(TimeManager &timeManager,
const GridView &gridView)
- : ParentType(timeManager, GridCreator::grid().leafGridView())
+ : ParentType(timeManager, gridView)
{
nTemperature_ = GET_RUNTIME_PARAM(TypeTag, int, Problem.NTemperature);
nPressure_ = GET_RUNTIME_PARAM(TypeTag, int, Problem.NPressure);
diff --git a/test/porousmediumflow/2p2c/implicit/test_box2p2c.input b/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
index ddde44d713..04fdad3190 100644
--- a/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
+++ b/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
TEnd = 1e4 # [s]
[Grid]
-File = ./grids/test_2p2c.dgf
+LowerLeft = 0 0
+UpperRight = 60 40
+Cells = 24 16
[Problem]
Name = injectionbox # [-] the name of the output files
diff --git a/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input b/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
index b166d6eaa2..e742c23188 100644
--- a/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
+++ b/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
TEnd = 1e4 # [s]
[Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
[Problem]
Name = waterairbox
diff --git a/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input b/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
index b166d6eaa2..e742c23188 100644
--- a/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
+++ b/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
TEnd = 1e4 # [s]
[Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
[Problem]
Name = waterairbox
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
index a817ff2f3e..7237f3520e 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
TEnd = 1e4 # [s]
[Grid]
-File = ./grids/test_2p2c.dgf
+LowerLeft = 0 0
+UpperRight = 60 40
+Cells = 24 16
[Problem]
Name = injectioncc # [-] the name of the output files
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
index 7edffc9ade..0d8d8bf207 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
TEnd = 1e4 # [s]
[Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
[Problem]
Name = wateraircc
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
index 7edffc9ade..0d8d8bf207 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
TEnd = 1e4 # [s]
[Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
[Problem]
Name = wateraircc
diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
index 3a77dd188d..1ff7e8ea36 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
@@ -25,8 +25,6 @@
#ifndef DUMUX_WATER_AIR_PROBLEM_HH
#define DUMUX_WATER_AIR_PROBLEM_HH
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
#include <dumux/material/fluidsystems/h2on2.hh>
#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
--
GitLab