OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,696 Commits 18 Branches 75 Tags 73 MiB
a5cc1cfe48
Commit Graph

4696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torbjørn skille
25fd3fcc14 updated name of function, and fix space around assignments 2018-03-20 14:40:21 +01:00
Torbjrn Skille
bee5699d79 Files renamed, forgot to add new files. Here they are 2018-03-19 19:56:16 +01:00
Torbjrn Skille
5374faa9b8 includes additional updates based on feedback from maintainer 2018-03-19 19:40:16 +01:00
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
Torbjrn Skille
c8f99ee59e code updated based on feedback from maintainer. 2018-03-16 19:47:58 +01:00
Torbjrn Skille
94beeb67cb Added reference to publication 2018-03-16 13:16:00 +01:00
Torbjrn Skille
9b1c421f0f Added routine for calculating cell volumes based on corner point input. 2018-03-16 12:52:53 +01:00
Joakim Hove
def103ec90
Merge pull request #356 from joakim-hove/input-units 
Added pseudo unit system for untransformed input values.
 2018-03-15 13:06:53 +01:00
Joakim Hove
2d8457e3a9 Added pseoudo unit system for untransformed input values. 2018-03-15 10:43:53 +01:00
Arne Morten Kvarving
84f44ac036
Merge pull request #354 from joakim-hove/timestep_fix 
Timestep fix
 2018-03-15 09:05:35 +01:00
Joakim Hove
e63283093c
Merge pull request #355 from joakim-hove/add-keywords 
Added new keyword LICENSE. Fixed misconfigured connection keywords
 2018-03-14 12:09:03 +01:00
Joakim Hove
0ba730ba72 Added new keyword LICENSE. Fixed misconfigured connection keywords 2018-03-14 10:05:17 +01:00
Joakim Hove
1e5b532e78 Using sim_step when evaluating flowing wells. 2018-03-14 09:50:14 +01:00
Atgeirr Flø Rasmussen
a1225ac715
Merge pull request #351 from akva2/remove_more_refs 
fixed: remove left-over opm-parser/opm-output references
 2018-03-13 12:43:14 +01:00
Arne Morten Kvarving
067ad664d8 fixed: remove left-over opm-parser/opm-output references 2018-03-13 08:28:25 +01:00
Lars Petter Øren Hauge
bbf2ae26f1 Match timestep for well info 
Decrement timestep where necessary to avoid well post-configuration.

Consider the following:

.
.
.

WELLSPECS
 'W1'  'G1' ... /

TSTEP
 2*1 /

WELLSPECS
 'W1'  'G2' .../

TSTEP
 2*1 /

In that case the parent group of W1 is changed after two timesteps. At timestep
two the Group parent will indicate G2, while the GOPT:G2 at timestep two should
be reported for what has progressed up until timestep two.
 2018-03-13 08:16:07 +01:00
Joakim Hove
f706d6e7c1 Embed restart_step in restarted summary writer. 2018-03-12 17:13:17 +01:00
Joakim Hove
091756bfc7
Merge pull request #349 from GitPaean/adding_missing_item_wconinje 
adding missing SURFACE_WATER_FRACTION to WCONINJE
 2018-03-12 14:53:43 +01:00
Kai Bao
34605e7f2c adding missing SURFACE_WATER_FRACTION to WCONINJE 2018-03-12 09:05:48 +01:00
Joakim Hove
a0eb47d976
Merge pull request #347 from GitPaean/silencing_extra_ 
silencing warning related to an extra ;
 2018-03-09 18:18:55 +01:00
Joakim Hove
dd543d2dad
Merge pull request #348 from GitPaean/adding_keywords_polymw 
Adding keywords POLYMW, PINTDIMS and PLYVMH
 2018-03-09 18:18:34 +01:00
Kai Bao
02ea808fa0 adding keyword PLYVMH 
we only the definition with METRIC unit system. Not sure how they should
be used with other unit sytem, since we do not know the units of these
values, which is not easy to find out either.

For the moment, we only handle the METRIC unit system for now.
 2018-03-09 12:21:40 +01:00
