Commit Graph
1939 Commits
Author SHA1 Message Date
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 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
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
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 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
Joakim Hove 545a5ecf7b Use event_step 2020-12-13 09:02:10 +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 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 c31ebda702 Add test for boolean logic 2020-12-09 17:34:18 +01:00
Peter Verveer 81c7b53449 Support cylindrical grids as a spiderweb with corrected volumes 2020-12-09 15:51:01 +01:00
Joakim Hove cf244a293e Add time range to WellStatus 2020-12-08 20:01:55 +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
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 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
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
Joakim Hove 7615088a03 Merge pull request #2146 from joakim-hove/pavg-fixup
Pavg fixup
2020-12-03 09:44:56 +01:00
Arne Morten Kvarving fa9dc54bbb Merge pull request #2132 from tskille/eclio_lgr
Eclio lgr
2020-12-02 11:23:08 +01:00
Joakim Hove f5cc5bc3f2 Merge pull request #2145 from joakim-hove/improve-error-message
Improve error message for connection in inactive cell
2020-12-02 08:29:55 +01:00
Joakim Hove 5b50805c0f Merge pull request #2143 from joakim-hove/roew-copt
Summary keyword ROEW is based on COPT and not WOPT
2020-12-02 08:29:40 +01:00
Joakim Hove 9c6c07c294 Merge pull request #2139 from joakim-hove/actionx-required-summary-variables
ACTIONX: Determine required summary keywords
2020-12-02 08:27:33 +01:00
Torbjørn Skille a8461fd121 Updating class ERst
- rename member function from getRst -> getRestartData
 - adding support for parsing and reading data for LGRs
 - a number of member functions made const
 - updated python bindings for this class
2020-12-01 23:06:44 +01:00
Torbjørn Skille a7314ab5a0 Updating class EGrid
- now supporting parsing/reading of lgrs
 - detect if radial grid is used
 - return xyz coordinates also for radial grids
 - support for getting nnc data
2020-12-01 20:14:37 +01:00
Torbjørn Skille e1334adbf6 Adding new class EInit
- for parsing and loading data from INIT file
 - including functions to support parsing/logading LGR data
2020-12-01 20:14:37 +01:00
Joakim Hove 1ac1582f12 PAvgCalculatorCollection: accept presssure updates in invalid cell 2020-12-01 10:27:44 +01:00
Joakim Hove 38c01e91e1 Improve error message for connection in inactive cell 2020-12-01 08:17:16 +01:00
Joakim Hove 53cd73c2d7 PAvgCalculator to calculate WBP? pressures 2020-11-30 10:42:15 +01:00
Joakim Hove a6215ce107 Summary keyword ROEW is based on COPT and not WOPT 2020-11-29 13:46:26 +01:00
Joakim Hove e0a9bcc924 ACTIONX: Determine required summary keywords 2020-11-26 20:09:28 +01:00
Joakim Hove 678edf4497 Export static function to check month name validity 2020-11-26 20:09:28 +01:00
Peter Verveer 479225f170 Add test to check PERMR/PERMTHT 2020-11-26 15:29:57 +01:00
Peter Verveer 3070696070 Support PERMR and PERMTHT aliases for PERMX and PERMY 2020-11-26 15:21:36 +01:00
Joakim Hove f395629dd5 Merge pull request #2131 from jalvestad/swel-cor
Correction of SWEL to handle zero rates in WCONHIST and WELOPEN SHUT
2020-11-26 14:07:32 +01:00
Bård Skaflestad a14c4184a9 Support Outputting Preferred Phase PI to Summary File
This commit adds support for outputting the productivity index of
a well's preferred phase at the well and connection levels to the
summary file (keywords 'WPI' and 'CPI').

Update unit tests accordingly.
2020-11-24 16:10:02 +01:00
Joakim Hove 08f8685bd1 Merge pull request #2127 from joakim-hove/summary-rhpv
Support summary keyword RHPV
2020-11-24 15:28:29 +01:00
Joakim Hove 9b0b03d6d3 Merge pull request #2126 from joakim-hove/udq-type-cast
Udq type cast
2020-11-24 14:28:25 +01:00
Joakim Hove ef5c51cee7 RHPV 2020-11-24 12:10:05 +01:00
Joakim Hove fa3b740d1d UDQ Cast can cast to both lhs type and rhs type 2020-11-24 11:48:17 +01:00
Jostein Alvestad b22334f08a correction of an unintended change in test_AggregateWellData.cpp 2020-11-24 10:54:58 +01:00
Jostein Alvestad f2e32fa436 Added unit tests for corrections 2020-11-24 10:49:47 +01:00
Joakim Hove 60920dd487 Ensure that WOPT is added to SummaryConfig when requesting ROEW 2020-11-23 11:02:02 +01:00
Joakim Hove 8e83deef26 Merge pull request #2123 from joakim-hove/region-cache-wells
Add method RegionCache::wells()
2020-11-23 11:00:22 +01:00
Joakim Hove 174c16058c Changes in SummaryState deserialize: Use internal variables directly 2020-11-21 09:33:33 +01:00
Joakim Hove 25beb52f68 Add operator== to SummaryState 2020-11-21 09:33:33 +01:00
Joakim Hove 8f65921753 Add put_vector() and get_vector() methods to Serializer 2020-11-21 09:33:33 +01:00