Commit Graph

1077 Commits

Author SHA1 Message Date
Arne Morten Kvarving
c85243314b get rid of deck usage setting up EclEpsScalingPointsInfo 2020-03-09 10:28:02 +01:00
Arne Morten Kvarving
477f2cd425 get rid of deck usage setting up EclEpsConfig 2020-03-09 10:28:02 +01:00
Arne Morten Kvarving
8d07bef17c get rid of deck usage setting up three phase options 2020-03-09 10:10:32 +01:00
Arne Morten Kvarving
e0a43d7973 use hysteresis config from state 2020-03-09 09:33:08 +01:00
Arne Morten Kvarving
5f2d7c6308 use STONE1EX from table manager 2020-03-06 12:17:21 +01:00
Bård Skaflestad
861a6ad4b4 Merge pull request #411 from akva2/no_serialization_fluidsystem
Get rid of deck usage in BlackoilFluidSystem
2020-03-03 21:27:04 -06:00
Arne Morten Kvarving
36d9df1876 drop serialization templates for BlackoilFluidSystem 2020-03-03 15:57:58 +01:00
Arne Morten Kvarving
51d644b96c changed: get rid of last deck usage in BlackoilFluidSystem
rename initFromDeck to initFromState. Pass the Schedule instead
of the deck.
2020-03-03 15:57:58 +01:00
Arne Morten Kvarving
43232d878f Merge pull request #409 from akva2/less_deck_blackoil_fluid_system
changed: lessen deck usage setting up BlackoilFluidSystem
2020-03-03 15:57:05 +01:00
Arne Morten Kvarving
2c270cb4f3 changed: lessen deck usage setting up BlackoilFluidSystem 2020-03-03 15:56:33 +01:00
Arne Morten Kvarving
24e84ad2e5 Merge pull request #410 from akva2/use_state_surface_conditions
use surface conditions from InitConfig
2020-03-03 13:46:14 +01:00
Arne Morten Kvarving
3dc71ffb5b use standard conditions from EclipseState 2020-03-03 12:03:48 +01:00
Markus Blatt
fb803f1fec Merge pull request #408 from akva2/use_compressed_props
Use compressed field properties
2020-03-02 09:46:16 +01:00
Arne Morten Kvarving
ac9207cba1 use compressed field properties in EclThermalLawManager 2020-02-28 13:07:03 +01:00
Arne Morten Kvarving
efdb6a4dfc use compressed field properties in EclMaterialLawManager 2020-02-28 13:07:03 +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
Bård Skaflestad
cecce4ddd2 Merge pull request #407 from akva2/less_deck_usage
changed: lessen deck usage in pvt setup
2020-02-26 09:48:45 -06: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
Bård Skaflestad
29b46efea8 Merge pull request #405 from akva2/fix_heatcr_indices
fixed: wrong indices setting up HeatCr
2020-02-25 08:57:16 -06: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
89dd68d1e7 Merge pull request #398 from atgeirr/fix-warning
Silence unused variable warning.
2020-02-13 12:59:10 +01:00
Atgeirr Flø Rasmussen
6dfe5c7ac9 Silence unused variable warning. 2020-02-13 09:18:01 +01:00
Atgeirr Flø Rasmussen
ee5011a61d Merge pull request #397 from akva2/use_numeric_limits
fixed: use std::numeric_limits<Scalar> in one more spot
2020-02-11 08:06:13 +01:00
Arne Morten Kvarving
0668699179 fixed: use std::numeric_limits<Scalar> in one more spot 2020-02-10 15:57:25 +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
c681d0a402 Merge pull request #393 from akva2/no_density_kw
changed: avoid using DENSITY from deck in Pvt classes
2020-02-06 18:14:39 +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
Bård Skaflestad
ff5c8eea84 Merge pull request #390 from akva2/thermal_fixes
Thermal fixes
2020-01-29 13:26:36 +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
31d5347d73 Merge pull request #389 from akva2/hide_fprops_ifaces
don't use templated get and has interface from fieldpropsmanager
2020-01-28 15:34:02 +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