Commit Graph
1114 Commits
Author SHA1 Message Date
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 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
Joakim Hove 7615088a03 Merge pull request #2146 from joakim-hove/pavg-fixup
Pavg fixup
2020-12-03 09:44:56 +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
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 9b0b03d6d3 Merge pull request #2126 from joakim-hove/udq-type-cast
Udq type cast
2020-11-24 14:28:25 +01:00
Joakim Hove fa3b740d1d UDQ Cast can cast to both lhs type and rhs type 2020-11-24 11:48:17 +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 b8179b943d Merge pull request #2115 from joakim-hove/all-connections-inactive
Automatically shut wells with no connections
2020-11-18 06:49:35 +01:00
Joakim Hove 61c879e8cb Load summary keyword RHPV_xxx 2020-11-17 15:15:26 +01:00
Joakim Hove 91275cc0a5 Automatically shut wells with no connections 2020-11-17 14:55:48 +01:00
Joakim Hove 8ffb918650 Merge pull request #2112 from joakim-hove/udq-update
Support UDQ UPDATE
2020-11-17 10:31:47 +01:00
Joakim Hove c46488236a Merge pull request #2110 from joakim-hove/actionx-welpi
Actionx welpi
2020-11-16 18:12:53 +01:00
Joakim Hove 278c2182bd Handle WELPI keyword in ACTIONX blocks 2020-11-16 16:55:34 +01:00
Joakim Hove e4ab6c43ce Merge pull request #2107 from joakim-hove/rrpv
Rrpv
2020-11-16 10:37:12 +01:00
Joakim Hove ed5ed62203 Parse summary keyword ROEW_xxx 2020-11-16 07:12:59 +01:00
Joakim Hove b2da0228b1 Support UDQ UPDATE action 2020-11-15 10:03:34 +01:00
Joakim Hove e0e5ed1f91 Make sure UDQ can use also special summary values like TIME 2020-11-15 10:02:34 +01:00
Joakim Hove e35febde59 Merge pull request #2108 from joakim-hove/actionx-gconinje
Hanlde GCONINJE in ACTIONX block
2020-11-13 17:48:05 +01:00
Joakim Hove 27883b8a3c Merge pull request #2105 from GitPaean/aqunum_activating_cells
AQUNUM can activate inactive cells
2020-11-13 17:23:14 +01:00
Kai Bao 72d3346ab8 Numerical aquifer cells need to be active
even the cells are disabled with ACTNUM
2020-11-13 11:18:48 +01:00
Joakim Hove e8cb3f37e0 Hanlde GCONINJE in ACTIONX block 2020-11-13 08:48:11 +01:00
Joakim Hove 54cae0f07e Merge pull request #2095 from joakim-hove/nnc-location
Nnc location
2020-11-13 08:26:30 +01:00
Joakim Hove cfbafc236a Allow deck_names in ParserKeyword to be interpreted as regexp 2020-11-13 08:19:43 +01:00
Joakim Hove d4513d214f Internalize WPAVE and WWPAVE keywords 2020-11-12 23:59:10 +01:00
Joakim Hove 37b71e8be5 Skip NNCEDIT with multiplier = 1 2020-11-11 19:57:06 +01:00
Joakim Hove e61e7afcc8 Refactor the NNC input class
- The NNC and EDITNNC keywords are internalized in the same class.
- The EDITNNC keyword operations are applied directly to the NNC keywords.
- The nnc vectors are ordered with cell1 < cell2 and ascending order.
- An api has been added to get the KeywordLocation from an NCC
- NNC/EDITNNC which is connected to inactive cell is ignored
2020-11-11 19:57:06 +01:00
Bård Skaflestad c157760ac7 CxL: Account for Dynamically Changing Set of Connections
This commit adds a new helper function

    getCompletionNumberFromGlobalConnectionIndex

which returns an optional<int> containing the completion number of
the connection with the associated global cell index, or nullopt if
no such connection exists.  We then reimplement the CxL summary
keywords in terms of this function to handle connections being added
dynamically during the simulation.  The connections at the end of
the simulation, from which we configure all connection-related
summary nodes, might not accurately reflect the connections existing
at all times during the simulation.
2020-11-11 16:04:08 +01:00
Joakim Hove f3d6c3abe4 Support GCONLIFT in ACTIONX 2020-11-09 17:15:17 +01:00
Joakim Hove 7dd50935d1 Refactor ACTIONX testing to use a make_schedule() setup function 2020-11-09 17:15:17 +01:00