Commit Graph
9824 Commits
Author SHA1 Message Date
Joakim Hove 154b8727e1 Merge pull request #2294 from joakim-hove/aquconn
Aquconn
2021-02-15 09:19:34 +01:00
Joakim Hove 79375ecc9c Use face area as default influx coefficient for aquifer connection 2021-02-14 20:55:28 +01:00
Joakim Hove 6b9eea3919 Merge pull request #2293 from joakim-hove/handlercontext-add-wellpi
Handle WELPI + ACTIONX
2021-02-14 19:50:28 +01:00
Joakim Hove 36159d8512 Handle WELPI as ACTIONX keyword 2021-02-14 18:57:51 +01:00
Joakim Hove 6ad537fb20 Merge pull request #2292 from joakim-hove/tran-distribute-keys
Unconditionally include TRAN? keywords in FieldProps::keys<double>()
2021-02-12 16:58:49 +01:00
Joakim Hove 6fcd31850c Unconditionally include TRAN? keywords in FieldProps::keys<double>() 2021-02-12 09:59:14 +01:00
Joakim Hove aa7b619fc7 Merge pull request #2287 from joakim-hove/target-wellpi
Store target_wellpi in simple map member of ScheduleState
2021-02-12 09:24:27 +01:00
Joakim Hove 579890177e Remove prod_index member from Well class 2021-02-11 15:57:42 +01:00
Bård Skaflestad 7c67eccb93 Merge pull request #2288 from tskille/wct_unit
change units for water cut vectors
2021-02-11 00:01:35 +01:00
Torbjørn Skille 1256f93f63 change units for water cut vectors
using same as for commercial simulator
2021-02-10 21:09:55 +01:00
Joakim Hove 35761f31c1 Store target_wellpi in simple map member of ScheduleState 2021-02-10 21:03:26 +01:00
Joakim Hove 5b195311ee Merge pull request #2286 from joakim-hove/well-get-index-forward
Use template predicate and perfect forwarding
2021-02-10 15:37:50 +01:00
Joakim Hove 20b2531f95 Merge pull request #2285 from joakim-hove/apply-action-wellpi-arg
Update Schedulle::applyAction() api with wellpi argument
2021-02-10 14:59:17 +01:00
Joakim Hove cbf18f3a89 Use template predicate and perfect forwarding 2021-02-10 13:19:32 +01:00
Joakim Hove 6d02754260 Update Schedulle::applyAction() api with wellpi argument 2021-02-10 12:30:49 +01:00
Joakim Hove df563c0776 Merge pull request #2284 from joakim-hove/well-get-by-insert-index
Well get by insert index
2021-02-10 11:06:25 +01:00
Joakim Hove 23c1b15a46 Merge pull request #2283 from joakim-hove/unused-arg-warning
Remove unused arguments
2021-02-10 11:01:24 +01:00
Joakim Hove 7a40f31823 Add operator[] to NameOrder class 2021-02-10 09:45:01 +01:00
Joakim Hove 0e3839a6f1 Remove unused arguments 2021-02-10 09:19:39 +01:00
Joakim Hove b45d40e722 Add Schedule::getWell( well_index, report_step) method 2021-02-10 09:09:53 +01:00
Joakim Hove aea7de2c29 Add size() method to NameOrder class 2021-02-10 09:09:53 +01:00
Joakim Hove 994703e9db Merge pull request #2269 from joakim-hove/well-sched-state2
Well use SchedState
2021-02-10 09:08:16 +01:00
Joakim Hove bcffaefa7a Use ScheduleState for wells++
Use SchedueleState for wells, in addition to the members UDQConfig, GasLiftOpt
and GuideRateConfig.
2021-02-10 07:22:46 +01:00
Joakim Hove 0a6bbffea9 Merge pull request #2281 from joakim-hove/use-summarystate-optional-get
Use SummaryState::get_well_var(, default) instead of manual check
2021-02-10 07:21:51 +01:00
Joakim Hove 564c207a05 Use SummaryState::get_well_var() 2021-02-09 21:51:26 +01:00
Joakim Hove 2c4ac9d52f Merge pull request #2252 from GitPaean/new_numerical_aquifer_2
Numerical Aquifer continue
2021-02-09 07:22:25 +01:00
Joakim Hove a64a7ba9d5 Merge pull request #2279 from joakim-hove/action-welpi
Export list of WELPI wells from an ACTIONX keyword
2021-02-09 07:20:39 +01:00
Bård Skaflestad 83e6c4d2ca Merge pull request #2276 from joakim-hove/wellpi
Apply WELPI is based on newWellPI and not scaling factor
2021-02-08 23:28:50 +01:00
Kai Bao e5277221c7 adding more tests in AquiferTests for numerical aquifer 2021-02-08 09:40:25 +01:00
Joakim Hove c294e1779a Merge pull request #2280 from joakim-hove/mutable-overloads
Add mutable overloads for map_member methods get() and operator()
2021-02-07 23:39:41 +01:00
Joakim Hove 61e9d2ba98 Add mutable overloads for map_member methods get() and operator() 2021-02-07 18:05:40 +01:00
Joakim Hove 759a00538e Export list of WELPI wells from an ACTIONX keyword 2021-02-07 16:26:58 +01:00
Bård Skaflestad f880a4fa61 Merge pull request #2278 from joakim-hove/compdat-no-move
Avoid use after move

