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

#2561 Fracture Template : Set Default Conductivity Result in loadDataAndUpdate()

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-06 08:16:39 +01:00
parent 0bf72d5f68
commit cbb25cb514
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Application/RiaApplication.cpp
View File

@ -512,7 +512,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
oilField->fractureDefinitionCollection()->loadAndUpdateData(); oilField->fractureDefinitionCollection()->loadAndUpdateData();
oilField->fractureDefinitionCollection()->createAndAssignTemplateCopyForNonMatchingUnit(); oilField->fractureDefinitionCollection()->createAndAssignTemplateCopyForNonMatchingUnit();
oilField->fractureDefinitionCollection()->setDefaultConductivityResultIfEmpty();
{ {
std::vector<RimWellPathFracture*> wellPathFractures; std::vector<RimWellPathFracture*> wellPathFractures;

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

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

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

@ -50,7 +50,6 @@ public:
void createAndAssignTemplateCopyForNonMatchingUnit(); void createAndAssignTemplateCopyForNonMatchingUnit();
void loadAndUpdateData(); void loadAndUpdateData();
void setDefaultConductivityResultIfEmpty();
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath); void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
protected: protected:

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

@ -250,6 +250,8 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
if (m_stimPlanFractureDefinitionData.notNull()) if (m_stimPlanFractureDefinitionData.notNull())
{ {
setDefaultConductivityResultIfEmpty();
if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_UNKNOWN) if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_UNKNOWN)
{ {
setFractureTemplateUnit(m_stimPlanFractureDefinitionData->unitSet()); setFractureTemplateUnit(m_stimPlanFractureDefinitionData->unitSet());

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

@ -86,7 +86,6 @@ public:
PosNegAccumulator& posNegAccumulator) const override; PosNegAccumulator& posNegAccumulator) const override;
QString mapUiResultNameToFileResultName(const QString& uiResultName) const; QString mapUiResultNameToFileResultName(const QString& uiResultName) const;
void setDefaultConductivityResultIfEmpty();
bool showStimPlanMesh() const; bool showStimPlanMesh() const;
@ -103,6 +102,7 @@ protected:
virtual bool supportsConductivityScaling() const override { return true; } virtual bool supportsConductivityScaling() const override { return true; }
private: private:
void setDefaultConductivityResultIfEmpty();
bool setBorderPolygonResultNameToDefault(); bool setBorderPolygonResultNameToDefault();
void setDepthOfWellPathAtFracture(); void setDepthOfWellPathAtFracture();
void setPerforationLength(); void setPerforationLength();