Commit Graph

4141 Commits

Author SHA1 Message Date
Joakim Hove
dd1591f1a2 Use Action::State object to keep track of actions being run 2020-06-18 16:45:39 +02:00
Joakim Hove
f54245f1ca Add class Action::State to keep track of ACTIONX count 2020-06-18 16:45:39 +02:00
Joakim Hove
7d856b4933 Add id member to ActionX objects 2020-06-18 16:45:39 +02:00
Bård Skaflestad
2123884655 Merge pull request #1408 from jalvestad/extend_udq_actx_rst
Changes to extend and improve the ECL-compatible restart
2020-06-18 16:29:52 +02:00
Arne Morten Kvarving
8d3680c7b5 anonymize to quell unused parameter warning 2020-06-18 08:27:48 +02:00
Joakim Hove
986f0acad7 Merge pull request #1826 from akva2/add_missing_initializer
fixed: add missing initializer
2020-06-17 15:44:22 +02:00
Arne Morten Kvarving
643b8b179d fixed: add missing initializer 2020-06-17 14:32:42 +02:00
Joakim Hove
3478263de9 Fix: bug in serializer function for GPMaint class 2020-06-17 12:45:23 +02:00
Markus Blatt
8c6cd2f10f Merge pull request #1810 from blattms/support-pinch-nogap
Support querying GAP/NOGAP mode for Pinch form EclipseGrid.
2020-06-15 17:27:15 +02:00
Jostein Alvestad
c846716044 add variable to hold min value of nonzero uda 2020-06-15 09:55:40 +02:00
Jostein Alvestad
fea794ee17 further corrections of unit tests and code clean up 2020-06-15 09:55:38 +02:00
Jostein Alvestad
ec976db684 correction for lift quantity well-data
corrections to IUAD and IUAP

various improvements of E100 compatible restart file

add debug output

additonal debug print

corrected loop placement for active prod/inj wells

remove debug print and clean up code
2020-06-15 09:55:34 +02:00
Joakim Hove
985cb279ff Allow negative rates when evaluating UDA values
corrections to iwel[10] open/shut flag

further corrections SWEL for handling udq-restarts correctly

further changes to get correct SWEL in ECL-Restart file

added comment to clarify change

correction to group sequence and group controls for EclRST-file

changes to correct IGRP[NWGMAX+5]

corrected compile errors/warnings

further minor code corrections

initial changes to include group current Prod/inj Constraint in summary file

further changes to currentsStatusGroupControl to Summary output

further corrections and additions of Field current controls

further corrections for IGRP

minor corrections to code style

corrections for tests

changes to correct test_AggregateWellData

a few more initial changes for next version of igrp/sgrp

changes to igrp & sgrp according to tests

changes to handle special conditions at report step 0

corrections due to changes in Summary.cpp

changes to improve code quality and robustness

Add default value to igrp[nwgmax+5]

corrections and code improvements base on testing

corrections to handling of GCONINJE

further corrections for IGRP

even further corrections IGRP

changes to correct SGRP

correction to IGRP defaults

corrections to SWEL and IGRP

further corrections for IGRP

removed some comments
2020-06-15 09:55:27 +02:00
Joakim Hove
84aa2f77f3 Merge pull request #1820 from joakim-hove/udq-nan-values
UDQSet will check for nan values
2020-06-12 13:49:24 +02:00
Joakim Hove
0841e4f398 Merge pull request #1797 from joakim-hove/GPMAINT
Add code to internalize GPMAINT keyword in Group objects
2020-06-12 12:19:20 +02:00
Joakim Hove
10b2b2ac48 Add caching of well and group names in SummaryState 2020-06-12 12:07:04 +02:00
Joakim Hove
213c6fb6ad Add function SummaryState::update_udq() to add variables from UDQSet 2020-06-12 09:12:55 +02:00
Joakim Hove
90d1d992e5 Ensure that evaluated UDQSet have the correct name 2020-06-12 09:12:55 +02:00
Joakim Hove
669918547a Add del() method to SummaryState 2020-06-12 09:12:55 +02:00
Joakim Hove
b07bd377cd Merge pull request #1819 from joakim-hove/aicd
Aicd
2020-06-12 09:12:18 +02:00
Atgeirr Flø Rasmussen
e08a3666e3 Merge pull request #1818 from atgeirr/fix-nupcol-runspec
Handle NUPCOL in RUNSPEC correctly
2020-06-11 20:50:30 +02:00
Joakim Hove
224911bd10 Add implementation for autonomous ICD: AutoICD 2020-06-11 11:38:29 +02:00
Joakim Hove
73a244ceda Templated internalizing of WSEGSICD keyword 2020-06-11 11:38:29 +02:00
Joakim Hove
0f032d6fca Merge pull request #1801 from joakim-hove/icd-variant
Use std::variant<> to hold ICD alternatives
2020-06-11 11:31:58 +02:00
Joakim Hove
6090470045 Add code to internalize GPMAINT keyword in Group objects 2020-06-11 09:40:55 +02:00
Atgeirr Flø Rasmussen
0c6d1c31d7 Implement and use Runspec::nupcol(). 2020-06-11 07:44:49 +02:00
Joakim Hove
dae980ddd5 Hide away templated convert function 2020-06-10 16:36:33 +02:00
Bård Skaflestad
83429bf908 Sat-Func Initializers: Pass TOLCRIT to Table-Scanning Layer
This is a pure API change.  The TOLCRIT value is not yet used as
part of determining the critical saturations.

