Commit Graph

13852 Commits

Author SHA1 Message Date
Arne Morten Kvarving
02faaedcfd add serialization support to GuideRate 2023-02-10 14:11:10 +01:00
Bård Skaflestad
f09c42ae17
Merge pull request #3392 from akva2/gpmaint_serialize
GPMaint::State: add serialization support
2023-02-10 12:28:14 +01:00
Bård Skaflestad
335c375c9d
Merge pull request #3391 from goncalvesmachadoc/errorMsgTables
Improve Simple Table errros messages
2023-02-10 12:26:33 +01:00
Bård Skaflestad
2171c7afe6
Merge pull request #3389 from hnil/timing_block
Added empty macro which can be used for timing with for example Tracy
2023-02-10 12:22:44 +01:00
hnil
05a7672173 addressed review comments 2023-02-10 11:13:08 +01:00
Markus Blatt
ff08945b4f [bugfix] Make sure to use CONFIG mode for subsequent boost searches.
Otherwise boost components found by previous search will be marked as
not found if a new component is not found in the new search.

This happend for #3381 if regex was not found and made cmake believe
that unit_test_framework was not found either. Even though it was in a
previous search.

Now we make sure to CONFIG mode if boost was found before, which fixes
this problem. Also we only link dunecommon to test if they are
actually built (read unit_test_framework was marked as found).

Closes #3881
2023-02-09 22:18:16 +01:00
goncalvesmachadoc
0a23c63c28 rewrite message 2023-02-09 21:29:55 +01:00
goncalvesmachadoc
b24130aedc update unit tests 2023-02-09 20:51:41 +01:00
goncalvesmachadoc
b2325c7d6d add Table name 2023-02-09 17:18:01 +01:00
goncalvesmachadoc
71fc372ced print order schema 2023-02-09 16:00:56 +01:00
goncalvesmachadoc
f74dd68755 pass by reference 2023-02-09 16:00:12 +01:00
Arne Morten Kvarving
49fb77a339 fixed: process all MULTREGP entries in the deck 2023-02-09 11:00:05 +01:00
goncalvesmachadoc
5c1b6f5dbc msg typo fix 2023-02-09 10:09:30 +01:00
goncalvesmachadoc
599979452a table name to column number throw 2023-02-08 19:32:44 +01:00
Bård Skaflestad
872e7b04ba
Merge pull request #3394 from bska/fix-out-of-bounds
Don't Index Out of Bounds in Vector
2023-02-08 15:02:40 +01:00
Bård Skaflestad
e6abb5e3df Don't Index Out of Bounds in Vector
In the admittedly special case that "position" is equal to the
buffer's size() and "n == 0", then the expression

   &buffer[position]

will index out of bounds.  Use the safer expression

   buffer.data() + position

instead since that's valid when position <= size().

Detected by libstdc++'s debug mode (checked iterators).
2023-02-08 12:52:28 +01:00
Arne Morten Kvarving
59393b49f7 add serialization support to GPMaint::State 2023-02-08 12:37:18 +01:00
Bård Skaflestad
182d58e210
Merge pull request #3388 from akva2/evaluation_serialize
Evaluation: add serialization support
2023-02-08 12:35:40 +01:00
Arne Morten Kvarving
1be072adf2 add serialization support to Evaluation 2023-02-08 10:20:30 +01:00
Atgeirr Flø Rasmussen
46d268fba0
Merge pull request #3383 from akva2/mempacker_public
changed: rename the packer used in test_Serialization to MemPacker
2023-02-08 10:19:28 +01:00
goncalvesmachadoc
65535202cc addKeywordName 2023-02-07 18:16:06 +01:00
Markus Blatt
4d39ccd1dc
Merge pull request #3338 from bska/parse-segment-selector
Recognise Numbers as Part of UDQ Set Selector
2023-02-07 13:48:40 +01:00
Bård Skaflestad
2109552335 Recognise Numbers as Part of UDQ Set Selector
Needed in order to support segment sets which, potentially, have
both a well name pattern and a segment number.

This change also means that we now support *parsing* block (cell)
UDQ sets like

    BPR 11 22 33

and that, in turn, means we detect unsupported UDQ types later than
we used to.  That also means that the error detection exception type
changes, so update affected unit tests accordingly.
2023-02-07 09:47:46 +01:00
Bård Skaflestad
bd7de87ac2 Pull String Token Normalisation Out to New Helper
This enables constructing UDQDefine::m_tokens in the initialiser
list.
2023-02-03 17:59:10 +01:00
Bård Skaflestad
9161ac9503 Split Scalar Value Scattering Out to Helper Function
In preparation of adding support for segment level UDQs.  While
here, also apply const in a few places.
2023-02-03 17:59:10 +01:00
Bård Skaflestad
b1f3b3b4cf Adjust Whitespace in UDQ Tests Implementation File
In preparation of adding tests for segment level UDQs.
2023-02-03 17:59:10 +01:00
Markus Blatt
b034c91483
Merge pull request #3379 from bska/prepare-udq-assign-segment
Prepare for Handling UDQ ASSIGN for Segments
2023-02-03 17:50:17 +01:00
hnil
9613cdd917 Added empty marco which can be used for timing with forexample Tracy 2023-02-02 14:19:51 +01:00
Bård Skaflestad
2b2330ab24 Prepare for Handling UDQ ASSIGN for Segments
This commit adds support for constructing UDQ ASSIGN records for
enumerated well items such as those encountered in UDQs at the
segment level, e.g.,

    ASSIGN SUSPECT PROD01    123.456 /
    ASSIGN SUSPECT PROD02 17 654.321 /

