Merged upstream/master

tests/testBlackoilState1.DATA

@@ -13,3 +13,6 @@ DZV
 ACTNUM
    1 998*2 3 /
 
+
+DEPTHZ
+121*2000 /

tests/testBlackoilState2.DATA

@@ -9,3 +9,6 @@ DYV
 
 DZV 
 10*10 /
+
+DEPTHZ
+110*2000 /

tests/test_parser.cpp

@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(CreateParser)
     Opm::ParserPtr parser(new Opm::Parser() );
     Opm::DeckConstPtr deck = parser->parseFile( filename1 );
 
-    BOOST_CHECK_EQUAL( 5U , deck->size() );
+    BOOST_CHECK_EQUAL( 6U , deck->size() );
     Opm::DeckItemConstPtr actnum = deck->getKeyword("ACTNUM")->getRecord(0)->getItem(0);
     const std::vector<int>& actnum_data = actnum->getIntData();
 

tests/wells_manager_data.data

@@ -16,6 +16,10 @@ DYV
 DZV
 10.0 20.0 30.0 10.0 5.0 /
 
+DEPTHZ
+121*2000
+/
+
 SCHEDULE
 
 WELSPECS

tests/wells_manager_data_expanded.data

@@ -16,6 +16,12 @@ DYV
 DZV
 10.0 20.0 30.0 10.0 5.0 /
 
+-- The DEPTHZ keyword is only here to satisfy the old parser; content might
+-- completely bogus.
+DEPTHZ
+121*2000 /
+
+
 SCHEDULE
 
 WELSPECS