Kai Bao
d8ce4b944e adding keyword PINTDIMS 2018-03-09 08:56:42 +01:00
Kai Bao
bb4936c6c1 adding POLYMW to phase class in Runspec 2018-03-09 08:38:10 +01:00
Kai Bao
c8bc4d9649 adding keyword POLYMW 2018-03-08 21:57:39 +01:00
Kai Bao
000efd5341 silencing warning related to an extra ; 2018-03-08 14:34:34 +01:00
Joakim Hove
504e827139
Merge pull request #346 from bska/minimal-welldims 
Runspec: Add Support for Parsing Limited Subset of WELLDIMS
 2018-03-08 13:22:22 +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
Joakim Hove
938db7a198
Merge pull request #342 from GitPaean/small_fixing_pvt_tables 
small fixes of the pvtables.
 2018-03-07 16:37:40 +01:00
Atgeirr Flø Rasmussen
5d2d9e574f
Merge pull request #345 from akva2/fix_packaging_repo_merge 
fix packaging after repo merge
 2018-03-07 11:10:56 +01:00
Kai Bao
dbf2a4c425 small fixes of the pvtables. 
some rules are from testing output.
 2018-03-07 08:31:00 +01:00
Arne Morten Kvarving
32764b0128 fix packaging after repo merge 2018-03-07 08:20:17 +01:00
Arne Morten Kvarving
35ebab0b69
Merge pull request #341 from akva2/import_parser_output 
Import opm-parser and opm-output
 2018-03-06 15:34:27 +01:00
Arne Morten Kvarving
932cece7d3 add imported parser/output sources to build system 
use -DENABLE_ECL_INPUT=0 to disable input (and output) support
use -DENABLE_ECL_OUTPUT=0 to disable output support

both default to on
 2018-03-06 11:18:03 +01:00
Arne Morten Kvarving
dbba64e5c3 Import opm-output 2018-03-05 10:30:59 +01:00
Arne Morten Kvarving
726ccd7fd7 Import opm-parser 2018-03-05 10:30:29 +01:00
Arne Morten Kvarving
bdb17fdece
Merge pull request #339 from blattms/fix-libecl-path-in-flow 
Always add ecl target to ecl_LIBRARIES.
 2018-03-05 10:29:35 +01:00
Atgeirr Flø Rasmussen
0672c5ac34
Merge pull request #340 from andlaus/include_config.h 
include config.h in all unit tests
 2018-03-05 09:20:53 +01:00
Andreas Lauser
1083db48a3 test_LinearisedOutputTable: include config.h unconditionally 
this is already the case for the vast majority of the other OPM code.
 2018-03-03 13:23:37 +01:00
Andreas Lauser
2dc08dd0a7 include config.h in all unit tests 
in some it was already included, so let's fix that inconsistency The
Right Way (TM).
 2018-03-03 13:11:12 +01:00
Markus Blatt
0e25c9f2e9 Always add ecl target to ecl_LIBRARIES. 
Otherwise the flow binary does not know the correct
path to libecl in some situations.
 2018-03-02 22:15:54 +01:00
Arne Morten Kvarving
c63ab13a89
Merge pull request #335 from akva2/split_src_headers 
changed: split headers and sources
 2018-03-01 07:01:28 +01:00
Arne Morten Kvarving
27c31b58ed changed: split headers and sources 
keep headers in opm/ and move sources to src/opm/
 2018-02-28 13:56:49 +01:00
Arne Morten Kvarving
4b49e934e4 changed: drop opmjson library 2018-02-28 09:57:21 +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
Sveinung Rundhovde
a693d21c68 Set PORV dimension to ReservoirVolume 
PORV dimension string was set to "Volume". This is not a valid dimension
string, causing an exception.
 2018-02-22 08:44:51 +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
Joakim Hove
7a2bf8a0b5 SummaryConfig: changed implementation for empty well/group keywords. 
Will never raise SUMMARY_UNKNOWN_WELL for empty well related summary keywords.
 2018-02-20 16:51:38 +01:00