OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,505 Commits 9 Branches 35 Tags
1b31b207fea4bf35b19929c67992de46dd4c3cde
Commit Graph

74 Commits

Author SHA1 Message Date
Joakim Hove
564ba1c3aa Changed functions readKeyword and classifyKeyword to become static methods in class EclipseGridParser. 2012-10-21 21:51:13 +02:00
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
31174cf727 Merge remote-tracking branch 'upstream/master' into ert 
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
 2012-10-12 00:43:51 +02:00
Atgeirr Flø Rasmussen
6f4775df9c Improve comment. 2012-10-10 19:23:11 +02:00
Atgeirr Flø Rasmussen
38b62d23f5 Fix bug in GCONINJE input. 2012-10-10 14:16:11 +02:00
Atgeirr Flø Rasmussen
2ded7e7dfe Table interpolation for default values improved. 
If there were no non-defaulted elements in the table, we would crash.
Now, all defaulted elements get the value 0.0 instead.

The usage pattern was encountered for the capillary pressure column
of a SWOF table.
 2012-10-10 14:13:13 +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
Bjørn Spjelkavik
8694794aae Added private member function getNumericErtFields 2012-08-29 11:28:23 +02:00
Atgeirr Flø Rasmussen
91a96307be Added TOPS keyword to deck parser. 2012-08-09 14:24:08 +02:00
Andreas Lauser
6f69de969a opm-core: make it work nicely with clang 2012-07-05 12:42:49 +02:00
Bård Skaflestad
4c36b397fd EquilLine: Initialise all members in default constructor. 2012-07-02 18:30:56 +02:00
Bård Skaflestad
95df9e5e2f WpolymerLine: Initialise all members in constructor. 2012-07-02 17:42:10 +02:00
Bård Skaflestad
2ef628233e WeltargLine: Initialise all members in constructor. 2012-07-02 17:32:37 +02:00
Bård Skaflestad
f2f0b95a1d WgrupconLine: Initialise all members in constructor. 2012-07-02 17:29:59 +02:00
Bård Skaflestad
f57ed8856d WelSpecsLine: Initialise all members in constructor 2012-07-02 17:22:48 +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
Atgeirr Flø Rasmussen
dd3b623f87 Refined COMPDAT::write() and WELSPECS::write() a little. 2012-05-24 09:17:51 +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
3bb9fcb58d Corrected some default values in GCONINJE. 2012-05-09 15:48:27 +02:00
Kjetil Olsen Lye
fba33e03d8 Reading the voidage replacement fraction from GCONINJE. 2012-05-09 15:47:01 +02:00
Kjetil Olsen Lye
ca0048f2fa Converted reservoir volume max rate correctly in GCONPROD 2012-05-07 14:35:32 +02:00
Kjetil Olsen Lye
b75f8a8e2b Added reading of reservoir fluid max rate on GCONPROD 2012-05-07 14:23:26 +02:00
Kjetil Olsen Lye
54a8f7335c Fixed small reading bug in well structure 2012-05-02 16:30:48 +02:00
Atgeirr Flø Rasmussen
849eed6eee Variable name changes. Default values in well-related fields are negative numbers. 
This is to more easily indicate that a field is defaulted, for example to make a
limit not active.
 2012-05-02 09:22:57 +02:00
Bård Skaflestad
cd38c0dba2 GconinjeLine: Fix warnings. Initialise fields in declaration order. 2012-04-16 19:25:37 +02:00
Kjetil Olsen Lye
52485ee5f7 Fixed reading of gconprod to handle defaulted arguments better 2012-04-16 17:10:17 +02:00
Kjetil Olsen Lye
3b99ec7ae3 Added reading of reservoir fluid max rate for GCONINJE 2012-04-16 14:49:13 +02:00
Kjetil Olsen Lye
2771bec005 Added further checks for well conditions. Fixed a small bug in reading WCONPROD 2012-04-16 13:44:53 +02:00
Bård Skaflestad
bb559dde38 WGRUPCON::convertToSI(): Suppress warning about unused parameter. 2012-04-13 14:12:26 +02:00
Bård Skaflestad
ab9ead475f WGRUPCON::read(): Don't shadow the name() method. 2012-04-13 14:08:45 +02:00
Kjetil Olsen Lye
f8b3a8c3f9 Fixed a warning, adjusted the tutorial to reflect the new solver interfacd 2012-04-13 13:41:23 +02:00
Kjetil Olsen Lye
affbb08795 Added checks for BHP and fluid_volume_rate for group control. Also added error tolerance for group control 2012-04-13 12:57:47 +02:00
Kjetil Olsen Lye
fdfd360481 Fixed a small bug in reading of WCONPROD 2012-04-13 11:37:50 +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
6e23dcab17 Added WellCollection as a forest of Well group trees. Did parsing of group control input data into this forest format 2012-03-29 18:34:51 +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
89f1b6399f Fixed gruptree reading 2012-03-28 09:35:49 +02:00