From 906a7c846a077cf72f6d41f93f68100133e77ca6 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Tue, 22 Mar 2016 15:11:48 +0100 Subject: [PATCH] [test][3p3c] Replace unnecessary dgf by input file --- .../3p3c/implicit/grids/column.dgf | 15 --------------- .../3p3c/implicit/grids/kuev_3p3cni.dgf | 15 --------------- .../3p3c/implicit/grids/test_3p3c.dgf | 15 --------------- .../3p3c/implicit/grids/test_3p3c_coarse.dgf | 15 --------------- .../3p3c/implicit/test_box3p3c.input | 3 ++- .../3p3c/implicit/test_box3p3c_reference.input | 3 ++- .../3p3c/implicit/test_box3p3cnicolumnxylol.input | 5 +++-- .../3p3c/implicit/test_box3p3cnikuevette.input | 3 ++- .../3p3c/implicit/test_cc3p3c.input | 3 ++- .../3p3c/implicit/test_cc3p3c_reference.input | 3 ++- .../3p3c/implicit/test_cc3p3cnicolumnxylol.input | 3 ++- .../3p3c/implicit/test_cc3p3cnikuevette.input | 3 ++- 12 files changed, 17 insertions(+), 69 deletions(-) delete mode 100644 test/porousmediumflow/3p3c/implicit/grids/column.dgf delete mode 100644 test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf delete mode 100644 test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf delete mode 100644 test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf diff --git a/test/porousmediumflow/3p3c/implicit/grids/column.dgf b/test/porousmediumflow/3p3c/implicit/grids/column.dgf deleted file mode 100644 index 1818d513a6..0000000000 --- a/test/porousmediumflow/3p3c/implicit/grids/column.dgf +++ /dev/null @@ -1,15 +0,0 @@ -DGF -Interval -0 0 % first corner -0.1 1.20 % second corner -1 120 % 22 cells in x and 12 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/3p3c/implicit/grids/kuev_3p3cni.dgf b/test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf deleted file mode 100644 index f8a5dea942..0000000000 --- a/test/porousmediumflow/3p3c/implicit/grids/kuev_3p3cni.dgf +++ /dev/null @@ -1,15 +0,0 @@ -DGF -Interval -0 0 % first corner -1.5 0.74 % second corner -15 8 % cells in and 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/3p3c/implicit/grids/test_3p3c.dgf b/test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf deleted file mode 100644 index 7b7f27a3c3..0000000000 --- a/test/porousmediumflow/3p3c/implicit/grids/test_3p3c.dgf +++ /dev/null @@ -1,15 +0,0 @@ -DGF -Interval -0 0 % first corner -500 10 % second corner -250 10 % cells in x and 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/3p3c/implicit/grids/test_3p3c_coarse.dgf b/test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf deleted file mode 100644 index b36f87afc6..0000000000 --- a/test/porousmediumflow/3p3c/implicit/grids/test_3p3c_coarse.dgf +++ /dev/null @@ -1,15 +0,0 @@ -DGF -Interval -0 0 % first corner -500 10 % second corner -40 4 % cells in x and 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/3p3c/implicit/test_box3p3c.input b/test/porousmediumflow/3p3c/implicit/test_box3p3c.input index 5bc35023d2..80639b17c8 100644 --- a/test/porousmediumflow/3p3c/implicit/test_box3p3c.input +++ b/test/porousmediumflow/3p3c/implicit/test_box3p3c.input @@ -3,7 +3,8 @@ DtInitial = 60 # [s] TEnd = 864000 # [s] [Grid] -File = ./grids/test_3p3c.dgf +UpperRight = 500 10 +Cells = 250 10 [Problem] Name = infiltrationbox diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input b/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input index c31a525356..26470f2cb7 100644 --- a/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input +++ b/test/porousmediumflow/3p3c/implicit/test_box3p3c_reference.input @@ -3,7 +3,8 @@ DtInitial = 86400 # [s] TEnd = 864000 # [s] [Grid] -File = ./grids/test_3p3c_coarse.dgf +UpperRight = 500 10 +Cells = 40 4 [Problem] Name = box3p3c diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input b/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input index 8c6853ac47..bed5d51223 100644 --- a/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input +++ b/test/porousmediumflow/3p3c/implicit/test_box3p3cnicolumnxylol.input @@ -3,7 +3,8 @@ DtInitial = 1 # [s] TEnd = 200 # [s] [Grid] -File = ./grids/column.dgf +UpperRight = 0.1 1.20 +Cells = 1 120 [Problem] Name = columnxylolbox # name passed to the output routines @@ -12,4 +13,4 @@ Name = columnxylolbox # name passed to the output routines NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences [TimeManager] -MaxTimeStepSize= 4. # Set the maximum time step +MaxTimeStepSize= 4.0 # Set the maximum time step diff --git a/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input b/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input index a154da0069..3e844993aa 100644 --- a/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input +++ b/test/porousmediumflow/3p3c/implicit/test_box3p3cnikuevette.input @@ -5,7 +5,8 @@ MaxTimeStepSize = 60 # [s] EpisodeLength = 1000 # [s] [Grid] -File = ./grids/kuev_3p3cni.dgf +UpperRight = 1.5 0.74 +Cells = 15 8 [Problem] Name = kuevettebox # name passed to the output routines diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input index 07c896f8bc..750bf8c828 100644 --- a/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input +++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3c.input @@ -3,7 +3,8 @@ DtInitial = 60 # [s] TEnd = 864000 # [s] [Grid] -File = ./grids/test_3p3c.dgf +UpperRight = 500 10 +Cells = 250 10 [Problem] Name = infiltrationcc diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input index 7dd8695209..553e58c86c 100644 --- a/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input +++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3c_reference.input @@ -3,7 +3,8 @@ DtInitial = 86400 # [s] TEnd = 864000 # [s] [Grid] -File = ./grids/test_3p3c_coarse.dgf +UpperRight = 500 10 +Cells = 40 4 [Problem] Name = cc3p3c diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input index c85cf38d3c..73b95afdfb 100644 --- a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input +++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnicolumnxylol.input @@ -3,7 +3,8 @@ DtInitial = 1 # [s] TEnd = 200 # [s] [Grid] -File = ./grids/column.dgf +UpperRight = 0.1 1.20 +Cells = 1 120 [Problem] Name = columnxylolcc # name passed to the output routines diff --git a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input index 9bf1894b74..ffe5648570 100644 --- a/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input +++ b/test/porousmediumflow/3p3c/implicit/test_cc3p3cnikuevette.input @@ -5,7 +5,8 @@ MaxTimeStepSize = 60 # [s] EpisodeLength = 1000 # [s] [Grid] -File = ./grids/kuev_3p3cni.dgf +UpperRight = 1.5 0.74 +Cells = 15 8 [Problem] Name = kuevettecc # name passed to the output routines -- GitLab