Commit Graph

1101 Commits

Author SHA1 Message Date
Trine S. Mykkeltvedt
1841b05b16 implemented simple salt/brine option 2020-01-07 09:30:08 +01:00
Bård Skaflestad
8d5d8ad26c Merge pull request #379 from akva2/noecl_flush
More serialization preparation
2019-12-19 17:42:13 +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
Joakim Hove
477360ca75 Merge pull request #377 from joakim-hove/use-vector-value
Use std::vector<T> and check for .empty() instead of pointer
2019-12-19 10:53:54 +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
f85e9754a3 Merge pull request #376 from joakim-hove/thermal-cond
Thermal cond
2019-12-16 12:10:43 +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
a668794a3b Merge pull request #375 from joakim-hove/only-active-cells
Use temporary global properties when accesing FieldPropsManager
2019-12-14 15:13:36 +01:00
Joakim Hove
751f3b5091 Use temporary global properties when accessing FieldPropsManager 2019-12-14 12:53:03 +01:00
Joakim Hove
ce0f902777 Merge pull request #374 from akva2/janitoring
remove unused variable
2019-12-07 13:36:36 +01:00
Joakim Hove
4b3b64c88c Merge pull request #373 from joakim-hove/ecleps-config-fp
Ecleps config fp
2019-12-07 12:08:02 +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
Arne Morten Kvarving
0445dc3ddb remove unused variable 2019-12-06 23:35:12 +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
2282e439e2 Merge pull request #370 from joakim-hove/fp-double
Fp double
2019-11-29 16:53:33 +01:00
Joakim Hove
95b514f660 Merge pull request #371 from joakim-hove/add-PORO
Add PORO to testdata
2019-11-29 12:46:51 +01:00
Joakim Hove
ba798c5c22 Add PORO to testdata 2019-11-29 11:19:04 +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
Tor Harald Sandve
f6beba2caa Merge pull request #369 from joakim-hove/use-fp
Use FieldPropsManager to get SATNUM vector
2019-11-28 09:07:55 +01:00
Joakim Hove
2ac41b75ca Use FieldPropsManager to get SATNUM vector 2019-11-27 17:55:29 +01:00
Joakim Hove
589e55d30d Merge pull request #368 from joakim-hove/pull-out-of-loop
Extract creation of EclEpsGridProperties out of loop
2019-11-27 17:02:15 +01:00
Joakim Hove
da16a4ef42 Extract creation of EclEpsGridProperties out of loop 2019-11-27 15:07:40 +01:00
Joakim Hove
1427042583 Merge pull request #365 from joakim-hove/use-active-vectors
Use active vectors
2019-11-26 20:46:24 +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
Joakim Hove
d8db34f3f7 Extract EclEpsGridProperties class to separate file 2019-11-21 11:32:49 +01:00
Joakim Hove
343f2faa52 Merge pull request #360 from joakim-hove/deckitem-size-rename
Rename DeckItem::size -> DeckItem::data_size
2019-11-19 20:39:54 +01:00