Commit Graph

1515 Commits

Author SHA1 Message Date
Kai Bao
a1e587ef09 return std::map of std::shared_ptr for getVFPxTables()
in Schedule.
2018-04-20 11:27:26 +02:00
Atgeirr Flø Rasmussen
fb4fbc318b Merge pull request #381 from akva2/mark_explicit
mark constructor explicit
2018-04-13 11:35:38 +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
Joakim Hove
033362bed7 White space change 2018-04-12 19:00:22 +02:00
Joakim Hove
5d9c6f9fc4 Remove comments 2018-04-12 18:57:08 +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
Arne Morten Kvarving
1bd6e9ca66 mark constructor explicit 2018-04-12 10:52:33 +02:00
Joakim Hove
a119dadb45 Add (unused) new constroctors 2018-04-11 08:10:53 +02:00
Joakim Hove
8d7e890967 Add argument timeStep to VFP access methods. 2018-04-11 06:23:28 +02:00
Joakim Hove
4d835fc759 Add events VFPINJ_UPDATE and VFPPROD_UPDATE 2018-04-11 06:19:24 +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
Joakim Hove
da8424e1e8 Add UDQ container class 2018-04-05 17:45:30 +02:00
Joakim Hove
8176c5a826 Add UDQExpression class - for one UDQ record 2018-04-05 17:45:30 +02:00
Joakim Hove
4a7410d412 Add UDQConfig object. 2018-04-05 17:42:23 +02:00
Joakim Hove
e3758e41ea Merge pull request #368 from stefoss23/RemoveMessageContainer
Removed MessageContainer. OpmLog used instead.
2018-03-26 13:04:23 +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
Bård Skaflestad
aa97b76fbb Runspec: Retrieve WSEGDIMS Default Values from Keyword Impl
Suggested by: [at]joakim-hove
2018-03-22 14:23:02 +01:00
Bård Skaflestad
da2b6aec77 Runspec: Add Support for Parsing Limited Subset of WSEGDIMS
Capture the maximum number of segmented wells, the maximum number of
segments per well, and the maximum number of lateral branches per
(segmented) well.

These maximum sizes are needed to correctly define portions of the
contents of the INTEHEAD vector in a restart step.
2018-03-22 11:14:51 +01:00
Bård Skaflestad
15eb84d3e9 Expose "REGDIMS" Keyword from TableManager
Some of these values are needed for restart purposes (go into the
INTEHEAD) vector.
2018-03-22 00:00:48 +01:00
Joakim Hove
f5a80f807f Using OrderedMap as container for groups 2018-03-18 19:33:58 +01:00
Joakim Hove
0dbabc19ca Added at() method to orderedmap. 2018-03-18 19:24:48 +01:00
Kai Bao
bb4936c6c1 adding POLYMW to phase class in Runspec 2018-03-09 08:38:10 +01:00
Bård Skaflestad
af07812167 Runspec: Add Support for Parsing Limited Subset of WELLDIMS
Capture the maximum number of connections/perforations per well, the
maximum number of wells (or sub-groups) per well/node group, and the
maximum number of well/node groups in the field.

These maximum sizes are needed to correctly define the portions of
the contents of the INTEHEAD vector in a restart step.
2018-03-08 10:50:47 +01:00
Kai Bao
dbf2a4c425 small fixes of the pvtables.
some rules are from testing output.
2018-03-07 08:31:00 +01:00
Lars Petter Øren Hauge
800cc2af62 Support default construction uppon ADD/MULTIPLY
Allow keywords that can be default constructed to do so when acted uppon
by MULTIPLY and ADD.

Setting the "MULTIPLY" keyword to act on "PORV" would throw an
exception:

"Program threw an exception: Fatal error processing MULTIPLY keyword.
Tried to scale not defined keyword PORV"

Now the initPORV is called if the MULTIPLY keyword is parsed with PORV.
Note that MULTIPLY for PORV will also work in the GRID section (which it
does not in eclipse), but will fail if it is placed prior to setting a
variable PORV depends on.

