Commit Graph
21493 Commits
Author SHA1 Message Date
Bård Skaflestad 2e62b6c1cc Merge pull request #6065 from akva2/fix_optional_deref
fixed: capture as optional
2025-03-11 09:28:24 +01:00
Bård Skaflestad c76f75f8d3 Merge pull request #6064 from akva2/tracer_avoid_alloc
Tracer: avoid allocations in inner loop
2025-03-11 09:27:06 +01:00
Arne Morten Kvarving c9a104bad9 remove unused capture 2025-03-11 09:02:26 +01:00
Arne Morten Kvarving 7006799b7f fixed: capture as optional
unconditional deref while creating (unused) extractor will
trigger asserts in debug iterator builds
2025-03-11 09:00:09 +01:00
Arne Morten Kvarving 137434ddf6 Tracer: avoid allocation in inner loop 2025-03-11 08:51:10 +01:00
Bård Skaflestad 1ef58b643d Merge pull request #6061 from akva2/tracer_unify_2
Tracer: Unify some helper functions
2025-03-10 16:14:37 +01:00
Tor Harald Sandve 98703f0c99 Merge pull request #6020 from totto82/stopMSWiter
modify stagnation and oscillation code for MSW
2025-03-07 15:22:03 +01:00
Bård Skaflestad 115922da59 Merge pull request #5916 from totto82/fix_gpmaint0
Fix gpmaint for region 0
2025-03-07 14:06:34 +01:00
Bård Skaflestad 33661ca6e9 Merge pull request #6059 from daavid00/co2h2output
Improving terminal/dbg output
2025-03-07 13:47:03 +01:00
Arne Morten Kvarving 7664f98537 unify computeFreeFlux_ and computeSolFlux_ in one template 2025-03-07 13:11:51 +01:00
Arne Morten Kvarving d229083b44 unify computeFreeVolume_ and computeSolutionVolume_ in one template 2025-03-07 13:11:51 +01:00
David Landa Marban a7ae439035 Improving terminal/dbg output 2025-03-07 12:32:35 +01:00
Bård Skaflestad 32a8c07dad Merge pull request #6030 from akva2/processelement_blockdata_table
Move blockdata processing into a table
2025-03-07 11:46:29 +01:00
Arne Morten Kvarving e7f26dd53a move block data extractors to a table 2025-03-07 11:10:51 +01:00
Arne Morten Kvarving 20d138e3a3 move block data extraction into shared loop
no reason to setup the element contexts twice
2025-03-07 09:25:46 +01:00
Tor Harald Sandve 6e872c32b0 Merge pull request #6057 from daavid00/fixDryVtk
Fix to write vtk (if enabled) for dry runs in cases without oilPhase
2025-03-07 09:06:55 +01:00
Bård Skaflestad 5baca97503 Merge pull request #6058 from akva2/tracer_enumerate
Tracer: enumerate components
2025-03-06 17:33:45 +01:00
Bård Skaflestad 1498ef31cb Merge pull request #6008 from akva2/processelement_table
OutputBlackoilModule::processElement: use a table for data extraction
2025-03-06 16:26:21 +01:00
Arne Morten Kvarving 71a96821bc enumerate tracer components 2025-03-06 16:04:24 +01:00
Bård Skaflestad a8483795ee Merge pull request #6056 from akva2/tracer_cosm_repeated
Tracer: some cosmetics, const correctness and (irrelevant) flop reduction
2025-03-06 15:46:03 +01:00
David Landa Marban e560b941c7 Fix to write vtk (if enabled) for dry runs in cases without oilPhase 2025-03-06 15:14:53 +01:00
Arne Morten Kvarving 0ac69fc4c5 avoid std::max call for water tracers 2025-03-06 14:52:17 +01:00
Arne Morten Kvarving c8d1e617f6 use ranged for 2025-03-06 14:52:17 +01:00
Arne Morten Kvarving dac7d41e70 mark member functions const 2025-03-06 14:52:17 +01:00
Arne Morten Kvarving ea67be3a3b avoid repeated calculations 2025-03-06 14:52:17 +01:00
Arne Morten Kvarving 376de4c733 cosmetics 2025-03-06 14:52:17 +01:00
Bård Skaflestad 96ec6ad143 Merge pull request #6055 from akva2/tracer_unify_arrays
Tracer: Store [f|s]vol1_ and [f|s]dVol_ as one array
2025-03-06 14:25:54 +01:00
Bård Skaflestad 23349b2242 Merge pull request #6052 from akva2/fix_tracer_indices
Fix parallel tracers
2025-03-06 11:48:47 +01:00
Arne Morten Kvarving 506368379e fixed: mixed up indices in tracers
fixes fallout from #6044, sorry about that
2025-03-06 11:25:55 +01:00
Arne Morten Kvarving 4330055f7f add parallel exception handling to tracer assembly 2025-03-06 10:14:47 +01:00
Arne Morten Kvarving b0a897025d vol1|dvol1: store as an array
make free / solution indexable to enable code deduplication
2025-03-06 09:16:45 +01:00
Kai Bao c7c0aeb4e1 Merge pull request #6046 from hnil/geomech
make nonlinear system possible to change
2025-03-05 16:46:06 +01:00
Atgeirr Flø Rasmussen f75dcbb079 Merge pull request #6044 from akva2/tracer_rate_structs
Tracer: add some structs for well rate output and avoid complex keys
2025-03-05 16:18:04 +01:00
Tor Harald Sandve e73b6058d9 Add back the fall-back of loose tolerance 2025-03-05 13:01:25 +01:00
Atgeirr Flø Rasmussen 163608f1e6 Merge pull request #6048 from totto82/makePreSolveOptional
Make pre-solve network optional
2025-03-05 12:51:10 +01:00
Tor Harald Sandve 6b63264249 WIP stagnation and oscillations 2025-03-05 11:26:37 +01:00
Tor Harald Sandve 1a126b7ddb stop MSW iterations if stagnate_count>5 2025-03-05 11:26:37 +01:00
Tor Harald Sandve 7571800482 Make pre-solve network optional 2025-03-05 10:03:57 +01:00
Tor Harald Sandve d5d2dd7044 Merge pull request #6018 from totto82/trivial_target
Only check trivial_target for GRUP when checking in THP
2025-03-05 09:01:28 +01:00
Bård Skaflestad 0c9e782ba1 Merge pull request #6047 from akva2/fix_maindispatch_common
fixed: make MainDispatchDynamic dependent on the opmcommon target
2025-03-04 18:59:47 +01:00
Bård Skaflestad 9db8cf78ff Merge pull request #6045 from akva2/tracer_avoid_ilu
TracerModel: avoid setting up ILU if no solves will be performed
2025-03-04 18:59:13 +01:00
Halvor M Nilsen 5214efab27 fixed compilation 2025-03-04 15:36:48 +01:00
Arne Morten Kvarving a0f0b2ab9f fixed: make MainDispatchDynamic dependent on the opmcommon target
if not parallel builds wll fail with the super-build
2025-03-04 15:18:18 +01:00
Arne Morten Kvarving 59a71fdb14 TracerModel: avoid setting up ILU if no solves will be performed 2025-03-04 14:33:21 +01:00
Halvor M Nilsen bb80ca7163 make nonlinear system i.e. BlackoilModel (need for renaming) possible to substitute. 2025-03-04 14:12:13 +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
Tor Harald Sandve 8e406e61bb Only check trivial_target for GRUP when checking in THP 2025-03-03 15:07:44 +01:00
Bård Skaflestad 9ca81bc929 Merge pull request #6043 from akva2/tracer_polish
Tracer: some janitoring
2025-03-03 12:07:00 +01:00
Arne Morten Kvarving 224e705671 remove unused variable 2025-03-03 11:33:44 +01:00