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

#2441: Fracture Colors : Make sure conductivity result is set on template for old project files

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-01 15:37:05 +01:00
parent c5333d09b2
commit a4eb16883b
7 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Application/RiaApplication.cpp
View File

@ -96,6 +96,7 @@
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h"
#include "RimWellPathFracture.h"
#include "RimStimPlanColors.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
@ -512,7 +513,9 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
}
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
oilField->fractureDefinitionCollection()->loadAndUpdateData();
oilField->fractureDefinitionCollection()->setDefaultConductivityResultIfEmpty();
{
std::vector<RimWellPathFracture*> wellPathFractures;
@ -543,6 +546,7 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
}
// Now load the ReservoirViews for the cases
// Add all "native" cases in the project
std::vector<RimCase*> casesToLoad;
@ -568,6 +572,18 @@ 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;
riv->descendantsIncludingThisOfType(stimPlanColors);
if (stimPlanColors.size() == 1)
{
stimPlanColors[0]->updateConductivityResultName();
}
}
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
riv->loadDataAndUpdate();
this->setActiveReservoirView(riv);

15
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
View File

@ -125,6 +125,21 @@ void RimFractureTemplateCollection::loadAndUpdateData()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFractureTemplateCollection::setDefaultConductivityResultIfEmpty()
{
for (RimFractureTemplate* f : fractureDefinitions())
{
RimStimPlanFractureTemplate* stimPlanFracture = dynamic_cast<RimStimPlanFractureTemplate*>(f);
if (stimPlanFracture)
{
stimPlanFracture->setDefaultConductivityResultIfEmpty();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
View File

@ -46,6 +46,7 @@ public:
void deleteFractureDefinitions();
void loadAndUpdateData();
void setDefaultConductivityResultIfEmpty();
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
};

14
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@ -397,6 +397,20 @@ QString RimStimPlanFractureTemplate::getUnitForStimPlanParameter(QString paramet
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimStimPlanFractureTemplate::setDefaultConductivityResultIfEmpty()
{
if (m_conductivityResultNameOnFile().isEmpty())
{
if (!m_stimPlanFractureDefinitionData->conductivityResultNames().isEmpty())
{
m_conductivityResultNameOnFile = m_stimPlanFractureDefinitionData->conductivityResultNames().front();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@ -86,6 +86,7 @@ public:
PosNegAccumulator& posNegAccumulator) const override;
QString mapUiResultNameToFileResultName(const QString& uiResultName) const;
void setDefaultConductivityResultIfEmpty();
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;

22
ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp
View File

@ -313,6 +313,28 @@ void RimStimPlanColors::updateStimPlanTemplates() const
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimStimPlanColors::updateConductivityResultName()
{
// Conductivity result name as reported from the XML file was moved to the fracture template
// Replace all conductivity names with the one and only conductivity uiName reported from by fracture template
if (m_resultNameAndUnit().contains("conductivity", Qt::CaseInsensitive))
{
RimFractureTemplateCollection* fractureTemplates = fractureTemplateCollection();
for (auto resultNameAndUnit : fractureTemplates->stimPlanResultNamesAndUnits())
{
if (resultNameAndUnit.first.contains("conductivity", Qt::CaseInsensitive))
{
QString resultNameAndUnitString = toString(resultNameAndUnit);
m_resultNameAndUnit = resultNameAndUnitString;
}
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimStimPlanColors.h
View File

@ -67,6 +67,8 @@ public:
void updateStimPlanTemplates() const;
StimPlanResultColorType stimPlanResultColorType() const { return m_stimPlanCellVizMode(); };
void updateConductivityResultName();
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;