Commit Graph
270 Commits
Author SHA1 Message Date
Bård Skaflestad a1313a9d00 Reorder Well Data Report Function
The shut connection handling should be the final stage of this
reporting.  While here, also split the tracer rate assingments out
to a separate helper function.
2025-05-05 13:46:06 +02:00
David Landa Marban 9ebbcc3292 Summary vectors for water mass 2025-04-29 17:38:04 +02:00
Markus Blatt 1a24fcaa52 Merge pull request #6180 from atgeirr/remove-redundant-broadcast
Remove unneeded broadcast() overload.
2025-04-28 10:47:00 +02:00
Bård Skaflestad b879ee4bfa Merge pull request #6196 from akva2/janitoring_sca
Janitoring: quell static analyzer issues
2025-04-25 10:20:51 +02:00
Tor Harald Sandve 6e3e21b45c Store and use last valid network pressure 2025-04-24 15:04:24 +02:00
Atgeirr Flø Rasmussen 86086b92d0 Take root argument for broadcast() via special type.
Helps avoiding accidentally mixing up parameters, for example when
broadcasting an int.

Also fix some minor warning/namespace issues.
2025-04-24 13:02:05 +02:00
Arne Morten Kvarving 79919abcf0 use std::find_if instead of raw loops 2025-04-23 14:58:46 +02:00
Arne Morten Kvarving d20bb2cff9 use std::any_of instead of loops 2025-04-23 14:18:08 +02:00
Atgeirr Flø Rasmussen 5d7fc46e4b Remove unneeded broadcast() overload.
Note that this changes the order of arguments for some calls: now the
root always comes first, there is no possible mixup between the root
argument and the data arguments.

Most changes are due to no longer having a default argument
for the root. I consider that a good thing in itself.
2025-04-14 15:22:44 +02:00
Tor Harald Sandve 27e5555962 Merge pull request #6100 from vkip/nupcol3_and_nwglo
Actually respect NUPCOL (not NUPCOL+1) and allow network to converge with GLO
2025-04-02 16:12:45 +02:00
Kai Bao 5c17f27c88 Merge pull request #6128 from totto82/useNupcolRatesInGuideRateScaling
Use well rates from well_state_nupcol instead of previous_well_state in updateWellRates
2025-04-02 12:41:50 +02:00
Kai Bao dbe575502b removing unused hasTHPConstraints()
from BlackoilWellModelConstraints and BlackoilWellModelGeneric
2025-04-02 09:21:59 +02:00
Tor Harald Sandve 74d7871090 Use well rates from well_state_nupcol instead of previous_well_state in updateWellRates 2025-04-01 10:48:18 +02:00
Vegard Kippe 4fa3a501a0 Actually respect NUPCOL (not NUPCOL+1) and allow network to converge also with gas lift optimization. 2025-03-21 12:41:35 +01:00
Markus Blatt 197f82e830 Fully support switching types of wells (injector <-> producer) in ACTIONX
For this we need to make sure that status in ECL matches the
simulator, the surface rates make sense and the containers used for reporting.
2025-03-18 22:29:30 +01:00
Arne Morten Kvarving 175117b185 introduce a MSWellTracerRate struct
use this to avoid complex keys in maps for msw tracer rates
2025-03-04 10:54:47 +01:00
Arne Morten Kvarving 1665e989eb introduce a WellTracerRate struct
use this to avoid complex keys in maps for tracer rates
2025-03-04 08:29:34 +01:00
Vegard Kippe 44a87f8e65 Support NEFAC and clean up implementation 2025-02-14 11:37:26 +01:00
Bård Skaflestad b95490fabc Merge pull request #5847 from akva2/blackoilwellmodel_nldd
changed: move NLDD BlackoilWellModel code to separate class
2025-02-04 14:46:50 +01:00
Vegard Kippe 1d2e413d63 Parameterize network sub-iterations and pressure update dampening 2025-01-27 11:44:10 +01:00
Arne Morten Kvarving b41f512214 BlackoilWellModelGasLift: serialize last_glift_opt_time 2025-01-24 14:37:00 +01:00
Arne Morten Kvarving da22efb623 BlackoilWellModelGeneric: move operator== to translation unit 2025-01-24 14:35:52 +01:00
Bård Skaflestad d02ad0f637 Merge pull request #5909 from hnil/add_tracy
added more timing
2025-01-23 12:24:55 +01:00
Halvor M Nilsen f2bfa1b2ef added more timing 2025-01-23 11:28:20 +01:00
Arne Morten Kvarving fe3c687eaa remove some duplicate if conditionals 2025-01-23 11:16:32 +01:00
Arne Morten Kvarving c114def851 mark parameters/variables as const where appropriate 2025-01-23 07:57:44 +01:00
Arne Morten Kvarving 078249503f changed: move NLDD BlackoilWellModel code to separate class 2025-01-22 15:33:28 +01:00
Arne Morten Kvarving ecc231a2a2 Merge pull request #5858 from akva2/blackoilwellmodel_temperature_constexpr
BlackoilWellModel::computeWellTemperature: use if constexpr
2025-01-15 10:41:25 +01:00
Vegard Kippe d7d83c4f45 Avoid setWsolvent call for wells shut by WCYCLE (assertion failure, at best) 2025-01-13 15:30:36 +01:00
Atgeirr Flø Rasmussen 6952d19a92 Merge pull request #5849 from akva2/rename_haswell
Fix BlackoilWellModel::hasWell mixups
2025-01-13 11:29:19 +01:00
Arne Morten Kvarving 6d003b2f33 BlackoilWellModel::computeWellTemperature: use if constexpr 2025-01-10 09:50:58 +01:00
Arne Morten Kvarving 73ede837bb changed: move WBP BlackoilWellModel code to separate class
model using has-a instead of is-a in BlackoilWellModelGeneric
2025-01-10 09:38:35 +01:00
Arne Morten Kvarving f59dd4084d BlackoilWellModelGeneric::reportGroupSwitching: use {fmt} 2025-01-10 09:18:06 +01:00
Arne Morten Kvarving 70e993c0bc BlackoilWellModel: move group switching reporting to separate method
this can be put in the generic TU
2025-01-10 09:18:05 +01:00
Arne Morten Kvarving 8a1ccaca80 changed: rename BlackoilWellModelGeneric::hasWell to hasLocalWell 2025-01-09 15:33:44 +01:00
Arne Morten Kvarving 64f9ebb06c move hasOpenLocalWell to BlackoilWellModelGeneric 2025-01-09 15:32:00 +01:00
Arne Morten Kvarving 89dbda4621 changed: move GasLift to separate class
move to has-a instead of is-a for modelling in BlackoilWellModel
2025-01-06 15:15:59 +01:00
Arne Morten Kvarving 7c5f9c59b3 BlackoilWellModel: move initialization of terminal_output_ to the generic class
it is now possible since parameter system does not need typetag
2025-01-06 15:09:56 +01:00
Tor Harald Sandve c0318c8759 Merge pull request #5754 from plgbrts/ac-group-guide-rates
Allow group guide rates in case that a group is an auto choke group
2024-12-20 07:54:57 +01:00
Arne Morten Kvarving 4f5c86d72c Merge pull request #5816 from akva2/fix_wcycle_glob
Allow query for efficiency scaling factor in off-process wells where required
2024-12-19 13:53:30 +01:00
Vegard Kippe 60d738bc1c Allow query for efficiency scaling factor in off-process wells where required 2024-12-19 13:31:52 +01:00
Paul 9d735b8d6e add group target calculation
added temporary output

