Commit Graph

13944 Commits

Author SHA1 Message Date
Kai Bao
fceb3515b7 let AquiferConfig handle the AQUFLUX aquifer existence
for summary and restart file output.
2023-02-17 15:44:08 +01:00
Kai Bao
00ff5b41de creating dummy AQUFLUX aquifers in AquiferConfig
for the ones that were not specified in the SOLUTION section
2023-02-17 15:44:08 +01:00
Kai Bao
f081ee5826 using AquiferConfig to handle AQUFLUX aquifers 2023-02-17 15:44:08 +01:00
Kai Bao
d412158cf7 WIP in handling the summary output for AQUFLUX
AAQR, AAQP, AAQT works fine while FAQR and FAQT are not handled yet.
2023-02-17 15:44:08 +01:00
Kai Bao
83457f679e prototyping for the AQUFLUX parsing implementation
at the end, SOLUTIONSection() function is used to handle the
keywords in the SOLUTION section.
2023-02-17 15:44:08 +01:00
Kai Bao
1e4b33317b correcting the definition of keyword AQUFLUX 2023-02-17 15:44:08 +01:00
Atgeirr Flø Rasmussen
55efa07fe9
Merge pull request #3403 from totto82/fixJfunc
BUGFIX JFUNC,  use the correct config file when getting the endpoints
2023-02-17 11:49:12 +01:00
Tor Harald Sandve
0c1e891d0a BUGFIX JFUNC, use the correct config file when getting the endpoints 2023-02-17 11:04:47 +01:00
Bård Skaflestad
d439ef9b91
Merge pull request #3402 from akva2/gpmaint_state_comp_op
GPMaint::State: add comparison operator
2023-02-15 20:54:18 +01:00
Arne Morten Kvarving
c5a2807b44 GPMaint::State: add comparison operator
while at it, move some code to cpp file and add missing headers
2023-02-15 20:04:20 +01:00
Bård Skaflestad
708964721d
Merge pull request #3400 from hnil/add_timing_block
added timingblocks most important functions
2023-02-15 12:37:03 +01:00
Bård Skaflestad
652713b0ef
Merge pull request #3397 from GitPaean/aquct_fetp_not_schedule
throw when AQUCT and AQUFETP are used as SCHEDULE keywords
2023-02-15 11:37:25 +01:00
Kai Bao
812d119363 give error messages for AQUCT and AQUFETP in SCHEDULE section 2023-02-15 10:12:01 +01:00
hnil
a3e025290f added timingblocks most important functions 2023-02-15 09:39:14 +01:00
Bård Skaflestad
63bfa8e47c
Merge pull request #3399 from akva2/serialization_test_mark_const
test_Serialization: mark variables const
2023-02-14 14:38:42 +01:00
Arne Morten Kvarving
735bca1d8f test_Serialization: mark variables const 2023-02-14 13:49:51 +01:00
Bård Skaflestad
a8a2e0f317
Merge pull request #3398 from hnil/nicer_comments
Removed unnecessary comment
2023-02-14 12:28:20 +01:00
hnil
502b0df428 Removed unnecessary comment 2023-02-14 11:07:52 +01:00
Kai Bao
a89136f1f2 only using the AQUCT and AQUFETP in SOLUTION section
to generate the aquifers in AquiferConfig.
2023-02-14 10:44:17 +01:00
Bård Skaflestad
093ead5946
Merge pull request #3353 from bska/summary-state-seg-var
Add Separate SummaryState Data Member for Segment Level Values
2023-02-10 16:12:02 +01:00
Bård Skaflestad
93b340cede Store Per-Segment Summary Vectors Separately
Enables easier access for UDQ/ACTIONX purposes.

While here, also move the serializationTestObject() member
function's implementation to the .cpp file.
2023-02-10 15:26:27 +01:00
Bård Skaflestad
a76768cf75 Reorder SummaryState Member Functions
This way the implementation file matches the declared order in the
header file.
2023-02-10 15:26:27 +01:00
Markus Blatt
febb03c9d6
Merge pull request #3395 from akva2/multregp_multiple_record
fixed: process all MULTREGP entries in the deck
2023-02-10 15:03:52 +01:00
Bård Skaflestad
6d93cc7969
Merge pull request #3393 from akva2/guiderate_serialize
GuideRate: add serialization support
2023-02-10 14:56:09 +01:00
Markus Blatt
18db394b34
Merge pull request #3396 from blattms/fix-multiple-boost-searches
[bugfix] Make sure to use CONFIG mode  for subsequent boost searches.
2023-02-10 14:44:34 +01:00
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