From e2f2cf4f24ee9396bb27df0481ccad4220d79d92 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sat, 9 Aug 2014 14:45:21 +0200
Subject: [PATCH] Removed asserts and simplified code

---
 .../RigResultModifierFactory.cpp              | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp
index 80efe51c5a..8d04aa6bcf 100644
--- a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp
@@ -34,12 +34,9 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCa
     size_t timeStepIndex,
     QString& uiResultName)
 {
-    CVF_ASSERT(gridIndex < eclipseCase->gridCount());
-    CVF_ASSERT(eclipseCase);
-    CVF_ASSERT(eclipseCase->results(porosityModel));
-    CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
+	if (!eclipseCase) return NULL;
 
-    if (!eclipseCase || !eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
+    if (!eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
     {
         return NULL;
     }
@@ -58,23 +55,24 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCa
     RifReaderInterface::PorosityModelResultType porosityModel,
     size_t timeStepIndex, size_t scalarResultIndex)
 {
-    CVF_ASSERT(gridIndex < eclipseCase->gridCount());
-    CVF_ASSERT(eclipseCase);
-    CVF_ASSERT(eclipseCase->results(porosityModel));
-    CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
+	if (!eclipseCase) return NULL;
 
-    RigGridBase* grid = eclipseCase->grid(gridIndex);
-
-    if (!eclipseCase || !eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
-    {
-        return NULL;
-    }
+	if (!eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
+	{
+		return NULL;
+	}
 
     if (scalarResultIndex == cvf::UNDEFINED_SIZE_T)
     {
         return NULL;
     }
 
+    RigGridBase* grid = eclipseCase->grid(gridIndex);
+	if (!grid)
+	{
+		return NULL;
+	}
+
     std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(scalarResultIndex);
 
     if (timeStepIndex >= scalarSetResults.size())