Commit Graph

104 Commits

Author SHA1 Message Date
Arne Morten Kvarving
6576370c19 changed: only use operator() for the serializer 2022-09-14 10:33:56 +02:00
Markus Blatt
ff3da8cc79 Merge pull request #3146 from akva2/janitoring
Some janitoring
2022-09-12 12:36:21 +02:00
Tor Harald Sandve
d10ed6c953 Merge pull request #3109 from totto82/tempAquifer
add support for temperature and analytical aquifers
2022-09-12 07:32:49 +02:00
Arne Morten Kvarving
6546b780f8 fixed: respect rule-of-three for EclipseGrid
no need to explicitly declare the cc
2022-09-09 08:06:09 +02:00
Arne Morten Kvarving
43c66042da add virtual dtor in class with virtual members 2022-09-09 07:46:18 +02:00
Bård Skaflestad
b38da649e0 Refactor RFTConfig
Mostly in preparation of adding new data types (e.g., segment),
but also to leverage standard algorithms and to apply 'const' where
possible.
2022-09-08 16:22:39 +02:00
Bård Skaflestad
d91608eff3 Rewrap WellConnections Code
Mostly to split long lines and to apply 'const' where possible.
2022-09-08 16:22:39 +02:00
Bård Skaflestad
6b94c5091a Direct Verbose Action Messages to Debug File
While useful for analysis in the case of failure, end users will
typically not care that we "rerun" portions of the SCHEDULE section
in response to triggering an action.  In the cases where we do need
those messages they will be available in the CASE.DBG file instead.
2022-09-08 11:44:27 +02:00
Bård Skaflestad
418173bbcc Add Restart Support for NETBALAN Keyword
This commit loads NETBALAN parameters from the restart file and
forms Network::Balance objects from these parameters.
2022-09-07 13:04:54 +02:00
Arne Morten Kvarving
d42481b747 add serializeObject to TranCalculator 2022-09-07 10:31:47 +02:00
Arne Morten Kvarving
1573ffb8da SummaryState: remove unused serialization code 2022-09-07 10:31:47 +02:00
Arne Morten Kvarving
0b1280ceec FieldProps(Manager): remove unused serialization code 2022-09-07 10:24:01 +02:00
Arne Morten Kvarving
5eb496c79c PAvgCalculator: remove unused serialization code 2022-09-07 10:24:01 +02:00
Arne Morten Kvarving
08830154b6 UDQScalar/UDQSet: remove unused serialization code 2022-09-07 10:08:54 +02:00
Arne Morten Kvarving
7b903660a0 UDQState: remove unused serialization code 2022-09-07 10:08:54 +02:00
Markus Blatt
f018c2e0d9 Merge pull request #3143 from akva2/tran_serialize
added: support serialization for TranCalculator
2022-09-07 10:04:59 +02:00
Arne Morten Kvarving
0c4492500b added: support serialization for TranCalculator
and some accessors to enable downstream to use it
2022-09-07 09:38:27 +02:00
Arne Morten Kvarving
a2bade84a4 added: append function in SummaryState
this appends information from one instance to another.
needed to handle semantics used in parallel serialization
2022-09-07 08:17:48 +02:00
Arne Morten Kvarving
a8c0e19424 SummaryState: add serializer support 2022-09-06 10:03:55 +02:00
Bård Skaflestad
7f50f7e95d Merge pull request #3118 from akva2/serialize_map_change
adjust for map serializer API change
2022-09-02 20:59:07 +02:00
Arne Morten Kvarving
d09c275fe4 adjust for map serializer API change 2022-09-02 17:20:14 +02:00
Arne Morten Kvarving
99ea0ee497 adjust for set serializer API change 2022-09-02 17:17:11 +02:00
Bård Skaflestad
e9e70c6eac Merge pull request #3116 from akva2/serialize_vector_change
adjust for vector serializer API change
2022-09-02 17:08:14 +02:00
Arne Morten Kvarving
0de1c488d2 adjust for vector serializer API change 2022-09-02 14:39:16 +02:00
Arne Morten Kvarving
fd3f444c80 adjust for array serializer API change 2022-09-02 14:18:15 +02:00
Tor Harald Sandve
072b8be064 add support for temperature and analytical aquifers 2022-09-01 12:28:22 +02:00
Arne Morten Kvarving
a3a9413ab0 fixed: initialize dimensions in serializeObject
the array is left uninitialized by the constructor
2022-09-01 12:21:58 +02:00
Bård Skaflestad
9658257960 Serialize Exit Status
While here, also add missing serialization tests for WGNames and
CompletedCells.
2022-08-25 11:22:59 +02:00
Bård Skaflestad
7ee1fd9ed1 Match Member Order in Schedule Serialization
In particular, in Schedule::seralizeOp(), Schedule::operator==(),
and Schedule::serializeObject().
2022-08-25 11:20:51 +02:00
Bård Skaflestad
da6802e787 Prefer Template Argument Deduction
Don't pass 'Serializer' as an explicit template argument.
2022-08-25 11:14:37 +02:00
Kai Bao
61e68dccb6 fixing running when only analytical aquifer connections defined
without this, the restart writer will trigger a segmentation fault
error.

