Commit Graph

222 Commits

Author SHA1 Message Date
Liu Ming
17918ac5b3 use proper function to log filename, line number, msg. 2016-04-19 15:06:03 +08:00
Liu Ming
940d7f8449 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
2016-04-15 09:14:00 +08:00
Liu Ming
63e54c0157 use message container instead of OpmLog. 2016-04-14 11:03:53 +08:00
Liu Ming
f28dd65142 add MessageContainer object. 2016-04-14 09:39:28 +08:00
Jørgen Kvalsvik
2e58d42ad0 Schedule::getWell const support 2016-03-29 14:34:00 +02:00
chflo
f2ed1ba7ea Moved OpmLog from opm-parser to opm-common 2016-03-21 22:07:49 +01:00
Liu Ming
a4a449538d rename ParseMode as ParseContext in EclipseState folder. 2016-03-16 17:15:09 +08:00
Jørgen Kvalsvik
f0ae5db131 opm-parser adoption of Deck automatic ownership
Since the Deck* family of classes have changed their interfaces to no
longer use shared_ptr, a lot of code broke. This patch fixes all
problems in tests, other signatures and accesses to now use the new Deck
interfaces.
2016-02-18 13:27:24 +01:00
Atgeirr Flø Rasmussen
31961cc193 Silence unused function argument warning. 2016-02-15 00:10:13 +01:00
Jørgen Kvalsvik
381e419329 Adds Schedule::getGroups()
Similar to the already-existant Schedule::getWells, this simple method
returns (const) pointers to all groups, suitable for iteration, maps and
for-all-in operations.
2016-02-01 14:20:05 +01:00
Jørgen Kvalsvik
4b98943665 Replaces unecessary header includes with fwd decls
Every header is self-contained and includes only what it must to
function, relying on users include what they need in source files,
adopting a pay-what-you-use model (in particular for internal
dependencies).
2016-01-26 13:23:22 +01:00
chflo
3f266d02b7 Internalize GEFAC keyword 2016-01-25 11:32:08 +01:00
chflo
cc2b7f5f50 Support GRUP controlmode in wellProductionProperties if well is available for group control 2016-01-25 10:47:22 +01:00
Jørgen Kvalsvik
04900a4bb6 ParserKeywords.hpp -> ParserKeywordsX.hpp
To reduce compiler stress and be more explicit w.r.t. dependencies, all
files now includes only the keywords they need, instead of the
collection of all files.
2016-01-21 09:25:58 +01:00
Jørgen Kvalsvik
f404828d63 Cleans up headers to improve build preformance
This is an effort to improve build performance.  Several includes
scattered across the project are either unused or partially used (i.e.
just used to import a type name, not depending on the actual contents of
the header file).

