From 47c0e2d0f2f0c9b1bb1d7d6abe71af6a68d7dc19 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 22 Mar 2016 17:07:39 +0100
Subject: [PATCH] [cleanup][tests] Use new standard grid creator for zeroeq

* Use input file for structured grids instead of dgf files for
  zeroeq tests
---
 test/freeflow/zeroeq/grids/channel.dgf           | 15 ---------------
 test/freeflow/zeroeq/grids/pipe.dgf              | 15 ---------------
 test/freeflow/zeroeq/test_zeroeq.input           |  4 +++-
 test/freeflow/zeroeq/test_zeroeq_channel.input   |  4 +++-
 test/freeflow/zeroeq/zeroeqchanneltestproblem.hh |  6 ------
 test/freeflow/zeroeq/zeroeqtestproblem.hh        |  6 ------
 6 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 test/freeflow/zeroeq/grids/channel.dgf
 delete mode 100644 test/freeflow/zeroeq/grids/pipe.dgf

diff --git a/test/freeflow/zeroeq/grids/channel.dgf b/test/freeflow/zeroeq/grids/channel.dgf
deleted file mode 100644
index 8b84fd446c..0000000000
--- a/test/freeflow/zeroeq/grids/channel.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-5.0 1.5  % second corner
-25 15 % cells in x and y direction
-#
-
-Cube
-0 1 2 3
-#
-
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/freeflow/zeroeq/grids/pipe.dgf b/test/freeflow/zeroeq/grids/pipe.dgf
deleted file mode 100644
index 06d6510435..0000000000
--- a/test/freeflow/zeroeq/grids/pipe.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-10 0.2469  % second corner
-20 40 % cells in x and y direction
-#
-
-Cube
-0 1 2 3
-#
-
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/freeflow/zeroeq/test_zeroeq.input b/test/freeflow/zeroeq/test_zeroeq.input
index e12d1be523..4ee0d2cd3a 100644
--- a/test/freeflow/zeroeq/test_zeroeq.input
+++ b/test/freeflow/zeroeq/test_zeroeq.input
@@ -3,7 +3,9 @@ DtInitial = 5 # [s]
 TEnd = 50 # [s]
 
 [Grid]
-File = grids/pipe.dgf
+LowerLeft = 0 0
+UpperRight = 10 0.2469
+Cells = 20 40
 
 [Problem]
 OutputName = "zeroeq"
diff --git a/test/freeflow/zeroeq/test_zeroeq_channel.input b/test/freeflow/zeroeq/test_zeroeq_channel.input
index db94a2c643..5e013aee65 100644
--- a/test/freeflow/zeroeq/test_zeroeq_channel.input
+++ b/test/freeflow/zeroeq/test_zeroeq_channel.input
@@ -3,7 +3,9 @@ DtInitial = 0.001 # [s]
 TEnd = 10 # [s]
 
 [Grid]
-File = grids/channel.dgf
+LowerLeft = 0 0
+UpperRight = 5.0 1.5
+Cells = 25 15
 
 [Problem]
 OutputName = "zeroeqchannel"
diff --git a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
index 7442c972f1..f5fdec65fb 100644
--- a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
@@ -23,12 +23,6 @@
 #ifndef DUMUX_ZEROEQCHANNELTESTPROBLEM_HH
 #define DUMUX_ZEROEQCHANNELTESTPROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#else
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 
diff --git a/test/freeflow/zeroeq/zeroeqtestproblem.hh b/test/freeflow/zeroeq/zeroeqtestproblem.hh
index 0f3b8814c7..b9fd860116 100644
--- a/test/freeflow/zeroeq/zeroeqtestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqtestproblem.hh
@@ -26,12 +26,6 @@
 #ifndef DUMUX_ZEROEQTESTPROBLEM_HH
 #define DUMUX_ZEROEQTESTPROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#else
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 
-- 
GitLab