Commit Graph

439 Commits

Author SHA1 Message Date
Tor Harald Sandve
f91b9b7c31 add support for wvfpexp in the input layer 2022-04-07 09:38:03 +02:00
Bård Skaflestad
68975be966 Add Accumulating Mapping Structure for Inter-Region Flows
This commit introduces a new helper facility,

    data::InterRegFlowMap

that knows how to interpret region IDs.  It is a simple wrapper
around a common CSR representation of (source, destination) region
ID pairs with the additional feature that the element type of the
connection is a linear sequence values of arithmetic type.  We've
initially elected to make this sequence out of 'float' in order to
conserve memory since we expect to do little arithmetic to the
sequence itself outside of compression and parallel communication.

Client code will be of two primary categories

  1. Producing side which inserts flow rates from individual
     connections, compresses the result when done, and communicates
     the results to one or more parallel I/O ranks

  2. Consuming side, typically on an I/O rank, which merges the
     contributions from multiple source ranks and extracts values
     pertaining inter-region flows for purpose of outputting time
     series data to a summary file.

The first case will create and populate 'FlowRates' and add these
into the container using the 'addConnection' function and finally
call 'compress' when complete.  Consumers will then use member
function 'getInterRegFlows' to extract a signed view of flow rate
values associated to a particular region ID pair (nullopt if no such
pair is registered).
2022-02-16 23:28:46 +01:00
Bård Skaflestad
7ef3d6c0b3 Add Protocol to Linearise Connection Flow Rates Into Subrange
This commit introduces a wrapper for a linear subrange of
consecutive elements of an arithmetic type that imposes an ordering
of the elements when treated as directional component surface flow
rates.  The wrapper distinguishes negative from positive flow rate
contributions and tracks those separately.  This is a building block
for accounting for the inter-region flows in a parallel context.
2022-02-16 23:28:46 +01:00
Bård Skaflestad
27da32d812 Re-Sort Main Source File Section for output/data
In preparation of adding more source files here.
2022-02-16 23:28:46 +01:00
Joakim Hove
343f14dacf Record and act on return value from PYACTION 2022-01-28 12:05:17 +01:00
Joakim Hove
46b663218a Enable running normal ACTIONX keywords from PYACTION
The run() function invoked by PYACTION has got a new fifth argument which is a
callable the script should utilize to apply the keywords from an ACTIONX
keyword. The callable is implemented as C++ lambda which will run the
Schedule::iterateScheduleSection() method and make sure an updated
SimulatorUpdate variable can be passed back to the simulator.
2022-01-25 10:04:43 +01:00
Joakim Hove
c50eb01bb0 Implement fnmatch() in Opm::shmatch() with std::regex 2022-01-11 11:14:11 +01:00
Joakim Hove
0a59bd8f61 Filesystem rename EclipseState/Schedule/ Schedule/ 2022-01-02 14:32:14 +01:00
Joakim Hove
aede532b9a Filesystem rename parser/eclipse/ input/eclipse 2022-01-02 14:32:14 +01:00
Joakim Hove
aabc3b999b Utility class Action::WGNames to manage names introduced in ACTIONX 2021-12-13 18:33:14 +01:00
Paul Egberts
f053ba9a20 salt solubility table implementation using simpleTableContainer 2021-12-02 11:52:38 +01:00
Paul Egberts
e40fdf75ba salt solubility table allowing specification of solubility per region 2021-12-02 11:52:37 +01:00
Joakim Hove
cb2e90bb71 Output WSTAT numerical value to summary file 2021-11-17 12:16:34 +01:00
Joakim Hove
b6ec75eeb6 Merge pull request #2841 from joakim-hove/register-tests-in-files
Register ecl io tests using the file list in CMakeLists_files.cmake
2021-11-16 13:47:15 +01:00
Joakim Hove
a8d3997c72 Register ecl io tests using the file list in CMakeLists_files.cmake 2021-11-15 10:20:36 +01:00
Bård Skaflestad
19ec3b34f9 Support Loading Extended Network Model From Restart
This commit adds a new helper class, RstNetwork, that loads the raw
data representing the extended network model from restart vectors
IBRAN, INODE, RNODE, and ZNODE.  We support loading the information
that is currently output to those restart vectors, but those do not
include every option supported by the input keywords BRANPROP and
NODEPROP.

The RstNetwork type supports querying whether or not the extended
network model is active and, if so, to get iterable collections of
branches and nodes that are geared towards constructing ExtNetwork
objects.
2021-11-12 13:06:31 +01:00
Joakim Hove
d950e3ceb1 rst_deck: optionally interpret restart argument as proper filename 2021-11-12 12:22:15 +01:00
Joakim Hove
ee105b7bbf Remove base class DeckViewInternal and create new class DeckView 2021-11-12 08:09:29 +01:00
Joakim Hove
f1e768e184 Add struct SimulatorUpdate to transport results back to simulator 2021-11-10 15:57:56 +01:00
Arne Morten Kvarving
6465cfe1ea changed: drop gcc7 compatibility
this means getting rid of the Opm::filesystem namespace
and directly using std::filesystem, as well as dropping
some of the compat code for the tr filesystem.

