Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps

This commit is contained in:
Robert K 2015-01-12 12:47:40 +01:00
commit 01fe222c2b

View File

@ -51,7 +51,7 @@ double computeWellIndex(const double radius,
const std::array<double, 3>& cubical,
const double* cell_permeability,
const double skin_factor,
const Opm::CompletionDirection::DirectionEnum direction,
const Opm::WellCompletion::DirectionEnum direction,
const double ntg);
template <int dim, class C2F, class FC>