Arne Morten Kvarving
2c270cb4f3
changed: lessen deck usage setting up BlackoilFluidSystem
2020-03-03 15:56:33 +01:00
Arne Morten Kvarving
7f749723e5
Merge pull request #406 from akva2/sdensity_from_manager
...
changed: use solvent density from table manager
2020-02-27 13:37:36 +01:00
Arne Morten Kvarving
b76a809e04
changed: lessen deck usage in pvt setup
2020-02-26 15:33:08 +01:00
Arne Morten Kvarving
988f1b9577
changed: use solvent density from table manager
2020-02-26 13:31:29 +01:00
Joakim Hove
86e12ae598
Merge pull request #404 from joakim-hove/use-DenT
...
Use dent
2020-02-26 09:56:09 +01:00
Arne Morten Kvarving
2ba7c31e5a
fixed: wrong indices setting up HeatCr
2020-02-25 14:38:04 +01:00
Joakim Hove
1bbc8f2315
Use Tables::gas_comp_index()
2020-02-25 08:03:17 +01:00
Joakim Hove
de9dd579b6
Use DenT instances for temperature dependent density
2020-02-25 06:49:56 +01:00
Bård Skaflestad
d4ee80c358
Merge pull request #403 from akva2/avoid_deck_usage
...
changed: void more deck usage setting up pvt classes
2020-02-24 11:09:34 -06:00
Bård Skaflestad
14286eca07
Merge pull request #402 from akva2/use_array
...
changed: use std::array instead of C arrays
2020-02-24 08:16:24 -06:00
Arne Morten Kvarving
723c619b5e
changed: void more deck usage setting up pvt classes
2020-02-24 13:41:48 +01:00
Arne Morten Kvarving
2f838a4268
Merge pull request #391 from akva2/noecl_avoid_global
...
changed: avoid allocating long vectors of zeros
2020-02-24 13:13:27 +01:00
Arne Morten Kvarving
aa0725e519
changed: use std::array instead of C arrays
2020-02-24 09:56:03 +01:00
Tor Harald Sandve
517ce64f58
Merge pull request #392 from akva2/cleanup_brine
...
some cleanups in ConstantCompressibilityBrinePvt
2020-02-17 14:13:55 +01:00
Atgeirr Flø Rasmussen
6dfe5c7ac9
Silence unused variable warning.
2020-02-13 09:18:01 +01:00
Arne Morten Kvarving
5f36812707
get rid of deck usage setting up GasPvtMultiplexer
2020-02-07 10:11:44 +01:00
Arne Morten Kvarving
6524ed889a
use PvtwTable from TableManager setting up ConstantCompressibilityWaterPvt
2020-02-07 10:11:44 +01:00
Arne Morten Kvarving
6d8f5f50bf
changed: use PVCDO from TableManager setting up ConstantCompressibilityOilPvt
2020-02-07 10:11:44 +01:00
Arne Morten Kvarving
ed99a1df1a
changed: avoid using DENSITY from deck in Pvt classes
2020-02-06 12:12:09 +01:00
Arne Morten Kvarving
9a7eac1874
some cleanups in ConstantCompressibilityBrinePvt
2020-02-06 10:33:00 +01:00
Arne Morten Kvarving
1c71722179
changed: avoid allocating long vectors of zeros
2020-01-29 16:45:12 +01:00
Arne Morten Kvarving
75c9726d96
remove unused parameters from private member functions
...
they can be re-added if they are needed. keep it simple
2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
8909d471e8
disable assert
...
this triggers while running a thermal deck (SPE1CASE2_THERMAL),
but there is no apparent reason why it is an error.
2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
370923a186
fix operators after brine addition
2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
328bb9c427
add missing initializers
...
does not really do harm, but quells warnings from valgrind
when serializing the class
2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
81ccf49424
changed: rename initFromDeck to initParamsForElements
...
there is no deck dependent code now
2020-01-29 08:48:39 +01:00
Arne Morten Kvarving
e96c7d9cbc
changed: check for SPECROCK in tables instead of checking deck for keyword
2020-01-29 08:42:16 +01:00
Arne Morten Kvarving
1cd88d27d7
don't use templated get and has interface from fieldpropsmanager
...
it is now private
2020-01-27 15:32:32 +01:00
Bård Skaflestad
2f827bfae5
Don't Index Out of Bounds
...
The phaseIsActive_ array has size numPhases. We must not form the
expression phaseIsActive_[numPhases]. Switch to using fill_n in
place of fill lest we have to write
fill(&phaseIsActive_[0], &phaseIsActive_[0] + numPhases, v)
2020-01-24 20:44:26 +01:00
Arne Morten Kvarving
73b9e32d88
add mpi serialization for EclMaterialLawManager
2020-01-22 11:26:45 +01:00
Arne Morten Kvarving
ee17c70ade
add mpi serialization for EclHysteresisConfig
2020-01-22 11:26:45 +01:00
Arne Morten Kvarving
e58d8675ee
add serialization support for EclEpsConfig
2020-01-22 11:26:45 +01:00
Arne Morten Kvarving
908b2d1aa6
add equality operator to EclEpsScalingPointsInfo
2020-01-22 11:26:45 +01:00
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