OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,569 Commits 18 Branches 75 Tags
f5a61c33824ff02ee3d0f24d2abbcd4b6d80d257
Commit Graph

9569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jostein Alvestad
12598aee05 added more extensive unit tests for iudq[1] 
Added one test case, cleaned code

Some minor cleaning / corrections

some changes to improve code quality
 2020-12-14 13:55:55 +01:00
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
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