Commit Graph

71 Commits

Author SHA1 Message Date
Bård Skaflestad
5a701a2ee8 Merge pull request #1609 from wito/new-summarynode
New SummaryNode implementation
2020-03-26 11:34:21 +01:00
Atgeirr Flø Rasmussen
0b0fab781b Add missing header inclusion. 2020-03-23 17:49:43 +01:00
Arne Morten Kvarving
e3bd1e6723 add static method to return a test object for serialization
this allows killing the constructors taking member values
2020-03-23 10:58:15 +01:00
Williham Williham Totland
6970158f7f Makes the return value of Opm::Group::flow_group/::control_group optional. 2020-03-20 14:08:03 +01:00
Arne Morten Kvarving
e4e853065c remove accessors in Group added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
5304b0ce2b add serialization template to Group 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
21e5d975e8 add serialization template to GroupProductionProperties 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
a87ec3ad46 add serialization template to GroupInjectionProperties 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
422509d201 remove accessors in GConSump added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
f61da6684d add serialization template to GConSump 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
21ba0ad213 remove accessors in GConSale added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
bfc44df84f add serialization template to GConSale 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
9dc0761550 remove accessors in GuideRateConfig added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
a7c9ca900c add serialization template to GuideRateConfig 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
79263a74c4 remove accessors in GuideRateModel added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
f9aa3ee3d4 add serialization template to GuideRateModel 2020-03-19 09:34:12 +01:00
Atgeirr Flø Rasmussen
be2337e2c1 Add GuideRate::has(). 2020-03-11 15:19:47 +01:00
Williham Totland
13e838d171 Separates Opm::Group::parent() for the extended network model
In order to support the extended network model going forwards, the method Opm::Group::parent() is split in the API into two new methods, Opm::Group::control_group() and Opm::Group::flow_group(). These methods give the names of the parent node in the group control hierarchy and network structure, respectively.

While for the standard network model these two values will be the same (and the same as ::parent()), code that presently calls ::parent() should be revisited with an eye to the question of which parent group is desired.
2020-03-06 14:38:38 +01:00
Atgeirr Flø Rasmussen
1a0f47f274 Add Group::isAvailableForGroupControl() method.
The method has very similar intended usage as the method of the
same name in the Well class.
2020-02-27 14:56:31 +01:00
Atgeirr Flø Rasmussen
8b110916e6 Add overloads to eval() and get() for simpler generic usage. 2020-02-24 16:05:48 +01:00
Tor Harald Sandve
e9318b1457 continue the work of allowing for phase dependent injection control 2020-02-14 09:30:58 +01:00
Joakim Hove
0b2dbf7fc2 GroupInjection is a map over phases + implement topup_phase 2020-02-14 09:30:58 +01:00
Arne Morten Kvarving
97319d4831 make GConSump constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-02 15:25:42 +01:00
Arne Morten Kvarving
e7d7e2e232 make GConSale constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-02 15:22:59 +01:00
Arne Morten Kvarving
01dd29278a make GuideRateConfig constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-02 15:20:16 +01:00
Arne Morten Kvarving
e803f97374 make GuideRateModel constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-02 15:17:08 +01:00
Arne Morten Kvarving
c8c5102e9d make Group constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-02 09:17:33 +01:00
Jostein Alvestad
0c9a2cbbf6 initial changes to test output of UDQ and ACTIONX data to ecl-restart
change to avoid zero-size windows in Actionx

changes to improve Restart output content

change to correct IUDQ for DEFINE

corrections to IACN and SACN

initial changes to add item to ZWEL

further changes to add Action to well

further changes to allow for action name in ZWEL

more changes

further changes to output action name to ZWEL

changes to test/debug Restart write

turn on writing of ZWEL again

First running version of udq-actionx-rst

use Action::Result direkte

first working! version

some corrections

changes to allow for output of SACN [4.6.8]

added debug print

changes to improve IACN and IACT

