Commit Graph

3523 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Jostein Alvestad
ef6e0b084d Corrected merge conflicts with upstream master
Write cumulative production / injection only in eclipse compatible mode
2018-09-19 16:02:17 +02:00
Bård Skaflestad
980f55271f Connection Data: Write Flow Rates to XCON
This commit adds a simple facility for outputting surface rates of
the oil, gas, and water components for each well connection, as well
as total reservoir voidage rate per well connection if available in
the data::Connection object.
2018-09-19 16:02:16 +02:00
Bård Skaflestad
335b070564 Aggregate Connection Data: Use Named Indices
This commit introduces a new set of named indices pertaining to the
*CON vectors (ICON, SCON, XCON).  Use these where appropriate in
ICON and SCON.
2018-09-19 16:02:15 +02:00
Jostein Alvestad
9d32793796 Added improvements to connection data ICON (account for inactive cells) etc. 2018-09-19 16:02:12 +02:00
Jostein Alvestad
409a497396 Added corrections to code to generate Eclipse compatible Restart file: i) two changes to intehead, [49] and [50] -> 1 (based on tests), ii) corrections to ISEG mainly for multisegmented wells and iii) change to ICON to allow for default saturation table implying ICON[6] and [9] = 0 2018-09-19 16:02:09 +02:00
Jostein Alvestad
4f9f952e77 Added corrections to SWEL and ISEG plus InteHead[179] to 146 2018-09-19 16:02:08 +02:00
Jostein Alvestad
6ea83724d6 corrected code for write of unformatted restart 2018-09-19 16:02:07 +02:00
Jostein Alvestad
0a96fc012e Corrected code for differences in buffer size for read from restart files 2018-09-19 16:02:06 +02:00
Jostein Alvestad
17966d098b Added unit conversion for MSW data pluss correctin for complum 2018-09-19 16:02:05 +02:00
Jostein Alvestad
9d0604ad99 additions to handle segmented wells for ICON and SCON 2018-09-19 16:02:05 +02:00
Jostein Alvestad
36de4a4a31 Added changes needed to provide connection index for restart file 2018-09-19 16:02:04 +02:00
Jostein Alvestad
690fe11e58 Additional changes for restart writing og well and connection data 2018-09-19 16:02:03 +02:00
Jostein Alvestad
bce55f7087 Added changes to remove debug print plus some code comments 2018-09-19 16:02:03 +02:00
Jostein Alvestad
5b1ec7b5b0 Added code to write restart data for groups and segmented wells to restart file - consistent with Eclipse 100 2018-09-19 16:02:02 +02:00
Jostein Alvestad
6ed9c356a9 Final changes for first "beta" version of segmented well ++ for restart 2018-09-19 16:02:00 +02:00
Jostein Alvestad
d9adf7ccc2 Further changes to include iSeg and rSeg data to Restart file 2018-09-19 16:01:59 +02:00
Jostein Alvestad
c5a1b30dc1 Added code to finalize writing of group data to restart file 2018-09-19 16:01:59 +02:00
Jostein Alvestad
cedadaf649 Added code to implement writing XGRP to the restart file. 2018-09-19 16:01:58 +02:00
Jostein Alvestad
86ca704d75 Further changes to implement group output to the restart file.
Starting to use the SummaryState class to include summary data
2018-09-19 16:01:57 +02:00
Jostein Alvestad
53d19e8a44 Further changes to implement group data (IGRP and SGRP)
Plus updating source code to the latest github version of the rest of the OPM code
2018-09-19 16:01:57 +02:00
Jostein Alvestad
9cf9bf310d Added changes to serialize IGPR and SGRP and write to restart file
Well info at correct step for save & load RESTART

Retrieve number of wells and completions at the beginning of the
simulated step. Otherwise a well introduced at the same time step as the
report will be included - even though there doesn't exist any simulated
data yet.

This issue would trigger a throw if WRFTPLT was added at the same time
step as a well is introduced in the schedule section.

Removed one DATES item in FIRST_SIM.DATA. The
EclipseReadWriteWellStateData in test_Restart compared state at T1,
which did not include any well data as it was. No other tests were
affected.

Added new implementation of serialize_ICON

The new function has been added to the file WriteRestartHelpers, and
intended to take over for the local function 'serialize_ICON' in
`restartIO.cpp` when `restartIO::save()` is to be updated.  The purpose
of the new implementation is to be compatible with Eclipse.

Handle wildcard in group keywords

Added function getGroups(pattern) to allow records with wildcard.

Included the functionality for GCONPROD, GCONINJE and GEFAC - currently
the only group keywords that should accept wildcards.

Add key string to RestartKey

Pass dimension information for extra fields in restart

Verify that the extra container has THPRES
2018-09-19 16:01:54 +02:00
Jostein Alvestad
a284acc3ed Further additions and changes to implement preparation and writing of group data to the restart file 2018-09-19 16:01:54 +02:00
Jostein Alvestad
19bb0e0077 Additional changes to create restart group data in general and igrp data in particular 2018-09-19 16:01:53 +02:00
Jostein Alvestad
89b11dfd26 Further changes to write group data to restart file 2018-09-19 16:01:53 +02:00
Jostein Alvestad
2552750bed Initial changes to implement group data into writing of restart file 2018-09-19 16:01:52 +02:00
Jostein Alvestad
7b2c36bde5 Added changes to include no of groups in InteHEAD 2018-09-19 16:01:52 +02:00
Jostein Alvestad
b9bb0ae60a Initial changes to add group data to restart output plus adding changes to include no of groups in inteHEAD 2018-09-19 16:01:51 +02:00
Joakim Hove
42745e0bfc Merge pull request #493 from joakim-hove/default-ecl-compatible
Make ecl compatible restart files default
2018-09-15 11:09:44 +02:00
Tor Harald Sandve
fdc4b0142e Write restart when SAVE keyword is in the schedule file 2018-09-14 13:36:22 +02:00
Joakim Hove
eded8bacfc Remove unused include 2018-09-13 17:11:49 +02:00
Joakim Hove
079d946723 Make ecl compatible restart files default 2018-09-12 18:02:47 +02:00
Joakim Hove
71d92c3dc8 Add opm_formatted property to the IOConfig 2018-09-12 11:34:57 +02:00
Joakim Hove
552c390465 Merge pull request #464 from joakim-hove/peaceman-formula
Peaceman formula
2018-09-11 13:18:40 +02:00
Joakim Hove
c870172a30 Merge pull request #484 from joakim-hove/use-c-smspec
Using plain C api for smspec_nodes
2018-09-10 17:51:23 +02:00
Joakim Hove
4a5b71d8c1 Include Peaceman calculation in Connection class
- The calculation of well connection transmissibility CF and effective
   permeability is calculated.

 - The Connection objects are immutable; should never be updated.

 - The properties of the Connection class are just plain properties, have
   removed getter methods and the use of Value<double>.
2018-09-09 11:16:42 +02:00