Commit Graph

9649 Commits

Author SHA1 Message Date
Jostein Alvestad
768f9958b6 first draft version of new code 2020-12-14 13:55:47 +01:00
Jostein Alvestad
4f1e65e29b initial temporary changes to improve iudq[1]
initial changes to improve iudq[1] for DEFINE

further changes for IUDQ revision

further improvments iudq[1] - top parser tree

further improvments to IUDQ[1] - minus-sign++

first working version of revised UDQ-restart output

additional improvements SWEL, XCON

initial - unfinished changes of rewriting iudq[1]

some minor debug output changes
2020-12-14 13:55:37 +01:00
Joakim Hove
debfc70450
Merge pull request #2169 from joakim-hove/welpi-actionx2
Use event_step
2020-12-13 14:01:39 +01:00
Joakim Hove
545a5ecf7b Use event_step 2020-12-13 09:02:10 +01:00
Bård Skaflestad
9ef5cc2309
Merge pull request #2164 from jalvestad/swel_xconn
Changes for SWEL  for correct handling of lift gas plus improvements to XCONN
2020-12-11 22:52:18 +01:00
Joakim Hove
5474bc9a90
Merge pull request #2158 from joakim-hove/well-status
Manage well status with a shared pointer: To enable/improve runtime updates
2020-12-11 17:10:19 +01:00
Joakim Hove
bd2330df4f
Merge pull request #2166 from joakim-hove/actionx-restart-paren
Handle parenthesis in the Actionx::Condition class
2020-12-11 17:01:30 +01:00
Joakim Hove
469cf09d85 Handle parenthesis in the Actionx::Condition class 2020-12-11 14:53:29 +01:00
Tor Harald Sandve
44ebf2f241 add WELTARG and WEFAC to events 2020-12-11 11:35:41 +01:00
Joakim Hove
59f9813e14
Merge pull request #2163 from verveerpj/cylindrical_grid
Support cylindrical grids as a spiderweb with corrected volumes
2020-12-10 09:55:33 +01:00
Joakim Hove
a365a2575a
Merge pull request #2165 from joakim-hove/actionx-paren
Add test for boolean logic
2020-12-10 09:40:44 +01:00
Joakim Hove
c31ebda702 Add test for boolean logic 2020-12-09 17:34:18 +01:00
Peter Verveer
40940625fc Bug fix in calculation of depth 2020-12-09 15:51:30 +01:00
Peter Verveer
81c7b53449 Support cylindrical grids as a spiderweb with corrected volumes 2020-12-09 15:51:01 +01:00
Joakim Hove
7541b5e503
Merge pull request #2161 from joakim-hove/update-range
Add function DynamicState::update_range()
2020-12-08 22:14:30 +01:00
Joakim Hove
934e031f22
Merge pull request #2162 from akva2/janitoring
Some bug fixes
2020-12-08 22:14:15 +01:00
Joakim Hove
cf244a293e Add time range to WellStatus 2020-12-08 20:01:55 +01:00
Arne Morten Kvarving
c776ede067 fixed: error in comparison operator 2020-12-08 15:52:55 +01:00
Arne Morten Kvarving
4fd58bf2f3 fixed: use fabs, not abs()
latter is for ints
2020-12-08 15:52:55 +01:00
Arne Morten Kvarving
c205a11037 fixed: forward struct as struct 2020-12-08 15:52:55 +01:00
Jostein Alvestad
fe9ade9dab changes to SWEL and XCONN for lift gas optimisation 2020-12-08 14:50:45 +01:00
Joakim Hove
2e832f0fbe Changes to Well status implementation
o The status of a well is maintened as a small object which is managed by a new
   std::shared_ptr member in the well objects. The consequence of this is that
   several well objects can share the same underlying status object. The
   advantage of this is that runtime (i.e. ACTIONX) updates of well status will
   affect the correct set of wells.

 o The general Schedule::updateWell() will use the DynamicState::upadte_equal()
