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

#1198 - pre-proto - Adding enum to control finite / infinite conductivity. Calculation for finite conductivity not yet implemented, so transmissibilitiy calculation will as of now always assume infinite cond.

Browse Source
This commit is contained in:
astridkbjorke 2017-02-10 13:29:31 +01:00
parent fc96b33baa
commit 6c9ee7f059
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/RimEllipseFractureTemplate.cpp
View File

@ -165,6 +165,7 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm
geometryGroup->add(&azimuthAngle);
caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Fracture properties");
propertyGroup->add(&fractureConductivity);
propertyGroup->add(&permeability);
propertyGroup->add(&width);
propertyGroup->add(&skinFactor);

13
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@ -56,6 +56,7 @@
#include "clipper/clipper.hpp"
#include <math.h>
#include <QDebug>
@ -271,6 +272,18 @@ cvf::Mat4f RimFracture::transformMatrix()
//--------------------------------------------------------------------------------------------------
void RimFracture::computeTransmissibility(RimEclipseCase* caseToApply)
{
//TODO: Handle case with finite conductivity in fracture
if (attachedFractureDefinition())
{
if (attachedFractureDefinition()->fractureConductivity == RimFractureTemplate::FINITE_CONDUCTIVITY)
{
qDebug() << "Transimssibility for finite conductity in fracture not yet implemented.";
qDebug() << "Performing calculation for infinite conductivity instead.";
}
}
RigEclipseCaseData* eclipseCaseData = caseToApply->reservoirData();
RifReaderInterface::PorosityModelResultType porosityModel = RifReaderInterface::MATRIX_RESULTS;

11
ApplicationCode/ProjectDataModel/RimFractureTemplate.cpp
View File

@ -41,6 +41,14 @@ namespace caf
setDefault(RimFractureTemplate::TRANSVERSE_WELL_PATH);
}
void caf::AppEnum< RimFractureTemplate::FracConductivityEnum>::setUp()
{
addItem(RimFractureTemplate::INFINITE_CONDUCTIVITY, "InfiniteConductivity", "Infinite conductivity in fracture");
addItem(RimFractureTemplate::FINITE_CONDUCTIVITY, "FiniteConductivity", "Finite conductivity in fracture");
setDefault(RimFractureTemplate::INFINITE_CONDUCTIVITY);
}
}
@ -58,6 +66,9 @@ RimFractureTemplate::RimFractureTemplate(void)
CAF_PDM_InitField(&orientation, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture orientation", "", "", "");
CAF_PDM_InitField(&azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle", "", "", ""); //Is this correct description?
CAF_PDM_InitField(&skinFactor, "SkinFactor", 1.0f, "Skin Factor", "", "", "");
CAF_PDM_InitField(&fractureConductivity, "FractureCondictivity", caf::AppEnum<FracConductivityEnum>(INFINITE_CONDUCTIVITY), "Fracture conductivity", "", "", "");
}
//--------------------------------------------------------------------------------------------------

7
ApplicationCode/ProjectDataModel/RimFractureTemplate.h
View File

@ -53,6 +53,13 @@ public:
TRANSVERSE_WELL_PATH
};
caf::PdmField< caf::AppEnum< FracOrientationEnum > > orientation;
enum FracConductivityEnum
{
INFINITE_CONDUCTIVITY,
FINITE_CONDUCTIVITY,
};
caf::PdmField< caf::AppEnum< FracConductivityEnum > > fractureConductivity;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;