Commit Graph
22624 Commits
Author SHA1 Message Date
Håkon Hægland b3334cca6a Handle scalar/enum case correctly 2025-06-22 17:05:51 +02:00
Håkon Hægland 25ba9418df Remove Simulator alias
Remove Simulator alias since it is not used by any code
2025-06-22 13:15:40 +02:00
Håkon Hægland 61e5a3dd7f Use try_emplace() instead of emplace()
Fix bug where emplace() did not update existing keys in the map.
Instead use try_emplace() for efficient conditional construction and
assignment.
2025-06-22 12:09:14 +02:00
Håkon Hægland aee9658269 Create guiderate item names for debugging
Avoid reusing implementation detail itemName() of class GuideRateValue
2025-06-22 10:57:27 +02:00
Håkon Hægland 6bd6c7a872 Store group potentials in GroupState
Store the group potentials in the GroupState object so we avoid
recomputing them later when we need to send the slave group potentials
to the master.
2025-06-22 10:57:27 +02:00
Håkon Hægland 1623f37f49 Add comment for clarification
Add a comment to clarify that communication of slave group potentials is not
done during the nonlinear iterations
2025-06-22 10:57:27 +02:00
Håkon Hægland 9a2b3687a9 Add a comment
Add a comment to improve readability
2025-06-22 10:57:27 +02:00
Håkon Hægland edf0493849 Generic code for building MPI traits
Add generic code for building MPI traits for structs
2025-06-22 10:57:27 +02:00
Håkon Hægland 55313a6aef Don't store simulator reference 2025-06-22 10:57:27 +02:00
Håkon Hægland 439ea3f5fa Rename method 2025-06-22 10:57:27 +02:00
Håkon Hægland a2ce7dae7d Add Doxygen comment 2025-06-22 10:57:27 +02:00
Håkon Hægland 9dcd882260 Remove redundant if check 2025-06-22 10:57:27 +02:00
Håkon Hægland 3d54ad6318 Use references instead of copying 2025-06-22 10:57:27 +02:00
Håkon Hægland ce20b0adfd Use MPI custom datatype for potentials
Using a custom MPI datatype for the potentials, we can avoid
serialization and deserialization code.
2025-06-22 10:57:27 +02:00
Håkon Hægland cb031cd99a Fix serial build 2025-06-22 10:57:27 +02:00
Håkon Hægland 5abe7d69f9 Fixed bug in guide rate calculation
Even if a group is a pure injection group, we still need to include its
group potential in the calculation of the production potential of a
higher group
2025-06-22 10:57:27 +02:00
Håkon Hægland 006be80de0 Debugging code to dump guide rates
Added debugging code to dump all guide rates
2025-06-22 10:57:27 +02:00
Håkon Hægland 827cda4f79 Communicate group potentials
Send group potentials from the slaves to the master process, then
use the potentials in the master process to calculate guide rates.
2025-06-22 10:57:24 +02:00
Tor Harald Sandve dac43aa446 Merge pull request #6335 from daavid00/rundry
Fixing --enable-dry-run=1
2025-06-20 09:59:17 +02:00
Bård Skaflestad d19ff5fd45 Merge pull request #6334 from bska/prefer-names-to-objcopy
Don't Copy Well Objects When Well Names are Sufficient
2025-06-19 10:50:08 +02:00
Bård Skaflestad fa45c41dd3 Don't Copy Well Objects When Well Names are Sufficient
In particular, favour calling member functions on
ScheduleState::wells to retrieve references to individual well
objects given a name instead of using Schedule::getWells() or
Schedule::getWellsAtEnd().  While convenient, these functions
introduce needless copies of all well objects stored in the Schedule
object.  This commit instead, where possible, uses the somewhat less
convenient ScheduleState::well_order() accessor and then accesses
individual wells by name.

To this end, change BlackoilWellModelGeneric::not_on_process_ from a
function taking a well and returning a bool into a function taking a
well name and returning a bool.
2025-06-19 09:27:57 +02:00
Atgeirr Flø Rasmussen 9020fed6b1 Merge pull request #6333 from GitPaean/using_group_limit_action_oil
using  group_limit_action.oil instead of allRates for better code readability and potentially better flexibility
2025-06-18 16:58:56 +02:00
David Landa Marban b770d8bf90 Fixing --enable-dry-run=1 2025-06-18 13:32:29 +02:00
Kai Bao 53774ea2ce using group_limit_action.oil instead of allRates
better readability and potentially better flexbility.
2025-06-17 22:27:13 +02:00
Kai Bao 1c9de5f07f Merge pull request #6331 from atgeirr/fix-phase-specific-group-procedures
Bugfix: respect phase-specific group constraint actions
2025-06-17 13:21:10 +02:00
Atgeirr Flø Rasmussen 8e3208610a Bugfix: respect phase-specific group constraint actions
When a constraint is broken, we should use the appropriate action
depending on the phase whose constraint was broken, not always using
the one set for the general case (== the oil phase action).

