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

#1092 - pre-proto - Update export function to be able to handle multple cells for each fracture. Calculated / exported values not yet correct.

Browse Source
This commit is contained in:
astridkbjorke
2017-01-11 14:32:15 +01:00
parent a7ecea983c
commit 97cdf836cd
7 changed files with 127 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/ProjectDataModel/RimFracture.cpp
View File

@@ -24,14 +24,12 @@
#include "RimFractureDefinition.h"
#include "RimView.h"
#define _USE_MATH_DEFINES
#include <math.h> //TODO: Is this OK? What about cmath?
#include "cafPdmUiDoubleSliderEditor.h"
#include "cvfMath.h"
#include "cvfMatrix4.h"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimFracture, "Fracture");
//--------------------------------------------------------------------------------------------------
@@ -133,16 +131,16 @@ void RimFracture::computeGeometry()
///
//--------------------------------------------------------------------------------------------------
void RimFracture::computeTransmissibility()
{
{
std::vector<RigFractureData> fracDataVec;
// Finne ijk-er for alle celler...
//For now, only consider center cell:
std::vector<std::pair<size_t, size_t>> fracCells = getFracturedCells();
for (auto fracCell : fracCells)
{
// RigFractureData* fracData = new RigFractureData;
RigFractureData fracData;
fracData.cellindex = fracCell.first;
fracData.gridIndex = fracCell.second;
//TODO: get correct input values...
double area = 2.468;
@@ -150,12 +148,16 @@ void RimFracture::computeTransmissibility()
double flowLength = 2.718281828;
double c = 0.008527; // TODO: Get value with units, is defined in RimReservoirCellResultsStorage
double transmissibility = 8 * c * attachedFractureDefinition()->permeability * area /
( flowLength + (attachedFractureDefinition()->skinFactor * fractureLength)/M_PI );
// fracData.cellindex = 0;
// fracDataVec.push_back(fracData);
double transmissibility;
if (attachedFractureDefinition())
{
transmissibility = 8 * c * attachedFractureDefinition()->permeability * area /
( flowLength + (attachedFractureDefinition()->skinFactor * fractureLength) / cvf::PI_D);
}
else transmissibility = cvf::UNDEFINED_DOUBLE;
fracData.transmissibility = transmissibility;
fracDataVec.push_back(fracData);
}
m_rigFracture->setFractureData(fracDataVec);
@@ -205,13 +207,9 @@ void RimFracture::defineEditorAttribute(const caf::PdmFieldHandle* field, QStrin
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<std::pair<size_t, size_t>> RimFracture::getFracturedCells()
cvf::ref<RigFracture> RimFracture::attachedRigFracture()
{
//TODO: Remove this? For now returning empty vector since function
// is not yet implemented for well path fractures
std::vector<std::pair<size_t, size_t>> cells;
return cells;
return m_rigFracture;
}
//--------------------------------------------------------------------------------------------------

14
ApplicationCode/ProjectDataModel/RimFracture.h
View File

@@ -46,22 +46,19 @@ public:
virtual cvf::Vec3d centerPointForFracture() = 0;
virtual RimFractureDefinition* attachedFractureDefinition() = 0;
virtual std::vector<std::pair<size_t, size_t>> getFracturedCells();
virtual std::vector<size_t> getIJK() = 0;
cvf::ref<RigFracture> attachedRigFracture();
bool hasValidGeometry() const;
void computeGeometry();
void computeTransmissibility();
void setRecomputeGeometryFlag();
const std::vector<cvf::uint>& polygonIndices() const;
const std::vector<cvf::Vec3f>& nodeCoords() const;
virtual std::vector<std::pair<size_t, size_t>> getFracturedCells() = 0;
void computeTransmissibility();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected:
@@ -70,7 +67,6 @@ protected:
private:
bool isRecomputeGeometryFlagSet();
// cvf::Vec3d fracturePositionForUi() const;
private:

19
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@@ -180,9 +180,9 @@ std::vector<std::pair<size_t, size_t>> RimSimWellFracture::getFracturedCells()
const RigMainGrid* mainGrid = mainView->mainGrid();
if (!mainGrid) return cells;
size_t gridCellIndex = mainGrid->cellIndexFromIJK(m_i - 1, m_j - 1, m_k - 1); // cellIndexFromIJK uses 0-based indexing
size_t cellIndex = mainGrid->cellIndexFromIJK(m_i - 1, m_j - 1, m_k - 1); // cellIndexFromIJK uses 0-based indexing
cells.push_back(std::make_pair(gridCellIndex, gridindex));
cells.push_back(std::make_pair(cellIndex, gridindex));
return cells;
}
@@ -205,20 +205,7 @@ void RimSimWellFracture::setIJK(size_t i, size_t j, size_t k)
m_k = static_cast<int>(k + 1);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<size_t> RimSimWellFracture::getIJK()
{
std::vector<size_t> ijk;
ijk.push_back(m_i);
ijk.push_back(m_j);
ijk.push_back(m_k);
return ijk;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

39
ApplicationCode/ProjectDataModel/RimSimWellFracture.h
View File

@@ -45,32 +45,29 @@ public:
RimSimWellFracture(void);
virtual ~RimSimWellFracture(void);
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition*> fractureDefinition;
size_t gridindex;
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition*> fractureDefinition;
size_t gridindex;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
void setIJK(size_t i, size_t j, size_t k);
std::vector<size_t> getIJK() override;
void setCellCenterPosition();
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
void setIJK(size_t i, size_t j, size_t k);
void setCellCenterPosition();
// Overrides from RimFracture
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
virtual std::vector<std::pair<size_t, size_t>> getFracturedCells() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
cvf::Vec3d fracturePositionForUi() const;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
cvf::Vec3d fracturePositionForUi() const;
private:
caf::PdmField<int> m_i; //Eclipse indexing, lowest value is 1
caf::PdmField<int> m_j;
caf::PdmField<int> m_k;
caf::PdmField<cvf::Vec3d> cellCenterPosition;
caf::PdmProxyValueField<cvf::Vec3d> ui_cellCenterPosition;
caf::PdmField<int> m_i; //Eclipse indexing, lowest value is 1
caf::PdmField<int> m_j;
caf::PdmField<int> m_k;
caf::PdmField<cvf::Vec3d> cellCenterPosition;
caf::PdmProxyValueField<cvf::Vec3d> ui_cellCenterPosition;
};

15
ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@@ -126,18 +126,17 @@ RimFractureDefinition* RimWellPathFracture::attachedFractureDefinition()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<size_t> RimWellPathFracture::getIJK()
std::vector<std::pair<size_t, size_t>> RimWellPathFracture::getFracturedCells()
{
//TODO: Need to find these indecies.
//For now just writing dummy values to be able to test fracture export function.
std::vector<size_t> ijk;
ijk.push_back(1);
ijk.push_back(2);
ijk.push_back(3);
std::vector<std::pair<size_t, size_t>> cells;
size_t cellindex = 123; //TODO! For now just retunrning a dummy value!
size_t gridindex = 0;
cells.push_back(std::make_pair(cellindex, gridindex));
return ijk;
return cells;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

34
ApplicationCode/ProjectDataModel/RimWellPathFracture.h
View File

@@ -46,29 +46,31 @@ public:
RimWellPathFracture(void);
virtual ~RimWellPathFracture(void);
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition* > fractureDefinition;
caf::PdmField<QString> name;
caf::PdmPtrField<RimFractureDefinition* > fractureDefinition;
caf::PdmField<float> measuredDepth;
caf::PdmField<cvf::Vec3d> positionAtWellpath;
caf::PdmProxyValueField<cvf::Vec3d> ui_positionAtWellpath;
caf::PdmField<float> measuredDepth;
caf::PdmField<cvf::Vec3d> positionAtWellpath;
caf::PdmProxyValueField<cvf::Vec3d> ui_positionAtWellpath;
caf::PdmField<int> i;
caf::PdmField<int> j;
caf::PdmField<int> k;
caf::PdmField<int> i;
caf::PdmField<int> j;
caf::PdmField<int> k;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
// Overrides from RimFracture
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
virtual cvf::Vec3d centerPointForFracture() override;
virtual RimFractureDefinition* attachedFractureDefinition() override;
virtual std::vector<std::pair<size_t, size_t>> getFracturedCells() override;
virtual std::vector<size_t> getIJK() override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
cvf::Vec3d fracturePositionForUi() const;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
cvf::Vec3d fracturePositionForUi() const;
};