OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed asserts and simplified code

Browse Source
This commit is contained in:
Magne Sjaastad 2014-08-09 14:45:21 +02:00
parent a9794815c7
commit faff8dd380
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp
View File

@ -34,12 +34,9 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCa
size_t timeStepIndex, size_t timeStepIndex,
QString& uiResultName) QString& uiResultName)
{ {
CVF_ASSERT(gridIndex < eclipseCase->gridCount()); if (!eclipseCase) return NULL;
CVF_ASSERT(eclipseCase);
CVF_ASSERT(eclipseCase->results(porosityModel));
CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
if (!eclipseCase || !eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel)) if (!eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
{ {
return NULL; return NULL;
} }
@ -58,14 +55,9 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCa
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t scalarResultIndex) size_t timeStepIndex, size_t scalarResultIndex)
{ {
CVF_ASSERT(gridIndex < eclipseCase->gridCount()); if (!eclipseCase) return NULL;
CVF_ASSERT(eclipseCase);
CVF_ASSERT(eclipseCase->results(porosityModel));
CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
RigGridBase* grid = eclipseCase->grid(gridIndex); if (!eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
if (!eclipseCase || !eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
{ {
return NULL; return NULL;
} }
@ -75,6 +67,12 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCa
return NULL; return NULL;
} }
RigGridBase* grid = eclipseCase->grid(gridIndex);
if (!grid)
{
return NULL;
}
std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(scalarResultIndex); std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(scalarResultIndex);
if (timeStepIndex >= scalarSetResults.size()) if (timeStepIndex >= scalarSetResults.size())