Add PORO keyword to testdata

python/tests/data/CORNERPOINT_ACTNUM.DATA

@@ -1199,6 +1199,8 @@ ZCORN
 ACTNUM
   200*0 100*1 200*0 /
 
+PORO
+  500*0.15 /
 
 EDIT
 

tests/UDQ_TEST_WCONPROD_IUAD-2.DATA

@@ -93,6 +93,9 @@ COPY
   PERMX PERMY /
  /
 
+PORO
+   500*0.15 /
+
 RPTGRID
   -- Report Levels for Grid Section Data
   --

tests/parser/AquanconTests.cpp

@@ -46,6 +46,8 @@ inline Deck createAQUANCONDeck_DEFAULT_INFLUX2() {
         "TOPS\n"
         "9*100 /\n"
         "\n"
+        "PORO\n"
+        "  27*0.15 /\n"
         "SOLUTION\n"
         "\n"
         "AQUANCON\n"
@@ -78,6 +80,8 @@ inline Deck createAQUANCONDeck_DEFAULT_INFLUX1() {
     "\n"
     "TOPS\n"
     "9*100 /\n"
+    "PORO\n"
+    "  27*0.15 /\n"
     "\n"
     "SOLUTION\n"
     "\n"
@@ -111,6 +115,8 @@ inline Deck createAQUANCONDeck() {
         "TOPS\n"
         "9*100 /\n"
         "\n"
+        "PORO\n"
+        "  27*0.15 /\n"
         "SOLUTION\n"
         "\n"
         "AQUANCON\n"
@@ -193,6 +199,8 @@ inline Deck createAQUANCONDeck_ALLOW_INSIDE_AQUAN_OR_NOT() {
         "TOPS\n"
         "9*100 /\n"
         "\n"
+        "PORO\n"
+        "  27*0.15 /\n"
         "SOLUTION\n"
         "\n"
         "AQUFETP\n"

tests/parser/AquiferCTTests.cpp

@@ -44,6 +44,8 @@ inline Deck createAquiferCTDeck() {
         "TOPS\n"
         "9*100 /\n"
         "\n"
+        "PORO\n"
+        "  27*0.15 /\n"
         "PROPS\n"
         "AQUTAB\n"
         " 0.01 0.112 \n"
@@ -81,6 +83,8 @@ inline Deck createAquiferCTDeckDefaultP0() {
         "TOPS\n"
         "9*100 /\n"
         "\n"
+        "PORO\n"
+        "  27*0.15 /\n"
         "PROPS\n"
         "AQUTAB\n"
         " 0.01 0.112 \n"

tests/parser/EclipseGridTests.cpp

@@ -819,6 +819,8 @@ BOOST_AUTO_TEST_CASE(ConstructorNORUNSPEC) {
         "  8000*1 / \n"
         "ACTNUM \n"
         "  1000*1 / \n"
+        "PORO\n"
+        "  1000*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -842,6 +844,8 @@ BOOST_AUTO_TEST_CASE(ConstructorNoSections) {
         "  8000*1 / \n"
         "ACTNUM \n"
         "  1000*1 / \n"
+        "PORO\n"
+        "  1000*0.15 /\n"
         "\n";
 
     Opm::Parser parser;
@@ -905,6 +909,8 @@ static Opm::Deck createActnumDeck() {
             "EQUALS\n"
             " ACTNUM 0 1 1 1 1 1 1 /\n"
             "/ \n"
+            "PORO\n"
+            "  8*0.15 /\n"
             "FLUXNUM\n"
             "8*0 /\n";
 
@@ -930,6 +936,8 @@ static Opm::Deck createActnumBoxDeck() {
             "  10*0.25 /\n"
             "DEPTHZ\n"
             "  121*0.25 /\n"
+            "PORO \n"
+            "  1000*0.15 /\n"
             "EQUALS\n"
             " ACTNUM 0 1 10 1 10 1 1 /\n" // disable top layer
             "/ \n"
@@ -1005,7 +1013,6 @@ BOOST_AUTO_TEST_CASE(GridBoxActnum) {
     }
 }
 
-
 BOOST_AUTO_TEST_CASE(GridActnumVia3D) {
     auto deck = createActnumDeck();
 
@@ -1236,6 +1243,8 @@ static Opm::Deck radial_keywords_OK() {
         "10*0.25 /\n"
         "TOPS\n"
         "60*0.0 /\n"
+        "PORO \n"
+        "  600*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1261,6 +1270,8 @@ static Opm::Deck radial_keywords_OK_CIRCLE() {
         "10*0.25 /\n"
         "TOPS\n"
         "60*0.0 /\n"
+        "PORO \n"
+        "  600*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1304,6 +1315,8 @@ static Opm::Deck radial_keywords_DRV_size_mismatch() {
         "12*0.25 /\n"
         "TOPS\n"
         "60*0.0 /\n"
+        "PORO \n"
+        "  720*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1329,6 +1342,8 @@ static Opm::Deck radial_keywords_DZV_size_mismatch() {
         "11*0.25 /\n"
         "TOPS\n"
         "60*0.0 /\n"
+        "PORO \n"
+        "  720*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1353,6 +1368,8 @@ static Opm::Deck radial_keywords_DTHETAV_size_mismatch() {
         "12*0.25 /\n"
         "TOPS\n"
         "60*0.0 /\n"
+        "PORO \n"
+        "  720*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1380,6 +1397,8 @@ static Opm::Deck radial_keywords_TOPS_size_mismatch() {
         "12*0.25 /\n"
         "TOPS\n"
         "65*0.0 /\n"
+        "PORO \n"
+        "  720*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1404,6 +1423,8 @@ static Opm::Deck radial_keywords_ANGLE_OVERFLOW() {
         "12*0.25 /\n"
         "TOPS\n"
         "60*0.0 /\n"
+        "PORO \n"
+        "  720*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1437,6 +1458,8 @@ static Opm::Deck radial_details() {
         "2*1 /\n"
         "TOPS\n"
         "5*1.0 /\n"
+        "PORO \n"
+        "  10*0.15 /"
         "\n";
 
     Opm::Parser parser;
@@ -1497,6 +1520,8 @@ static Opm::Deck createCARTDeckTest3x4x2() {
         "12*25 12*35 /\n"
         "TOPS\n"
         "2500 2510 2520  2520 2530 2540  2540 2550 2560  2560 2570 2580 /\n"
+        "PORO \n"
+        "  24*0.15 /"
         "EDIT\n"
         "\n";
 
@@ -1633,6 +1658,8 @@ static Opm::Deck BAD_CP_GRID() {
         "   109.0170   109.3660   108.6681   109.0170   109.0170   109.3660\n"
         "   108.8426   109.1916   109.1916   109.5406  /\n"
         "\n"
+        "PORO\n"
+        "  8*0.15 /\n"
         "EDIT\n";
 
     Opm::Parser parser;
@@ -1674,6 +1701,8 @@ static Opm::Deck BAD_CP_GRID_MAPAXES() {
         "   109.0170   109.3660   108.6681   109.0170   109.0170   109.3660\n"
         "   108.8426   109.1916   109.1916   109.5406  /\n"
         "\n"
+        "PORO\n"
+        "  8*0.15 /\n"
         "EDIT\n";
 
     Opm::Parser parser;
@@ -1698,6 +1727,8 @@ BOOST_AUTO_TEST_CASE(SAVE_FIELD_UNITS) {
         " 16*20 16*30 16*50 / \n"
         "TOPS\n"
         " 16*8325 / \n"
+        "PORO\n"
+        "  48*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -1721,6 +1752,8 @@ BOOST_AUTO_TEST_CASE(SAVE_FIELD_UNITS) {
         " 16*20 16*30 16*50 / \n"
         "TOPS\n"
         " 16*8325 / \n"
+        "PORO\n"
+        "  48*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -1744,6 +1777,8 @@ BOOST_AUTO_TEST_CASE(SAVE_FIELD_UNITS) {
         " 16*20 16*30 16*50 / \n"
         "TOPS\n"
         " 16*8325 / \n"
+        "PORO\n"
+        "  48*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -1906,6 +1941,8 @@ BOOST_AUTO_TEST_CASE(SAVE_METRIC_UNITS) {
         " 3 2 1  3 3 2   1.05 / \n"
         " 4 2 1  4 3 2   1.15 / \n"
         "/ \n"
+        "PORO\n"
+        "  48*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -1933,6 +1970,8 @@ BOOST_AUTO_TEST_CASE(SAVE_METRIC_UNITS) {
         " 3 2 1  3 3 2   1.05 / \n"
         " 4 2 1  4 3 2   1.15 / \n"
         "/ \n"
+        "PORO\n"
+        "  48*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -2191,6 +2230,8 @@ BOOST_AUTO_TEST_CASE(TESTCP_ACTNUM_UPDATE) {
         " 2002.9995  2003.8722  2003.8722  2004.7448  2004.7448  2005.6174 / \n"
         "ACTNUM\n"
         " 0 1 1 1 0 1 / \n"
+        "PORO\n"
+        "  6*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -2258,7 +2299,8 @@ BOOST_AUTO_TEST_CASE(TEST_altGridConstructors) {
         "\n"
         "ACTNUM\n"
         " 1 1 1 1 1 0 1 1 1 0 1 1  /\n"
-
+        "PORO\n"
+        "  24*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -2316,6 +2358,8 @@ static Opm::Deck BAD_CP_GRID_ACTNUM() {
         "\n"
         "ACTNUM\n"
         "   1 1 1 1 0 1 0 1  /\n"
+        "PORO\n"
+        "  8*0.15 /\n"
         "EDIT\n";
 
     Opm::Parser parser;
@@ -2386,6 +2430,8 @@ BOOST_AUTO_TEST_CASE(TEST_constructFromEgrid) {
         " 100*8325 / \n"
         "ACTNUM\n"
         " 44*1 3*0 7*1 3*0  243*1/\n"
+        "PORO\n"
+        "  300*0.15 /\n"
         "EDIT\n"
         "\n";
 
@@ -2445,7 +2491,9 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_1) {
         "ZCORN\n"
         "2000.0000  2001.7452  2000.0000  2001.7452  2004.9992  2006.7445\n"
         "2004.9992  2006.7445  2004.9992  2006.7445  2004.9992  2006.7445\n"
-        "2014.9977  2016.7430  2014.9977  2016.7430 /\n";
+        "2014.9977  2016.7430  2014.9977  2016.7430 /\n"
+        "PORO\n"
+        "   2*0.15 /\n";
 
     const char* deckData2 =
         "RUNSPEC\n"
@@ -2458,7 +2506,9 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_1) {
         "10.0000    10.0000  2000.0000      9.8255    10.0000  2014.9977\n"
         "109.9848   10.0000  2001.7452    109.8102    10.0000  2016.7430\n"
         "10.0000   110.0000  2000.0000      9.8255   110.0000  2014.9977\n"
-        "109.9848   110.0000  2001.7452    109.8102   110.0000  2016.7430 /\n";
+        "109.9848   110.0000  2001.7452    109.8102   110.0000  2016.7430 /\n"
+        "PORO\n"
+        "   2*0.15 /\n";
 
     const char* deckData3 =
         "RUNSPEC\n"
@@ -2470,7 +2520,10 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_1) {
         "ZCORN\n"
         "2000.0000  2001.7452  2000.0000  2001.7452  2004.9992  2006.7445\n"
         "2004.9992  2006.7445  2004.9992  2006.7445  2004.9992  2006.7445\n"
-        "2014.9977  2016.7430  2014.9977  2016.7430 /\n";
+        "2014.9977  2016.7430  2014.9977  2016.7430 /\n"
+        "PORO\n"
+        "   2*0.15 /\n";
+
 
     Opm::Parser parser;
     auto deck1 = parser.parseString( deckData1) ;
@@ -2516,6 +2569,8 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
         "   109.0170   109.3660   108.6681   109.0170   109.0170   109.3660\n"
         "   108.8426   109.1916   109.1916   109.5406  /\n"
         "\n"
+        "PORO\n"
+        "   8*0.15 /\n"
         "EDIT\n";
 
     const char* deckData1a =
@@ -2551,6 +2606,8 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
         "\n"
         "ACTNUM\n"
         " 1 1 1 1 0 1 0 1 /\n"
+        "PORO\n"
+        "   8*0.15 /\n"
         "EDIT\n";
 
     const char* deckData1b =
@@ -2591,6 +2648,8 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
         "\n"
         "ACTNUM\n"
         " 1 1 1 1 0 1 0 1 /\n"
+        "PORO\n"
+        "   8*0.15 /\n"
         "EDIT\n";
 
     const char* deckData2 =

tests/parser/EclipseStateTests.cpp

@@ -138,6 +138,8 @@ const char *deckData =
 "  'F1' 0.50 / \n"
 "  'F2' 0.50 / \n"
 "/\n"
+"PORO\n"
+"  1000*0.15 /"
 "EDIT\n"
 "MULTFLT /\n"
 "  'F2' 0.25 / \n"
@@ -180,6 +182,8 @@ const char *deckData =
 "1000*0.25 /\n"
 "TOPS\n"
 "100*0.25 /\n"
+"PORO\n"
+"  1000*0.15 /"
 "PROPS\n"
 "-- multiply one layer for each face\n"
 "MULTX\n"
@@ -225,6 +229,8 @@ const std::string& inputStr = "RUNSPEC\n"
                 "120*0.25 /\n"
                 "TOPS\n"
                 "30*0.25 /\n"
+                "PORO\n"
+                "  120*0.15/ \n"
                 "REGIONS\n"
                 "EQLNUM\n"
                 "10*1 10*2 100*3 /\n "
@@ -377,6 +383,8 @@ static Deck createDeckNoGridOpts() {
         "1000*0.25 /\n"
         "TOPS\n"
         "100*0.25 /\n"
+        "PORO\n"
+        "  1000*0.15 /\n"
         "FLUXNUM\n"
         "  1000*1 /\n"
         "MULTNUM\n"
@@ -404,6 +412,8 @@ static Deck createDeckWithGridOpts() {
         "1000*0.25 /\n"
         "TOPS\n"
         "100*0.25 /\n"
+        "PORO\n"
+        "  1000*0.15 /\n"
         "FLUXNUM\n"
         "  1000*1 /\n"
         "MULTNUM\n"
@@ -474,6 +484,8 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreation) {
                           "1000*0.25 /\n"
                           "TOPS\n"
                           "100*0.25 /\n"
+                          "PORO\n"
+                          "  1000*0.15 /\n"
                           "START             -- 0 \n"
                           "19 JUN 2007 / \n"
                           "SCHEDULE\n"
@@ -519,6 +531,8 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreationWithSolutionRPTRST) {
                           "1000*0.25 /\n"
                           "TOPS\n"
                           "100*0.25 /\n"
+                          "PORO\n"
+                          "  1000*0.15 /\n"
                           "SOLUTION\n"
                           "RPTRST\n"
                           "BASIC=1/\n"
@@ -568,6 +582,8 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreationWithSolutionRPTSOL) {
                         "1000*0.25 /\n"
                         "TOPS\n"
                         "100*0.25 /\n"
+                        "PORO\n"
+                        "  1000*0.15 /\n"
                         "SOLUTION\n"
                         "RPTSOL\n"
                         "RESTART=2\n"
@@ -604,6 +620,8 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreationWithSolutionRPTSOL) {
                           "1000*0.25 /\n"
                           "TOPS\n"
                           "100*0.25 /\n"
+                          "PORO\n"
+                          "  1000*0.15 /\n"
                           "SOLUTION\n"
                           "RPTSOL\n"
                           "0 0 0 0 0 0 2\n"
@@ -668,6 +686,9 @@ BOOST_AUTO_TEST_CASE(TestBox) {
                 "4*0.25 /\n"
                 "TOPS\n"
                 "4*0.25 /\n"
+                "ENDBOX\n"
+                "PORO\n"
+                "  4*0.15 /\n"
                 "REGIONS\n"
                 "OPERNUM\n"
                 "3 3 1 2 /\n"

tests/parser/FoamTests.cpp

@@ -56,6 +56,8 @@ MULTFLT
   'F1' 0.50 /
   'F2' 0.50 /
 /
+PORO
+   1000*0.15/
 EDIT
 MULTFLT /
   'F2' 0.25 /
@@ -125,6 +127,8 @@ MULTFLT
   'F1' 0.50 /
   'F2' 0.50 /
 /
+PORO
+   1000*0.15/
 EDIT
 MULTFLT /
   'F2' 0.25 /

tests/parser/ScheduleTests.cpp

@@ -546,6 +546,8 @@ DZV
   5*5 /
 TOPS
   25*2500 /
+PORO
+  125*0.15 /
 PERMX
   125*500 /
 COPY
@@ -2968,6 +2970,8 @@ START\n \
 8 MAR 1998 /\n \
 \n \
 GRID \n\
+PORO\n\
+  1000*0.25 /\n\
 PERMX \n\
   1000*0.10/ \n\
 COPY \n\
@@ -3102,6 +3106,8 @@ BOOST_AUTO_TEST_CASE(POLYINJ_TEST) {
         "START\n"
         "   8 MAR 2018/\n"
         "GRID\n"
+        "PORO\n"
+        "  1000*0.25 /\n"
         "PERMX\n"
         "  1000*0.25 /\n"
         "COPY\n"
@@ -3171,6 +3177,8 @@ BOOST_AUTO_TEST_CASE(WFOAM_TEST) {
         "GRID\n"
         "PERMX\n"
         "  1000*0.25 /\n"
+        "PORO\n"
+        "  1000*0.25 /\n"
         "COPY\n"
         "  PERMX  PERMY /\n"
         "  PERMX  PERMZ /\n"

tests/parser/SummaryConfigTests.cpp

@@ -54,6 +54,8 @@ static Deck createDeck_no_wells( const std::string& summary ) {
             "  PERMX PERMY /\n"
             "  PERMX PERMZ /\n"
             "/\n"
+            "PORO \n"
+            "   1000*0.15 /\n"
             "REGIONS\n"
             "FIPNUM\n"
             "200*1 300*2 500*3 /\n"
@@ -87,6 +89,8 @@ static Deck createDeck( const std::string& summary ) {
             "  PERMX PERMY /\n"
             "  PERMX PERMZ /\n"
             "/\n"
+            "PORO \n"
+            "   1000*0.15 /\n"
             "REGIONS\n"
             "FIPNUM\n"
             "200*1 300*2 500*3 /\n"

tests/parser/UDQTests.cpp

@@ -36,17 +36,13 @@ using namespace Opm;
 
 Schedule make_schedule(const std::string& input) {
     Parser parser;
+
     auto deck = parser.parseString(input);
-    if (deck.hasKeyword("DIMENS")) {
+    EclipseGrid grid(10,10,10);
-        EclipseState es(deck);
+    TableManager table ( deck );
-        return Schedule(deck, es);
+    Eclipse3DProperties eclipseProperties ( deck , table, grid);
-    } else {
+    Runspec runspec (deck);
-        EclipseGrid grid(10,10,10);
+    return Schedule(deck, grid , eclipseProperties, runspec);
-        TableManager table ( deck );
-        Eclipse3DProperties eclipseProperties ( deck , table, grid);
-        Runspec runspec (deck);
-        return Schedule(deck, grid , eclipseProperties, runspec);
-    }
 }
 
 

tests/parser/data/integration_tests/BOX/BOXTEST1

@@ -13,6 +13,9 @@ DZ
 TOPS
 100*1 /
 
+PORO
+  1000*0.15 /
+
 NTG
   1000*1 /
 

tests/parser/data/integration_tests/EDITNNC/EDITNNC.DATA

@@ -26,6 +26,9 @@ TOPS
 100*10
 /
 
+PORO
+   100*0.15 /
+
 EDIT
 
 EDITNNC

tests/parser/data/integration_tests/GRID/CORNERPOINT.DATA

@@ -1193,5 +1193,7 @@ ZCORN
    0.20000000E+02   0.20000000E+02   0.20000000E+02   0.20000000E+02
 /
 
+PORO
+  500*0.15 /
 
 EDIT

tests/parser/data/integration_tests/GRID/CORNERPOINT_ACTNUM.DATA

@@ -1199,6 +1199,8 @@ ZCORN
 ACTNUM
   200*0 100*1 200*0 /      
 
+PORO
+   500*0.15 /
 
 EDIT
 

tests/parser/data/integration_tests/IOConfig/RPTRST_DECK.DATA

@@ -14,6 +14,8 @@ TOPS
 5152*1 /
 SPECGRID
    46  112   22     1     F     /
+PORO
+   113344*0.15/
 SOLUTION
 RPTRST
 'BASIC = 2' KRO KRW KRG /

tests/parser/data/integration_tests/IOConfig/RPT_TEST2.DATA

@@ -17,6 +17,9 @@ DZ
 TOPS
 32332*1 /
 
+PORO
+  905296*0.15 /
+
 SOLUTION
 
 RPTSOL

tests/parser/data/integration_tests/MULTREGT/MULTREGT.DATA

@@ -50,6 +50,8 @@ MULTREGT
 4  2    0.6  XYZ   ALL    F / 
 /
 
+PORO
+  8*0.15 /
 
 EDIT
 

tests/parser/data/integration_tests/NNC/NNC.DATA

@@ -26,6 +26,9 @@ TOPS
 100*10
 /
 
+PORO
+   100*0.15 /
+
 NNC
 1 1 1 2 1 1 0.5 /
 1 1 1 1 2 1 1.0 /

tests/parser/data/integration_tests/NNC/noNNC.DATA

@@ -26,3 +26,5 @@ TOPS
 100*10
 /
 
+PORO
+  100*0.15 /

tests/parser/data/integration_tests/SCHEDULE/SCHEDULE_MULTISEGMENT_WELL

@@ -37,6 +37,9 @@ TOPS
 20*2575
 20*2600 /
 
+PORO
+  100*0.15 /
+
 SCHEDULE
 
 WELSPECS

tests/parser/data/integration_tests/TRANS/Deck1

@@ -29,7 +29,8 @@ MULTFLT
    'F2' 0.10  /
 /
 
-
+PORO
+   25*0.15 /
 
 SCHEDULE
 

tests/test_AggregateConnectionData.cpp

@@ -173,6 +173,10 @@ COPY
   PERMX PERMY /
  /
 
+
+PORO
+   500*0.15 /
+
 RPTGRID
   -- Report Levels for Grid Section Data
   --

tests/test_AggregateMSWData.cpp

@@ -177,6 +177,9 @@ RPTGRID
   --
  /
 
+PORO
+   500*0.15 /
+
 PROPS       ==========================================================
 
 -- WATER RELATIVE PERMEABILITY AND CAPILLARY PRESSURE ARE TABULATED AS