fixing compilation and running after rebasing.

This commit is contained in:
Kai Bao
2015-10-06 13:24:34 +02:00
parent ca5dd0dca4
commit 09f8da0324
2 changed files with 80 additions and 58 deletions

View File

@@ -134,6 +134,8 @@ namespace Opm {
ReservoirState& reservoir_state,
WellState& well_state);
using Base::numPhases;
using Base::numMaterials;
using Base::materialName;
protected:
/*