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

#3038 Fix typo

Browse Source
This commit is contained in:
Magne Sjaastad
2018-08-06 09:36:42 +02:00
parent 411ef54364
commit 0e14499561
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,10 +244,10 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
const RigFractureCell& fractureCellNeighbourX = fractureGrid->cellFromIndex(fractureCellNeighbourXIndex);
double horizontalTransToXneigbour =
RigFractureTransmissibilityEquations::centerToCenterFractureCellTrans(fractureCell.getConductivtyValue(),
RigFractureTransmissibilityEquations::centerToCenterFractureCellTrans(fractureCell.getConductivityValue(),
fractureCell.cellSizeX(),
fractureCell.cellSizeZ(),
fractureCellNeighbourX.getConductivtyValue(),
fractureCellNeighbourX.getConductivityValue(),
fractureCellNeighbourX.cellSizeX(),
fractureCellNeighbourX.cellSizeZ(),
cDarcyInCorrectUnit);
@@ -263,10 +263,10 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
const RigFractureCell& fractureCellNeighbourZ = fractureGrid->cellFromIndex(fractureCellNeighbourZIndex);
double verticalTransToZneigbour =
RigFractureTransmissibilityEquations::centerToCenterFractureCellTrans(fractureCell.getConductivtyValue(),
RigFractureTransmissibilityEquations::centerToCenterFractureCellTrans(fractureCell.getConductivityValue(),
fractureCell.cellSizeZ(),
fractureCell.cellSizeX(),
fractureCellNeighbourZ.getConductivtyValue(),
fractureCellNeighbourZ.getConductivityValue(),
fractureCellNeighbourZ.cellSizeZ(),
fractureCellNeighbourZ.cellSizeX(),
cDarcyInCorrectUnit);
@@ -298,7 +298,7 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
const RigFractureCell& wellCell = fractureGrid->cellFromIndex(wellCellIndex);
double radialTrans = RigFractureTransmissibilityEquations::fractureCellToWellRadialTrans(wellCell.getConductivtyValue(),
double radialTrans = RigFractureTransmissibilityEquations::fractureCellToWellRadialTrans(wellCell.getConductivityValue(),
wellCell.cellSizeX(),
wellCell.cellSizeZ(),
fracture->wellRadius(),
@@ -330,7 +330,7 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
double linearTrans = 0.0;
if (intersection.hlength > 0.0 || intersection.vlength > 0.0)
{
linearTrans = RigFractureTransmissibilityEquations::fractureCellToWellLinearTrans(fractureWellCell.getConductivtyValue(),
linearTrans = RigFractureTransmissibilityEquations::fractureCellToWellLinearTrans(fractureWellCell.getConductivityValue(),
fractureWellCell.cellSizeX(),
fractureWellCell.cellSizeZ(),
intersection.vlength,

2
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -404,7 +404,7 @@ FractureWidthAndConductivity RimStimPlanFractureTemplate::widthAndConductivityAt
size_t wellCellIndex = m_fractureGrid->getGlobalIndexFromIJ(wellCellIJ.first, wellCellIJ.second);
const RigFractureCell& wellCell = m_fractureGrid->cellFromIndex(wellCellIndex);
double conductivity = wellCell.getConductivtyValue();
double conductivity = wellCell.getConductivityValue();
values.m_conductivity = conductivity;
std::vector<std::pair<QString, QString> > propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits();

2
ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
View File

@@ -83,7 +83,7 @@ const std::vector<double>& RigEclipseToStimPlanCellTransmissibilityCalculator::c
void RigEclipseToStimPlanCellTransmissibilityCalculator::calculateStimPlanCellsMatrixTransmissibility()
{
// Not calculating flow into fracture if stimPlan cell cond value is 0 (assumed to be outside the fracture):
if (m_stimPlanCell.getConductivtyValue() < 1e-7) return;
if (m_stimPlanCell.getConductivityValue() < 1e-7) return;
const RigEclipseCaseData* eclipseCaseData = m_case->eclipseCaseData();

10
ApplicationCode/ReservoirDataModel/RigFractureCell.cpp
View File

@@ -29,7 +29,7 @@ RigFractureCell::RigFractureCell(std::vector<cvf::Vec3d> polygon, size_t i, size
: m_polygon(polygon)
, m_i(i)
, m_j(j)
, m_concutivityValue(0.0)
, m_conductivityValue(0.0)
{
}
@@ -44,9 +44,9 @@ const std::vector<cvf::Vec3d>& RigFractureCell::getPolygon() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFractureCell::getConductivtyValue() const
double RigFractureCell::getConductivityValue() const
{
return m_concutivityValue;
return m_conductivityValue;
}
//--------------------------------------------------------------------------------------------------
@@ -70,7 +70,7 @@ size_t RigFractureCell::getJ() const
//--------------------------------------------------------------------------------------------------
bool RigFractureCell::hasNonZeroConductivity() const
{
return m_concutivityValue > 1e-7;
return m_conductivityValue > 1e-7;
}
//--------------------------------------------------------------------------------------------------
@@ -78,7 +78,7 @@ bool RigFractureCell::hasNonZeroConductivity() const
//--------------------------------------------------------------------------------------------------
void RigFractureCell::setConductivityValue(double cond)
{
m_concutivityValue = cond;
m_conductivityValue = cond;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ReservoirDataModel/RigFractureCell.h
View File

@@ -34,7 +34,7 @@ public:
RigFractureCell(std::vector<cvf::Vec3d> polygon, size_t i, size_t j);
const std::vector<cvf::Vec3d>& getPolygon() const;
double getConductivtyValue() const;
double getConductivityValue() const;
size_t getI() const;
size_t getJ() const;
@@ -46,7 +46,7 @@ public:
private:
std::vector<cvf::Vec3d> m_polygon;
double m_concutivityValue;
double m_conductivityValue;
size_t m_i;
size_t m_j;
};