Commit Graph
21371 Commits
Author SHA1 Message Date
David Landa Marban 154758a829 Fix Summary BFLOW* 2025-02-19 15:48:17 +01:00
Tor Harald Sandve f40d88a284 Merge pull request #6006 from daavid00/fixBugs
double instead of int
2025-02-19 10:09:36 +01:00
Bård Skaflestad a1facc4598 Merge pull request #6004 from bska/refactor-connval-report
Refactor Connection Value Report Function
2025-02-18 14:33:26 +01:00
David Landa Marban 2438ce2548 double instead of int 2025-02-18 13:58:27 +01:00
Bård Skaflestad ca38876a1e Refactor Connection Value Report Function
In particular, split this function into distinct steps:

  1. Computing the linearised IJK index of each connection.
  2. Reporting multiplicative factors such as the CTF, the D factor,
     and the transmissibility multiplier due to rock compaction.
  3. Reporting pressures, flow rates, and productivity indices.
  4. Reporting filter cake values for injectors

While here, also reverse a condition in init() to enable "early
continue" and reduce levels of nesting and to reduce scope of some
objects.
2025-02-18 12:34:52 +01:00
Bård Skaflestad 2ec1f3af7e Merge pull request #6003 from akva2/add_residual_reg_test
Add RESIDUAL output to a regression test
2025-02-18 12:29:17 +01:00
Bård Skaflestad 86067747a8 Merge pull request #6001 from akva2/eclwriter_reference
FlowProblem(Blackoil|Comp): Return a reference to EclWriter
2025-02-18 12:20:46 +01:00
Arne Morten Kvarving 756954b8e3 changed: make FlowProblem(Blackoil|Comp) return a reference to EclWriter
the pointer is allocated in the ctor, so the fact that it is a unique_ptr
can be kept as an implementation detail. furthermore, the previous
accessor did not properly enforce constness, as a const unique_ptr<EclWriter>
only applies const to the pointer class, not the data the pointer points to.
2025-02-18 11:41:50 +01:00
Arne Morten Kvarving e9a37eb46c enable opm rst file in NNC_AND_EDITNNC test
this to have regression test coverage for RESIDUAL output
2025-02-18 11:39:23 +01:00
Arne Morten Kvarving 2753de5266 fixed: don't have to update map for phases with None phase type 2025-02-18 11:39:23 +01:00
Arne Morten Kvarving ab8e730d4e fixed: guard against empty residual vector 2025-02-18 11:39:23 +01:00
Arne Morten Kvarving 61c20b8297 Merge pull request #6002 from daavid00/fixResidual
Fix to write residuals
2025-02-18 10:52:06 +01:00
Bård Skaflestad 61299ba7da Merge pull request #6000 from akva2/rstconv_encaps
move output of conv data into RSTConv class
2025-02-18 10:45:19 +01:00
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 9677f2e215 move output of conv data into RSTConv class
move member from model to output module. this way we don't have
to shuffle data around
2025-02-18 10:12:55 +01:00
David Landa Marban a297df7c3b Fix to write residuals 2025-02-18 10:07:23 +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