Commit Graph

155 Commits

Author SHA1 Message Date
Joakim Hove
3975db2ff3 Rename CompletionSet -> ConnectionSet 2018-06-11 14:03:32 +02:00
Joakim Hove
5008501318 Add WellTestConfiguration to Schedule 2018-05-16 00:57:54 +02:00
Lars Petter Øren Hauge
fcbcc9cda4 Add INVALID_NAME to GCONPROD, GCONINJE & GEFAC 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
675858f1e0 Handle wildcard in group keywords
Added function getGroups(pattern) to allow records with wildcard.

Included the functionality for GCONPROD, GCONINJE and GEFAC - currently
the only group keywords that should accept wildcards.
2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
427833b089 Add INVALID_WELLS to WECON & WEFAC 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
ba573b5834 Add INVALID_WELLS to WELOPEN & WELTARG 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
6a8e7a9a05 Add INVALID_WELL context to WPOLYMER & WSOLVENT 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
580a64563f Add INVALID_WELL context to W(INJ)TEMP
Handle well template (e.g. W*) in the .DATA file for WTEMP and WINJTEMP
and add INVALID_WELL_CONTEXT
2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
ba107498a1 Add INVALID_WELL context for WCONINJ(E/H) 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
183fd4eabb Add INVALID_WELL context for WCONPROD
Handle invalid wellpatterns for WCONPROD.

Given a deck with:

----
WELSPECS
  'PROD' 'G1'  10 10 8400 'OIL' /
/
COMPDAT
  'PROD' 10 10 3 3 'OPEN' 1* 1* 0.5 /
/
WCONPROD
  'SOMETHINGELSE' 'OPEN' 'ORAT' 20000 4* 1000 /
 /
----

OPM will now by default abort and inform the user that no well match
"SOMETHINGELSE".
2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
f2cb5fe9de Add INVALID_WELL parse context
Handle invalid wellpatterns for COMPDAT.

Given a deck with:

----
WELSPECS
  'PROD' 'G1'  10 10 8400 'OIL' /
/
COMPDAT
  'SOMETHINGELSE' 10 10 3 3 'OPEN' 1* 1* 0.5 /
/
----

OPM will now by default abort and inform the user that no well match
"SOMETHINGELSE".
2018-05-14 09:26:21 +02:00
Kai Bao
a1e587ef09 return std::map of std::shared_ptr for getVFPxTables()
in Schedule.
2018-04-20 11:27:26 +02:00
Joakim Hove
e5c4c2b504 Handle changes to VFP tables during simulation
With this commit the VFP tables are stored internally in DynamicState<VFPxTable>
container, this facilitates updates to the VFP tables during the simulation. In
addition the default constructor and the ::init( ) method has been removed from
the VFPxTable implementations.
2018-04-12 19:02:15 +02:00
Atgeirr Flø Rasmussen
438ccdebd0 Merge pull request #379 from joakim-hove/move-vfp-tables-api
Move vfp tables api
2018-04-12 11:20:27 +02:00
Joakim Hove
8d7e890967 Add argument timeStep to VFP access methods. 2018-04-11 06:23:28 +02:00
Andreas Lauser
10258f247b internalize the WINJTEMP keyword
currently the only quantity that us used is the well temperature,
i.e., specifying the fluid enthalpy does not have any effect.
2018-04-10 14:56:11 +02:00
Joakim Hove
c37e5f9503 Move VFP tables to Schedule. 2018-04-06 12:42:47 +02:00
Steinar Foss
d9ffb579e1 Removed MessageContainer. OpmLog used instead.
...

...

...

GenerateKeywords.cmake changed.

ParserContext.handleerror takes only two args.

Schedule: removed all MessageContainer.

...

...

...

GridProperties: removed MessageContiner.

...

Eclipse3DProperties: removed MessageContainer.

...

TabelManager:removed MessageContainer.

...

.nnn.

...

...

...

...

...

...

...

...

...

...

...

...

...
2018-03-26 10:15:18 +02:00
Joakim Hove
f5a80f807f Using OrderedMap as container for groups 2018-03-18 19:33:58 +01:00
Joakim Hove
3a590a0cab Added ability to filter out completions in inactive cells. 2018-02-07 11:22:35 +01:00
ReedMe
c9c6128bb4 add GRUPNET to group 2017-12-07 15:28:04 +01:00
Joakim Hove
3f4f566c1e Added Schedule constructor which takes EclipseState arg. 2017-12-03 09:00:56 +01:00
Joakim Hove
6ef1bd7c25 Made ParseContext argument to Schedule constructor optional. 2017-12-03 09:00:02 +01:00
Andreas Lauser
f353dcf745 add temperature to the well injection properties
so far, this uses the WTEMP keyword. the WINJTEMP keyword is still to
do!
2017-11-27 14:00:57 +01:00
Tor Harald Sandve
7aaad448d4 Add support for WEFAC 2017-11-21 09:55:07 +01:00
Joakim Hove
612e255d4f Extracted Schedule and SummaryConfig, 2017-10-24 09:27:42 +02:00
Tor Harald Sandve
eb4f0b68d6 Fix shut well logic when WELOPEN and COMPDAT is combined
Do not shut well if all completions are shut using WELOPEN but new
completions are opened using COMPDAT in the same time step.
2017-10-03 08:26:09 +02:00
Joakim Hove
44d4aa64cc Added Schedule::getWells( group, time) overload
The new Schedule::getWells( group, time) overload will recursively scan
th group tree rooted at 'group' and return all the wells in that tree.
2017-07-25 20:19:12 +02:00
Joakim Hove
e802737ec4 Changed from boost datetim to std::time_t. 2017-06-19 10:54:33 +02:00
Tor Harald Sandve
cdfd54593f Default saturation table_id in completions with cell satnum value
Pass eclGridProperties from EclipseState to Completions in order to set
default saturation table. Most changes are due to interface change in
Schedule(...)
2017-02-16 08:27:29 +01:00
Jørgen Kvalsvik
295a808310 Const'd OilVaporizationProperties 2016-12-22 15:18:04 +01:00
Jørgen Kvalsvik
57843f4eab COMPLUMP support
Support for COMPLUMP. a keyword to re-assign completion numbers that can
be used with keywords such as WELOPEN.

