From 3ce4cdaa558957f008efd27647a85b85362bb3a9 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 22 Mar 2016 15:40:06 +0100
Subject: [PATCH] [mpnc][test] Replace unnecessary dgf files by input files

---
 .../mpnc/implicit/grids/forchheimer1d.dgf         | 15 ---------------
 .../mpnc/implicit/grids/obstacle_24x16.dgf        | 15 ---------------
 .../mpnc/implicit/grids/obstacle_48x32.dgf        | 15 ---------------
 .../mpnc/implicit/test_boxmpnc.input              |  3 ++-
 .../mpnc/implicit/test_ccmpnc.input               |  3 ++-
 .../mpnc/implicit/test_forchheimer1p.input        |  3 ++-
 .../mpnc/implicit/test_forchheimer2p.input        |  5 +++--
 7 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
 delete mode 100644 test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
 delete mode 100644 test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf

diff --git a/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf b/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
deleted file mode 100644
index 3a7f451a5e..0000000000
--- a/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0    % first corner
-1   % second corner
-100   % 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/mpnc/implicit/grids/obstacle_24x16.dgf b/test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
deleted file mode 100644
index 457306bbd3..0000000000
--- a/test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-60 40   % second corner
-24 16   % 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/mpnc/implicit/grids/obstacle_48x32.dgf b/test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf
deleted file mode 100644
index 6242c812d5..0000000000
--- a/test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-60 40   % second corner
-48 32   % 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/mpnc/implicit/test_boxmpnc.input b/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
index 1c63f15fbe..1c58b3803a 100644
--- a/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
+++ b/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
@@ -3,7 +3,8 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/obstacle_24x16.dgf
+UpperRight = 60 40
+Cells = 24 16
 
 [LinearSolver]
 ResidualReduction = 1e-12
diff --git a/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input b/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
index ac0e738ef6..dbb4c29d38 100644
--- a/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
+++ b/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
@@ -3,7 +3,8 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/obstacle_24x16.dgf
+UpperRight = 60 40
+Cells = 24 16
 
 [LinearSolver]
 ResidualReduction = 1e-12
diff --git a/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input b/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
index bc0015963e..0acf3f7e82 100644
--- a/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
+++ b/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
@@ -3,7 +3,8 @@ DtInitial = 1e7 # [s]
 TEnd =     1e7 # [s]
 
 [Grid]
-File = ./grids/forchheimer1d.dgf
+UpperRight = 1
+Cells = 100
 
 [Problem]
 pMin 		= 1e5
diff --git a/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input b/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
index 8a9f6e4e6d..90028d6f98 100644
--- a/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
+++ b/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
@@ -3,10 +3,11 @@ DtInitial = 330 # [s]
 TEnd =     3e3 # [s]
 
 [Grid]
-File = ./grids/obstacle_24x16.dgf
+UpperRight = 60 40
+Cells = 24 16
 
 [Problem]
-pMin 		=    1e5
+pMin 		= 1e5
 pMax 		= 42e5
 outputName 	= test_forchheimer2p
 
-- 
GitLab