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

13961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Landa Marban
43c553330b Flows and Flores NNC extra fields 2022-12-15 15:14:24 +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
Bård Skaflestad
86b3c79ff4
Merge pull request #3260 from akva2/remove_math_include 
changed: remove include of Math.hpp
 2022-12-14 09:30:04 +01:00
Bård Skaflestad
f6546b7fc5
Merge pull request #3259 from akva2/exception_nih_begone 
changed: drop exceptions class from material
 2022-12-14 09:29:29 +01:00
Arne Morten Kvarving
b889f59145 changed: remove include of Math.hpp 
it should be up to instance sites to make every available for
the templates to instance properly, even though we know we are
instancing over Evaluations.
 2022-12-13 13:31:18 +01:00
Arne Morten Kvarving
9a77d47c35 changed: drop exceptions class from material 
use the opm-common exception classes directly
 2022-12-13 12:47:20 +01:00
Arne Morten Kvarving
cbdff5409e EclMaterialLawManager: move (most) code to separate compile unit 2022-12-13 11:38:23 +01:00
Arne Morten Kvarving
3b7c68b3cf WaterPvtThermal: remove watJT() from comparison operator 
no such method
 2022-12-13 11:15:45 +01:00
Arne Morten Kvarving
1a121a6e71 WaterPvtThermal: fix method name 2022-12-13 11:15:45 +01:00
Arne Morten Kvarving
0b6c7a2d40 OilPvtThermal: fix method name 2022-12-13 11:15:45 +01:00
Arne Morten Kvarving
7eeef002be GasPvtThermal: fix method name 2022-12-13 11:15:45 +01:00
Arne Morten Kvarving
8b64ed89f3 OilPvtMultiplexer: remove \ at end of macro 2022-12-13 11:15:44 +01:00
Arne Morten Kvarving
03ca1fdae4 GasPvtMultiplexer: remove \ at end of macro 2022-12-13 11:14:57 +01:00
Bård Skaflestad
6fcf29fa78
Merge pull request #3255 from akva2/co2brinepvt_encapsulate 
Co2BrinePvt: encapsulate EclipseState w/ friends
 2022-12-13 11:09:15 +01:00
Arne Morten Kvarving
414a07b1a7 BrineCo2Pvt: replace cerr output with OpmLog::warning 2022-12-13 10:23:51 +01:00
Arne Morten Kvarving
7b844eb8be BrineCo2Pvt: put initFromState in separate compile unit 
thus encapsulating EclipseState and TableManager
 2022-12-13 10:23:43 +01:00
Bård Skaflestad
9dfedcbd76
Merge pull request #3252 from akva2/enum_reduce_redundancy 
Reduce redundancy in some enums
 2022-12-12 23:35:03 +01:00
Bård Skaflestad
02cdb98cfc
Merge pull request #3251 from akva2/unused_includes 
Remove unused includes
 2022-12-12 23:29:00 +01:00
Bård Skaflestad
bf1cafb63f
Merge pull request #3250 from akva2/janitoring 
initialize variable to avoid compiler warnings
 2022-12-12 23:28:21 +01:00
Arne Morten Kvarving
119cba9edf GasPvtApproach: reduce redundancy in entries 
we already know it's 'pvt'
 2022-12-12 19:17:33 +01:00
Arne Morten Kvarving
59cd613747 OilPvtApproach: reduce redundancy in entries 
we already know it's 'pvt'
 2022-12-12 19:09:13 +01:00
Arne Morten Kvarving
2849651b23 WaterPvtApproach: reduce redundancy in entries 
we already know it's 'pvt'
 2022-12-12 18:54:24 +01:00
Arne Morten Kvarving
a5d038204e SatCurveMultiplexerApproach: reduce redundancy in entries 
we already know it's 'approach'
 2022-12-12 18:43:28 +01:00
Arne Morten Kvarving
603ca3476a EclTwoPhaseApproach: reduce redundancy in entries 
we already know it's 'ecl and twophase'
 2022-12-12 18:30:27 +01:00
Arne Morten Kvarving
ad69ef3ac4 EclMultiplexerApproach: reduce redundancy in entries 
we already know it's 'ecl and approach'
 2022-12-12 18:30:27 +01:00
Arne Morten Kvarving
afbab4d574 EclHysteresisTwoPhaseLawParams: remove unused include 2022-12-12 17:44:32 +01:00
Arne Morten Kvarving
63fe150194 EclEpsTwoPhaseLawParams: remove unused include 2022-12-12 17:44:32 +01:00
Arne Morten Kvarving
faa384abb6 initialize variable to avoid compiler warnings 2022-12-12 17:36:54 +01:00
Bård Skaflestad
138b97fb6e
Merge pull request #3247 from akva2/fix_pypi 
pypi: add dune-common dependency
 2022-12-12 15:39:40 +01:00
Arne Morten Kvarving
2c8e50fa53 pypi: add dune-common dependency 2022-12-12 13:39:18 +01:00
Bård Skaflestad
00cc1f7f08
Merge pull request #3244 from akva2/epsscalingpoints_encapsulate 
EclEpsScalingPoints(Info): put init and print in separate compile unit
 2022-12-12 09:45:41 +01:00
Bård Skaflestad
28f3d4cd67
Merge pull request #3245 from akva2/eclhysteresisconfig_encapsulate 
changed: put EclHysteresisConfig initFromState in separate compile unit
 2022-12-12 09:45:04 +01:00
Arne Morten Kvarving
97d4175aa6 changed: put EclHysteresisConfig initFromState in separate compile unit 
in particular this allows to encapsulate the Runspec class usage.
also use class member initialization instead of constructor.
 2022-12-10 16:20:29 +01:00
Arne Morten Kvarving
6e1aab5164 EclEpsScalingPoints(Info): put init and print in separate compile unit 
this allows to encapsulate EclipseState usage and iostream usage
 2022-12-10 00:15:27 +01:00
Bård Skaflestad
1670c80133
Merge pull request #3243 from akva2/epsgridprops_encapsulate 
changed: put EclEpsGridProperties constructor in separate compile unit
 2022-12-09 23:14:23 +01:00