Commit Graph

2651 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
b4d69b929d Merge pull request #360 from joakim-hove/ordered-groups
Ordered groups
2018-03-19 14:08:35 +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
Joakim Hove
2d8457e3a9 Added pseoudo unit system for untransformed input values. 2018-03-15 10:43:53 +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
Joakim Hove
4d1333e2ff Merge pull request #1218 from joakim-hove/summary-missing-wells
Summary missing wells
2018-02-20 22:16:08 +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
Joakim Hove
c904c6bf98 Added action argument to ParseContext::addKey() 2018-02-19 14:52:21 +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
cc4e56cc18 Merge pull request #1206 from joakim-hove/filter-completions
Added ability to filter out completions from inactive cells.
2018-02-07 15:06: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
c9291f165c address review comments 2018-02-05 10:38:57 +01:00
Andreas Lauser
ce93d98b80 respect the fact that non-SI temperature may be offset from zero
also, the UnitTests test was buggy.

V2: improve the accuracy of the °F->K offset, unit test all temperature measures
2018-02-02 17:13:50 +01:00
Joakim Hove
494dda28a8 Revert "respect the fact that non-SI temperature may be offset from zero" 2018-02-01 15:08:12 +01:00
Joakim Hove
a496158ed6 Merge pull request #1203 from andlaus/fix_measures
respect the fact that non-SI temperature may be offset from zero
2018-01-31 17:53:15 +01:00
Andreas Lauser
d6f4cb016e respect the fact that non-SI temperature may be offset from zero
also, the UnitTests test was buggy.
2018-01-31 13:17:06 +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
Steinar Foss
5ef8d22a48 IGNORE_EXTRA_RECORDS changed to PARSE_EXTRA_RECORDS.
...
2018-01-16 16:58:29 +01:00
Steinar Foss
e85162703e Added ParseContext::IGNORE_EXTRA_RECORDS
...

...

...

...

...
2018-01-16 16:58:29 +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
56180285b3 Merge pull request #1164 from joakim-hove/one-arg-parsecontext
Added one-argument ParseContext constructor.
2017-12-04 13:38:09 +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
Joakim Hove
22074a46bf Added one-argument ParseContext constructor. 2017-12-03 08:38:27 +01:00
Sveinung Styve Rundhovde (IT SI SIB)
ff193322e4 Add support for WTHPH+WBHPH keywords 2017-12-01 13:20:31 +01:00
Joakim Hove
adb017aec4 Merge pull request #1158 from andlaus/thermal_stuff
Thermal stuff
2017-12-01 12:19:28 +01:00
Joakim Hove
56bd653e51 Added optional shift attribute in keyword size configuration. 2017-11-28 10:09:41 +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
Andreas Lauser
96c5843421 add an energy "phase"
this is just like the solvent "phase" and the polymer "phase". Since
IMO this is a bit awkward, the Phases class should possibly be renamed to
something like "ConservedQuantities".
2017-11-25 18:08:28 +01:00
Andreas Lauser
1f7cda4569 add the infrastructure for SPECROCK
this is analogous to the SPECHEAT patch:

- fix the JSON definition
- add a table class
- wire the table class into TableManager
2017-11-25 18:08:28 +01:00