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

* Use input file for structured grids instead of dgf files for
  zeroeq2c tests
---
 test/freeflow/zeroeq2c/grids/testpipe.dgf     | 15 ---------------
 test/freeflow/zeroeq2c/test_zeroeq2c.input    |  4 +++-
 test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh |  6 ------
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 test/freeflow/zeroeq2c/grids/testpipe.dgf

diff --git a/test/freeflow/zeroeq2c/grids/testpipe.dgf b/test/freeflow/zeroeq2c/grids/testpipe.dgf
deleted file mode 100644
index 6bf3308370..0000000000
--- a/test/freeflow/zeroeq2c/grids/testpipe.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0 % first corner
-3 1 % second corner
-30 20 % cells in x and y direction
-#
-
-Cube
-0 1 2 3
-#
-
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
\ No newline at end of file
diff --git a/test/freeflow/zeroeq2c/test_zeroeq2c.input b/test/freeflow/zeroeq2c/test_zeroeq2c.input
index 63403fa6c9..421dcebc44 100644
--- a/test/freeflow/zeroeq2c/test_zeroeq2c.input
+++ b/test/freeflow/zeroeq2c/test_zeroeq2c.input
@@ -3,7 +3,9 @@ DtInitial = .1 # [s]
 TEnd = 10 # [s]
 
 [Grid]
-File = grids/testpipe.dgf
+LowerLeft = 0 0
+UpperRight = 3 1
+Cells = 30 20
 
 [Problem]
 OutputName = "zeroeq2c"
diff --git a/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh b/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
index ae5c0ebe6e..fbd211a05b 100644
--- a/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
+++ b/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
@@ -23,12 +23,6 @@
 #ifndef DUMUX_ZEROEQTWOCTESTPROBLEM_HH
 #define DUMUX_ZEROEQTWOCTESTPROBLEM_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