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

#3268 MSW Fracture Export: Add allFractures and allFishbones

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-07 13:32:53 +02:00
parent 7cd6c29c9c
commit 3e10e59445
14 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
View File

@@ -65,17 +65,11 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
{
std::vector<const RimFracture*> fracturesAlongWellPath;
if (wellPath->fractureCollection()->isChecked())
for (auto& frac : wellPath->fractureCollection()->activeFractures())
{
for (auto& frac : wellPath->fractureCollection()->fractures())
{
if (frac->isChecked())
{
frac->ensureValidNonDarcyProperties();
frac->ensureValidNonDarcyProperties();
fracturesAlongWellPath.push_back(frac);
}
}
fracturesAlongWellPath.push_back(frac);
}
return generateCompdatValues(caseToApply,
@@ -444,11 +438,11 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
reportItem.setData(transmissibility, allCompletionsForOneFracture.size(), fcd, area);
double conductivity = 0.0;
double width = 0.0;
double height = 0.0;
double halfLength = 0.0;
RiaEclipseUnitTools::UnitSystem unitSystem = RiaEclipseUnitTools::UNITS_METRIC;
double conductivity = 0.0;
double width = 0.0;
double height = 0.0;
double halfLength = 0.0;
RiaEclipseUnitTools::UnitSystem unitSystem = RiaEclipseUnitTools::UNITS_METRIC;
{
auto* ellipseTemplate = dynamic_cast<const RimEllipseFractureTemplate*>(fracTemplate);

7
ApplicationCode/Commands/CompletionExportCommands/RicExportFracturesWellSegmentsFeature.cpp
View File

@@ -130,12 +130,9 @@ void RicExportFracturesWellSegmentsFeature::onActionTriggered(bool isChecked)
}
else
{
for (RimWellPathFracture* fracture : collection->fractures())
for (RimWellPathFracture* fracture : collection->activeFractures())
{
if (fracture->isChecked())
{
fractures.push_back(fracture);
}
fractures.push_back(fracture);
}
}

2
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@@ -1102,7 +1102,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWellPathFractureReport(
{
std::set<RimWellPath*> wellPathsSet;
auto allWellPaths = RicWellPathFractureTextReportFeatureImpl::wellPathsWithFractures();
auto allWellPaths = RicWellPathFractureTextReportFeatureImpl::wellPathsWithActiveFractures();
for (const auto& wellPath : allWellPaths)
{
for (const auto& reportItem : wellPathFractureReportItems)

6
ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp
View File

@@ -148,7 +148,7 @@ QString RicWellPathFractureTextReportFeatureImpl::wellPathFractureReport(
std::vector<RimWellPathFracture*> wellPathFractures;
for (const auto& w : wellPaths)
{
for (const auto& frac : w->fractureCollection()->fractures())
for (const auto& frac : w->fractureCollection()->activeFractures())
{
wellPathFractures.push_back(frac);
}
@@ -182,7 +182,7 @@ QString RicWellPathFractureTextReportFeatureImpl::wellPathFractureReport(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimWellPath*> RicWellPathFractureTextReportFeatureImpl::wellPathsWithFractures()
std::vector<RimWellPath*> RicWellPathFractureTextReportFeatureImpl::wellPathsWithActiveFractures()
{
std::vector<RimWellPath*> wellPaths;
@@ -191,7 +191,7 @@ std::vector<RimWellPath*> RicWellPathFractureTextReportFeatureImpl::wellPathsWit
{
for (const auto& wellPath : wellPathColl->wellPaths())
{
if (!wellPath->fractureCollection()->fractures().empty())
if (!wellPath->fractureCollection()->activeFractures().empty())
{
wellPaths.push_back(wellPath);
}

2
ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.h
View File

@@ -39,7 +39,7 @@ public:
const std::vector<RimWellPath*>& wellPaths,
const std::vector<RicWellPathFractureReportItem>& wellPathFractureReportItems);
static std::vector<RimWellPath*> wellPathsWithFractures();
static std::vector<RimWellPath*> wellPathsWithActiveFractures();
private:
QString createWellFileLocationText(const std::vector<RimWellPath*>& wellPaths) const;

2
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp
View File

@@ -115,7 +115,7 @@ void RicCreateMultipleFracturesFeature::slotAppendFractures()
RimWellPathFractureCollection* fractureCollection = item.wellPath->fractureCollection();
// If this is the first fracture, set default result name
if (fractureCollection->fractures().empty())
if (fractureCollection->allFractures().empty())
{
RimEclipseView* activeView = dynamic_cast<RimEclipseView*>(RiaApplication::instance()->activeReservoirView());
if (activeView)

2
ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp
View File

@@ -61,7 +61,7 @@ void RicNewWellPathFractureFeature::addFracture(RimWellPath* wellPath, double me
RimWellPathFractureCollection* fractureCollection = wellPath->fractureCollection();
CVF_ASSERT(fractureCollection);
if (fractureCollection->fractures().empty())
if (fractureCollection->allFractures().empty())
{
RimEclipseView* activeView = dynamic_cast<RimEclipseView*>(RiaApplication::instance()->activeReservoirView());
if (activeView)

2
ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp
View File

@@ -131,7 +131,7 @@ bool RicDeleteSubItemsFeature::hasDeletableSubItems(caf::PdmUiItem* uiItem)
{
auto collection = dynamic_cast<RimWellPathFractureCollection*>(uiItem);
if (collection && !collection->fractures().empty())
if (collection && !collection->allFractures().empty())
{
return true;
}