Commit Graph

5938 Commits

Author SHA1 Message Date
Franz G. Fuchs
31415679f7 defined FoamDensity, added test 2019-06-25 13:32:11 +02:00
Franz G. Fuchs
ecc653cce4 foamadstable added 2019-06-25 13:32:11 +02:00
Franz G. Fuchs
bb292365ff added Foamadstable 2019-06-25 13:32:11 +02:00
Franz G. Fuchs
95070310f3 changed order 2019-06-25 13:32:11 +02:00
Franz G. Fuchs
6efe981234 use correct size of bit set, test added 2019-06-25 13:32:11 +02:00
Franz G. Fuchs
2fbf3c4fc9 added keyword for foam 2019-06-25 13:32:11 +02:00
Joakim Hove
763702fd0f Merge pull request #774 from joakim-hove/use-UDAValue
Use uda value
2019-06-24 13:56:25 +02:00
Joakim Hove
6eea66a332 Use UDAValue for rates and pressure limits in WCONPROD & WCONINJE 2019-06-24 12:54:07 +02:00
Joakim Hove
a4eeb57a58 Merge pull request #855 from joakim-hove/uda-value-raw
When writing deck output the UDAValue will write raw values
2019-06-24 12:53:44 +02:00
Joakim Hove
4a08b57b23 When writing deck output the UDAValue will write raw values 2019-06-24 11:53:56 +02:00
Joakim Hove
65f8812e46 Merge pull request #847 from joakim-hove/rft-first-open-bug
Fix bug in RFTConfig first open - for WRFTPLT keyword
2019-06-24 10:02:03 +02:00
Joakim Hove
b14bd5acce Merge pull request #848 from joakim-hove/scan-ignore-SOH
Ignore character SOH (ASCII 1) while parsing
2019-06-24 10:01:51 +02:00
Joakim Hove
677009317e Merge pull request #834 from bska/init-from-EclOutput
Replace LibECL Backend in Flow's INIT File Writing
2019-06-24 10:01:40 +02:00
Bård Skaflestad
e487dc1da5 writeInitial: Switch to Using InitIO::write() for INIT
This commit switches the implementation of

    EclipseIO::Impl::writeINITFile()

to using the new helper function Opm::InitIO::write().  This, in
turn, replaces LibECL with the EclOutput class in writing the INIT
file similarly to the previous work on the restart files.
2019-06-24 09:52:56 +02:00
Bård Skaflestad
281f701f27 writeInitial(): Don't Copy 'int_data' Unnecessarily
The object does potentially hold multiple grid-sized vectors and we
already have a copy on entry into the function.  We can use move().
2019-06-24 09:52:56 +02:00
Bård Skaflestad
fa37250446 INIT File: Add Writer Based on OutputStream::Init
This commit adds a new facility for creating the simulation runs'
INIT file.  This is intended to replace the implementation of class
EclipseIO::Impl's writeINITFile.  Initial structure taken from
current implementation of EclipseIO::Impl::writeINITFile().
2019-06-24 09:52:56 +02:00
Bård Skaflestad
323e9903b4 File Output: Add Manager for 'INIT' File Based on EclOutput
This commit introduces a new file manager,

    Opm::EclIO::OutputStream::Init

that's intended to replace the low-level operations of Flow's INIT
file writer.  The implementation uses the 'EclOutput' class and is
very similar to that of the 'Restart' stream introduced in commit
992d3b0c.  The commonality between the two file managers might
possibly be extracted to a base class at a later time.

