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

4968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
80154e8f5f Serialization: Add Initial Support for Segment Information 
This commit extends Opm::data::Wells to include a set of output
vectors for well segment information.  At present we define output
structures for segment rates and segment pressures.  The immediate
use case is properly assigning restart vector items RSEG[8 .. 11],
but these same values are also usable for outputting the summary
vectors SPR, SOFR, SGFR, and SWFR.  Future expansion is likely.
 2018-10-25 09:09:31 +02:00
Joakim Hove
ae0cb3e5ad
Merge pull request #528 from totto82/minpvv 
Add support for minpvv
 2018-10-25 09:04:32 +02:00
Joakim Hove
133f89198f
Merge pull request #507 from WesselDeZeeuw/aquifet 
Aquifet parser implementation
 2018-10-25 09:01:29 +02:00
Joakim Hove
e356a16ab2
Merge pull request #462 from joakim-hove/tranx-modifier 
Add deckAssigned() method to GridProperty + default construct TRAN
 2018-10-24 10:36:19 +02:00
Joakim Hove
eea23abedd
Merge pull request #533 from joakim-hove/GDFILE-location 
Update GDFILE hadling to parse DATA outside cwd
 2018-10-22 13:45:27 +02:00
Joakim Hove
c76ee877aa Update GDFILE handling to account for out-of-cwd 
Make sure path to GDFILE is correct
 2018-10-18 10:47:38 +02:00
Joakim Hove
fd36bf88fb Add function Deck::makeDeckPath() 2018-10-18 10:47:37 +02:00
Joakim Hove
24bd410313
Merge pull request #521 from joakim-hove/input-sim 
Add skeleton for input simulator
 2018-10-17 17:28:25 +02:00
Joakim Hove
984a308e24 Add skeleton for mock simulator 2018-10-17 17:21:11 +02:00
Joakim Hove
6ea7a1796d
Merge pull request #530 from joakim-hove/GDFILE 
Gdfile
 2018-10-17 15:01:57 +02:00
Joakim Hove
ee0d256a12 Add method seconds() to Schedule and TimeMap 2018-10-17 12:09:45 +02:00
Joakim Hove
42d7587e1b Add size() method to the Schedule class 2018-10-17 06:47:57 +02:00
Joakim Hove
c75a50796b White space change 2018-10-16 00:21:49 +02:00
Joakim Hove
1190260d7d Add support for GDFILE keyword 2018-10-16 00:21:35 +02:00
Joakim Hove
5b8882d6f0 Add methods save() and addNNC() to EclipseGrid 2018-10-16 00:20:09 +02:00
Joakim Hove
f8e711246f GridDims class can initialize from binary file 2018-10-16 00:14:33 +02:00
Joakim Hove
5283611695 Add static method for conversion between unit system enums 2018-10-16 00:12:53 +02:00
Tor Harald Sandve
ca8e2f279b Add support for minpvv 2018-10-15 13:35:04 +02:00
Joakim Hove
c49b51ab23 Add test to prevent using ADD on TRANX 2018-10-15 10:50:58 +02:00
Joakim Hove
7c65850894
Merge pull request #525 from joakim-hove/find-alberta-fixup 
Fixed ALBERTA_FOUND to OFF when not found
 2018-10-15 10:44:29 +02:00
Joakim Hove
7279fd5ea8 Add deckAssigned() method to GridProperty + default construct TRAN 
The deckAssigned() query method is added to the GridProperty class to enable the
simulator to check whether a property has been explicitly assigned in the deck
or autocreated through the use of some EDIT operators like MULTIPLY.
 2018-10-15 10:29:01 +02:00
Joakim Hove
f279c7e374 Fixed ALBERTA_FOUND to OFF when not found 2018-10-15 09:42:13 +02:00
WesselZ
7b1595d0b2 Modification of the Aquifetp header and class files for the handling the default value of p0. 
Small Changes to unit test of Aquifetp
 2018-10-15 09:28:39 +02:00
Joakim Hove
8c8290f614
Merge pull request #505 from blattms/fix-alberta-linker-issues 
Also search for Alberta (Fixes ebos compile issue with g++-8.2)
 2018-10-11 16:32:44 +02:00
WesselZ
3819910396 Modification of AquifetpTests.cpp -- 100% test passing 
Added nempty Aquifetp container -- Null object -- No parsing, succesfull
 2018-10-10 12:00:15 +02:00
Joakim Hove
72b39e513a
Merge pull request #515 from joakim-hove/parsecontext-ignore-kw 
Ability to ignore named keywords in ParseContext
 2018-10-09 17:06:33 +02:00
WesselZ
04a9e710d5 Added Improved Header Files and Class files, without the ecl dependency. 
Added Testfile for fetkovich implementation
 2018-10-09 16:42:39 +02:00
Bård Skaflestad
1c771a66fc
Merge pull request #516 from atgeirr/fix-const-map-types 
Use non-const string type in map.
 2018-10-08 18:32:30 +02:00
