Commit Graph
21356 Commits
Author SHA1 Message Date
Bård Skaflestad 0cd4d8ebe8 Merge pull request #5954 from akva2/flows_container
Add a container for FLOWS data output
2025-02-18 10:21:36 +01:00
Arne Morten Kvarving 79a1407cce simplify output registration in FlowsContainer 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving 76bc370c0b put FLORES- entries together with FLORES+ 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving 41775da780 FlowsContainer: swap phase / face indices 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving 2a44230a9f FlowsContainer: make data private 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving a2fec9949f FlowContainer: add accessor for flows value
and use this when assigning blockflow
2025-02-18 09:53:37 +01:00
Arne Morten Kvarving 2cead48a34 move assignment of Flores data to FlowsContainer 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving 095f560a62 move assignment of Flows data to FlowsContainer 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving 136d605a8f move output of Flows restart data to FlowsContainer 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving f7bdfad925 move allocation of Flows buffers into FlowsContainer 2025-02-18 09:53:37 +01:00
Arne Morten Kvarving ab9cbb6704 add a container for FLOWS
start by taking ownership of related variables and putting
initialization code in its ctor
2025-02-18 09:53:36 +01:00
Bård Skaflestad e53d384446 Merge pull request #5996 from akva2/add_rft_container
Add RFTContainer, a container for RFT data output
2025-02-18 09:50:06 +01:00
Arne Morten Kvarving d5b8c968e1 simplify: no reason to explicitly make pair 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving 04c1b8494f simplify: return early if rft is not active 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving dc5bb1691e simplify: write connection data directly into map 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving fa969b0177 simplify: use Connection::global_index() 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving c910fd2569 RFTContainer: make data private 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving 316a3d7597 RFTContainer: use standard algorithms 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving 8b0c00c8cb move assignment of RFT data into RFTContainer 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving 641787aca8 move adding of rft data to wells into RFTContainer 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving a5ee578c7a move allocation of RFT data into RFTContainer 2025-02-18 09:24:28 +01:00
Arne Morten Kvarving 91a5fa2bf3 add RFTContainer, a container for RFT data output
start by moving data members into it
2025-02-18 09:24:28 +01:00
Bård Skaflestad 76adb289d7 Merge pull request #5982 from hnil/skip_gaslift_not_active
skip gaslift if not active
2025-02-17 16:45:31 +01:00
Bård Skaflestad 0966394531 Merge pull request #5994 from akva2/simplify_doAllocBuffers
GenericOutputBlackoilModule: unify data resizing
2025-02-17 14:02:55 +01:00
Arne Morten Kvarving f974cc3f08 GenericOutputBlackoilModule: unify data resizing
use a table for the entries.
centralize conditionals, map fiddling and resizing
2025-02-17 13:40:22 +01:00
Bård Skaflestad d53c4ea71f Merge pull request #5995 from akva2/simplify_accessors
remove accessors
2025-02-17 12:54:55 +01:00
Arne Morten Kvarving e34a54c8e0 remove accessors
add one accessor for the vector, instead of separate ones for size and data
2025-02-17 12:37:12 +01:00
Atgeirr Flø Rasmussen 4b688e5945 Merge pull request #5988 from atgeirr/remove-unneeded-evaluation-updaters
Remove explicit updating of well AD vars.
2025-02-14 20:40:31 +01:00
Bård Skaflestad 69e78a9e4d Merge pull request #5974 from erikhide/general-controller-updated
General third order time step controller
2025-02-14 17:25:39 +01:00
Erik Hide Saeternes 565f5cffd8 Added #include <array> 2025-02-14 16:29:19 +01:00
Kai Bao 1e89fe7013 Merge pull request #5410 from vkip/extnet_efficiency
Support instantaneous flow rates in extended network (WEFAC and GEFAC item 3)
2025-02-14 14:37:19 +01:00
Erik Hide Saeternes 229c8f7733 Fixed bug in std::array 2025-02-14 14:16:41 +01:00
Erik Hide Saeternes fb05bbf881 Fixed a few details in the time step control 2025-02-14 13:56:59 +01:00
Atgeirr Flø Rasmussen 40043b0dc6 Bugfix: add call to setEvaluationsFromValues() in updatePolyMW(). 2025-02-14 12:44:44 +01:00
Bård Skaflestad 8a69818ba5 Merge pull request #5989 from akva2/simplify_doAllocBuffers
Simplify GenericOutputBlackoilModule::doAllocBuffers
2025-02-14 12:36:25 +01:00
Vegard Kippe 1913186383 Minor updates post review 2025-02-14 11:37:29 +01:00
Vegard Kippe 44a87f8e65 Support NEFAC and clean up implementation 2025-02-14 11:37:26 +01:00
Vegard Kippe cc68f7246a Support instantaneous flow rates in extended network (WEFAC and GEFAC item 3) 2025-02-14 11:35:07 +01:00
Arne Morten Kvarving 41fbe1c839 doAllocBuffers: pass hysteresis config instead of 3 bools 2025-02-14 11:31:03 +01:00
Arne Morten Kvarving 652a5a4646 GenericOutputBlackoilModule: check schedule directly for vappars
avoids a bool param in doAllocBuffers
2025-02-14 11:31:03 +01:00
Bård Skaflestad ee6d34f4a4 Merge pull request #5987 from akva2/tracer_container
Add TracerContainer, a container for tracer data output
2025-02-14 10:54:12 +01:00
Arne Morten Kvarving 2e5ad4f94b TracerContainer: make data private 2025-02-14 09:59:57 +01:00
Arne Morten Kvarving dcc4aa30dd move assignment of sol tracer concentration into TracerContainer 2025-02-14 09:59:39 +01:00
Arne Morten Kvarving 00fe560720 move assignment of free tracer concentration into TracerContainer 2025-02-14 09:59:39 +01:00
Arne Morten Kvarving 7386655b65 move output of tracer data into TracerContainer 2025-02-14 09:59:38 +01:00
Arne Morten Kvarving 7f4e3624f7 move allocation of tracer data into TracerContainer 2025-02-14 09:58:54 +01:00
Atgeirr Flø Rasmussen 06c5c17c96 Remove explicit updating of well AD vars.
Now that the AD (Evaluation) primary variables in the well classes
are always updated whenever the value primary variables are, we
no longer need to remember to explicitly update them, simplifying
the code and enabling removal of functions.

The init() function of the primary variable classes have been renamed
to setEvaluationsFromValues() and made private.
2025-02-14 09:56:54 +01:00
Arne Morten Kvarving 13fb52bf9e add TracerContainer, a container for tracer data output
start by moving data members into it
2025-02-14 08:47:07 +01:00
Atgeirr Flø Rasmussen c015df56f9 Merge pull request #5952 from hnil/consistent_primary_variables
Consistent primary variables
2025-02-13 18:24:53 +01:00
Halvor M Nilsen 5b161e2298 fixed error 2025-02-13 15:05:34 +01:00