OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,544 Commits 18 Branches 75 Tags 73 MiB
cc1e00d35e
Commit Graph

13544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
d754d83ea0 ConstantCompressibilityWaterPvt: some simplifications 
drop unused constructors and explicit comparison operator
 2022-12-21 18:32:14 +01:00
Arne Morten Kvarving
2d386e3e3f ConstantCompressibilityWaterPvt: replace assert 
this is user-provided data. instead throw an exception
 2022-12-21 18:32:13 +01:00
Arne Morten Kvarving
77f5581e27 ConstantCompressibilityWaterPvt: put initFromState in separate compile unit 
thus encapsulating EclipseState, Schedule and TableManager
 2022-12-21 18:21:26 +01:00
Bård Skaflestad
ff4fb71cb7
Merge pull request #3258 from akva2/constantcompressibilityoilpvt_encapsulate 
ConstantCompressibilityOilPvt: encapsulate EclipseState w/ friends
 2022-12-21 17:05:07 +01:00
Arne Morten Kvarving
a26cea5c37 ConstantCompressibilityOilPvt: some simplifications 
drop unused constructors and explicit comparison operator
 2022-12-21 16:23:11 +01:00
Arne Morten Kvarving
eedeada409 ConstantCompressbilityOilPvt: replace assert 
this is user-provided data. instead throw an exception
 2022-12-21 16:23:11 +01:00
Arne Morten Kvarving
094a40db41 ConstantCompressibilityOilPvt: put initFromState in separate compile unit 
thus encapsulating EclipseState and TableManager
 2022-12-21 16:23:11 +01:00
Arne Morten Kvarving
81f0315101
Merge pull request #3257 from akva2/constantcompressibilitybrinepvt_encapsulate 
ConstantCompressibilityBrinePvt: encapsulate EclipseState w/ friends
 2022-12-21 16:23:01 +01:00
Arne Morten Kvarving
f58d9f12b0 ConstantCompressibilityBrinePvt: some simplifications 
drop unused constructors and explicit comparison operator
 2022-12-21 15:49:02 +01:00
Arne Morten Kvarving
b91b83f814 ConstantCompressibilityBrinePvt: replace asserts 
this is user-provided data. instead throw an exception
also replace a naked throw with OPM_THROW
 2022-12-21 15:49:02 +01:00
Arne Morten Kvarving
a09d8496f6 ConstantCompressibilityBrinePvt: put initFromState in separate compile unit 
thus encapsulating EclipseState and TableManager
 2022-12-21 15:49:01 +01:00
Arne Morten Kvarving
5e03ff6726
Merge pull request #3256 from akva2/co2gaspvt_encapsulate 
Co2GasPvt: encapsulate EclipseState w/ friends
 2022-12-21 15:48:22 +01:00
Arne Morten Kvarving
12ff60693a
Merge pull request #3253 from akva2/eclmateriallawmanager_encapsulate 
EclMaterialLawManager: move most code to separate compile unit
 2022-12-21 15:13:38 +01:00
Bård Skaflestad
38f5c401a0
Merge pull request #3292 from akva2/brineco2pvt_remove_ctor_comp 
BrineCo2Pvt: some cleanups
 2022-12-21 14:42:30 +01:00
Arne Morten Kvarving
182f5d3b27
Merge pull request #3302 from akva2/rootfinders_libfmt 
RootFinders: avoid stream usage in header
 2022-12-21 13:43:30 +01:00
Tor Harald Sandve
ce3b37fe9d
Merge pull request #3246 from totto82/addRsw 
Add rsw
 2022-12-21 13:39:23 +01:00
Arne Morten Kvarving
f235061ee3 RootFinders: avoid stream usage in header 
put logging functions in separate compile unit where we use {fmt}
 2022-12-21 13:26:56 +01:00
Arne Morten Kvarving
93a32a66f4
Merge pull request #3301 from akva2/avoid_sstream_in_timerlog 
TimerLog: avoid sstream in header
 2022-12-21 12:06:28 +01:00
