OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,471 Commits 9 Branches 35 Tags 15 MiB
17643c0fad
Commit Graph

38 Commits

Author SHA1 Message Date
Bård Skaflestad
db77953c39 Suppress warning about unused variable in !HAVE_ERT case. 2012-10-14 17:55:51 +02:00
Atgeirr Flø Rasmussen
863eae3368 Hook IMPORT keyword to function reading binary input. 
Make sure it compiles and links both with and without ert.
 2012-10-12 14:25:53 +02:00
Atgeirr Flø Rasmussen
89750d856a Merge remote-tracking branch 'bspj/master' into ertekrok 2012-10-12 13:05:31 +02:00
Bård Skaflestad
2e99dd48dc Don't compare signed to unsigned integer types. 
This avoids recalcitrant objections from the compiler.
 2012-10-01 17:37:18 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
 2012-09-05 13:36:19 +02:00
Bjørn Spjelkavik
4294431584 Defined private member function 'getNumericErtFields' in class 'EclipseGridParser' 
The function stores data from one file from keyword IMPORT.
The file in 'fortio' format is read by ERT-functions.
 2012-08-29 13:36:57 +02:00
Atgeirr Flø Rasmussen
91a96307be Added TOPS keyword to deck parser. 2012-08-09 14:24:08 +02:00
Andreas Lauser
2a79bb2fe2 opm-core: make it work nicely with clang 2012-07-02 18:52:30 +02:00
Joakim Hove
bb066aa23b Added functionality to save results in ECLIPSE format from ERT libraries. 2012-06-27 20:20:05 +02:00
Atgeirr Flø Rasmussen
b99ef7a25a Bugfix: must have map for special fields for first epoch available after construction. 2012-06-15 10:49:44 +02:00
Atgeirr Flø Rasmussen
bebde670d6 Remove unused variable. 2012-06-08 23:01:22 +02:00
Atgeirr Flø Rasmussen
174ab7cd6e Initial version of schedule handling more or less complete. 2012-06-07 15:09:13 +02:00
Atgeirr Flø Rasmussen
fc7c9ea420 Undo an erroneous type change. 2012-06-07 14:17:26 +02:00
Atgeirr Flø Rasmussen
5bbf5bc832 For keywords classified as SpecialField, append data to existing objects, if any. 2012-06-07 14:05:32 +02:00
Atgeirr Flø Rasmussen
3aa067b374 Added WELOPEN, now schedules DATES and TSTEP properly. 2012-06-05 14:06:00 +02:00
Atgeirr Flø Rasmussen
f1bc8ca160 Work in progress on SCHEDULE. Now handles TSTEP properly. 2012-06-05 13:04:57 +02:00
Atgeirr Flø Rasmussen
7ec7651ea3 Work in progress on adding some SCHEDULE support. 2012-06-05 11:54:03 +02:00
Bård Skaflestad
2acc750d93 Add input support for ECLIPSE tensor grids (DXV &c). 2012-05-15 12:08:15 +02:00
Kjetil Olsen Lye
a3395d9903 Added reading of WGRUPCON, also added guide_rates to the well groups. Fixed a small bug in calculateWDP 2012-04-13 10:32:36 +02:00
Kjetil Olsen Lye
c8210a3a9a Fixed some warnings and added GCONPROD reading for the eclipse parser 2012-03-28 12:38:48 +02:00
Kjetil Olsen Lye
1b7862504c Added reading of Gconinje 2012-03-28 10:55:43 +02:00
Kjetil Olsen Lye
ef6e444eb1 Started reading the gruptree 2012-03-27 16:57:01 +02:00
Kjetil Olsen Lye
4773318b28 added initial input reading for group control (GRUP-keyword) 2012-03-27 09:23:24 +02:00
Atgeirr Flø Rasmussen
4cd6b84b00 Throw if user asks for field not found in deck, instead of returning empty vector. 2012-03-23 14:09:21 +01:00
Atgeirr Flø Rasmussen
3f74f31c8a Changed behaviour of EclipseGridParser class: now unknown keywords do not trigger an exception. 2012-03-23 14:01:39 +01:00
Atgeirr Flø Rasmussen
2244158f81 Moved readKeyword() and upcase() to EclipseGridParser.cpp. 2012-03-23 13:17:02 +01:00
Xavier Raynaud
9cf4442383 Keyword POLYMER acknowledged. 2012-03-05 11:59:49 +01:00
Bjørn Spjelkavik
ae5c38e739 Untabified. 2012-02-27 11:15:33 +01:00
Bjørn Spjelkavik
4c1ae099aa Added reading of polymer related keywords. 2012-02-27 11:13:08 +01:00
Bård Skaflestad
b5ebdd41b6 Use explicit string constructor for keywords SWFN, SOF2, and TUNING. 
Keywords are supposed to be strings anyway, and it's better to enforce
this restriction explicitly rather than to rely on implicit conversion
from character literals.
 2012-02-01 14:55:49 +01:00
Bård Skaflestad
b93709a8ba Implement read support for "RS" keyword (initial gas/oil solution ratio). 2012-01-31 10:20:37 +01:00
Bjørn Spjelkavik
e697fb72e3 Changed namespace Dune -> namespace Opm. 2012-01-19 13:50:57 +01:00
Atgeirr Flø Rasmussen
9b0005d132 Added SOIL keyword. 2012-01-03 16:05:43 +01:00
Bjørn Spjelkavik
7e3d000ec8 Minor reformatting. 2012-01-03 09:58:08 +01:00
Bjørn Spjelkavik
79ba5608c5 Implemented keyword TSTEP 2012-01-03 09:38:38 +01:00
Bård Skaflestad
1f1b58c56c Don't shadow field iterator 'i' with an index into that particular field. 2011-12-20 17:36:08 +01:00
Atgeirr Flø Rasmussen
81b58a0acf Now library contents build. Headers and tests not done yet. 2011-12-19 12:36:56 +01:00
Atgeirr Flø Rasmussen
7e90e732d9 Imported items from dune-cornerpoint/dune/common. 2011-12-19 11:34:50 +01:00