Commit Graph

21166 Commits

Author SHA1 Message Date
Arne Morten Kvarving
58c1a16299 move assignment of OilGasDistribution fip values into FIPContainer 2025-02-03 10:14:01 +01:00
Arne Morten Kvarving
be86ef16c5 OutputBlackoilModule: move updateInplaceVolumesReservoir to FIPContainer 2025-02-03 10:00:00 +01:00
Arne Morten Kvarving
3ffd6594f2 OutputBlackoilModule: move updateInplaceVolumesSurface to FIPContainer 2025-02-03 09:53:35 +01:00
Arne Morten Kvarving
63042c25ee OutputBlackoilModule: move gas-water fip assignment code to FIPContainer 2025-02-03 09:53:32 +01:00
Arne Morten Kvarving
efbda68f89 move assignment of Co2InGas fip values into FIPContainer 2025-02-03 09:03:48 +01:00
Arne Morten Kvarving
50f3d7d342 add a FIPContainer class
this is a container for the FIP map and associated code
in OutputBlackoilModule.

start by adding allocation functionality. for now the container
only owns a reference to the map
2025-01-31 15:50:53 +01:00
Bård Skaflestad
1858b493aa
Merge pull request #5938 from akva2/fix_pyaction_tests
fixed: pyaction tests for super build
2025-01-31 14:53:31 +01:00
Arne Morten Kvarving
b0c1a63537 fixed: pyaction tests for super build
properly set python path in tests to find the opm_embedded module
2025-01-31 14:38:11 +01:00
Kai Bao
4fc7545e98
Merge pull request #5926 from GitPaean/fixing_exp_comp_running
hacking to register the parameter ForceDisableFluidInPlaceOutput
2025-01-31 14:33:33 +01:00
Bård Skaflestad
1f81756a8d
Merge pull request #5608 from akva2/explicit_ctor_tabulated1d_function
adjust to constructor being marked explicit
2025-01-31 12:06:01 +01:00
Bård Skaflestad
6bdbb6abdf
Merge pull request #5934 from bska/install-more-headers
Install More Headers
2025-01-31 09:00:36 +01:00
Bård Skaflestad
e0e089d820
Merge pull request #5936 from akva2/eclstring_inplace
GenericOutputBlackoilModule: use EclString from Inplace
2025-01-31 09:00:12 +01:00
Arne Morten Kvarving
a0d371c615 GenericOutputBlackoilModule: use EclString from Inplace 2025-01-31 08:32:27 +01:00
Bård Skaflestad
38ade97e86 Install More Headers
Needed for Main::runStatic<>() to be usable out-of-tree.
2025-01-30 18:20:19 +01:00
Bård Skaflestad
1df6079007
Merge pull request #5928 from bska/main-dispatch-dynamic-tu
Move Dynamic Dispatch Function to Separate TU
2025-01-30 13:53:30 +01:00
Bård Skaflestad
1bf755f5e8 Move Dynamic Dispatch Function to Separate TU
This moves about 300 lines of code out of Main.hpp and, especially,
moves the <flow/flow_*.hpp> include statements as well.  This, in
turn, makes Main::runStatic<>() usable for out-of-tree consumers.
2025-01-30 13:18:02 +01:00
Bård Skaflestad
caf1723d8f
Merge pull request #5930 from bska/add-missing-headers
Add Missing Headers to Python Simulator
2025-01-30 12:29:52 +01:00
Bård Skaflestad
54663f96a4 Add Missing Headers to Python Simulator
These were originally obtained through transitive includes,
especially from Main.hpp, but that's not a stable condition if the
set of transitive includes changes.
2025-01-30 12:17:39 +01:00
Bård Skaflestad
c708e28176
Merge pull request #5931 from bska/install-ttag-flow-problem-tpfa
Install Type Tag for TPFA Flow Problems
2025-01-30 12:12:16 +01:00
Bård Skaflestad
a0f907b59b Install Type Tag for TPFA Flow Problems
Makes this accessible for out-of-tree uses.
2025-01-30 11:35:19 +01:00
Bård Skaflestad
aa5c52ee56
Merge pull request #5922 from bska/property-tree-get-children-as-vector
Add Property Tree Array Retrieval Mechanism
2025-01-29 17:01:07 +01:00
Bård Skaflestad
03ac2cbd93 Add Property Tree Array Retrieval Mechanism
This commit adds a new member function

    template <typename T>
    std::optional<std::vector<T>>
    get_child_items_as_vector(const std::string& child) const;

