OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into specialkeywords

Browse Source 
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.hpp
This commit is contained in:
Atle Haugan
2014-01-30 15:05:01 +01:00
parent 825e976566 49604cf631
commit 1dd448b178
22 changed files with 497 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testdata/integration_tests/SCHEDULE/SCHEDULE_WELLS2
Vendored
+13 -4
View File
@@ -23,7 +23,7 @@ WELSPECS
COMPDAT
-- WELL I J K1 K2 Sat. CF DIAM KH SKIN ND DIR Ro
'W_1' 30 37 1 3 'OPEN' 1* 32.948 0.311 3047.839 2* 'X' 22.100 /
'W_1' 31 37 14 14 'OPEN' 1* 19.731 0.311 1831.202 2* 'X' 22.463 /
'W_1' 31 37 14 14 'OPEN' 1* 19.731 0.311 1831.202 3.3 1* 'X' 22.463 /
--
'W_2' 20 51 1 1 'OPEN' 1* 1.168 0.311 107.872 2* 'Y' 21.925 /
'W_2' 20 51 5 5 'OPEN' 1* 7.359 0.311 679.489 2* 'Y' 21.903 /
@@ -82,18 +82,27 @@ DATES -- 9
/
WCONINJE
'W_1' 'WATER' 1* 'RATE' 20000.000 5* /
'W_1' 'WATER' 1* 'RESV' 20000.000 200000.000 5* /
/
DATES -- 10
10 AUG 2008 /
/
WCONINJE
'W_1' 'WATER' 1* 'RATE' 20000.000 200000.000 123 678 4* /
/
DATES -- 11
15 AUG 2008 /
/
WCONINJH
'W_1' 'WATER' 1* 5000.000 /
'W_1' 'WATER' 1* 5000.000 50000.000 /
/
DATES -- 11
DATES -- 12
10 SEP 2008 /
/