Commit Graph

14023 Commits

Author SHA1 Message Date
Tor Harald Sandve
1aff5fc604 add test that compares Brine and BrineDynamic 2023-05-12 09:07:55 +02:00
Tor Harald Sandve
4f3b67fa77 use 58.44 as molar mass of salt 2023-05-04 09:48:03 +02:00
Tor Harald Sandve
46f5558b59 Combine brine and the co2store module
This commit allows for dynamically changes in salinity in the co2 storage module

I.e. It allows for modeling salt precipition for co2 storage cases.
2023-05-03 15:09:06 +02:00
Bård Skaflestad
40b2fe3c14 Merge pull request #3496 from akva2/janitoring
Some janitoring
2023-04-28 10:03:24 +02:00
Arne Morten Kvarving
d659aa567f reorder initialization lists 2023-04-28 09:43:02 +02:00
Arne Morten Kvarving
54966e074f add forward declarations for explicit template instantations
causes a clang-tidy warning
2023-04-28 09:43:02 +02:00
Arne Morten Kvarving
bf39554b12 remove unused include 2023-04-28 09:43:02 +02:00
Arne Morten Kvarving
02fc95d0f7 remove trailing semicolon in package dependency list
causes a cmake warning,
"Empty dependency in find module for dune-polygongrid (check for trailing semi-colon)"
2023-04-28 09:43:02 +02:00
Markus Blatt
6a00383cdc Merge pull request #3494 from akva2/remove_unused_cmake_module
remove unused cmake module
2023-04-28 09:33:40 +02:00
Arne Morten Kvarving
344e920956 remove unused cmake module 2023-04-28 08:26:31 +02:00
Bård Skaflestad
28e030ff80 Merge pull request #3489 from akva2/python_fix_embed
Python: avoid searching from Development.Embed unless required
2023-04-27 13:33:54 +02:00
Arne Morten Kvarving
f76bda06e4 Merge pull request #3490 from akva2/pypi_fix_wheels
changed: build python wheels using skbuild
2023-04-27 13:29:46 +02:00
Arne Morten Kvarving
6316768bbb changed: build python wheels using skbuild
the vanilla setup-tools doesn't get the triplet correctly for some
reason. also use cmake from pip as cmake 3.16 in the image has a bug
in the python find rule
2023-04-27 13:17:19 +02:00
Arne Morten Kvarving
ba14a9e126 fixed: setuptools are no longer required to build the python bindings
only required if building packages for pypi, which is done separately
from the main buildsystem.
2023-04-27 13:03:08 +02:00
Arne Morten Kvarving
33c416b3e8 changed: only search for Development.Module if not building embedded python
the embedding headers are not available on the manylinux2014 containers
used to build the pypi packages. since this is anyways more correct
fix it this way
2023-04-27 13:03:08 +02:00
Markus Blatt
149fcdc88d Merge pull request #3481 from bska/rock-with-default-record-copy
Implement Proper Record Copying Behaviour for ROCK
2023-04-26 16:58:47 +02:00
Bård Skaflestad
91bb2b47e7 Use Base Class' serializeOp() Where Possible
Classes which inherit from FlatTableWithCopy and just call the base
class implementation of 'serializeOp()' don't really need a separate
implementation of that member function.

Noticed by: [at]blattms.
2023-04-26 15:29:12 +02:00
Bård Skaflestad
5cdeb6137b Implement Proper Record Copying Behaviour for ROCK
This commit adds the expected behaviour for all-defaulted records in
ROCK, provided the all-defaulted records are not the first of the
keyword.  Similarly to, e.g. PVTW, all-defaulted records are treated as
copies of the immediately preceding record.

In other words, given

    ROCK
    -- REF. PRES   COMPRESSIBILITY
       280.000        5.6E-5 /
    /

the second record is supposed to be a copy of the first.
2023-04-26 14:29:28 +02:00
Markus Blatt
8beebd49e3 Merge pull request #3485 from atgeirr/allow-field-wells
Allow FIELD group as parent for wells
2023-04-26 14:14:33 +02:00
Markus Blatt
f16b433b53 Merge pull request #3484 from akva2/fix_udqdefine_serialize
fixed: missing serialization of tokens in UDQDefine
2023-04-26 12:54:52 +02:00
Markus Blatt
0c64097e05 Merge pull request #3479 from bska/dynamic-rock-size
Implement Full Size Protocol for ROCK Keyword
2023-04-26 12:30:51 +02:00
Atgeirr Flø Rasmussen
a055f11392 Update tests for new behaviour. 2023-04-26 12:02:34 +02:00
Atgeirr Flø Rasmussen
33843346b4 Use ParseContext system to handle well under FIELD situation.
Also downgrade from a throw to a warning.
2023-04-26 11:43:21 +02:00
Arne Morten Kvarving
6ff355a141 fixed: missing serialization of tokens in UDQDefine
this went unnoticed since there are no UDQDefines in the pre-simulation
Schedule broadcast for parallel. however it causes issues for serialized
restarts
2023-04-26 11:35:12 +02:00
Atgeirr Flø Rasmussen
6de95332be Avoid printing "Internal error" for user input problems.
This is done by:
 - splitting the catch(std::exception) in KeywordHandlers.cpp
   in two and catching std::logic_error separately,
 - not adding "Internal error" in the OpmInputError constructor
   taking std::exception.