further corrections to Actionx IACN pluss error messages

changes to adapt to well2 converted to well class

further changes to enable restart with group control

changes to adapt to newly merged code in master

changes to include Intehead [51] - group control

test

changes to iGrp[nwgmax +7]

initial changes for GUIDERATE

changes to add guiderate parameters to the restart file

add comment

correction to guiderate - test if exist

correction to DoubHead - test if GR exist

correction to ISEG[8]

correction for eclipse version Restart-file

Cosmetic change

corrections to igrp

correction to segment type in iseg
2019-12-17 12:30:40 +01:00
Tor Harald Sandve
e1029e956b convert from UDA to double for GCONSALE and GCONSUMP 2019-11-26 11:14:12 +01:00
Tor Harald Sandve
225d6ea26d Make GCONSALE an injector 2019-11-26 11:14:12 +01:00
Joakim Hove
613ec70dab Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:19:26 +01:00
Steinar Foss
d86ea3cb30 GConSump/Sale: using default constructor. 2019-11-07 09:42:41 +01:00
Steinar Foss
f75c3921e5 Schedule handles keyword GCONSUMP.
GConSump: added and linked soruce files.

gconsump added to dynamicstate.

added handleGCONSUMP.

GConSump: add.

GConSump: has.

GConSump: get.

GConSump: added UDA values.

GConSump: added network_node.
2019-11-06 15:12:25 +01:00
Joakim Hove
8c6768cc89 Merge pull request #1193 from stefoss23/gconsale
Adding keyword GCONSALE to Schedule.
2019-11-04 15:02:19 +01:00
Steinar Foss
17d11e9a60 GConSaleGroup: MaxProcedure static, simplified get and add. 2019-11-04 13:59:54 +01:00
Steinar Foss
d2dce88411 Adding keyword GCONSALE to Schedule.
added files GConSale cpp/hpp.

Schedule: adde GConSale as DynamicState.

Shcedule: added function gConSale.

added function handleGCONSALE.

GConsale: added substruct GCONSALEGroup.

GConSale: empty records added.

GConSale: all values set to zero.

GCONSALE: values stored as UDA.

GConSale: UDAValues to SI.

GConSale: max_proc parsed.
2019-11-03 11:37:28 +01:00
Tor Harald Sandve
64f4919085 Add support for item 11 and 12 in GCONINJE 2019-11-01 13:15:52 +01:00
Tor Harald Sandve
d1d665c343 Convert targets. Tested on simple problems. 2019-10-17 11:33:17 +02:00
Joakim Hove
6cdd4fd76f Protext against zero potential 2019-09-30 16:15:35 +02:00
Tor Harald Sandve
f7b611afec various fixes to make guiderate work 2019-09-30 14:14:09 +02:00
Joakim Hove
a55f691581 Improvements to GuideRate 2019-09-30 14:14:09 +02:00
Joakim Hove
e738712ad5 GuideRateConfig class has a pointer to GuideRateModel 2019-09-30 14:14:09 +02:00
Joakim Hove
2b75ff1c19 Fix GuideRate warnings 2019-09-17 16:52:34 +02:00
Joakim Hove
a1f35584a9 Add GuideRate state/cache object 2019-09-16 16:28:45 +02:00
Joakim Hove
de7752b3e5 GuideRateConfig object 2019-09-16 10:52:35 +02:00
Joakim Hove
8553bbf326 Remove ScheduleEnum files 2019-09-04 14:49:12 +02:00
Joakim Hove
ee26316f92 Refactor Group GuideRateTarget enum 2019-09-04 14:49:12 +02:00
Joakim Hove
af72086db8 Refactor enum for GuideRate target 2019-09-04 14:49:12 +02:00
Joakim Hove
e026660c80 Move / refactor Group production control enum 2019-09-04 14:49:12 +02:00
Joakim Hove
0296759ad0 Move GroupType enum to Group2 2019-09-04 14:49:12 +02:00