Avoid crash on opening of input eclipse case without grid and log error

This commit is contained in:
Rebecca Cox
2017-10-19 11:37:17 +02:00
parent 7c0c45b7b9
commit 66af820acd
3 changed files with 14 additions and 7 deletions

View File

@@ -20,6 +20,7 @@
#include "RicImportInputEclipseCaseFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaPorosityModel.h"
#include "RimEclipseCaseCollection.h"
@@ -50,10 +51,15 @@ bool RicImportInputEclipseCaseFeature::openInputEclipseCaseFromFileNames(const Q
project->assignCaseIdToCase(rimInputReservoir);
rimInputReservoir->openDataFileSet(fileNames);
bool gridImportSuccess = rimInputReservoir->openDataFileSet(fileNames);
if (!gridImportSuccess)
{
RiaLogging::error("Failed to import grid");
return false;
}
RimEclipseCaseCollection* analysisModels = project->activeOilField() ? project->activeOilField()->analysisModels() : NULL;
if (analysisModels == NULL) return false;
RimEclipseCaseCollection* analysisModels = project->activeOilField() ? project->activeOilField()->analysisModels() : nullptr;
if (analysisModels == nullptr) return false;
analysisModels->cases.push_back(rimInputReservoir);