Commit authored by Sveinung Styve Rundhovde and Lars Petter Hauge
2018-02-26 13:51:37 +01:00
Atgeirr Flø Rasmussen
ac56621759 Silence warning.
Unlike returning const references, returning const values is no different
from returning a non-const value.
2018-02-20 14:11:18 +01:00
Rohith Nair
57792f1316 Carter-Tracy aquifer object to collect items from keywords AQUCT and AQUTAB
clean up

removed aquancon collection from Aquifer CT

clean up and unit test

clean up

Conflicts:
	lib/eclipse/CMakeLists.txt

Add reference to Van Everdingen and Hurst

remove cmakelists

added test in Cmake

Added aquiferct to cmake
2018-02-15 12:01:19 +01:00
Joakim Hove
3a590a0cab Added ability to filter out completions in inactive cells. 2018-02-07 11:22:35 +01:00
Joakim Hove
40fd922b6e Added iterator access to DynamicState<T> 2018-02-07 11:22:35 +01:00
Andreas Lauser
8a95794277 rename c_p to c_v in specrock and specheat table classes
even though the official documentation does not seem to specify
whether the specified heat capacities of the SPECROCK and SPECHEAT
keywords are for constant pressure or for constant volume, the
implicitly seem to be for the latter: pressure dependent heat
capacites cannot be specified, yet the enthalpy for an incompressible
fluid *is* pressure dependent, so the specified heat capacities must
be for constant volume and they specify the internal energy instead of
the enthalpy.
2018-01-30 12:06:58 +01:00
Joakim Hove
53d8d65c7b Merge pull request #1190 from nairr/aquancon_object
Aquancon object
2018-01-25 14:38:37 +01:00
Ove Sævareid
ec83e0fc18 Support for kw MAXVALUE/MINVALUE. 2018-01-24 16:01:09 +01:00
Joakim Hove
3a03c2226c Added support for defaults in the in-keyword boxes. 2018-01-18 12:58:32 +01:00
Joakim Hove
e1d0b39733 Added accessor functions to Box class 2018-01-18 12:58:32 +01:00
Joakim Hove
972979c931 Added nine argument(!) constructor for Box class 2018-01-18 10:50:04 +01:00
Rohith Nair
26cdaa8598 clean up, moved items to constructor, facedir mod etc. 2018-01-18 09:43:40 +01:00
Rohith Nair
5068acb29c Aquancon object
Aquancon object

Reorganized and changed the way the aqurecord object works

Working aquancon object. Still need to implement better logic. Also added test case

Changed indexing bug

Fixed the correct indices for the collate function

Made a private function for getting the record index matching the aquifer id

Reformatted the private function for readibility

Added logic to find unique global cell indices

Collate function done... Now need to apply logic to these entries...

clean up

Conflicts:
	lib/eclipse/EclipseState/Aquancon.cpp

edit object definition
2018-01-16 15:47:40 +01:00
Rohith Nair
1edd7cbd92 Carter-Tracy aquifer object to collect items from keywords AQUCT, AQUTAB and AQUANCON 2018-01-16 15:32:36 +01:00
Arne Morten Kvarving
120ad9e4fa changed: pass by const ref
quells a static analyzer warning
2018-01-11 13:18:41 +01:00
Joakim Hove
7f063e3ead Merge pull request #1179 from GitPaean/fixing_history_matching_well_1
Fixing history matching wells part 1
2018-01-09 14:36:57 +01:00
Tor Harald Sandve
867df8b7ce Add support for PDVD and PBVD 2018-01-08 14:17:37 +01:00
Kai Bao
35ecd2e37a fixing WCONHIST. 2018-01-06 21:49:27 +01:00
Rohith Nair
531a531650 aquatab table object 2017-12-22 13:24:54 +01:00
Rohith Nair
9e3e41b79a Adds tablemanager scheme for aqutab + modifications to aquct and aquancon parsing 2017-12-22 10:54:59 +01:00
Rohith Nair
6361c12c65 Introduces an aqudims class and a test for the same 2017-12-21 15:10:32 +01:00
ReedMe
c9c6128bb4 add GRUPNET to group 2017-12-07 15:28:04 +01:00
Joakim Hove
2a7185baed Merge pull request #1165 from joakim-hove/new-sched-ctx
New sched ctx
2017-12-04 13:38:35 +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