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

#1585 Adjustments to FractureContainment class

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp
View File

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

18
ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.h
View File

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