Commit Graph

13334 Commits

Author SHA1 Message Date
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
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
Arne Morten Kvarving
0986c4a8b0 changed: put EclEpsGridProperties constructor in separate compile unit
in particular this allows to encapsulate the EclipseState class usage.
2022-12-09 22:15:41 +01:00
Bård Skaflestad
cf13cddba9 Merge pull request #3242 from akva2/eclepsconfig_encapsulate
EclEpsConfig: put initFromState in separate compile unit
2022-12-09 16:32:34 +01:00
Arne Morten Kvarving
e1f6a1e636 make EclTwoPhaseSyStemType an enum class
in particular this allows for forwarding which will be useful later
2022-12-09 15:48:14 +01:00
Arne Morten Kvarving
cccc007842 changed: put EclEpsConfig init in separate compile unit
in particular this allows to encapsulate the EclipseState class usage.
also use class member initialization instead of constructor.
2022-12-09 15:48:14 +01:00
Bård Skaflestad
a71877277d Merge pull request #3241 from bska/additional-dune-common-links
Link Additional Targets to Dune Common
2022-12-09 15:25:14 +01:00
Bård Skaflestad
3baeba93c8 Link Additional Targets to Dune Common
While here, also remove a duplicate entry for

    examples/co2brinepvt.cpp
2022-12-09 15:03:21 +01:00
Arne Morten Kvarving
4eadaae69c Merge pull request #3240 from akva2/janitoring
Some janitoring
2022-12-09 14:50:38 +01:00
Arne Morten Kvarving
13dcaf8281 fixed: use std::array to avoid compiler warnings 2022-12-09 14:18:55 +01:00
Arne Morten Kvarving
c96a5a8668 fixed: zero initialize to avoid compiler warnings 2022-12-09 14:18:50 +01:00
Bård Skaflestad
d0f8a73083 Merge pull request #3234 from akva2/import_opm_material
Import opm-material with history
2022-12-09 12:26:16 +01:00
Arne Morten Kvarving
207d280ee4 remove HAVE_OPM_COMMON conditionals 2022-12-08 14:03:15 +01:00
Arne Morten Kvarving
5ed8a439e7 add imported files to build system
and adjust jenkins scripts
2022-12-08 14:03:15 +01:00
Markus Blatt
146c73eae9 Merge pull request #3077 from OPMUSER/MULTFLT
Improve Error Message for MULTFLT
2022-12-08 13:46:18 +01:00
Markus Blatt
c048262f79 Merge pull request #3217 from totto82/co2store_gw
Support CO2STORE with GAS + WATER
2022-12-08 11:17:13 +01:00
Markus Blatt
0291da1cb0 Merge pull request #3238 from akva2/fix_python_clean_tree
fixed: depend on the copy_python target
2022-12-05 10:22:07 +01:00
Tor Harald Sandve
a56496021d add keyword DISGASW to enable dissolution of gas in water 2022-12-02 15:43:22 +01:00
Arne Morten Kvarving
1491d9510e fixed: depend on the copy_python target
the generated python code requires the copy_python target
to setup the directory structure. without this, builds
failed when building a specific target (ie not 'all')
in a clean build tree
2022-12-02 12:57:46 +01:00
Arne Morten Kvarving
8245d17026 Merge pull request #3236 from akva2/flag_error_single_rft
changed: flag an error if just one case has a rft file
2022-12-02 11:05:23 +01:00
Arne Morten Kvarving
3feac9cb62 Merge pull request #3237 from akva2/janitoring
fixed: zero initialize to avoid compiler warnings
2022-12-02 10:12:41 +01:00
Arne Morten Kvarving
913f71557d fixed: zero initialize to avoid compiler warnings 2022-12-02 09:34:54 +01:00
Arne Morten Kvarving
97c03fffe6 changed: flag an error if just one case has a rft file 2022-12-02 09:07:43 +01:00
Arne Morten Kvarving
3710b8df69 Import (filtered) opm-material with history 2022-12-01 12:41:31 +01:00
Bård Skaflestad
b528fd768f Merge pull request #3231 from akva2/fix_no_input_output
Fix build with ENABLE_ECL_INPUT=0
2022-11-30 15:32:02 +01:00
Bård Skaflestad
e1a9466cac Merge pull request #545 from akva2/fix_build_no_ecl_input
fix build without ENABLE_ECL_INPUT
2022-11-30 14:58:08 +01:00
Arne Morten Kvarving
f4627455e5 Merge pull request #3233 from bska/apply-gridunit-to-output-copies
Apply GRIDUNIT Processing to COORD/ZCORN Output Copies
2022-11-30 14:35:14 +01:00
Bård Skaflestad
5faf7fc088 Apply GRIDUNIT Processing to COORD/ZCORN Output Copies
Needed to reflect the GRIDUNIT transformation in the EGRID output.
2022-11-30 14:09:20 +01:00
Arne Morten Kvarving
8478171d76 fix build without ENABLE_ECL_INPUT 2022-11-30 12:48:32 +01:00