Commit Graph

11835 Commits

Author SHA1 Message Date
Bård Skaflestad
d609d942db
Merge pull request #3152 from OPMUSER/VFPPROD
Update VFPProdTable.cpp
2022-09-23 10:59:33 +02:00
OPMUSER
c67bdf8aeb Update VFPProdTable.cpp
The error message for when VFPPROD tables had non-monotonic entries had the table number and the number of errors reversed. This PR fixes this output discrepancy.
2022-09-23 13:53:29 +08:00
Bård Skaflestad
351a5d7292
Merge pull request #3150 from atgeirr/check-backend-exists
Check that backend exists before logging.
2022-09-21 12:02:39 +02:00
Atgeirr Flø Rasmussen
c042c22546 Check that backend exists before logging. 2022-09-21 10:30:47 +02:00
Bård Skaflestad
1850e45ed5
Merge pull request #3103 from bska/rst-read-wecon
Add Restart Support for Known Well Level Economic Limits
2022-09-19 10:25:07 +02:00
Bård Skaflestad
939b943911 Add Restart Support for Known Well Level Economic Limits
Notably missing are

  - Maximum gas-liquid ratio
  - Maximum temperature
  - Minimum reservoir fluid flow rate
  - Follow-on well

We do not currently write those items to the restart file but will
extend the support as need arises.
2022-09-16 18:32:01 +02:00
Bård Skaflestad
b33d04ebf7 Extract RstState Object Creation to Factory Function
In preparation of adding unit tests for restarted economic limits at
the well level (WECON).
2022-09-16 18:32:01 +02:00
Bård Skaflestad
34ab8d73b0 Tidy Up Implementation of RstWell
In particular, make RstWell::segment() return 'reference-to-const'
instead of an object.  While here, also rewrap the licence blocks
and reorder two data members.  The latter is in preparation of
adding restart support for economic limits (WECON).
2022-09-16 18:32:01 +02:00
Bård Skaflestad
cff70712ca
Merge pull request #3149 from akva2/serializer_import
Import serializer code from opm-simulators
2022-09-16 16:02:06 +02:00
Arne Morten Kvarving
d731cd3775 import serializer code from opm-simulators
add tests using a simple memcpy based packer
2022-09-16 15:34:58 +02:00
Bård Skaflestad
95e78f64ad
Merge pull request #3148 from akva2/serializer_simplify
changed: only use operator() for the serializer
2022-09-16 13:08:31 +02:00
Bård Skaflestad
25daf13909
Merge pull request #3107 from plgbrts/equil
keyword RVWVD to specify vaporized water-gas ratio  vs depth tables
2022-09-14 14:28:45 +02:00
Arne Morten Kvarving
6576370c19 changed: only use operator() for the serializer 2022-09-14 10:33:56 +02:00
Paul Egberts
35cf4761df updated cmake file 2022-09-14 10:27:12 +02:00
Paul Egberts
f55bbefd18 addition of entry in EQUIL keyword for water-gas ratio initialization 2022-09-13 17:58:28 +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
1f5b60d651 changed: give variable a name
clang cannot parse the nameless variant for some reason
2022-09-09 07:46:45 +02:00
Arne Morten Kvarving
43c66042da add virtual dtor in class with virtual members 2022-09-09 07:46:18 +02:00
Arne Morten Kvarving
8e2445b4cc fixed: build python bindings on systems without openmp 2022-09-09 07:39:11 +02:00
Bård Skaflestad
b936fe6c0b
Merge pull request #3145 from bska/refactor-rft-output
Refactor RFT File Writing Code
2022-09-08 17:05:52 +02:00
Bård Skaflestad
964fdfde12 Refactor RFT File Writing Code
In preparation of supporting new data types (PLT and segment).
Introduce a wrapper class, WellRFTOutputData, which knows about all
supported data types and how to emit the RFT record header.  Defer
specialised data type handling to dedicated record types and, to
this end, rename the existing WellRFT class to RFTRecord.
2022-09-08 16:22:39 +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
07b506fc1c Reduce Level of Nesting in WRFT* Keyword Handlers
Mostly by switching from

    if (something) {
        handle case
    }

into

    if (! something) {
        continue;
    }

    handle case

While here, also reduce the length of a couple of very long lines.
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
8395ffd904
Merge pull request #3112 from bska/limit-action-messages
Direct Verbose Action Messages to Debug File

Resolves OPM/opm-simulators#4042
2022-09-08 16:10:24 +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
Markus Blatt
d21926a837
Merge pull request #3095 from bska/rst-read-netbalan
Add Restart Support for NETBALAN Keyword
2022-09-08 11:16:34 +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
Bård Skaflestad
1670c217ee Rename NETBALAN Items in INTEHEAD
Mostly to make restart code slightly more self explanatory.
2022-09-07 13:04:54 +02:00
Bård Skaflestad
de13002f2f Prepare for Adding NETBALAN Restart Support
Mostly whitespace and sorting headers.
2022-09-07 13:04:54 +02:00
Bård Skaflestad
541fba174a
Merge pull request #3144 from akva2/remove_dead_serialization
Remove dead serialization code
2022-09-07 12:54:35 +02:00
Arne Morten Kvarving
d42481b747 add serializeObject to TranCalculator 2022-09-07 10:31:47 +02:00
Arne Morten Kvarving
ada6853a61 changed: remove unused Serialization class 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
Bård Skaflestad
1a9713278c
Merge pull request #3142 from akva2/drop_friends
drop unused friend declarations
2022-09-07 09:36:14 +02:00
Bård Skaflestad
8a67f6606c
Merge pull request #3141 from akva2/summarystate_append
added: append function in SummaryState
2022-09-07 09:35:36 +02:00
Arne Morten Kvarving
9690397cc1 drop unused friend declarations 2022-09-07 08:19:22 +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
Bård Skaflestad
b1e3774aeb
Merge pull request #3140 from akva2/summarystate_serialize
SummaryState: add serializer support
2022-09-06 11:33:05 +02:00
Bård Skaflestad
14c67cdbe6
Merge pull request #3139 from akva2/restartvalue_serialize
RestartValue: add serializer support
2022-09-06 10:41:36 +02:00
Arne Morten Kvarving
a8c0e19424 SummaryState: add serializer support 2022-09-06 10:03:55 +02:00
Arne Morten Kvarving
de7f5a8f69 RestartValue: add serializer support 2022-09-06 10:01:27 +02:00