From ffce0408c465501c373c55a0002b7bfd9c2e996d Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 10 Nov 2014 00:20:48 +0100 Subject: [PATCH] Removed unused dummy grids in test deck. --- .../Grid/tests/MULTREGTScannerTests.cpp | 32 ------------------- .../EclipseState/tests/EclipseStateTests.cpp | 16 ---------- testdata/integration_tests/BOX/BOXTEST1 | 12 ------- testdata/integration_tests/BOX/BOXTEST2 | 11 ------- testdata/integration_tests/BOX/BOXTEST3 | 12 ------- 5 files changed, 83 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp index f0d52864d..e0103739b 100644 --- a/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/tests/MULTREGTScannerTests.cpp @@ -70,14 +70,6 @@ static Opm::DeckPtr createInvalidMULTREGTDeck() { "DIMENS\n" " 3 3 2 /\n" "GRID\n" - "DX\n" - "18*0.25 /\n" - "DYV\n" - "3*0.25 /\n" - "DZ\n" - "18*0.25 /\n" - "TOPS\n" - "9*0.25 /\n" "FLUXNUM\n" "1 1 2\n" "1 1 2\n" @@ -140,14 +132,6 @@ static Opm::DeckPtr createNotSupportedMULTREGTDeck() { "DIMENS\n" " 3 3 2 /\n" "GRID\n" - "DX\n" - "18*0.25 /\n" - "DYV\n" - "3*0.25 /\n" - "DZ\n" - "18*0.25 /\n" - "TOPS\n" - "9*0.25 /\n" "FLUXNUM\n" "1 1 2\n" "1 1 2\n" @@ -209,14 +193,6 @@ static Opm::DeckPtr createSimpleMULTREGTDeck() { "DIMENS\n" "2 2 2 /\n" "GRID\n" - "DX\n" - "8*0.25 /\n" - "DYV\n" - "2*0.25 /\n" - "DZ\n" - "8*0.25 /\n" - "TOPS\n" - "4*0.25 /\n" "FLUXNUM\n" "1 2\n" "1 2\n" @@ -316,14 +292,6 @@ static Opm::DeckPtr createCopyMULTNUMDeck() { "DIMENS\n" "2 2 2 /\n" "GRID\n" - "DX\n" - "8*0.25 /\n" - "DYV\n" - "2*0.25 /\n" - "DZ\n" - "8*0.25 /\n" - "TOPS\n" - "4*0.25 /\n" "FLUXNUM\n" "1 2\n" "1 2\n" diff --git a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp index ef12c2455..509cd179f 100644 --- a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp +++ b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp @@ -138,14 +138,6 @@ static DeckPtr createDeck() { "DIMENS\n" " 10 10 10 /\n" "GRID\n" - "DX\n" - "1000*0.25 /\n" - "DYV\n" - "10*0.25 /\n" - "DZ\n" - "1000*0.25 /\n" - "TOPS\n" - "1000*0.25 /\n" "FAULTS \n" " 'F1' 1 1 1 4 1 4 'X' / \n" " 'F2' 5 5 1 4 1 4 'X-' / \n" @@ -187,14 +179,6 @@ static DeckPtr createDeckNoFaults() { "DIMENS\n" " 10 10 10 /\n" "GRID\n" - "DX\n" - "1000*0.25 /\n" - "DYV\n" - "10*0.25 /\n" - "DZ\n" - "1000*0.25 /\n" - "TOPS\n" - "1000*0.25 /\n" "PROPS\n" "-- multiply one layer for each face\n" "MULTX\n" diff --git a/testdata/integration_tests/BOX/BOXTEST1 b/testdata/integration_tests/BOX/BOXTEST1 index cba78a3cb..06cad6229 100644 --- a/testdata/integration_tests/BOX/BOXTEST1 +++ b/testdata/integration_tests/BOX/BOXTEST1 @@ -5,18 +5,6 @@ DIMENS GRID -DX -1000*0.25 / - -DYV -10*0.25 / - -DZ -1000*0.25 / - -TOPS -1000*0.25 / - PERMX 1000*1 / diff --git a/testdata/integration_tests/BOX/BOXTEST2 b/testdata/integration_tests/BOX/BOXTEST2 index ca4b2efe0..0e4b5a1fd 100644 --- a/testdata/integration_tests/BOX/BOXTEST2 +++ b/testdata/integration_tests/BOX/BOXTEST2 @@ -5,17 +5,6 @@ DIMENS GRID -DX -1000*0.25 / - -DYV -10*0.25 / - -DZ -1000*0.25 / - -TOPS -1000*0.25 / EDIT diff --git a/testdata/integration_tests/BOX/BOXTEST3 b/testdata/integration_tests/BOX/BOXTEST3 index 370cde115..b33e4bbbb 100644 --- a/testdata/integration_tests/BOX/BOXTEST3 +++ b/testdata/integration_tests/BOX/BOXTEST3 @@ -5,18 +5,6 @@ DIMENS GRID -DX -1000*0.25 / - -DYV -10*0.25 / - -DZ -1000*0.25 / - -TOPS -1000*0.25 / - EDIT OIL