Some helper functions were moved out of handleWELOPEN and reused in
handleCOMPLUMP.
2016-12-12 12:34:54 +01:00
Jørgen Kvalsvik
b3d44c83a7 Completion number aware WELOPEN
No longer chokes when WELOPEN is given its last two parameters, C1 and
C2 for completion number begin/end. Instead, these now weigh in on
whether or not a well matches the criteria for opening or closing.

Includes some test fixes and some restructuring of handleWELOPEN.
Obsolete verifications of throwing on COMPLUMP have been removed.
2016-12-07 09:17:55 +01:00
Jørgen Kvalsvik
8d240c02f6 OilVaporizationProperties.defined
Extend the interface of OilVaporizationProperties to not rely on
checking the enum for existence checks. This facilities checking
hasOilVaporizationProperties which rely on DynamicState.size.
2016-12-01 16:23:01 +01:00
Jørgen Kvalsvik
847084234b Schedule.modifier_deck is no longer shared_ptr 2016-12-01 16:17:25 +01:00
Jørgen Kvalsvik
946cc18f3a Schedule.wells are no longer shared_ptrs 2016-12-01 16:17:25 +01:00
Jørgen Kvalsvik
e8d018e045 Schedule.timeMap is no longer shared_ptr 2016-12-01 16:17:25 +01:00
Jørgen Kvalsvik
5c1cf47966 Well.headI/J can change on timesteps
Well.headI and Well.headJ was assumed to be fixed on first declaration,
and that all subsequent changes of this position was an error. This
turns out not to be the case, so the I/J positions are made dynamic.
2016-11-22 14:13:07 +01:00
Anders Matheson
eacbade0c1 Remove default Phases from Schedule constructor 2016-11-02 15:50:39 +01:00
Anders Matheson
6d0d17a895 Only add present phases from WCONHIST 2016-11-02 13:44:33 +01:00
Jørgen Kvalsvik
21aaceaed9 Runspec object; move phases from TableManager
There has never really been a natural home for initial properties that
aren't InitConfig, meaning information such as phases in the deck and
other runspec information hasn't had a natural home.

This patch introduces the Runspec object on EclipseState for phase
information and other similar properties that are interesting and static
for when setting up parameters etc. for simulation, that aren't all that
interesting once simulation starts.

An additional benefit is a leaner implementation for the phase enum and
some stricter semantics via enum classes.
2016-11-01 16:41:19 +01:00
Jørgen Kvalsvik
4ad9b17449 Remove shared_ptr constructor in Schedule 2016-10-31 16:18:24 +01:00
Jørgen Kvalsvik
37c04328ca Remove shared_ptr typedefs 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
239ef7a34c Remove shared_ptr typedef in TimeMap 2016-10-19 20:38:28 +02:00
Liu Ming
fce0bab79f Rename MesasgesLimits to MessageLimits. 2016-10-17 10:41:17 +08:00
Liu Ming
a25c5c0850 Merge remote-tracking branch 'opm/master' into get-messages 2016-10-14 13:48:49 +08:00
Liu Ming
c7b3e2cf57 Get MESSAGES limits from Schedule and update every time step. 2016-10-14 10:06:35 +08:00
Jørgen Kvalsvik
d5251d97e6 Make Schedule.groups auto, not a shared_ptr 2016-10-05 14:39:01 +02:00
Jørgen Kvalsvik
1638341a90 Default construction for OilVaporizationProperties
OilVaporizationProperties can now be default constructed, and its
storage has been changed from shared_ptr to value (which mandates the
support for default construction and equality/unequality).

The default constructed Property is considered unspecified and
operations on it will not make sense.
2016-10-05 14:11:57 +02:00
Jørgen Kvalsvik
a97890bce2 Make Schedule.grouptree auto, not a shared_ptr
Also makes the *contents* of the vector values, not shared_ptrs.
This introduces the copy constructor (as an alternative to deepcopy())
and comparison operators, mandated by DynamicState.
2016-10-05 10:36:35 +02:00