As of right now, the Init class supports outputting vectors of
'int', 'bool', 'float', and 'double'.  Additional types will be
supported when needed.
2019-06-24 09:52:56 +02:00
Joakim Hove
a4b9b0d460 Merge pull request #851 from joakim-hove/uda-wconprod-resv
Use UDA for WCONPROD::RESV
2019-06-24 09:33:28 +02:00
Joakim Hove
cbc7394d60 Use UDA for WCONPROD::RESV 2019-06-24 08:29:14 +02:00
Joakim Hove
9ed68a9f1f Merge pull request #850 from joakim-hove/add-uda-test-deck
Add test deck for UDA simulation
2019-06-24 07:49:28 +02:00
Joakim Hove
ab6ea86eac Add test deck for UDA simulation 2019-06-24 07:36:36 +02:00
Joakim Hove
747a643288 Ignore character SOH (ASCII 1) while parsing 2019-06-23 12:09:54 +02:00
Joakim Hove
41a74beb3e Fix bug in RFTConfig first open - for WRFTPLT keyword 2019-06-23 10:21:40 +02:00
Joakim Hove
886e90c770 Merge pull request #846 from joakim-hove/remove-summarystate-reset-testing
Remove SUmmaryState::reset() testing
2019-06-23 10:14:58 +02:00
Joakim Hove
6bbfd66744 Minor testing of UDQValue 2019-06-23 09:10:39 +02:00
Joakim Hove
0f52c6a0ee Cleanuup 2019-06-23 08:45:59 +02:00
Joakim Hove
fe6fdf4589 Remove SUmmaryState::reset() testing 2019-06-23 08:32:22 +02:00
Joakim Hove
0631d4ad01 Merge pull request #842 from joakim-hove/well-prop-name
Well prop name
2019-06-22 11:47:43 +02:00
Joakim Hove
746a62b149 Add udq_default argument when creating ProductionControls 2019-06-22 08:01:25 +02:00
Joakim Hove
e4d030c891 Add argument when calling injection controls 2019-06-22 08:01:25 +02:00
Joakim Hove
bf6a0335b0 Add name property to WellInjectionProperties 2019-06-22 08:01:25 +02:00
Joakim Hove
96b7797c4e Add name to WellProductionPropertis 2019-06-22 08:01:25 +02:00
Joakim Hove
f8aa13f6e8 Merge pull request #841 from joakim-hove/add-st-arg
Add st arg
2019-06-21 22:38:06 +02:00
Joakim Hove
ead8cfc1e9 Merge pull request #840 from joakim-hove/aggregate-well-data-uda
Aggregate well data uda
2019-06-21 22:23:44 +02:00
Joakim Hove
98aafa4a9e Pass unused SummaryState argument 2019-06-21 21:24:07 +02:00
Joakim Hove
260365870a Merge pull request #839 from joakim-hove/summarystate-operator<<
Summarystate operator<<
2019-06-21 21:03:31 +02:00
Joakim Hove
df74ac102e Use proper SummaryState argument in AggregateWellData 2019-06-21 21:01:25 +02:00
Joakim Hove
2ecfa6e7b2 Add basic operator<< for SummaryState 2019-06-21 19:32:51 +02:00
Joakim Hove
5604c4c3ba Add basic operator<< for SummaryState 2019-06-21 19:22:27 +02:00
Joakim Hove
3d7bcb19ee Merge pull request #837 from bska/fix-aquct-numrec
Don't Infer Number of AQUFETP Records from AQUDIMS
2019-06-21 18:57:50 +02:00
Bård Skaflestad
63c802666d Don't Infer Number of AQUFETP Records from AQUDIMS
The number of records is unrelated to AQUDIMS Item 5 (NANAQU).  That
item sets the maximum aquifer ID permissible as Item 1 of AQUFETP.

Update unit test accordingly.
2019-06-21 18:06:43 +02:00
Joakim Hove
036951444c Merge pull request #838 from joakim-hove/udq-ast-something
UDQASTNode: check if well/group exists before assigning
2019-06-21 18:04:16 +02:00
Joakim Hove
217e63b1fd UDQASTNode: check if well/group exists before assigning 2019-06-21 16:53:23 +02:00
Joakim Hove
c9ca9717bc Merge pull request #836 from atgeirr/silence-warnings
Silence shadowing warnings
2019-06-21 16:21:42 +02:00
Atgeirr Flø Rasmussen
4018e4b70b This silences many, but not all shadowing warnings in opm-common.
Includes minor refactoring of ESMry and AggregateGroupData undertaken
with the aid of the original authors to ensure correctness.
2019-06-21 14:48:23 +02:00
Bård Skaflestad
b72439387e Merge pull request #835 from bska/fix-test-failures
Copy SPE1_TESTCASE.[FX]0025 to Build Directory
2019-06-21 12:40:18 +02:00
Bård Skaflestad
5395add039 Copy SPE1_TESTCASE.[FX]0025 to Build Directory
Restores 'test_ERst' Unit Test.

Pointy Hat: @bska
2019-06-21 10:29:54 +02:00
Bård Skaflestad
f71dec426a Merge pull request #832 from tskille/ERst
Modified class ERst, added 1 new test to test_ERst
2019-06-21 10:10:55 +02:00
Joakim Hove
bf752c81a5 Merge pull request #833 from joakim-hove/usa-UDAValue-init
Usa uda value init
2019-06-20 14:09:19 +02:00
Joakim Hove
fcdca4a4d7 UDA: GCONPROD 2019-06-20 12:38:20 +02:00