Arne Morten Kvarving
ba5add7b86
Merge pull request #3299 from akva2/orderedmap_no_sstream 
OrderedMap: avoid sstream usage
 2022-12-21 11:44:28 +01:00
Arne Morten Kvarving
b529080fb7 TimerLog: avoid sstream in header 2022-12-21 11:26:33 +01:00
Arne Morten Kvarving
ccfc3d6ac3 fixed: do not append to flags to CMAKE_CXX_FLAGS 
this should only be set on the target if using QuadMath.
every time cmake was rerun a build directory new entry was added,
leading to very long compile commands eventually.
 2022-12-21 11:03:12 +01:00
Arne Morten Kvarving
fe54e7ccf2
Merge pull request #3298 from akva2/dune_tests_separate_list 
changed: put dune-enabled tests in separate list
 2022-12-21 10:42:25 +01:00
Arne Morten Kvarving
101bbdfb47 avoid pulling sstream in OrderedMap 2022-12-21 10:34:34 +01:00
Arne Morten Kvarving
a7a8d63961 add missing test to OrderedMapTests 
test findSimilarStrings
 2022-12-21 10:34:28 +01:00
Arne Morten Kvarving
081715d229 changed: put dune-enabled tests in separate list 
more explicit, neater code
 2022-12-21 09:54:36 +01:00
Arne Morten Kvarving
680246b1ca
Merge pull request #3297 from bska/fix-copy-paste-doc 
Fix Copy-Pasted Function Documentation
 2022-12-20 17:05:59 +01:00
Bård Skaflestad
1c14b786d0 Fix Copy-Pasted Function Documentation 
The enumerated 'segments()' overload takes a well number, not a
well name.

Pointy Hat: [at]bska
 2022-12-20 15:58:57 +01:00
Bård Skaflestad
b0ad3a43dc
Merge pull request #3295 from bska/additional-dune-common-links 
Link New Test to Dune Common
 2022-12-20 14:41:34 +01:00
Bård Skaflestad
62022122c9
Merge pull request #3296 from bska/more-verbose-test 
Prefer BOOST_CHECK_EQUAL
 2022-12-20 14:07:21 +01:00
Bård Skaflestad
beef2ca737
Merge pull request #3293 from blattms/throw-for-missing-compsegs 
Abort parser if COMPSEGS is missing for multisegment well.
 2022-12-20 13:58:53 +01:00
Markus Blatt
0761d38294
Merge pull request #3235 from bska/segment-matcher-facility 
Add Facility For Identifying Specific Well Segments
 2022-12-20 13:52:22 +01:00
Bård Skaflestad
6bfa9b6c35 Prefer BOOST_CHECK_EQUAL 
That way, we get both strings printed if a test fails.
 2022-12-20 13:31:28 +01:00
Bård Skaflestad
fb8cd6f284 Link New Test to Dune Common 
Otherwise, we get build failures if the Dune libraries and headers
are outside of the system directories.
 2022-12-20 13:14:28 +01:00
Bård Skaflestad
1a1ba1f7a1 Add Facility For Identifying Specific Well Segments 
The primary use case is identifying UDQ sets when the model defines
UDQs at the segment level (SU*).  The call site will construct a
SegmentMatcher object backed by a specific ScheduleState, and then
segment-level UDQs will match against this to determine the correct
UDQ set on which to define the quantity.
 2022-12-20 12:57:00 +01:00
Markus Blatt
6da02a164d Improve error message for missing COMPSEGS keyword. 
Instead of listing a range where the errors are we now list the
location of each corresponding WELSEGS keyword to give the user all
the information that he may need.

Error looks like:

```
unknown location(0): fatal error: in "MissingCOMPSEGS": Opm::OpmInputError: Problem with keyword WELSEGS
In <memory string> line 38
Missing COMPSEGS keyword for the following multisegment well:
    PROD01 in <memory string> at line 38.
```
 2022-12-20 12:01:17 +01:00