While here, also add a unit test for getRawTableEndPoints() and
update the existing sat-func property unit tests to explicitly pass
TOLCRIT = 0 in preparation of adding actual TOLCRIT support.
2020-06-10 14:33:01 +02:00
Bård Skaflestad
f0f3764b89 Sat-Func Initializers: Expose RawTableEndPoints to Caller
This commit requires that the callers of satfunc::init() calculate
the raw table end-points.  That, in turn, enables callers to cache
those end-point values to avoid repeated calculations.

Add a new member, m_rtep, to FieldProps to act as such a cache to
take advantage of the new ability.
2020-06-10 14:33:01 +02:00
Joakim Hove
afd5c3153a Use value based semantics for Segment -> valve 2020-06-10 06:35:03 +02:00
Joakim Hove
b1250c2f7a Use std::variant<> to hold ICD alternatives 2020-06-10 06:35:03 +02:00
Joakim Hove
b73f4aa5dc Merge pull request #1811 from joakim-hove/rst-segment-connection-refactor
Reshuffle segments and connections after restart
2020-06-09 07:08:37 +02:00
Bernd Flemisch
27e310d436 [parser] include required header 2020-06-08 15:23:52 +02:00
Joakim Hove
7a88808ccb Add Segment::updateValve() overload which does not take length arg 2020-06-07 09:09:26 +02:00
Markus Blatt
23dd41ba38 Support querying GAP/NOGAP mode for Pinch form EclipseGrid.
While we currently only support GAP and do not need this,
we will need it eventually to support NOGAP in the simulator.
2020-06-04 20:19:51 +02:00
Joakim Hove
6b468787c8 Refactor COMPSEGS handling
When handling the COMPSEGS keyword the connections are updated with segment
number and the segments are updated with total perforated length. The new
Compsegs::processCOMPSEGS() function will create new updated copies of both
WellSegments and WellConnections.
2020-06-04 16:57:40 +02:00
Cintia Goncalves Machado
628afd7abe finalizeSaltTables 2020-06-04 11:43:59 +02:00
Joakim Hove
1b2fc9a7fa Add new function to calculate total perforated length for segment 2020-06-03 08:28:53 +02:00
Joakim Hove
dcec08767d Add member perf_length to Segment class 2020-06-03 08:28:53 +02:00
Håkon Hægland
f7d2631a57 Added const keyword to getters.
The access method should be marked as const so to make the compiler
aware that they should not modify the state of the object.
2020-06-02 09:20:54 +02:00
Håkon Hægland
c6d49a4b44 Added some getters for LIFTOPT.
Added getters for gaslift_increment() and min_eco_gradient() in
the Opm::GasLiftOpt class.
2020-06-02 07:21:01 +02:00
Joakim Hove
ccf3f150f2 Merge pull request #1798 from joakim-hove/aicd
Rename SpiralICD -> SICD
2020-05-29 07:24:38 +02:00
hnil
2c04ada035 added unification of inputoutput 2020-05-28 16:08:34 +02:00
hnil
e3d39a8b64 changes to be able to set request for restart. Also change the parallel restart to read uniform output 2020-05-28 16:08:34 +02:00
Joakim Hove
7df0577a58 Rename SpiralICD -> SICD 2020-05-28 11:03:24 +02:00
Bernd Flemisch
54f08156ad add some missing includes 2020-05-19 12:59:22 +02:00
Joakim Hove
66acfb5249 When defining branch properties: vfp == 0 should delete branch 2020-05-15 14:21:44 +02:00
Joakim Hove
fd5a42801f Make sure the UDQ usage in GCONPROD is recorded 2020-05-15 08:27:52 +02:00
Bård Skaflestad
355fb2aabb Merge pull request #1784 from joakim-hove/guderate-def-init
Initialize group production guide_rate to Target::NONE
2020-05-11 19:04:40 +02:00
Joakim Hove
ce368bb850 Initialize groups GuideRate target to NONE 2020-05-11 12:53:37 +02:00