OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
819 Commits 18 Branches 75 Tags
93df3fa6d5efe1931ee4275d2bf73ec14de87bf4
Commit Graph

581 Commits

Author SHA1 Message Date
Arne Morten Kvarving
93df3fa6d5 fixed: enum member in EclMultiplexerApproach clashes with EclTwoPhaseApproach enum 
fix by converting both to enum class
 2020-01-21 13:22:00 +01:00
Bård Skaflestad
1b5206200c Merge pull request #384 from akva2/reorganize_matlaw 
Reorganize EclMaterialLawManager
 2020-01-21 12:57:26 +01:00
Arne Morten Kvarving
9af6f1fe4d changed: do not call initParamsForElements in initFromDeck 2020-01-21 11:32:57 +01:00
Arne Morten Kvarving
14eff62913 changed: make initParamsForElements public 2020-01-21 11:32:57 +01:00
Arne Morten Kvarving
fcf113509e remove unnecessary parameters 
these are class members. no need to pass them as parameters
 2020-01-21 11:32:57 +01:00
Arne Morten Kvarving
064930de95 EclMaterialLawManager: reorganize to better separate deck and deck-independent code 
in the process some of the config vars are moved to members
 2020-01-21 11:32:56 +01:00
Arne Morten Kvarving
5cfd584e89 changed: put the phase active status in member vars 
and chase the deck usages it eliminates. to prepare for
parallel setup without deck access
 2020-01-21 11:32:14 +01:00
Bård Skaflestad
fe5760beb4 Merge pull request #383 from akva2/add_blackoil_serialization 
Add serialization support for BlackoilFluidSystem
 2020-01-21 10:41:32 +01:00
Arne Morten Kvarving
20b5f5f4bf changed: store stone etas in a member 
thus we avoid deck usage in initThreePhaseParams_
 2020-01-20 14:59:59 +01:00
Arne Morten Kvarving
44d81819f6 add serialization support for BlackoilFluidSystem 2020-01-20 11:16:19 +01:00
Arne Morten Kvarving
e2841d943c use std::array instead of C array 
motivation: simpler serialization
 2020-01-20 11:16:14 +01:00
Joakim Hove
429d008eb6 Remove #include GridProperty.hpp 2020-01-20 08:42:00 +01:00
Joakim Hove
ce989e6a64 Use FieldPropsManager unconditionally 2020-01-11 07:01:07 +01:00
Tor Harald Sandve
fdfe8cbbb2 allow constructing ConstCompressibilityBrinePvt from data 
also add accessors and equality operator
    and adapt multiplexer to brine
 2020-01-09 11:04:18 +01:00
Trine S. Mykkeltvedt
36eda7f17e renamed saltwater-->brine and fixed other things commented in review 2020-01-07 09:30:08 +01:00
Trine S. Mykkeltvedt
1841b05b16 implemented simple salt/brine option 2020-01-07 09:30:08 +01:00
Arne Morten Kvarving
4606f7e752 allow constructing WaterPvtThermal from data 
also add accessors, assignment operator and equality operator
 2019-12-19 14:21:40 +01:00
Arne Morten Kvarving
c1b55c4364 allow constructing WaterPvtMultiplexer from data 
also add accessors, assignment operator and equality operator
 2019-12-19 14:19:40 +01:00
Arne Morten Kvarving
125ab46c71 allow constructing ConstCompressibilityWaterPvt from data 
also add accessors and equality operator
 2019-12-19 14:19:01 +01:00
Arne Morten Kvarving
9966756ef1 allow constructing OilPvtThermal from data 
also add accessors and equality operator
 2019-12-19 14:18:01 +01:00
Arne Morten Kvarving
0d53ec6e3f allow constructing OilPvtMultiplexer from data 
also add accessors, assignment operator and equality operator
 2019-12-19 14:14:58 +01:00
Arne Morten Kvarving
788ec7eb6a allow constructing LiveOilPvt from data 
also add accessors and equality operator
 2019-12-19 14:14:58 +01:00
