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
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
Joakim Hove
acfa281f77
UDA: GCONINJE
2019-06-20 12:36:23 +02:00
Joakim Hove
1da4bd2ea4
UDA: GECON
2019-06-20 12:14:13 +02:00
Joakim Hove
729dc8dbd9
UDA: WSOLVENT
2019-06-20 12:11:57 +02:00
Joakim Hove
7a8d092c8b
UDA: WTRACER
2019-06-20 12:11:17 +02:00
Joakim Hove
1c8d0bb0ab
UDA: WECON
2019-06-20 12:08:13 +02:00
Joakim Hove
36651b803c
UDA: WPOLYMER
2019-06-20 12:07:29 +02:00
Joakim Hove
e360b4b34e
Add private utility to evaluate well related UDA
2019-06-20 12:05:10 +02:00
Joakim Hove
73839c43d2
Moved file injection.hpp
2019-06-20 11:24:49 +02:00
Joakim Hove
3f2eefc638
UDQContext:
...
- add member const UDQParams&
- add functions has_well_var() and has_group_var()
2019-06-20 11:20:47 +02:00
Torbjørn Skille
7394a654bb
Modified class ERst, added 1 new test to test_ERst
2019-06-19 22:35:49 +02:00
Joakim Hove
7e5c9dee67
Merge pull request #830 from stefoss23/compile_sunbeam2
...
Compile sunbeam2
2019-06-19 15:41:17 +02:00
Joakim Hove
c638e5d1a0
Merge pull request #828 from joakim-hove/well-udq-params
...
Add member udq_undefined to Well2 object
2019-06-19 15:37:29 +02:00
Joakim Hove
2da74c7d80
Merge pull request #829 from bska/groupid-out-of-bounds
...
INTEHEAD: Store Actual Maximum Number of Groups in Item 21
2019-06-19 15:36:33 +02:00
Steinar Foss
5e88782e51
sunbeam test schedule.py works for new Well2.
2019-06-19 14:43:59 +02:00
Steinar Foss
24f44c1c64
sunbeam test connections.py works for new Well2.
2019-06-19 14:06:20 +02:00
Steinar Foss
4161a1339a
test well.py all pass with new Well2.
2019-06-19 13:51:43 +02:00
Joakim Hove
7d0b6f1bf6
Add member udq_undefined to Well2 object
2019-06-19 13:24:21 +02:00
Bård Skaflestad
212150e7b8
INTEHEAD: Store Actual Maximum Number of Groups in Item 21
...
Commit 7986e99e
intended to make OPM Flow able to run simulation
cases whose active number of groups might exceed the declared
maximum number of (non-FIELD) groups (Item 3 of WELLDIMS). However,
we did not ensure that Item 21 of INTEHEAD contained the larger of
WELLDIMS(3) and the actual number of active groups.
This, in turn, meant that downstream consumers--such as the code to
enumerate groups according to their order of appearance in the
simulation deck--would generate subscripts/indices that were out of
bounds for the allocated tables. Flow's restart code would then not
produce any output and the user would not be aware of the problem
until attempting to restart a simulation or trying to visualise 3D
simulation results.
This commit corrects the situation by ensuring that we always store
the larger of the two sizes in INTEHEAD(21).
Pointy Hat: @bska
2019-06-19 13:23:34 +02:00
Steinar Foss
a1d4fe13af
sunbeam scheduls: get_wells as a function.
2019-06-19 11:51:38 +02:00