In addition, two possible user errors related to mixing groups
and wells as children of a single group have been changed to
std::runtime_error.
2023-04-26 11:35:05 +02:00
Bård Skaflestad
ffea242f7e Reimplement Enum->String Conversion in Terms of Array
Improves lookup speed.

Suggested by: [at]blattms.
2023-04-25 19:49:18 +02:00
Bård Skaflestad
0c6aff9b68 Make Diagnostic Message Reflect Reality
We also need to include DOUBLE_SLASH_TERMINATED in the list of
alternatives.
2023-04-25 19:47:02 +02:00
Bård Skaflestad
599194191d Implement Full Size Protocol for ROCK Keyword
This commit adds a special case for handling the dynamic nature of
the number of records in the ROCK keyword.  In particular, if the
ROCKOPTS keyword is NOT entered before ROCK, then the number of
records is NTPVT--item 2 from TABDIMS.  Conversely, when ROCKOPTS is
entered before ROCK, the number of records in the latter depends on
the setting in item 3 of ROCKOPTS.

This interaction cannot be easily captured in our JSON-based models,
so we introduce a special size class, SPECIAL_CASE_ROCK, that only
applies to the ROCK keyword and implement the logic in a dedicated
function in 'Parser.cpp'.  Once we have determined the correct
number of records, we form a RawKeyword of type FIXED and defer
further processing to the existing handling of fixed-sized keywords.

Add a selection of unit tests to exercise the new behaviour.
2023-04-24 12:54:41 +02:00
Bård Skaflestad
2c6f08269d Prefer Data to Logic
Switch if/else chain out in favour of a map-based approach.  This
simplifies adding new enumerators.  While here, also return string
objects instead of constant string objects.
2023-04-24 12:54:41 +02:00
Bård Skaflestad
d5d17bff2f Adjust Whitespace in Preparation of Special New Size Class
In particular, split long lines where appropriate.
2023-04-24 12:54:41 +02:00
Arne Morten Kvarving
4a2cc1a64a Merge pull request #3478 from blattms/python-development-component-is-mandatory
Always search for Development component of Python.
2023-04-24 08:46:08 +02:00
Markus Blatt
59ca5b1ba8 Always search for Development component of Python.
It is needed as we will call pybind11_add_module which calls
python3_add_library (in recent pybind11 versions). That
function is only there if the development component is searched for
and found.
2023-04-19 15:26:23 +02:00
Bård Skaflestad
b59ecf2d3b Merge pull request #3476 from GitPaean/remove_canOpen
removing Well::canOpen() function
2023-04-14 12:27:16 +02:00
Kai Bao
909cfdcdb7 removing Well::canOpen() function
which is not needed anymore.
2023-04-14 11:17:28 +02:00
Arne Morten Kvarving
5048b4e9ec Merge pull request #3467 from akva2/bump_2023.10
bump version to 2023.10-pre
2023-04-13 15:21:42 +02:00
Arne Morten Kvarving
19c819074f Merge pull request #3473 from blattms/fix-grid-indep-well
Added missing file for grid independent well specification.
2023-04-13 14:20:17 +02:00
Markus Blatt
8a21a8a23f Added missing file for grid independent well specification. 2023-04-13 12:55:30 +02:00
Bård Skaflestad
93a2f71545 Merge pull request #3463 from GitPaean/open_wellopen_zerorate_nocrossflow_wells
not forbidding WELOPEN wells with zero rate and disallowing crossflow
2023-04-13 10:34:41 +02:00
Bård Skaflestad
134a4dbef4 Merge pull request #3459 from blattms/internalize-editnncr
Internalize EDITNNCR keyword and make it available with the other NNC information.
2023-04-13 10:33:49 +02:00
Markus Blatt
f0da305684 Use erase just to make reviewer happy. 2023-04-13 08:05:23 +02:00
Markus Blatt
0ca91f5498 Fixed wrong data file comment. 2023-04-12 17:02:07 +02:00
Markus Blatt
87a961246f Updated copyright. 2023-04-12 16:57:33 +02:00
Markus Blatt
f3767d0f24 Added explicit include of algorithm. 2023-04-12 16:57:11 +02:00
Markus Blatt
e16fd02498 Use deque::assign instead of relying on smart compilers. 2023-04-12 16:50:23 +02:00
Markus Blatt
7187d03f0c Use stable_sort to keep reverse insertion order for same cell pairs 2023-04-12 16:49:29 +02:00
Markus Blatt
83e05e7ba3 Effort to make the code documentation better. 2023-04-12 16:48:48 +02:00
Bård Skaflestad
8473d9b8ec Merge pull request #3469 from GitPaean/reverting_aquct_commit
checking all the instances of AQUCT and AQUFETP keywords
2023-04-12 14:26:15 +02:00
Bård Skaflestad
9bf9f65f63 Merge pull request #3466 from blattms/fix-compiler-warnings
Fix compiler warnings
2023-04-12 14:03:20 +02:00
Kai Bao
32e4384109 checking all the instances of AQUCT and AQUFETP keywords
with master branch, only the last instance will be caught for these two
keywords.
2023-04-12 13:37:18 +02:00
Bård Skaflestad
b9c1b39a61 Merge pull request #3468 from GitPaean/reverting_aquct_commit
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
2023-04-12 13:24:34 +02:00