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

#2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-26 20:54:45 +01:00
parent 2b368fb0b8
commit 72b5f540e5
33 changed files with 16 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -93,11 +93,9 @@
#include "RiuWellAllocationPlot.h"
#include "RiuFlowCharacteristicsPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h"
#include "RimWellPathFracture.h"
#include "RimStimPlanColors.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RicImportInputEclipseCaseFeature.h"
@@ -511,8 +509,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
rimObservedData->updateMetaData();
}
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
oilField->fractureDefinitionCollection()->loadAndUpdateData();
oilField->fractureDefinitionCollection()->setDefaultConductivityResultIfEmpty();
@@ -526,7 +522,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
fracture->loadDataAndUpdate();
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}
@@ -572,7 +567,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
viewProgress.setProgressDescription(riv->name());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (m_project->isProjectFileVersionEqualOrOlderThan("2018.1.0.103"))
{
std::vector<RimStimPlanColors*> stimPlanColors;
@@ -582,7 +576,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
stimPlanColors[0]->updateConductivityResultName();
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
riv->loadDataAndUpdate();
this->setActiveReservoirView(riv);