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 |
|
Joakim Hove
|
c68202eada
|
Merge pull request #382 from joakim-hove/remove-eclipse3d
Remove #include GridProperty.hpp
|
2020-01-20 11:35:14 +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
|
028e53e7d7
|
Merge pull request #380 from joakim-hove/only-active-cells
Use FieldProps implementation for 3D properties
|
2020-01-13 15:47:22 +01:00 |
|
Joakim Hove
|
ce989e6a64
|
Use FieldPropsManager unconditionally
|
2020-01-11 07:01:07 +01:00 |
|
Joakim Hove
|
a2d728724d
|
Merge pull request #381 from totto82/trinemykk-smartwater
Trinemykk smartwater
|
2020-01-11 06:50:36 +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 |
|
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 |
|