Fixes #2277
2021-02-07 11:29:07 +01:00
Joakim Hove f9a9361180 Avoid use after move 2021-02-07 07:55:37 +01:00
Kai Bao 8443b991c7 isolate numerical aquifer cells by setting permeability to zero
instead of editing transmissiblity directly.
2021-02-05 14:40:38 +01:00
Kai Bao fc8ca0566d updating more fieldProps related to numerical aquifer cells 2021-02-05 14:40:38 +01:00
Kai Bao 667f20df70 addressing reviewing comments in OPM/opm-common#2252 2021-02-05 14:40:38 +01:00
Kai Bao 9231c6c25d adding a few functions for simulator usage
return aqufier id and access all the aquifers in NumericalAquifers
2021-02-05 14:40:38 +01:00
Kai Bao 74921e3668 summary support for numerical aquifer keywords 2021-02-05 14:40:38 +01:00
Kai Bao 2da3a2987c fixing test TESTCP_ACTNUM_AQUNUM in EclipseGridTests 2021-02-05 14:40:38 +01:00
Kai Bao a1f98d7f2d creating NNCs to form numerical aquifers
Aquifer cells are connected through NNCs to form the aquifer itself. And
the reservoirs cells are connected to the first aquifer cell through
NNCs also.
2021-02-05 14:40:38 +01:00
Kai Bao 398d45ff68 updating some field_props for numerical aquifer cells
in the implementation, numerical aquifer cells are some specific grid
cells. At the same time, aquifer keywords can specify these cells with
very different properties, like depth, porosoity, pore volume, SATNUM,
PVTNUM, and so on.
2021-02-05 14:40:38 +01:00
Kai Bao 7628d7e13b isolating the aquifer cells from the rest of the reservoir
by setting the transmissiblity associated with aquifer cells to be zero.
2021-02-05 14:40:38 +01:00
Joakim Hove e571aca93b Apply WELPI is based on newWellPI and not scaling factor 2021-02-05 13:02:47 +01:00
Joakim Hove c9908df914 Merge pull request #2275 from joakim-hove/apply-action-simtime
Pass simulation time argument to Schedule::applyAction()
2021-02-05 12:06:44 +01:00
Joakim Hove 39c560e5cc Pass simulation time argument to Schedule::applyAction() 2021-02-05 09:53:27 +01:00
Joakim Hove eb736fa9cd Merge pull request #2273 from joakim-hove/sched-unique
Sched unique
2021-02-04 13:52:55 +01:00
Joakim Hove 7a45b23736 Merge pull request #2272 from joakim-hove/remove-udq-constructor
Remove UDQParams( Deck ) constructor
2021-02-04 11:12:55 +01:00
Joakim Hove 08cb85e08e Add temporary disabled Schedule::unique<UDQConfig>() test 2021-02-04 11:11:40 +01:00
Joakim Hove 3bc82e7a96 Add Schedule::unique<T>() 2021-02-04 11:11:40 +01:00