2020-12-08 09:36:45 +01:00
Joakim Hove
85e2c641d3 Add function DynamicState::update_range() 2020-12-08 09:36:44 +01:00
Markus Blatt
1ef1646fb1
Merge pull request #2159 from joakim-hove/warning-unused
Fix warning with unused variable
2020-12-07 12:27:09 +01:00
Joakim Hove
1b76cd1fe6 Fix warning with unused variable 2020-12-06 10:04:49 +01:00
Joakim Hove
e261253683
Merge pull request #2157 from joakim-hove/wbp-porv
Add PORV argument when creating PAvgCalculator
2020-12-04 20:31:52 +01:00
Joakim Hove
968aa79468
Merge pull request #2151 from verveerpj/spiderweb
Allow use of both DZ and DZV when creating a spiderweb grid
2020-12-04 13:13:57 +01:00
Joakim Hove
135e8c793c
Merge pull request #2154 from joakim-hove/dynamicstate-update
Dynamicstate update
2020-12-04 13:13:44 +01:00
Bård Skaflestad
8ada1cc333
Merge pull request #2155 from joakim-hove/handle-welpi-report-step
Use argument reportStep + 1 when evaulating WELPI in  ACTIONX
2020-12-04 12:54:35 +01:00
Joakim Hove
9809197b5d Add PORV argument when creating PAvgCalculator 2020-12-04 10:58:27 +01:00
Peter Verveer
b85ab8813e Allow use of both DZ and DZV when creating a spiderweb grid 2020-12-04 09:44:36 +01:00
Joakim Hove
dbc23dca65 Use argument reportStep + 1 for WELPI ACTIONX events 2020-12-04 09:28:14 +01:00
Joakim Hove
0102d736ac
Merge pull request #2141 from GitPaean/wsegaicd2
WSEGAICD
2020-12-04 08:52:16 +01:00
Joakim Hove
0752764ecc Refactor of DynamicState::update_equal() 2020-12-04 08:10:54 +01:00
Bård Skaflestad
aaff4d1785
Merge pull request #2153 from bska/fix-wpi-shut
Summary Test Deck: Open Wells 1, 2, 3, and 6 at First Step
2020-12-04 00:30:20 +01:00
Bård Skaflestad
e1db7cd87e Summary Test Deck: Open Wells 1, 2, 3, and 6 at First Step
This restores 'test_Summary' for WPI vectors.
2020-12-03 22:08:01 +01:00
Kai Bao
c965db78e4 addressing reviewing comments for OPM/opm-common#2141 2020-12-03 21:54:31 +01:00
Kai Bao
f78e0e9c96 adding more accessing functions for AICD class 2020-12-03 15:23:04 +01:00
Kai Bao
540b45b8c7 adding the parsing of WSEGAICD 2020-12-03 15:23:04 +01:00
Bård Skaflestad
971f9d9415
Merge pull request #2150 from joakim-hove/zero-PI-closed-wells
The summary calculator should return zero PI for non flowing wells
2020-12-03 15:09:35 +01:00
Joakim Hove
1a2e0ec01e The summary calculator should return zero PI for non flowing wells 2020-12-03 11:05:10 +01:00
Joakim Hove
acb55a1bff
Merge pull request #2148 from joakim-hove/guard-copt
Check that we have the COPT key before accessing it
2020-12-03 09:45:08 +01:00
Joakim Hove
7615088a03
Merge pull request #2146 from joakim-hove/pavg-fixup
Pavg fixup
2020-12-03 09:44:56 +01:00
Bård Skaflestad
b573fc0223
Merge pull request #2149 from tskille/gridhead_fix
fix gridhead out-of-bounds indexing error in EGrid
2020-12-02 23:18:11 +01:00
Torbjørn Skille
26de5bb9b0 fix gridhead out-of-bounds indexing error in EGrid 2020-12-02 19:06:58 +01:00
Joakim Hove
4c48f9bcf9
Merge pull request #2144 from totto82/alq_default
Fix gaslift output
2020-12-02 15:56:35 +01:00
Joakim Hove
19e755e10d Check that we have the COPT key before accessing it 2020-12-02 15:54:01 +01:00
Joakim Hove
1ca2a0b06b
Merge pull request #2147 from akva2/fix_deckitem_serialize
fixed: missing serialization for rsval in DeckItem
2020-12-02 14:06:20 +01:00
Arne Morten Kvarving
fa9dc54bbb
Merge pull request #2132 from tskille/eclio_lgr
Eclio lgr
2020-12-02 11:23:08 +01:00
Arne Morten Kvarving
0c11863bb5 fixed: missing serialization for rsval in DeckItem
this broke ActionX in parallel
2020-12-02 09:43:22 +01:00