Commit Graph

323 Commits

Author SHA1 Message Date
hnil
3cd55b5290 - changed materialsparams to not use shared pointers
- added interface of reusing search in tables

- fixed after modifiying files for minimal diffs

fixed NDEBUG things

fixed from review
2023-03-03 14:43:50 +01:00
Arne Morten Kvarving
3fddcc0dd8 split out timing macros to separate header 2023-03-01 13:17:00 +01:00
Arne Morten Kvarving
59d3619460 EclMaterialLawManager: add restart serialization support 2023-02-24 11:03:02 +01:00
Arne Morten Kvarving
b9a2b3fb86 EclXXXMaterialParams: add restart serialization support 2023-02-24 11:01:55 +01:00
Arne Morten Kvarving
09f1f06404 EclHysteresisTwoPhaseLawParams: add restart serialization support 2023-02-24 10:43:45 +01:00
Arne Morten Kvarving
ce9d8030d6 EclHysteresisTwoPhaseLawParams: header cleanup 2023-02-24 09:59:45 +01:00
Arne Morten Kvarving
11db5ce3af DirectionMaterialLawParams: add missing include
and some reformatting
2023-02-24 09:59:45 +01:00
hnil
a3e025290f added timingblocks most important functions 2023-02-15 09:39:14 +01:00
Håkon Hægland
9c47f8900d Add support for IMBNUM
First stage in adding support for using imbibition for cell faces (IMBNUMX,
IMBNUMY, IMBNUMZ). At the same time, refactors initParamsForElements() in
EclMaterialLawManager.hpp into separate files to more easily add support
for materal law parameters for cell faces.
2023-01-16 21:29:25 +01:00
Arne Morten Kvarving
28d160dec3 ThreePhaseParkerVanGenucthenParams: remove fvector include
not used
2022-12-23 08:49:19 +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
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
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
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
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
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
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
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
Arne Morten Kvarving
207d280ee4 remove HAVE_OPM_COMMON conditionals 2022-12-08 14:03:15 +01:00
Arne Morten Kvarving
8478171d76 fix build without ENABLE_ECL_INPUT 2022-11-30 12:48:32 +01:00
Ove Sævareid
bade82f44c Neutral initialisation for no-hysteresis case. 2022-10-10 14:34:36 +02:00
Ove Sævareid
6268aa6604 Killough's hysteresis model for relperm and cap-pressure. 2022-10-07 15:08:16 +02:00
Håkon Hægland
143ffd0e6f Add method to check for directional relperm
Adds a method that can be used to check if directional relperms are
enabled.
2022-09-06 19:25:13 +02:00
Håkon Hægland
148fa6c8c3 Add support for KRNUM 2022-08-29 11:12:59 +02:00
Arne Morten Kvarving
bb813485ab changed: consistently use std::array 2022-08-16 08:34:04 +02:00
Arne Morten Kvarving
85f5d23966 PiecewiseLinearTwoPhaseMaterial(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
a9c26cbd18 TwoPhaseLETCurves(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
f4d7b96485 SatCurveMultiplexer(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
d9e4bc6aa2 MaterialTraits: some modernization
- typedef -> using
- use constexpr where appropriate
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
d7fa046d3b EclTwoPhaseMaterial(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
1cdadca7cd EclStone2Material(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
cfc5ad7061 EclStone1Material(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
2a266a5834 EclMultiplexerMaterial(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
cb51404dfa EclMaterialLawManager: some modernization
- typedef -> using
- use constexpr where appropriate
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
8c63ef6f04 EclHysteresisTwoPhaseLaw(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- fix includes
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
6f75049854 EclHysteresisConfig: fix includes 2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
b8e6353d8f EclEpsTwoPhaseLaw(Params): some modernization
- typedef -> using
- remove unused headers
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
55c5c4b6fc EclEpsScalingPoints: fix includes 2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
f20d8f56e7 EclEpsGridProperties: fix includes 2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
62bc8f5e54 EclEpsConfig: fix includes 2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
ce2b049d26 EclDefaultMaterial(Params): some modernization
- typedef -> using
- use constexpr where appropriate
- remove unused headers
2022-08-03 10:21:52 +02:00
Arne Morten Kvarving
cb9f01df4e remove unused includes of Unused.hpp 2022-08-02 10:16:25 +02:00
Arne Morten Kvarving
ffcd22ebb1 remove unnecessary includes 2022-07-27 15:36:46 +02:00