mainly rebasing

rebasing

some further attempts

fixed target calculations

remove some case specific choices

clean up

some clean up

generalised code for calculating target rate in groupControlledWells

small rebase fix

<double> replaced by <Scalar>

<double> replaced by <Scalar> (2)
2024-12-19 12:11:00 +00:00
Paul 6b2c372f11 allow individual well constraints
before rebasing

moved common thp calculation to updateWellControls

Small fix

clean up and improvements according reviewer comments

clean up and improvements according reviewer comments, part 2

changed assessing safe THP range

rebasing fixes

removed unused argument

rebasing
2024-12-19 12:10:50 +00:00
Arne Morten Kvarving 44c8b6086b computeWellBlockAveragePressures: move to BlackoilWellModelGeneric 2024-12-19 13:10:46 +01:00
Arne Morten Kvarving 4d998545eb initializeWBPCalculationService: move to BlackoilWellModelGeneric 2024-12-19 13:10:46 +01:00
Paul 32e45489d7 This is a combination of 3 commits.
autochoke producers control mode set to THP

simplyfying code as some logic is moved to the parser

minor repair work
2024-12-19 12:08:59 +00:00
Arne Morten Kvarving a67e8c44b4 registerOpenWellsForWbpCalculation: move to BlackoilWellModelGeneric 2024-12-19 12:58:50 +01:00
Arne Morten Kvarving 3d10b549e7 setPrimaryVarsDomain: move to BlackoilWellModelGeneric 2024-12-19 12:58:50 +01:00
Arne Morten Kvarving a36d40957b getPrimaryVarsDomain: move to BlackoilWellModelGeneric 2024-12-19 12:58:50 +01:00
Arne Morten Kvarving 5217e63309 logPrimaryVars: move to BlackoilWellModelGeneric 2024-12-19 12:58:50 +01:00