From 68081129a46cccb490eead9c9207859e15914251 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Tue, 22 Mar 2016 14:49:57 +0100 Subject: [PATCH] [richards] Remove unnecessary dgf files > grid in input file --- .../implicit/grids/richardsanalytical-1x64.dgf | 6 ------ .../richards/implicit/grids/richardslens-24x16.dgf | 11 ----------- .../richards/implicit/grids/richardslens-48x32.dgf | 11 ----------- .../richards/implicit/grids/richardslens-96x64.dgf | 11 ----------- .../implicit/grids/test_richardsniconduction.dgf | 11 ----------- .../implicit/grids/test_richardsniconvection.dgf | 11 ----------- .../richards/implicit/test_boxrichards.input | 3 ++- .../implicit/test_boxrichardsniconduction.input | 3 ++- .../implicit/test_boxrichardsniconvection.input | 3 ++- .../richards/implicit/test_ccrichards.input | 3 ++- .../richards/implicit/test_ccrichardsanalytical.input | 3 ++- .../implicit/test_ccrichardsniconduction.input | 3 ++- .../implicit/test_ccrichardsniconvection.input | 3 ++- 13 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf delete mode 100644 test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf delete mode 100644 test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf delete mode 100644 test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf delete mode 100644 test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf delete mode 100644 test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf diff --git a/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf b/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf deleted file mode 100644 index 1d03a21af4..0000000000 --- a/test/porousmediumflow/richards/implicit/grids/richardsanalytical-1x64.dgf +++ /dev/null @@ -1,6 +0,0 @@ -DGF -Interval -0 0 % first corner -6 4 % second corner -1 512 % cells in x and in y direction -# diff --git a/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf deleted file mode 100644 index 190de1ef5d..0000000000 --- a/test/porousmediumflow/richards/implicit/grids/richardslens-24x16.dgf +++ /dev/null @@ -1,11 +0,0 @@ -DGF -Interval -0 0 % first corner -6 4 % second corner -24 16 % cells in x and in y direction -# - -BOUNDARYDOMAIN -default 1 % all boundaries have id 1 -#BOUNDARYDOMAIN -# unitcube.dgf diff --git a/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf deleted file mode 100644 index 199f78c5b7..0000000000 --- a/test/porousmediumflow/richards/implicit/grids/richardslens-48x32.dgf +++ /dev/null @@ -1,11 +0,0 @@ -DGF -Interval -0 0 % first corner -6 4 % second corner -48 32 % cells in x and in y direction -# - -BOUNDARYDOMAIN -default 1 % all boundaries have id 1 -#BOUNDARYDOMAIN -# unitcube.dgf diff --git a/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf b/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf deleted file mode 100644 index 4d771763a2..0000000000 --- a/test/porousmediumflow/richards/implicit/grids/richardslens-96x64.dgf +++ /dev/null @@ -1,11 +0,0 @@ -DGF -Interval -0 0 % first corner -6 4 % second corner -96 64 % cells in x and in y direction -# - -BOUNDARYDOMAIN -default 1 % all boundaries have id 1 -#BOUNDARYDOMAIN -# unitcube.dgf diff --git a/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf b/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf deleted file mode 100644 index b2cbd56640..0000000000 --- a/test/porousmediumflow/richards/implicit/grids/test_richardsniconduction.dgf +++ /dev/null @@ -1,11 +0,0 @@ -DGF -Interval -0 0 % first corner -5 1 % second corner -200 1 % number of cells in x and y direction -# - -BOUNDARYDOMAIN -default 1 % all boundaries have id 1 -#BOUNDARYDOMAIN -# unitcube.dgf diff --git a/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf b/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf deleted file mode 100644 index 0bccad0e53..0000000000 --- a/test/porousmediumflow/richards/implicit/grids/test_richardsniconvection.dgf +++ /dev/null @@ -1,11 +0,0 @@ -DGF -Interval -0 0 % first corner -20 1 % second corner -80 1 % number of cells in x and y direction -# - -BOUNDARYDOMAIN -default 1 % all boundaries have id 1 -#BOUNDARYDOMAIN -# unitcube.dgf diff --git a/test/porousmediumflow/richards/implicit/test_boxrichards.input b/test/porousmediumflow/richards/implicit/test_boxrichards.input index 25fe8e5727..4161962997 100644 --- a/test/porousmediumflow/richards/implicit/test_boxrichards.input +++ b/test/porousmediumflow/richards/implicit/test_boxrichards.input @@ -3,7 +3,8 @@ DtInitial = 100 # [s] TEnd = 3000 # [s] [Grid] -File = ./grids/richardslens-24x16.dgf +UpperRight = 6 4 +Cells = 24 16 [Problem] Name = richardslensbox diff --git a/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input b/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input index da1e6086d3..afed3ddd3c 100644 --- a/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input +++ b/test/porousmediumflow/richards/implicit/test_boxrichardsniconduction.input @@ -4,7 +4,8 @@ TEnd = 1e5 # [s] MaxTimeStepSize = 1e10 # [s] [Grid] -File = ./grids/test_richardsniconduction.dgf +UpperRight = 5 1 +Cells = 200 1 [Problem] Name = test_boxrichardsniconduction # name passed to the output routines diff --git a/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input b/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input index e7a20189f8..98fd0d6c70 100644 --- a/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input +++ b/test/porousmediumflow/richards/implicit/test_boxrichardsniconvection.input @@ -4,7 +4,8 @@ TEnd = 3e4 # [s] MaxTimeStepSize = 1e3 # [s] [Grid] -File = ./grids/test_richardsniconvection.dgf +UpperRight = 20 1 +Cells = 80 1 [Problem] Name = test_boxrichardsniconvection # name passed to the output routines diff --git a/test/porousmediumflow/richards/implicit/test_ccrichards.input b/test/porousmediumflow/richards/implicit/test_ccrichards.input index 3d19ce46f9..effd06edc0 100644 --- a/test/porousmediumflow/richards/implicit/test_ccrichards.input +++ b/test/porousmediumflow/richards/implicit/test_ccrichards.input @@ -3,7 +3,8 @@ DtInitial = 100 # [s] TEnd = 3000 # [s] [Grid] -File = ./grids/richardslens-24x16.dgf +UpperRight = 6 4 +Cells = 24 16 [Problem] Name = richardslenscc diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input index 73435ae63a..4d6e06e783 100644 --- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input +++ b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input @@ -4,7 +4,8 @@ TEnd = 100 # [s] MaxTimeStepSize = 1e-1 # [s] [Grid] -File = ./grids/richardsanalytical-1x64.dgf +UpperRight = 6 4 +Cells = 1 512 [Problem] Name = richardsanalyticalcc diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input b/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input index 77fc39cc96..9f1d1ae0be 100644 --- a/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input +++ b/test/porousmediumflow/richards/implicit/test_ccrichardsniconduction.input @@ -4,7 +4,8 @@ TEnd = 1e5 # [s] MaxTimeStepSize = 1e10 # [s] [Grid] -File = ./grids/test_richardsniconduction.dgf +UpperRight = 5 1 +Cells = 200 1 [Problem] Name = test_ccrichardsniconduction # name passed to the output routines diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input b/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input index c7e7eec25d..a8d961715f 100644 --- a/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input +++ b/test/porousmediumflow/richards/implicit/test_ccrichardsniconvection.input @@ -4,7 +4,8 @@ TEnd = 3e4 # [s] MaxTimeStepSize = 1e3 # [s] [Grid] -File = ./grids/test_richardsniconvection.dgf +UpperRight = 20 1 +Cells = 80 1 [Problem] Name = test_ccrichardsniconvection # name passed to the output routines -- GitLab