which retrieves an array-type property value from a property tree.
Initially defined for 'int' and 'double', but could be extended to
'std::string', 'float', or other element types as needed.
2025-01-29 15:15:49 +01:00
Bård Skaflestad
2fe71ce294
Merge pull request #5927 from bska/property-tree-std-sizet
Implement Property Tree Put/Get for std::size_t
2025-01-29 14:54:49 +01:00
Kai Bao
dd9a7db39e register ForceDisableFluidInPlaceOutput for flowexp_comp
FluidSystem<0> at this stage due to how it is implemented
2025-01-29 14:48:17 +01:00
Bård Skaflestad
999f98e281 Implement Property Tree Put/Get for std::size_t
This replaces the original specialisations for "bare" size_t from
the <stddef.h> header.

While here, also reorder the specialisations to match declaration
order in the header.
2025-01-29 13:48:31 +01:00
Bård Skaflestad
9fb46ab420
Merge pull request #5925 from akva2/janitoring
janitoring: use string concat instead of operator+
2025-01-29 13:39:22 +01:00
Bård Skaflestad
b102ecd00f
Merge pull request #5921 from bska/document-and-test-property-tree
Document and Test PropertyTree Class
2025-01-29 13:38:19 +01:00
Arne Morten Kvarving
aa3226a71f janitoring: use string concat instead of operator+
and avoid unnecessary temporary
2025-01-29 13:23:25 +01:00
Bård Skaflestad
efede0a253 Document and Test PropertyTree Class
In particular, add Doxygen-style documentation to the header file
and add a simple unit test for the PropertyTree class interface.

While here, also add missing headers and prefer template argument
deduction over explicit template arguments.
2025-01-29 12:58:29 +01:00
Atgeirr Flø Rasmussen
d2b272b5f5
Merge pull request #5923 from michal-toth/bugfix/log-message
Correct a keyword in a message
2025-01-29 09:23:43 +01:00
Michal Tóth
f9af91abfc Correct the keyword in the message 2025-01-28 16:04:12 +01:00
Atgeirr Flø Rasmussen
270018cfbb
Merge pull request #5900 from totto82/improve_well_shutting
Improve well shutting logic
2025-01-28 10:46:10 +01:00
Kai Bao
536ad41987
Merge pull request #5918 from vkip/nwparam
Parameterize network sub-iterations and pressure update dampening
2025-01-28 10:44:37 +01:00
Atgeirr Flø Rasmussen
2fedd5c29e
Merge pull request #5912 from atgeirr/use-element-chunks
Switch property evaluation to using ElementChunks.
2025-01-28 10:39:15 +01:00
Kai Bao
ff29f04cdb
Merge pull request #5919 from vkip/network_empty_leaf_nodes
Allow empty leaf nodes that do not exist in GRUPTREE
2025-01-28 10:05:04 +01:00
Tor Harald Sandve
eabb2de362
Merge pull request #5902 from totto82/wcycle_chop
Dont reset subtimestep from tuning/wcycle if time step is chopped due  to convergence issues
2025-01-28 10:00:58 +01:00
Atgeirr Flø Rasmussen
57fb01ad57 Switch property evaluation to using ElementChunks. 2025-01-28 09:59:16 +01:00
Tor Harald Sandve
cfc2b03b5a Improve well shutting logic
In particular allow for failed wells to shut even though they haven't failed consitatantly in the last 3 attempts
if the timestep is reduce enhough already.
2025-01-28 09:55:36 +01:00
Atgeirr Flø Rasmussen
e912d3b3de
Merge pull request #5890 from akva2/multithread_tran_calc
Add multi-threading to transmissibility calculation
2025-01-28 09:22:23 +01:00
Vegard Kippe
7b1d8d1df6 Allow empty leaf nodes that do not exist in GRUPTREE 2025-01-27 13:11:49 +01:00
Vegard Kippe
1d2e413d63 Parameterize network sub-iterations and pressure update dampening 2025-01-27 11:44:10 +01:00
Atgeirr Flø Rasmussen
6bfb60ded0
Merge pull request #5915 from akva2/serialize_glift_last_opt
BlackoilWellModelGasLift: serialize last_glift_opt_time
2025-01-27 10:17:44 +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
Arne Morten Kvarving
2b930ca51c SimulatorSerializer: add LoadFile to ignore list 2025-01-24 14:33:58 +01:00
Bård Skaflestad
6b5097ce63
Merge pull request #5913 from bska/udq-regression-tests
Add Regression/Restart Tests for Recent UDQ Work
2025-01-24 13:50:07 +01:00
Arne Morten Kvarving
f68864db8c reindent 2025-01-24 12:27:41 +01:00
Arne Morten Kvarving
8772f41e62 Transmissibility::update(): enable multithreading 2025-01-24 12:26:34 +01:00
Arne Morten Kvarving
d551d95762 Transmissibility::update: use ThreadedMap for dispersivity_
this in preparation for multithreading the loop
2025-01-24 12:17:56 +01:00
Arne Morten Kvarving
a502a86dc1 Transmissibility::update: use ThreadSafeMapBuilder for diffusivity_
this in preparation for multithreading the loop
2025-01-24 12:17:56 +01:00