Also, the handling of NONE is not really needed, and was in any case
quite strange.
2025-06-17 12:52:28 +02:00
Tor Harald Sandve 69567f3875 Merge pull request #6311 from totto82/storeGroupTarget
Store wellgroup targets
2025-06-16 08:58:36 +02:00
Tor Harald Sandve f6cd593585 Merge pull request #6317 from totto82/fix_oper_bhp
Also check operability for wells without thp control
2025-06-13 17:48:00 +02:00
Tor Harald Sandve 69dea18f5a Clean-up based on review 2025-06-13 12:55:43 +02:00
Atgeirr Flø Rasmussen ee7b9ed80c Merge pull request #6326 from kjetilly/throw_on_missing_partition
Check if specified external partition file exists
2025-06-12 10:06:54 +02:00
Kjetil Olsen Lye 8db4f69468 Check if specified external partition file exists 2025-06-11 15:49:00 +02:00
Atgeirr Flø Rasmussen 57654067ec Merge pull request #6328 from GitPaean/indices_num_phases
using PrimaryVariables::numWellEq in MultisegmentWellSegments
2025-06-11 15:30:00 +02:00
Tor Harald Sandve 233837cbb0 Fix checking of guiderate fractions
We dont want to check for guiderate fractions during local solves
(i.e. while well rates are not converged)
2025-06-11 11:05:27 +02:00
Kai Bao 5908b3e033 using PrimaryVariables::numWellEq in MultisegmentWellSegments 2025-06-11 09:46:51 +02:00
Markus Blatt ccdfa82b78 Merge pull request #6297 from arturcastiel/lgr-well-wip
LGR Well
2025-06-10 12:01:06 +02:00
Kai Bao e3035cf4d0 Merge pull request #6322 from GitPaean/removing_duplication_pv_index
reusing primary variable indices and flags defined
2025-06-06 15:23:51 +02:00
Kai Bao 68202cad85 reusing primary variable indices and flags defined
MultisegmentWellAssemble reuses the indices and flags defined in
MultisegmentWellPrimaryVariable.
2025-06-06 14:58:56 +02:00
Bård Skaflestad 04f084feb4 Merge pull request #6324 from tskille/update_prt
Update PRT reports
2025-06-06 12:04:15 +02:00
tskille bdc0edef69 Update PRT reports 2025-06-06 11:39:16 +02:00
Tor Harald Sandve e598a14046 fixup and cleanup 2025-06-06 11:05:10 +02:00
Bård Skaflestad 44dfda8c51 Merge pull request #6321 from GitPaean/removing_one_function
removing the unused and mistakenly defined function
2025-06-05 09:17:19 +02:00
Kai Bao 8be1a686b1 removing the unused and mistakenly defined function
assignPrimaryVars from blackoilenergymodules.
2025-06-04 23:22:57 +02:00
Tor Harald Sandve 03c7565b10 Compute and store well-group targets in singleWellState and use them
This avoid recomputing of wellgroup targets and also makes the wellgroup target
consistent during control switching during local well solves.
2025-06-04 20:57:02 +02:00
arturcastiel 95da3ddc82 code janitoring and reviewing 2025-06-04 08:34:18 +00:00
Atgeirr Flø Rasmussen e952a40df2 Merge pull request #6280 from erikhide/general-controller-further-updates
Further updates and fixes to general controller
2025-06-04 10:33:49 +02:00
Tor Harald Sandve af026f12fa Also check operability for wells without thp control 2025-06-04 09:39:47 +02:00
Markus Blatt 52b5e2e67a Merge pull request #6309 from multitalentloes/minor_naming_fix
correct misleading macro name
2025-06-03 15:22:53 +02:00
Lisa Julia Nebel 3092c220c4 Merge pull request #6294 from lisajulia/ms-wells/add-test-9-perfs-1-seg
Add test for Multisegment wells: Well with 9 perforations on one segment
2025-06-03 15:11:33 +02:00
Erik Hide Saeternes 6cf2d41c99 Fixed tiny bug which caused test failure 2025-06-03 14:49:39 +02:00
Erik Hide Saeternes 752fba50f7 Removed default parameters from constructor 2025-06-03 13:55:43 +02:00