opm-core/opm/core
Atgeirr Flø Rasmussen 064d408b20 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
..
eclipse Added TOPS keyword to deck parser. 2012-08-09 14:24:08 +02:00
fluid Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 13:34:30 +02:00
grid Add parentheses to c1 assignment for consistency. 2012-08-21 15:15:40 +02:00
linalg Restore original method spacing. 2012-08-14 11:26:07 +02:00
pressure Merge remote-tracking branch 'atgeirr/master' 2012-08-27 13:32:55 +02:00
simulator Merge remote-tracking branch 'upstream/master' 2012-08-24 13:31:05 +02:00
transport Corrected comment. 2012-08-28 13:12:54 +02:00
utility Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 13:34:30 +02:00
vag_format Added necessary include, suppressed a warning. 2012-06-13 10:59:48 +02:00
wells Prune an unused header. 2012-06-19 09:34:34 +02:00
doxygen_main.hpp Added skeleton doxygen_main.hpp for overview documentation. 2012-06-05 15:20:13 +02:00
grid.c Restore coding conventions. 2012-08-14 10:44:17 +02:00
grid.h Refine description of allocate_grid() return value. 2012-06-11 18:52:44 +02:00
GridAdapter.hpp Fallout from removal of grid_t typedef. 2012-02-01 20:29:05 +01:00
GridManager.cpp Require DIMENS or SPECGRID also for DXV, DYZ etc. grid specs. 2012-08-24 08:19:24 +02:00
GridManager.hpp Whitespace cleanup. 2012-08-09 14:48:44 +02:00
newwells.c Add support for storing well names in "Wells" structure. 2012-06-18 10:15:53 +02:00
newwells.h Document add_well()s "name" parameter. 2012-06-18 10:18:14 +02:00
well.h Document the obsolescent well representation. 2012-06-25 00:55:50 +02:00