OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 12:10:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do minor cleanup in SimWellFractureAtPos Feature

Browse Source
This commit is contained in:
Jacob Støren 2017-06-20 10:17:23 +02:00
parent a91a4d2285
commit 551a3015ed
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/Commands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -63,14 +63,9 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
}
RimEclipseWell* simWell = simWellItem->m_simWell;
caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(simWell);
if (!objHandle) return;
if (!simWell) return;
RimEclipseWell* simWellObject = nullptr;
objHandle->firstAncestorOrThisOfType(simWellObject);
if (!simWellObject) return;
RimSimWellFractureCollection* fractureCollection = simWellObject->simwellFractureCollection();
RimSimWellFractureCollection* fractureCollection = simWell->simwellFractureCollection();
if (!fractureCollection) return;
RimSimWellFracture* fracture = new RimSimWellFracture();
@ -79,7 +74,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
fracture->setClosestWellCoord(simWellItem->m_domainCoord, simWellItem->m_branchIndex);
RimOilField* oilfield = nullptr;
objHandle->firstAncestorOrThisOfType(oilfield);
simWell->firstAncestorOrThisOfType(oilfield);
if (!oilfield) return;
std::vector<RimFracture* > oldFractures;
@ -89,7 +84,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
fracture->setName(QString("Fracture_") + fracNum);
RimEclipseResultCase* eclipseCase = nullptr;
objHandle->firstAncestorOrThisOfType(eclipseCase);
simWell->firstAncestorOrThisOfType(eclipseCase);
RigEclipseCaseData::UnitsType caseUnit = eclipseCase->eclipseCaseData()->unitsType();
if (caseUnit == RigEclipseCaseData::UNITS_METRIC) fracture->fractureUnit = RiaEclipseUnitTools::UNITS_METRIC;
else if (caseUnit == RigEclipseCaseData::UNITS_FIELD) fracture->fractureUnit = RiaEclipseUnitTools::UNITS_FIELD;
@ -100,7 +95,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
fracture->setFractureTemplate(fracDef);
}
simWellObject->updateConnectedEditors();
simWell->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fracture);
activeView->scheduleCreateDisplayModelAndRedraw();

3
ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
View File

@ -306,7 +306,8 @@ void RimSimWellFracture::setBranchGeometry()
std::vector< std::vector <cvf::Vec3d> > pipeBranchesCLCoords;
std::vector< std::vector <RigWellResultPoint> > pipeBranchesCellIds;
rimWell->calculateWellPipeStaticCenterLine(pipeBranchesCLCoords, pipeBranchesCellIds);
rimWell->calculateWellPipeStaticCenterLine(pipeBranchesCLCoords,
pipeBranchesCellIds);
for (const auto& branch : pipeBranchesCLCoords)
{