clean up the DGF grid files a bit

2025-02-25 18:55:30 -06:00 · 2014-03-05 13:29:21 +01:00 · 2014-03-05 13:29:21 +01:00 · 8b39dc2880
commit 8b39dc2880
parent b10f332c47
20 changed files with 222 additions and 120 deletions
--- a/tests/grids/co2injection.dgf
+++ b/tests/grids/co2injection.dgf
@ -3,15 +3,16 @@ DGF
 Interval
 0 0   % first corner
 60 40   % second corner
-24 16   % 24 cells in x and 16 in y direction
-#Interval
+24 16   % cells in x and in y direction
+#
+
+GridParameter
+overlap 1
+closure green
+#

 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
+#

-GridParameter
-Overlap 1
-#GridParameter
-
-#DGF
+#
--- a/tests/grids/cuvette_11x4.dgf
+++ b/tests/grids/cuvette_11x4.dgf
@ -1,15 +1,18 @@
 DGF
+
 Interval
 0 0        % first corner
 1.5 0.74   % second corner
 11 4       % cells in x and in y direction
 #
+
 GridParameter
-overlap 0 
-periodic 
+overlap 1
 closure green
-#GridParameter 
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/cuvette_44x24.dgf
+++ b/tests/grids/cuvette_44x24.dgf
@ -1,15 +1,18 @@
 DGF
+
 Interval
 0 0        % first corner
 1.5 0.74   % second corner
-44 24   % 22 cells in x and 12 in y direction
+44 24      % cells in x and in y direction
 #
+
 GridParameter
-overlap 0 
-periodic 
+overlap 1
 closure green
 #GridParameter
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/groundwater_1d.dgf
+++ b/tests/grids/groundwater_1d.dgf
@ -1,11 +1,18 @@
 DGF
+
 Interval
 0 % first corner
 1 % second corner
 10 % cells in x direction
 #

+GridParameter
+overlap 1
+closure green
+#GridParameter
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/groundwater_2d.dgf
+++ b/tests/grids/groundwater_2d.dgf
@ -1,11 +1,18 @@
 DGF
+
 Interval
 0 0   % first corner
 1 1   % second corner
 10 10 % cells in x and y direction
 #

+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/groundwater_3d.dgf
+++ b/tests/grids/groundwater_3d.dgf
@ -1,11 +1,18 @@
 DGF
+
 Interval
 0 0 0  % first corner
 1 1 1  % second corner
-20 20 20  % 1 cells in x and 1 in y direction
+20 20 20  % cells in x and in y direction
+#
+
+GridParameter
+overlap 1
+closure green
 #

 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/infiltration_250x20.dgf
+++ b/tests/grids/infiltration_250x20.dgf
@ -1,15 +1,18 @@
 DGF
+
 Interval
 0 0      % first corner
 500 10   % second corner
 250 20   % cells in x and y direction
 #
+
 GridParameter
-overlap 0 
-periodic 
+overlap 1
 closure green
-#GridParameter 
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/infiltration_50x3.dgf
+++ b/tests/grids/infiltration_50x3.dgf
@ -1,15 +1,18 @@
 DGF
+
 Interval
 0 0   % first corner
 500 10   % second corner
 50 3   % cells in x and y direction
 #
+
 GridParameter
-overlap 0 
-periodic 
+overlap 1
 closure green
-#GridParameter 
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/obstacle_24x16.dgf
+++ b/tests/grids/obstacle_24x16.dgf
@ -1,15 +1,18 @@
 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 
+overlap 1
 closure green
-#GridParameter 
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/obstacle_48x32.dgf
+++ b/tests/grids/obstacle_48x32.dgf
@ -1,15 +1,18 @@
 DGF
+
 Interval
 0 0   % first corner
 60 40   % second corner
-48 32   % 24 cells in x and 16 in y direction
+48 32   % cells in x and in y direction
 #
+
 GridParameter
-overlap 0 
-periodic 
+overlap 1
 closure green
-#GridParameter 
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/outflow.dgf
+++ b/tests/grids/outflow.dgf
@ -5,7 +5,13 @@ Interval
 20 20  % number of cells in x and y direction
 #

+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/reservoir.dgf
+++ b/tests/grids/reservoir.dgf
@ -1,10 +1,18 @@
 DGF
+
 Interval
 0 0   % first corner
 6000 20   % second corner
-100 10   % 24 cells in x and 16 in y direction
+100 10   % 100 cells in x and 10 in y direction
 #
+
+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
+#
+
 #
--- a/tests/grids/richardslens_24x16.dgf
+++ b/tests/grids/richardslens_24x16.dgf
@ -1,11 +1,18 @@
 DGF
+
 Interval
 0 0   % first corner
 6 4   % second corner
 24 16 % cells in x and in y direction
 #

+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/richardslens_48x32.dgf
+++ b/tests/grids/richardslens_48x32.dgf
@ -1,11 +1,17 @@
 DGF
+
 Interval
 0 0   % first corner
 6 4   % second corner
 48 32 % cells in x and in y direction
 #

+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+#
--- a/tests/grids/richardslens_96x64.dgf
+++ b/tests/grids/richardslens_96x64.dgf
@ -1,11 +1,18 @@
 DGF
+
 Interval
 0 0     % first corner
 6 4     % second corner
 96 64   % cells in x and in y direction
 #

+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/test_navierstokes.dgf
+++ b/tests/grids/test_navierstokes.dgf
@ -1,4 +1,5 @@
 DGF
+
 %%%
 % grid with 86 times 86 rectangular cells, [0,1] times [0,1]
 % refined towards the boundaries, 6 time finer compared to the middle
@ -7401,6 +7402,7 @@ Vertex
 0.994736842105263 1.000000000000000
 1.000000000000000 1.000000000000000
 #
+
 CUBE
 0 1 86 87
 1 2 87 88
@ -14628,6 +14630,14 @@ CUBE
 7307 7308 7393 7394
 7308 7309 7394 7395
 #
+
+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1
 #
+
+#
--- a/tests/grids/test_stokes.dgf
+++ b/tests/grids/test_stokes.dgf
@ -1,10 +1,18 @@
 DGF
+
 Interval
 0 0     % first corner
 1.0 1.0 % second corner
 32 32   % cells in x and in y direction
 #
+
+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/test_stokes2c.dgf
+++ b/tests/grids/test_stokes2c.dgf
@ -1,16 +1,20 @@
 DGF
+
 Interval
 0 0     % first corner
 1.0 1.0 % second corner
-32 32 % 120 30   % 24 cells in x and 16 in y direction
+32 32   % cells in x and in y direction
 #
-#GridParameter
-#overlap 0 
-#periodic 
-#closure green
-#copies none
-#heapsize 500
+
+GridParameter
+overlap 1
+closure green
+copies none
+heapsize 500
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/test_stokes2cni.dgf
+++ b/tests/grids/test_stokes2cni.dgf
@ -1,16 +1,18 @@
 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
+18 18   % cells in x and in y direction
 #
-#GridParameter
-#overlap 0 
-#periodic 
-#closure green
-#copies none
-#heapsize 500
+
+GridParameter
+overlap 1
+closure green
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#
--- a/tests/grids/waterair.dgf
+++ b/tests/grids/waterair.dgf
@ -1,15 +1,19 @@
 DGF
+
 Interval
 0 0   % first corner
 40 40 % second corner
-64 64
+64 64 % cells in x and y direction
 #
+
 GridParameter
-overlap 0 
+overlap 1
 periodic
 closure green
-#GridParameter 
+#
+
 BOUNDARYDOMAIN
 default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
+#
+
+#