Joakim Hove
c938765224 Ability to ignore named keywords in ParseContext 2018-10-08 18:07:21 +02:00
Atgeirr Flø Rasmussen
a37625b2cf Use non-const string type in map. 
Using const string as key type instead of plain string fails with libc++,
the standard library implementation used by clang. The libc++ implementation
assumes that map keys can be copied, and the standard requires map keys to be
copyable.

Using const string as a value also fails with clang, I am not 100% sure why.
It does severely restrict how you can interact with the container, and seems to
make it noncopyable. The error is reported from DynamicState<GroupTree>::update(),
the std::fill() call.
 2018-10-08 11:02:22 +02:00
Joakim Hove
83331033b5
Merge pull request #511 from bska/wellconnections-ctor 
WellConnections: Initialise Head in Copy Constructor
 2018-10-02 21:02:53 +02:00
Bård Skaflestad
58a5a4e371 WellConnections: Initialise Head in Copy Constructor 
This commit ensures that the data members 'headI' and 'headJ' are
properly initialised in the constructor

    WellConnections(const WellConnections&, const EclipseGrid&)

which powers the implementation of

    Well::getActiveConnections()
 2018-10-02 15:59:04 +02:00
Joakim Hove
3655213c40
Merge pull request #513 from joakim-hove/bump-versions-master 
Bump versions
 2018-10-02 15:50:50 +02:00
Joakim Hove
2844aa4468 Bump versions 2018-10-02 15:43:01 +02:00
Joakim Hove
c81e5027c9
Merge pull request #510 from bska/difftime 
TimeMap: Use difftime() for Time Deltas as double
 2018-10-02 14:44:44 +02:00
Bård Skaflestad
23950403f1 TimeMap: Use difftime() for Time Deltas as double 
Reduces the amount of explicit arithmetic on std::time_t values and
thereby, implicitly, the assumption of targeting Posix systems only.
 2018-10-02 13:11:02 +02:00
Bård Skaflestad
33372a3337
Merge pull request #506 from jalvestad/flow-flow-restart 
EclipseRestart-improvements
 2018-10-02 13:05:43 +02:00
Jostein Alvestad
c067e48276 Additional improvement and correction for writing of eclipse compatible restart file 2018-09-28 15:39:25 +02:00
Jostein Alvestad
5d398565c2 Improved the code structure - current improvement 2018-09-28 11:23:42 +02:00
Jostein Alvestad
a9a82e3814 Minor correction to previous commit rseg [39] was not properly assigned 2018-09-28 09:56:03 +02:00
Jostein Alvestad
3f94b580a2 Added changes to improve treatment of multi segment wells in Eclipse Restart 
Added flowing well bottom hole pressure to item[8] and [39] plus adjusted item[9]
 2018-09-28 09:48:03 +02:00
Jostein Alvestad
cfc1b29c08 Added improvements and corrections to handle writing of eclipse compatible restart file 
for more general well data
 2018-09-27 16:23:34 +02:00
Jostein Alvestad
264d451d56 Added additional changes to handle repeated read of COMPDAT 
for same grid i,j,k cell.
Corrections for handling wells with only 1 connection
Correction for XWEL - BG being NaN
 2018-09-27 16:23:32 +02:00
Jostein Alvestad
21eddfbdf2 Added changes to handle repeated read of COMPDAT for same grid cells 2018-09-27 16:23:31 +02:00
Markus Blatt
22b38f1031 Also search for Alberta 
We do not use it in OPM, but for whatever reason I was experiencing
linker errors (unresolved symbol) when compiling ebos with DUNE 2.6
and g++-8.2. dune-grid exports its alberta wrapper libraries in dune-grid_LIBRARIES. Previously this did not pose a problem. Somehow it does now. If
I strip the libraries from the linker line everything is fine but this
is not a good solution.

Therefore I have added a test for Alberta that is triggered by the test of
dune-grid.
 2018-09-27 15:05:04 +02:00
Joakim Hove
34b9cbcaa4
Merge pull request #502 from GitPaean/alq_unit_wcon 
not converting the unit of ALQ value in VFPPROD
 2018-09-26 20:16:42 +02:00
Kai Bao
8721385104 not converting the unit of ALQ value in VFPPROD 
since the ALQ value in WCON* keywords are not converted based on the
unit of ALQ in the VFPPROD keyword. Easiest fix is not to convert either
of them.
 2018-09-26 13:01:29 +02:00
Arne Morten Kvarving
fa85844a9b
Merge pull request #500 from akva2/bash_completion 
added: cmake glue for adding bash tab completion for an installed product
 2018-09-25 12:32:03 +02:00
Arne Morten Kvarving
e3bc8a6ad7 fixed: fail build in jenkins scripts if installation target fails 2018-09-25 12:31:11 +02:00
Arne Morten Kvarving
564f064392 added: cmake glue for adding bash tab completion for an installed product 2018-09-25 12:31:11 +02:00