Merge branch 'dev' into pre-proto

This commit is contained in:
Bjørnar Grip Fjær
2017-06-20 13:26:52 +02:00
47 changed files with 1460 additions and 395 deletions

View File

@@ -1568,7 +1568,7 @@ double RimReservoirCellResultsStorage::darchysValue()
if (rimCase && rimCase->eclipseCaseData())
{
darchy = rimCase->eclipseCaseData()->darchysValue();
darchy = RiaEclipseUnitTools::darcysConstant(rimCase->eclipseCaseData()->unitsType());
}
return darchy;