Merged upstream/master

2025-02-25 18:55:30 -06:00 · 2014-02-04 21:42:07 +01:00
parent 3d215691da 5ce1d09370
commit ca2def2a02
6 changed files with 423 additions and 224 deletions
--- a/tests/testBlackoilState1.DATA
+++ b/tests/testBlackoilState1.DATA
@@ -13,3 +13,6 @@ DZV
 ACTNUM
   1 998*2 3 /

+
+DEPTHZ
+121*2000 /
--- a/tests/testBlackoilState2.DATA
+++ b/tests/testBlackoilState2.DATA
@@ -9,3 +9,6 @@ DYV

 DZV 
 10*10 /
+
+DEPTHZ
+110*2000 /
--- a/tests/wells_manager_data.data
+++ b/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
--- a/tests/wells_manager_data_expanded.data
+++ b/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