#1585 Adjustments to FractureContainment class

This commit is contained in:
Jacob Støren 2017-06-14 12:44:08 +02:00
parent 1d405384ee
commit bca96d31ad
2 changed files with 14 additions and 15 deletions

View File

@ -231,7 +231,8 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
{
////
//If fracture has orientation Azimuth or Transverse, assume only radial inflow
if (fracture->fractureTemplate()->orientationType() == RimFractureTemplate::AZIMUTH
if ( fracture->fractureTemplate()->orientationType() == RimFractureTemplate::AZIMUTH
|| fracture->fractureTemplate()->orientationType() == RimFractureTemplate::TRANSVERSE_WELL_PATH)
{
const RigFractureGrid* fracGrid = fracture->fractureTemplate()->fractureGrid();
@ -251,9 +252,9 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
radialTrans);
}
////
//If fracture has orientation along well, linear inflow along well and radial flow at endpoints
else if (fracture->fractureTemplate()->orientationType() == RimFractureTemplate::ALONG_WELL_PATH)
{
RigWellPathStimplanIntersector wellFractureIntersector(wellPathGeometry, fracture);
@ -292,9 +293,9 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
double totalWellTrans = 0.5 * intersection.endpointCount * radialTrans + linearTrans;
transCondenser.addNeighborTransmissibility( { true, RigTransmissibilityCondenser::CellAddress::WELL, 1},
{ false, RigTransmissibilityCondenser::CellAddress::STIMPLAN, fracWellCellIdx },
totalWellTrans);
transCondenser.addNeighborTransmissibility( { true, RigTransmissibilityCondenser::CellAddress::WELL, 1 },
{ false, RigTransmissibilityCondenser::CellAddress::STIMPLAN, fracWellCellIdx },
totalWellTrans);
}
}
}

View File

@ -16,6 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "cafAppEnum.h"
@ -27,10 +28,6 @@ class RimFractureContainment : public caf::PdmObject
public:
RimFractureContainment();
caf::PdmField<bool> m_isUsingFractureContainment;
caf::PdmField<int> m_topKLayer;
caf::PdmField<int> m_bottomKLayer;
enum FaultTruncType
{
DISABLED,
@ -38,18 +35,19 @@ public:
CONTINUE_IN_CONTAINMENT_ZONE
};
friend caf::AppEnum< FaultTruncType >;
caf::PdmField< caf::AppEnum< FaultTruncType > > m_faultTruncation;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
private:
friend caf::AppEnum< FaultTruncType >;
caf::PdmField< caf::AppEnum< FaultTruncType > > m_faultTruncation;
caf::PdmField<bool> m_isUsingFractureContainment;
caf::PdmField<int> m_topKLayer;
caf::PdmField<int> m_bottomKLayer;
};