we still need the FileSystem.hpp/cpp files though as unique_path
is not part of std::filesystem.
2021-11-01 12:36:42 +01:00
Joakim Hove
2c0a1b4cb6 Merge pull request #2779 from jalvestad/rst-netbalan
Add items for the NETBALAN keyword to the Eclipse-compatible restart file
2021-10-25 22:46:20 +02:00
Jostein Alvestad
6b7875765d added unit tests to InteHead and DoubHead for NETBALAN 2021-10-25 14:27:23 +02:00
Williham Williham Totland
4134b98701 Introduce class SchduleGrid to be used as grid by Schedule class 2021-10-22 08:35:17 +02:00
Bård Skaflestad
5e3ba88dde Merge pull request #2759 from joakim-hove/restart-errors
Validate restart input in constructor
2021-10-19 21:52:54 +02:00
Bård Skaflestad
6da7c3c88e Merge pull request #2756 from joakim-hove/rst-wlist
Rst wlist
2021-10-18 09:46:12 +02:00
Joakim Hove
a13376c2d1 Better error messages when the RESTART keyword is invalid 2021-10-17 19:59:29 +02:00
Tor Harald Sandve
0dff883914 Merge pull request #2743 from daavid00/micp-2021-10
micp
2021-10-14 22:27:43 +02:00
daavid00
ae5c09243a adding one test for the MICP keywords 2021-10-14 19:31:07 +02:00
daavid00
60963e2310 first version of micp implementation in flow 2021-10-14 17:27:13 +02:00
Joakim Hove
35f35541ff Add testdata for WLIST restart testing 2021-10-14 11:41:40 +02:00
Joakim Hove
e1b9602a25 Handle NETBALAN keyword in Schedule 2021-10-04 13:43:19 +02:00
Joakim Hove
24f31e6358 Add application rst_deck 2021-09-24 14:19:25 +02:00
Joakim Hove
294d98b9bd Add container FileDeck to represent a deck with file awareness 2021-09-23 21:46:10 +02:00
Joakim Hove
6f94580ff1 Add class DeckTree to mange include file hierarchy 2021-09-23 14:24:35 +02:00
Joakim Hove
4b3231c9ef Merge pull request #2647 from joakim-hove/rst-actionx
Rst actionx
2021-09-14 15:54:32 +02:00
Joakim Hove
b14790f990 Merge pull request #2675 from joakim-hove/no-actnum
Handle GDFILE with grid without actnum
2021-09-14 15:53:24 +02:00
Joakim Hove
507f60ec25 Merge pull request #2681 from joakim-hove/testdata-include
Reorganize test deck to use INCLUDE
2021-09-13 16:46:32 +02:00
Joakim Hove
6cc0cba14c Reorganize test deck to use INCLUDE 2021-09-13 16:26:20 +02:00
Joakim Hove
efaa613368 Add testdata for restart load testing of ACTIONX 2021-09-13 10:33:32 +02:00
Joakim Hove
de942d91b6 Load ACTIONX conditions from restart file 2021-09-13 10:33:32 +02:00
Joakim Hove
539c86c21c Move action condition related enums to separate compilation unit 2021-09-13 10:18:35 +02:00
Joakim Hove
a1f8585395 Handle GDFILE with grid without actnum 2021-09-13 09:00:16 +02:00
Joakim Hove
6a684235d2 Merge pull request #2656 from joakim-hove/action-rst-const
Action rst const
2021-09-08 08:36:13 +02:00
Torbjørn Skille
c900462edb fixing bug in Opm::EclIO::ESmry constructor
- changed behaviour when opening summary file from restart run
 - will now work with loadBaseRunData=false and original base run folder
   not found.
2021-09-07 22:49:48 +02:00
Joakim Hove
d281881448 rst: use named constants for actionx condition information 2021-09-07 12:40:23 +02:00
Joakim Hove
d060d92268 Merge pull request #2649 from joakim-hove/actdims-rename
Rename actDims in AggregateActionxData
2021-09-04 19:10:47 +02:00
Joakim Hove
d904ab6108 Rename actDims -> action_rst_dims + refactor Actionx restart 2021-09-04 18:13:11 +02:00
Jostein Alvestad
1d3415d07a added unit tests for IGPH 2021-09-03 13:29:18 +02:00
Joakim Hove
fd010c1370 Add testdata for UDA restart testing 2021-08-31 11:20:12 +02:00
Bård Skaflestad
0d35d64aea Load Analytic Aquifer Objects from Restart File
This commit adds support for creating the analytic aquifer objects

    Opm::AquiferCT
    Opm::Aquifetp
    Opm::Aquancon
    Opm::AquiferConfig

from information stored in the restart vectors

    {I,S,X}AAQ
    {I,S}CAQ

We add a new helper class

    Opm::RestartIO::RstAquifer

which contain the same data members as the '*_data' structures of
the analytic aquifer objects.  Those analytic aquifer objects then
get friendship from the '*_data' structures in order to assign the
private members from the corresponding restart information.  We
finally add a gateway to EclipseState that consumes an RstAquifer
instance and overwrites the internal AquiferConfig object when the
restarted run contains analytic aquifers.

Update RstState constructor API to meet requirements of RstAquifer,
notably by adding an EclipseGrid parameter.  That in turn is needed
by the RstAquifer to translate connection (I,J,K) tuples to active
cell IDs.

Note that if an analytic aquifer does not have any connections then
this facility will not load said aquifer.  That may be a problem
when plotting summary curves, but we will address the issue later if
it comes up.
2021-08-19 20:34:19 +02:00