OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 13:33:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
f68c289e9d
opm-simulators/opm/core/fluid
History
Atgeirr Flø Rasmussen f68c289e9d Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
2012-09-04 13:34:30 +02:00
..
blackoil Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
BlackoilPropertiesBasic.cpp Added satRange() method to BlackoilPropertiesInterface. 2012-05-15 12:48:16 +02:00
BlackoilPropertiesBasic.hpp Added satRange() method to BlackoilPropertiesInterface. 2012-05-15 12:48:16 +02:00
BlackoilPropertiesFromDeck.cpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 13:34:30 +02:00
BlackoilPropertiesFromDeck.hpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 13:34:30 +02:00
BlackoilPropertiesInterface.hpp Added satRange() method to BlackoilPropertiesInterface. 2012-05-15 12:48:16 +02:00
IncompPropertiesBasic.cpp Added surfaceDensity() method to IncompPropertiesInterface. 2012-05-14 11:21:13 +02:00
IncompPropertiesBasic.hpp Reindent. 2012-06-12 15:22:23 +02:00
IncompPropertiesFromDeck.cpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
IncompPropertiesFromDeck.hpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
IncompPropertiesInterface.hpp Added surfaceDensity() method to IncompPropertiesInterface. 2012-05-14 11:21:13 +02:00
PvtPropertiesBasic.cpp Make constructor take arguments by reference. Silence a warning. 2012-04-19 11:47:41 +02:00
PvtPropertiesBasic.hpp Make constructor take arguments by reference. Silence a warning. 2012-04-19 11:47:41 +02:00
PvtPropertiesIncompFromDeck.cpp Accounting for (constant) formation volume factor in incompressible fluids. 2012-04-20 14:00:38 +02:00
PvtPropertiesIncompFromDeck.hpp Accounting for (constant) formation volume factor in incompressible fluids. 2012-04-20 14:00:38 +02:00
RockBasic.hpp Added RockBasic class. 2012-01-17 09:31:25 +01:00
RockCompressibility.cpp Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
RockCompressibility.hpp Fixed const correctness issue in RockCompressibility class. 2012-03-20 10:29:43 +01:00
RockFromDeck.cpp Removed unneeded function numGlobalCells(). 2012-08-24 08:18:59 +02:00
RockFromDeck.hpp Constructors of *FromDeck classes now take an UnstructuredGrid. 2012-08-10 10:12:45 +02:00
SaturationPropsBasic.cpp Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
SaturationPropsBasic.hpp Added setup functions which take arguments directly (do not use ParamterGroup) 2012-04-16 17:53:10 +02:00
SaturationPropsFromDeck_impl.hpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
SaturationPropsFromDeck.hpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
SaturationPropsInterface.hpp Enable choice of spline-smoothed saturation props (or not). 2012-08-27 17:56:01 +02:00