Replaces a lot of these includes with forward declarations.
2016-01-21 09:22:06 +01:00
Joakim Hove
a85bac0034 Changes in const'ness 2015-12-21 15:30:14 +01:00
Kai Bao
33302f6edb moving the multi-segment related to MSW directory. 2015-11-12 12:28:08 +01:00
Kai Bao
e90c5b11bb correcting the typo in Schedule
handleWELSEGS to handleCOMPSEGS
2015-11-12 12:28:08 +01:00
Kai Bao
e14d3f6ba1 adding function handleCOMPSEGS()
there are some other small changes to make the compilation work.
2015-11-12 12:28:08 +01:00
Kai Bao
ecb0186a08 using const std::string& for well_name and fix CMakeLists.txt
The problem for CMakeLists.txt is from the re-basing process.
2015-11-09 14:09:31 +01:00
Kai Bao
2ed7e5985d adding addSegmentSet() to Well 2015-11-09 12:12:39 +01:00
Kai Bao
3e9320fc31 adding function handleWELSEGS to Schedule. 2015-11-09 12:12:39 +01:00
Joakim Hove
2b3e1c381a Added 'minideck' to Schedule object. 2015-11-09 12:05:10 +01:00
Joakim Hove
b20f46649d Track Schedule event GEO_MODIFIERS. 2015-11-09 12:05:08 +01:00
Tor Harald Sandve
abe925ff2f Add method Well::canOpen(currentStep) and use it in Schedule 2015-11-09 09:52:23 +01:00
Tor Harald Sandve
a66c820f0a Prevent wells with zero rate and crossflow disabled to open 2015-11-05 14:37:47 +01:00
Joakim Hove
4178257b17 Merge pull request #622 from joakim-hove/dynamic-vector
Dynamic vector
2015-10-30 10:33:45 +01:00
Joakim Hove
a5b97fc2b8 Implemented Events with DynamicVector.
As a side side effect the m_events member in the Schedule class has
become a shared pointer.
2015-10-29 14:28:24 +01:00
Joakim Hove
da7871feaf Enable BHP control for history and WELTARG. 2015-10-28 17:13:33 +01:00
Joakim Hove
461c74cc57 Do not update well BHP limit from WCONHIST. 2015-10-28 17:13:29 +01:00
Joakim Hove
88fbe579ed Merge pull request #603 from totto82/shut_crossflow
Shut wells with zero rates and crossflow not allowed
2015-10-12 16:12:18 +02:00
Tor Harald Sandve
539e75081f Add paranthesis 2015-10-12 12:28:12 +02:00
Joakim Hove
3dfbc75bc4 Merge pull request #594 from iLoop2/AddDRSDT_DRVDT_VAPPOR
Add keywords DRSDT DRVDT VAPPARS
2015-10-12 08:18:54 +02:00
Tor Harald Sandve
99c03c3914 Shut wells with zero rates and crossflow not allowed
Note: Producing wells in prediction mode is kept open even if the
control rate is set to zero.
2015-10-08 12:17:29 +02:00
Fredrik Gundersen
80a77136cf Fix OilVaporizationProperties to have only one constructor 2015-10-08 11:17:24 +02:00
Tor Harald Samdve
0d4d71dcef Use the autogenerated build constants 2015-10-07 12:23:04 +02:00
Tor Harald Sandve
9665b54ad3 Add flag allowCrossFlow()
This PR adds support for item 10 in welspecs where a flag is used to
determine whether the well should allow cross flow or not.

A test is added to check default behavior.
2015-10-06 15:47:07 +02:00
Fredrik Gundersen
cc66cfff51 Merge remote-tracking branch 'upstream/master' 2015-10-02 10:55:42 +02:00
Fredrik Gundersen
73621d3f21 OPM-230 Added support for keywords 2015-10-02 10:49:23 +02:00
chflo
f7046ff8e0 OPM-218-fix: TimeMap: Added vectors and methods for timestep Years/Months, init only once 2015-09-25 10:28:23 +02:00
Fredrik Gundersen
956b7c53fb OPM-223 Changed error text 2015-09-07 12:19:55 +02:00
Fredrik Gundersen
69abd7b0ce OPM-223 Fix wrong factor used on Gas 2015-09-04 13:46:23 +02:00
Fredrik Gundersen
e8f9114944 OPM-223 Added missing behavior to WELTARG 2015-09-04 13:42:10 +02:00
Atgeirr Flø Rasmussen
76e6972042 Silence various warnings. 2015-09-02 13:08:11 +02:00
chflo
2c27fa6076 Fix in getWells(..wellNamePattern), - use new Well::wellNameInWellNamePattern 2015-08-31 18:57:40 +02:00
chflo
dba0ce4582 OPM-222: Support COMPORD: Check compord when handling WELSPECS 2015-08-31 18:57:39 +02:00
Joakim Hove
3b12ed762d Merge pull request #554 from atgeirr/fix-groupcontrol-resv
Add reservoirVolumeTarget property for group production.
2015-08-14 13:47:32 +02:00
Atgeirr Flø Rasmussen
dc5a19a402 Add reservoirVolumeTarget property for group production.
Also change defaults for production rate properties to
-999e100, since 0 is an actual possible rate, and while
it would be possible to ask if a default was applied
(the default should be no rate or limit, not a zero rate),
unlike for wells there are no methods doing this currently.
2015-08-13 10:23:32 +02:00
babrodtk
3c7e1c5624 Updates for VFPINJ 2015-08-11 16:28:52 +02:00
Joakim Hove
d26428dd52 Reimplmented ParseMode based on string keys.
Completely reimplemented the ParseMode class. Now the main datastructure
is a map<string,action> where the possible error situations are the
keys. This approach allows for a much more flexible
setting/filtering/querying of the ParseMode settings.
2015-08-10 14:27:53 +02:00