Bård Skaflestad
c8daba28ad
Merge pull request #3294 from akva2/evaluation_fmt 
added: fmt formatter for Evaluation
 2022-12-20 11:13:07 +01:00
Markus Blatt
f3a4408172 Added test whether parser throws for ms well without COMPSEGS keyword. 2022-12-20 11:11:24 +01:00
Markus Blatt
fd600582f5 Added missig COMPSEGS keywords for multisegment well tests. 
No that we are stricter this is needed as otherwise the tests may
fail.

Due to my laziness I descreased the number of connection for the wells.
 2022-12-20 10:55:49 +01:00
Arne Morten Kvarving
7f694089a7 added: fmt formatter for Evaluation 
and a simple test
 2022-12-20 08:45:06 +01:00
Markus Blatt
7d3c688953 Abort parser if COMPSEGS is missing for multisegment well. 
This might not be 100% perfect but it will detect completely missing
COMPSEGS keywords for multisegment wells already during file parsing
instead of during the simulation at the report step where the problem
occurs (could be rather late). Hence it improves  OPM/opm-simulators#4329.

We keep track of all the wells that appear in WELSEGS and COMPSEGS and
at the end of each report step parsed, we check that there is entry using
COMPSEGS for each well that was in WELSEGS.

Note that the keyword used for the error is the last one in the report
step, which is a bit misleading. Error message looks like:

```
Error: Problem with keyword WCONPROD
In /tmp/MSW-3D-03.DATA line 2462
Missing COMPSEGS keyword for well PROD01 between <memory string> line 0 and /tmp/MSW-3D-03.DATA line 2462.

Error: Unrecoverable errors while loading input: Problem with keyword WCONPROD
In /tmp/MSW-3D-03.DATA line 2462
Missing COMPSEGS keyword for well PROD01 between <memory string> line 0 and /tmp/MSW-3D-03.DATA line 2462.
```
 2022-12-19 22:54:56 +01:00
Tor Harald Sandve
9d583b2293 Add support for dissolved gas in water in the blackoil fluidsystem 
If DISGASW is in the input deck gas in allowed to dissolved into water
Currently only works in combination with CO2STORE
For general support assosiated input tables needs to be provided
 2022-12-16 13:49:44 +01:00
Arne Morten Kvarving
802bc21246 BrineCo2Pvt: some cleanups 
remove unused ctor and explicit comparison operator
 2022-12-16 13:38:27 +01:00
Arne Morten Kvarving
99ebf0bd3d
Merge pull request #3286 from akva2/remove_unused_header 
remove unused header
 2022-12-15 14:23:32 +01:00
Arne Morten Kvarving
a999c06862 remove unused header 
it will never be used either as opm requires c++17 now
which means final is always supported
 2022-12-15 14:05:44 +01:00
Arne Morten Kvarving
b58c682f62 CO2: encapsulate CO2Tables 
this way we don't have to drag 6MB of tables into multiple compile
units. some flexibility is lost (ie the template parameter for the
table), but this is unused in the current code.

comment out some templates that do not instance as they are referring
to non-existent table members.
 2022-12-15 13:52:49 +01:00
Arne Morten Kvarving
0aa6fc1edd Co2GasPvt: drop unused constructor and explicit comparison operator 2022-12-15 11:14:33 +01:00
Arne Morten Kvarving
7a44ca3052 Co2GasPvt: replace cerr output with OpmLog::warning 2022-12-15 11:08:42 +01:00
Arne Morten Kvarving
0874e7542e Co2GasPvt: put initFromState in separate compile unit 
thus encapsulating EclipseState and TableManager
 2022-12-15 11:08:42 +01:00
Bård Skaflestad
9d4b36a891
Merge pull request #3273 from blattms/make-multz--global 
Always use MULTZ- as a global array.
 2022-12-14 14:40:31 +01:00
Markus Blatt
4f0f64f637 Always use MULTZ- as a global array. 
This is needed as it is used when calculating transmissibilities over
pinched out cells. There it needs to behave the same way as MULTZ does.
 2022-12-14 10:30:27 +01:00