Joakim Hove
167ada2020
Merge pull request #2190 from joakim-hove/schedule-tuning
...
Schedule tuning
2021-01-07 07:49:23 +01:00
Joakim Hove
628293c26a
Manage Tuning object through ScheduleState
2021-01-06 23:13:43 +01:00
Bård Skaflestad
dca842a5c7
Merge pull request #2178 from joakim-hove/add-sched-tstep
...
Add sched tstep
2021-01-06 20:56:06 +01:00
Joakim Hove
aaacdd6c57
Add class ScheduleTStep
2021-01-06 19:08:00 +01:00
Bård Skaflestad
22ac814056
Merge pull request #2183 from joakim-hove/sched-deck
...
Sched deck
2021-01-05 21:46:16 +01:00
Bård Skaflestad
d20b4e0145
Merge pull request #2187 from berland/json_segment1
...
Use consistent names in WSEG* keywords
2021-01-05 21:04:48 +01:00
Joakim Hove
8cd9065b61
Add class ScheduleDeck
2021-01-05 19:36:00 +01:00
Håvard Berland
c07bf30bcf
Use consistent names in WSEG* keywords
...
WSEGAICD and WSEGSICD used SEG1 and SEG2, while all
other WSEG* keywords use SEGMENT1 and SEGMENT2 for the same
item.
2021-01-05 15:00:50 +01:00
Joakim Hove
3fb60785b5
Merge pull request #2186 from joakim-hove/wbp-improvements
...
Wbp improvements
2021-01-05 13:51:34 +01:00
Joakim Hove
1695d75d7a
Better error message if PAvgCalculatorCollection is missing well
2021-01-05 11:36:52 +01:00
Joakim Hove
ff8035fd0e
Merge pull request #2185 from joakim-hove/use-make-shared
...
Use std::make_shared<> instead of new
2021-01-05 09:20:21 +01:00
Joakim Hove
985ea968d8
Use std::make_shared<> instead of new
2021-01-05 08:37:56 +01:00
Joakim Hove
e15a4a5259
Updated WBP calculator to account for PORV
2021-01-05 08:32:38 +01:00
Joakim Hove
c08b62ac9a
Make general WBP calculator public
2021-01-05 07:35:45 +01:00
Joakim Hove
b73a9321aa
Merge pull request #2184 from joakim-hove/timemap-allow-rst
...
Timemap allow rst
2021-01-04 22:13:24 +01:00
Joakim Hove
f1305155e7
Merge pull request #2182 from joakim-hove/wpb-ref-depth
...
Add reference depth member to PAvg and PAvgCalculator
2021-01-04 22:12:19 +01:00
Joakim Hove
df833aaed3
Internalize WPAVEDEP keyword with reference depth for WBP
2021-01-04 18:39:45 +01:00
Joakim Hove
7a4bdd4ab5
Update report number in comment
2021-01-04 11:28:16 +01:00
Joakim Hove
8bc16ab7fe
Rewrite TimeMap::operator[]
...
- Access to the historical period for a restarted run will not be caught.
- Access to underlying timepoint will be based on at()
2021-01-04 11:28:08 +01:00
Joakim Hove
cbd8c85a6e
Merge pull request #2180 from joakim-hove/use-start-time
...
Use start_time instead of invalid time as dummy for restart
2021-01-01 23:20:43 +01:00
Joakim Hove
314587b608
Use start_time instead of invalid time as dummy for restart
2021-01-01 21:43:44 +01:00
Joakim Hove
777f4f9859
Merge pull request #2179 from joakim-hove/multiline-strings
...
Multiline strings
2021-01-01 21:40:51 +01:00
Joakim Hove
cc772aa1df
Use raw string deck input strings
2021-01-01 21:22:12 +01:00
Bård Skaflestad
764065ccf9
Merge pull request #2167 from totto82/addEvents
...
add WELTARG and WEFAC to events
2020-12-21 21:30:54 +01:00
Joakim Hove
5c722e5267
Merge pull request #2177 from bska/no-sfunc-1p
...
Don't Require Saturation Functions for One-Phase Runs
2020-12-21 13:35:10 +01:00
Bård Skaflestad
dde58f8e38
Don't Require Saturation Functions for One-Phase Runs
...
Users should not have to supply synthetic relative permeability or
capillary pressure functions in a single-phase run.
2020-12-21 11:03:08 +01:00
Joakim Hove
824625f121
Merge pull request #2173 from bska/promote-sfunc-family
...
Make Saturation Function Family Available in Runspec
2020-12-18 07:39:49 +01:00
Bård Skaflestad
5816d2dbd2
Push Compatibility Check To Parser Level
...
Leverage the 'prohibits'/'requires' support to enforce earlier
keyword compatibility checks. This plays better with parallel runs.
2020-12-17 21:33:11 +01:00
Bård Skaflestad
1ca668b67c
Make Saturation Function Family Available in Runspec
...
This information is generally useful so we should have a single
source of truth and not have to reimplement the logic every time
we need it.
2020-12-17 21:33:11 +01:00
Bård Skaflestad
f5a61c3382
Merge pull request #2160 from jalvestad/iudq1-rev
...
Revision of AggregateUDQData plus some improvements to SWEL and XCON
2020-12-17 21:31:36 +01:00
Joakim Hove
628ad29da1
Merge pull request #2175 from joakim-hove/remove-porv-warning
...
Remove check and warning for use of porv based WBP calculation
2020-12-17 16:43:26 +01:00
Joakim Hove
93913d64a3
Merge pull request #2119 from jalvestad/glopt
...
Enable eclipse compatible restart for wells with gas lift optimization
2020-12-17 15:56:48 +01:00
Joakim Hove
5484053cd5
Remove check and warning for use of porv based WBP calculation
2020-12-17 15:49:08 +01:00
Bård Skaflestad
2c5403409e
Merge pull request #2172 from bska/relax-eps-requirements
...
Relax EPS Activation Criterion
2020-12-17 10:19:52 +01:00
Bård Skaflestad
ad8209d882
Relax EPS Activation Criterion
...
Existence of certain EPS keywords (SWL, SGCR, others) is sufficient
to activate the end-point scaling option. The deck does not *need*
to have the ENDSCALE keyword in these cases, but it is recommended
that ENDSCALE nevertheless be used.
On the other hand, certain other keywords do require the presence of
ENDSCALE so record this in "requires" clauses.
2020-12-16 17:47:00 +01:00
Joakim Hove
32d9dab412
Merge pull request #2170 from akva2/aquifer_serialize
...
Add serialization for aquifers
2020-12-16 12:38:43 +01:00
Joakim Hove
1e30916130
Merge pull request #2171 from akva2/fix_autoicd_serialize
...
Fix AutoICD serialization
2020-12-16 12:37:53 +01:00
Arne Morten Kvarving
6971705c30
fix indentation
2020-12-16 08:34:43 +01:00
Arne Morten Kvarving
8175a8a18f
implement AutoICD::serializeObject
2020-12-16 08:34:43 +01:00
Arne Morten Kvarving
fc46b310d6
fix AutoICD::serializeOp
2020-12-16 08:34:43 +01:00
Tor Harald Sandve
648030f1d0
add a well efficiency event
2020-12-15 13:34:34 +01:00
Arne Morten Kvarving
40ec45ebf2
add output serialization functions for aquifer
2020-12-15 11:49:48 +01:00
Jostein Alvestad
229950a591
added unit tests for the lift gas optimisation data
2020-12-15 10:53:29 +01:00
Jostein Alvestad
8c174d7f00
initial changes to make unit tests
2020-12-15 10:53:27 +01:00
Jostein Alvestad
df7e8220db
added file for unit-test - not ready yet
2020-12-15 10:53:25 +01:00
Jostein Alvestad
7d784f53ff
added code to write lift gas optimisation data to restart file
2020-12-15 10:53:16 +01:00
Arne Morten Kvarving
11ade04fd6
fixed: initialize members in Aquifer
2020-12-15 09:51:44 +01:00
Jostein Alvestad
e1e0857999
made UDQToken.hpp a public header file
2020-12-14 16:09:06 +01:00
Jostein Alvestad
c2a1218066
some minor improvements - warnings and comments
2020-12-14 15:26:25 +01:00
Jostein Alvestad
8da71d5620
improved code quality, used existing functions where possible
2020-12-14 13:56:02 +01:00