Commit Graph

1101 Commits

Author SHA1 Message Date
Bård Skaflestad
a068071f88 Merge pull request #425 from goncalvesmachadoc/patch-3
Extrapolate GASVISCT
2020-08-22 00:12:38 +02:00
Bård Skaflestad
d846c7128a Merge pull request #424 from goncalvesmachadoc/patch-2
Extrapolate OILVISCT
2020-08-22 00:10:44 +02:00
Cintia Goncalves Machado
d4f6ed4366 Extrapolate GASVISCT
Allow for extrapolation of gas viscosity curves.
2020-08-06 17:26:14 +02:00
Cintia Goncalves Machado
2ac7f84b9f Extrapolate OILVISCT
Allow for extrapolation of oil viscosity curves
2020-08-06 17:20:58 +02:00
Bård Skaflestad
50bd881199 Merge pull request #423 from totto82/applyPVTWsalt
make the water PVT salt dependent
2020-07-08 09:28:53 +02:00
Tor Harald Sandve
74a6b98b4f fix return type getSaltConcentration 2020-07-08 08:09:26 +02:00
Tor Harald Sandve
b4c8dd5e86 make the water PVT salt dependent 2020-07-02 13:42:58 +02:00
Atgeirr Flø Rasmussen
a11b3a53b2 Merge pull request #422 from goncalvesmachadoc/patch-1
Allow for extrapolation of WATVISC curve
2020-06-26 09:55:30 +02:00
Cintia Goncalves Machado
50f0f36156 Allow for extrapolation of WATVISC curve 2020-06-25 14:25:26 +02:00
Atgeirr Flø Rasmussen
1a9c3c30ca Merge pull request #421 from atgeirr/sequential
Add total saturation and capillary pressure to blackoil fluid state.
2020-06-11 11:18:50 +02:00
hnil
efb7dce342 Add total saturation and capillary pressure to blackoil fluid state.
This is intended for use with sequential formulations.
2020-06-11 08:51:55 +02:00
Atgeirr Flø Rasmussen
1f9c136f20 Merge pull request #420 from atgeirr/add-phaseIsActive
Add phaseIsActive(unsigned int) to base fluid system (returning true).
2020-05-29 16:31:59 +02:00
Atgeirr Flø Rasmussen
b5bd0a519f Add phaseIsActive(unsigned int) to base fluid system (returning true).
This promotes the feature from being a special function for the black oil
fluid system to being in theory available for all. The need for this
arose in downstream code.
2020-05-29 14:49:59 +02:00
Joakim Hove
12161d9c79 Merge pull request #417 from bska/fix-missing-include
Grid Properties: Include FieldPropsManager
2020-04-07 11:49:41 +02:00
Bård Skaflestad
f343e605ea Grid Properties: Include FieldPropsManager
We use the manager internally (for instance in the try_get() helper
function) and therefore need a declaration in scope.
2020-04-06 17:30:19 +02:00
Joakim Hove
30cbe6ed25 Merge pull request #415 from joakim-hove/use-shared-ptr
Use std::shared_ptr for Python handle
2020-03-31 16:50:47 +02:00
Joakim Hove
68e779a827 Use std::shared_ptr for Python handle 2020-03-31 10:46:17 +02:00
Joakim Hove
0defd3de8e Merge pull request #414 from joakim-hove/add-python-arg
Add Python arg to Schedule constructor
2020-03-27 13:43:55 +01:00
Joakim Hove
b68bdea6e4 Add Python arg to Schedule constructor 2020-03-25 18:32:46 +01:00
Bård Skaflestad
778459ec84 Merge pull request #413 from akva2/followup_stonetype
use relocated KrModel
2020-03-10 07:58:17 -05:00
Arne Morten Kvarving
51e5574c07 use relocated KrModel 2020-03-10 10:40:09 +01:00
Atgeirr Flø Rasmussen
a003a21d5c Merge pull request #412 from akva2/no_serialization_matman
Get rid of deck usage setting up MaterialLawManager
2020-03-09 16:05:40 +01:00
Arne Morten Kvarving
91d4dcdf90 remove serialization templates from EclMaterialLawManager 2020-03-09 11:42:37 +01:00
Arne Morten Kvarving
a2d52da69f rename EclMaterialLawManager::initFromDeck to initFromState
no deck usage any more
2020-03-09 11:42:37 +01:00
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