Arne Morten Kvarving
b3b22c8021 allow constructing DeadOilPvt from data 
also add accessors and equality operator
 2019-12-19 14:14:13 +01:00
Arne Morten Kvarving
d21edaff6a allow constructing ConstCompressOilPvt from data 
also add accessors and equality operator
 2019-12-19 14:12:08 +01:00
Bård Skaflestad
d63c127d52 Merge pull request #378 from akva2/noecl_flush 
Serialization preparation
 2019-12-19 13:57:58 +01:00
Arne Morten Kvarving
e9e495295a allow constructing GasPvtThermal from data 
also add accessors, assignment operator and equality operator
 2019-12-19 12:02:40 +01:00
Arne Morten Kvarving
bd03a9a30e allow constructing GasPvtMultiplexer from data 
also add accessors, assignment operator and equality operator
 2019-12-19 12:02:40 +01:00
Arne Morten Kvarving
a23f6998ea allow constructing WetGasPvt from data 
also add accessors and equality operator
 2019-12-19 10:57:03 +01:00
Arne Morten Kvarving
059c6b58aa add accessors and equality operator to Uniform(X)Tabulated2DFunction 2019-12-19 10:45:05 +01:00
Arne Morten Kvarving
0a73e4531e allow DryGasPvt to be constructed from variables 
also add accesors and equality operator
 2019-12-19 10:33:20 +01:00
Arne Morten Kvarving
52d310760b add accessors and equality operator to IntervalTabulated2DFunction 2019-12-19 10:32:47 +01:00
Arne Morten Kvarving
5757ccd237 allow SolventPvt to be constructed from variables 
also add accesors and equality operator
 2019-12-19 10:29:05 +01:00
Arne Morten Kvarving
5a23d7ffca add accessors and equality operator to Tabulated1DFunction 2019-12-19 10:27:50 +01:00
Joakim Hove
2740e89b13 Use std::vector<T> and check for .empty() instead of pointer 2019-12-18 15:26:08 +01:00
Joakim Hove
a9d70c223c Default initialize thermal keywords with numerical 0 2019-12-16 09:13:12 +01:00
Joakim Hove
0448e902b4 Use get_global for thermal properties 2019-12-16 08:32:23 +01:00
Joakim Hove
751f3b5091 Use temporary global properties when accessing FieldPropsManager 2019-12-14 12:53:03 +01:00
Joakim Hove
7feb96014c FieldPropsManager in EclThermal 2019-12-07 09:57:48 +01:00
Joakim Hove
6b21e51fa2 Enable FieldPropsManager in EclEpsGridProperties 2019-12-07 09:57:48 +01:00
Joakim Hove
9c3763d02f Remove unused function 2019-12-05 19:49:58 +01:00
Joakim Hove
7fc692ec62 Move variable into correct #ifdef block 2019-12-05 19:36:35 +01:00
Joakim Hove
4792cc63ec Enable FieldPropsManager in EclEpsConfig 2019-12-05 19:35:06 +01:00
Joakim Hove
6f047e4360 Moved code-lines around to prepare for FieldPropsManager 2019-12-05 19:33:02 +01:00
Joakim Hove
8c2c7d2fdc Enable 3DProps testing for thermal properties 2019-11-28 16:58:13 +01:00
Joakim Hove
c6a2017e8d Grouping lines of code 2019-11-28 16:52:47 +01:00
Joakim Hove
2ac41b75ca Use FieldPropsManager to get SATNUM vector 2019-11-27 17:55:29 +01:00
Joakim Hove
da16a4ef42 Extract creation of EclEpsGridProperties out of loop 2019-11-27 15:07:40 +01:00
Joakim Hove
c991993d7f Store and use only active cells in EclEpsGridProperties 2019-11-26 19:38:31 +01:00
Joakim Hove
0f04b8ef69 Wrap all EclEpsGridProperties members behind public get 2019-11-21 11:32:49 +01:00
Joakim Hove
c97d39cb35 Use constructor for EclEpsGridProperties 2019-11-21 11:32:49 +01:00