We do not support this syntax quite yet, but this is a step on the
way there.
2023-02-02 12:43:16 +01:00
Bård Skaflestad
e67a49b10f
Merge pull request #3387 from akva2/aquifer_missing_include
SingleNumericalAquifer: add missing include
2023-02-02 12:29:21 +01:00
Arne Morten Kvarving
2e15535afe SingleNumericalAquifer: add missing include 2023-02-02 11:41:50 +01:00
Bård Skaflestad
f1326bb134
Merge pull request #3224 from daavid00/flres
FLOWS and FLORES support
2023-02-02 10:37:23 +01:00
Arne Morten Kvarving
d04a30592a Serializer: handle Dune::BlockVector as vectors 2023-02-01 14:49:15 +01:00
Arne Morten Kvarving
6ba29b0920 Serializer: allow generic vector classes
needs to adhere to stl's interface
2023-02-01 14:48:39 +01:00
Arne Morten Kvarving
e211a8cbf6 Serializer: handle Dune::FieldVector as arrays 2023-02-01 14:39:32 +01:00
Arne Morten Kvarving
7e6b28317a Serializer.hpp: add missing include 2023-02-01 10:48:48 +01:00
Arne Morten Kvarving
b138598518 changed: rename the packer used in test_Serialization to MemPacker
make it a public header so it can be reused elsewhere.
2023-02-01 10:48:48 +01:00
Atgeirr Flø Rasmussen
59ae098ff8
Merge pull request #3385 from daavid00/fixMacbuild
Fixing broken built in macOS
2023-02-01 10:39:53 +01:00
David Landa Marban
78ed39bd51 Fixing broken built in macOS 2023-02-01 09:56:15 +01:00
Tor Harald Sandve
9b3e1f92bf
Merge pull request #3364 from hakonhagland/imbnum3
Adds support for directional relative permeabilities with hysteresis
2023-01-30 12:33:36 +01:00
Markus Blatt
b83f10d2d7
Merge pull request #3373 from bska/support-numbered-udq-scalars
Add Numbered Item to UDQ Scalars
2023-01-27 15:49:21 +01:00
Håkon Hægland
5430dc46a4 Compute the oil-water scaled info
We need to compute the oil-water scaled info even if we are running a
two-phase case without water (e.g. gas-oil) since the oil-water scaled
info is used when computing the initial condition
2023-01-24 21:50:43 +01:00
Bård Skaflestad
b3dd728a2e Add Numbered Item to UDQ Scalars
This is in preparation of adding UDQs at the segment level.  We will
probably need to rethink the UDQ scalars and UDQ sets at some point,
since the lookup and assignment operations become more expensive
from adding this piece of information.

While here, also add containers for segment level UDQs to the UDQ
state object.  These are currently unused, but adding them here
simplifies follow-up work.

Finally, add some Doxygen-style documentation to the UDQ set and
scalar types.
2023-01-24 19:45:46 +01:00
Kai Bao
2b2c05d9a1
Merge pull request #3377 from GitPaean/updating_nodal_pressure_schedule
we need to update the nodal pressure when a new NODEPROP is specified in the schedule
2023-01-23 12:36:46 +01:00
Kai Bao
e5bb64fb65 when a new NODEPROP is specified
we need to update the nodal pressure. Master branch uses std::map::insert(), the new
value will not be used if the node exists already.
2023-01-23 11:42:33 +01:00
David Landa-Marbán
37ec6667cf
Merge branch 'OPM:master' into flres 2023-01-19 15:11:56 +01:00
Arne Morten Kvarving
0801519f97
Merge pull request #3376 from akva2/restartvalue_move_to_cpp
RestartValue: move some more code to compile unit
2023-01-19 14:28:53 +01:00
Markus Blatt
55a9f44d49
Merge pull request #3374 from akva2/pavgcalculatorcollection.hpp_reduce_hotness
Summary.hpp: forward PAvgCalculatorCollection
2023-01-19 14:05:28 +01:00
Arne Morten Kvarving
eed2a179ca RestartValue: move some more code to compile unit 2023-01-19 13:40:15 +01:00
Arne Morten Kvarving
abce488f3b Summary.hpp: forward PAvgCalculatorCollection 2023-01-19 13:19:27 +01:00