And also, some minor refactoring and function development so that the
simulator can check whether there are valid connections defined for
aquifers with certain id.
2022-08-24 09:31:20 +02:00
Arne Morten Kvarving
5df933460b changed: remove (basically) empty Well(Injection|Production)Properties.hpp 2022-08-11 11:47:54 +02:00
Tor Harald Sandve
189a043c6d add unit gas oil ratio rate for output of drsdt 2022-08-10 15:42:50 +02:00
Bård Skaflestad
9af8c785b2 Merge pull request #3085 from akva2/cleanup_schedule
Cleanup Schedule.hpp usage
2022-07-30 00:42:06 +02:00
Arne Morten Kvarving
e82ec7a274 clean up includes in Schedule.hpp 2022-07-29 18:37:57 +02:00
Markus Blatt
6561138236 Merge pull request #3067 from GitPaean/fixing_multiple_wpimult
fixing multiple WPIMULT records
2022-07-29 10:24:50 +02:00
Arne Morten Kvarving
1012e15711 remove unused file 2022-07-27 17:51:17 +02:00
Markus Blatt
92ebef3bc9 Merge pull request #3084 from akva2/cleanup_stream_includes
clean up stream includes
2022-07-27 17:08:28 +02:00
Markus Blatt
5532176af4 Merge pull request #3083 from akva2/cleanup_deck
changed: remove include of Deck.hpp in header
2022-07-27 17:06:26 +02:00
Arne Morten Kvarving
068bff1ebc clean up stream includes 2022-07-27 16:05:01 +02:00
Arne Morten Kvarving
5e7191c79e changed: remove include of Deck.hpp in header
and deal with the consequences
2022-07-26 18:42:39 +02:00
Arne Morten Kvarving
ef6d448077 changed: remove include of EclipseState.hpp in header
and deal with the consequences
2022-07-26 16:03:52 +02:00
Kai Bao
96ab0e036d addressing some reviewing comments for PR#3067 2022-07-06 14:32:59 +02:00
Bård Skaflestad
a79ee15082 Decouple Opm::Box From EclipseGrid
This commit switches to constructing Box instances from a GridDims
and two call-back functions instead of taking an EclipseGrid
directly.  The two call-back functions are a predicate for active
cells and a translation from Cartesian to active cell indices
respectively.

This is intended to simplify working with nested boxes, such as
those that occur for local grid refinement.
2022-07-05 14:27:49 +02:00
Kai Bao
b87867d144 multple MPIMULT keywords within one report step is handled
and ScheduleTests is updated with tests
2022-07-05 10:52:25 +02:00
Bård Skaflestad
5377ff3442 Streamline GridDims::getIJK()
This commit switches the Cartesian -> IJK decomposition in GridDims
from K->J->I into the I->J->K order.  The latter is simpler.

While here, also consistently use 'std::size_t' instead of 'size_t'.
2022-07-04 15:06:07 +02:00
Bård Skaflestad
c740b3705d Handle Active Cell/Numerical Aquifers In Constructor Body
The constructor did implicitly assume that no cell in a numerical
aquifer would be declared inactive in ACTNUM, and this restriction
still applies.  Moving numerical aquifer property and connection
processing into the constructor body enables using existing member
functions for non-neighbouring connections and removes a branch that
obscured the fact that we should have ACTNUM be as close to
finalised as possible before creating analytic aquifer connections.
2022-07-04 14:08:11 +02:00
Bård Skaflestad
1516b63a39 Merge pull request #3065 from blattms/ordered-map-truncate-key
Use only first 8 characters as fault name when comparing/searching.
2022-06-28 10:22:35 +02:00
Arne Morten Kvarving
114753c459 changed: add initializer
harmless and suppresses compiler diagnostics
2022-06-27 14:44:30 +02:00
Markus Blatt
35029e0313 Only use first 8 characters as fault names when comparing/searching.
Note this is currently done silently as the warnings will probably
need to go to the validation code in opm-simulators.
2022-06-27 11:14:41 +02:00