OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
064d408b20
opm-core/examples
History
Atgeirr Flø Rasmussen a07d894500 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
2012-09-04 11:42:31 +02:00
..
Makefile.am Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00
refine_wells.cpp Added program refine_wells. 2012-05-24 09:18:37 +02:00
scaneclipsedeck.c Conform to C90 standard (don't mix declaration and code). 2011-12-08 16:40:43 +01:00
sim_2p_comp_reorder.cpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
sim_2p_incomp_reorder.cpp Fix pressure renormalization conditions. Some formatting fixes. 2012-08-21 14:52:43 +02:00
sim_wateroil.cpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
spu_2p.cpp Added writing of timings in param format 2012-08-21 09:57:36 +02:00
wells_example.cpp Constructors of *FromDeck classes now take an UnstructuredGrid. 2012-08-10 10:12:45 +02:00