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

* Use input file for structured grids instead of dgf files for
  stokes2cni tests
---
 .../stokes2cni/grids/test_stokes2cni.dgf         | 16 ----------------
 .../freeflow/stokes2cni/stokes2cnitestproblem.hh |  2 --
 test/freeflow/stokes2cni/test_stokes2cni.input   |  4 +++-
 .../stokes2cni/test_stokes2cni_conduction.input  |  4 +++-
 4 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 test/freeflow/stokes2cni/grids/test_stokes2cni.dgf

diff --git a/test/freeflow/stokes2cni/grids/test_stokes2cni.dgf b/test/freeflow/stokes2cni/grids/test_stokes2cni.dgf
deleted file mode 100644
index bd986a5698..0000000000
--- a/test/freeflow/stokes2cni/grids/test_stokes2cni.dgf
+++ /dev/null
@@ -1,16 +0,0 @@
-DGF
-Interval
-0 0   % first corner 
-1.0 1.0 % second corner
-18 18 % 120 30   % 24 cells in x and 16 in y direction
-# 
-#GridParameter
-#overlap 0 
-#periodic 
-#closure green
-#copies none
-#heapsize 500
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index 4998e6d50c..f4dd73d526 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -23,8 +23,6 @@
 #ifndef DUMUX_STOKES2CNITESTPROBLEM_HH
 #define DUMUX_STOKES2CNITESTPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #if HAVE_PARDISO
 #include <dumux/linear/pardisobackend.hh>
 #endif
diff --git a/test/freeflow/stokes2cni/test_stokes2cni.input b/test/freeflow/stokes2cni/test_stokes2cni.input
index 900375c777..5da6ca3237 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni.input
@@ -3,7 +3,9 @@ DtInitial = 0.1 # [s]
 TEnd = 3 # [s]
 
 [Grid]
-File = ./grids/test_stokes2cni.dgf
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 18 18
 
 [Stokes]
 StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization
diff --git a/test/freeflow/stokes2cni/test_stokes2cni_conduction.input b/test/freeflow/stokes2cni/test_stokes2cni_conduction.input
index 0f082f22d1..3e2bf4f37e 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni_conduction.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni_conduction.input
@@ -3,7 +3,9 @@ DtInitial = 0.1 # [s]
 TEnd = 3 # [s]
 
 [Grid]
-File = ./grids/test_stokes2cni.dgf
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 18 18
 
 [Stokes]
 StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization
-- 
GitLab