Minor whitespace adjustments

This commit is contained in:
Jacob Støren 2017-06-25 10:42:05 +02:00
parent cbb0a58673
commit febdabc6c6
2 changed files with 16 additions and 7 deletions

View File

@ -124,7 +124,9 @@ std::vector<std::pair<QString, QString> > RigStimPlanFractureDefinition::getStim
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<std::vector<double>> RigStimPlanFractureDefinition::getMirroredDataAtTimeIndex(const QString& resultName, const QString& unitName, size_t timeStepIndex) const std::vector<std::vector<double>> RigStimPlanFractureDefinition::getMirroredDataAtTimeIndex(const QString& resultName,
const QString& unitName,
size_t timeStepIndex) const
{ {
std::vector<std::vector<double>> notMirrordedData = this->getDataAtTimeIndex(resultName, unitName, timeStepIndex); std::vector<std::vector<double>> notMirrordedData = this->getDataAtTimeIndex(resultName, unitName, timeStepIndex);
std::vector<std::vector<double>> mirroredData; std::vector<std::vector<double>> mirroredData;
@ -141,19 +143,27 @@ std::vector<std::vector<double>> RigStimPlanFractureDefinition::getMirroredDataA
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigFractureGrid> RigStimPlanFractureDefinition::createFractureGrid(const QString& resultNameFromColors, const QString& resultUnitFromColors, int m_activeTimeStepIndex, RiaEclipseUnitTools::UnitSystemType fractureTemplateUnit, double m_wellPathDepthAtFracture) cvf::ref<RigFractureGrid> RigStimPlanFractureDefinition::createFractureGrid(const QString& resultNameFromColors,
const QString& resultUnitFromColors,
int m_activeTimeStepIndex,
RiaEclipseUnitTools::UnitSystemType fractureTemplateUnit,
double m_wellPathDepthAtFracture)
{ {
std::vector<RigFractureCell> stimPlanCells; std::vector<RigFractureCell> stimPlanCells;
std::pair<size_t, size_t> wellCenterStimPlanCellIJ = std::make_pair(0, 0); std::pair<size_t, size_t> wellCenterStimPlanCellIJ = std::make_pair(0, 0);
bool wellCenterStimPlanCellFound = false; bool wellCenterStimPlanCellFound = false;
std::vector<std::vector<double>> displayPropertyValuesAtTimeStep = this->getMirroredDataAtTimeIndex(resultNameFromColors, resultUnitFromColors, m_activeTimeStepIndex); std::vector<std::vector<double>> displayPropertyValuesAtTimeStep = this->getMirroredDataAtTimeIndex(resultNameFromColors,
resultUnitFromColors,
m_activeTimeStepIndex);
QString condUnit; QString condUnit;
if ( fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC ) condUnit = "md-m"; if ( fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC ) condUnit = "md-m";
if ( fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD ) condUnit = "md-ft"; if ( fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD ) condUnit = "md-ft";
std::vector<std::vector<double>> conductivityValuesAtTimeStep = this->getMirroredDataAtTimeIndex("CONDUCTIVITY", condUnit, m_activeTimeStepIndex); std::vector<std::vector<double>> conductivityValuesAtTimeStep = this->getMirroredDataAtTimeIndex("CONDUCTIVITY",
condUnit,
m_activeTimeStepIndex);
std::vector<double> depthCoordsAtNodes = this->adjustedDepthCoordsAroundWellPathPosition(m_wellPathDepthAtFracture); std::vector<double> depthCoordsAtNodes = this->adjustedDepthCoordsAroundWellPathPosition(m_wellPathDepthAtFracture);
std::vector<double> xCoordsAtNodes = this->getNegAndPosXcoords(); std::vector<double> xCoordsAtNodes = this->getNegAndPosXcoords();

View File

@ -47,7 +47,7 @@ public:
RigStimPlanFractureDefinition(); RigStimPlanFractureDefinition();
~RigStimPlanFractureDefinition(); ~RigStimPlanFractureDefinition();
RiaEclipseUnitTools::UnitSystem unitSet() { return m_unitSet; } RiaEclipseUnitTools::UnitSystem unitSet() { return m_unitSet; }
void setUnitSet(RiaEclipseUnitTools::UnitSystem unitset) { m_unitSet = unitset;} void setUnitSet(RiaEclipseUnitTools::UnitSystem unitset) { m_unitSet = unitset;}
size_t gridXCount() { return m_gridXs.size();} size_t gridXCount() { return m_gridXs.size();}
@ -63,7 +63,6 @@ public:
double maxDepth() { return depths.back(); } double maxDepth() { return depths.back(); }
size_t depthCount() { return depths.size(); } size_t depthCount() { return depths.size(); }
// Grid Geometry // Grid Geometry
std::vector<double> getNegAndPosXcoords() const; std::vector<double> getNegAndPosXcoords() const;
@ -110,7 +109,7 @@ private:
size_t getTimeStepIndex(double timeStepValue); size_t getTimeStepIndex(double timeStepValue);
size_t resultIndex(const QString& resultName, const QString& unit) const; size_t resultIndex(const QString& resultName, const QString& unit) const;
RiaEclipseUnitTools::UnitSystem m_unitSet; RiaEclipseUnitTools::UnitSystem m_unitSet;
std::vector<double> m_gridXs; std::vector<double> m_gridXs;
std::vector<double> m_gridYs; std::vector<double> m_gridYs;
std::vector<double> depths; std::vector<double> depths;