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

Whitespace cleanup

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-21 19:53:22 +01:00
parent c22f38e30c
commit 594be93883
5 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
View File

@ -43,40 +43,37 @@ class RimEllipseFractureTemplate : public RimFractureTemplate
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimEllipseFractureTemplate(void); RimEllipseFractureTemplate();
virtual ~RimEllipseFractureTemplate(void); virtual ~RimEllipseFractureTemplate();
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* polygonIndices) override;
std::vector<cvf::Vec3f> fractureBorderPolygon() override;
void changeUnits();
const RigFractureGrid* fractureGrid() const override;
void setDefaultValuesFromUnit();
double conductivity() const;
void loadDataAndUpdate() override; void appendDataToResultStatistics(const QString& uiResultName,
const QString& unit,
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords, MinMaxAccumulator& minMaxAccumulator,
std::vector<cvf::uint>* polygonIndices); PosNegAccumulator& posNegAccumulator) const override;
std::vector<cvf::Vec3f> fractureBorderPolygon();
void changeUnits();
const RigFractureGrid* fractureGrid() const;
void setDefaultValuesFromUnit(); void convertToUnitSystem(RiaEclipseUnitTools::UnitSystem neededUnit) override;
double conductivity() const;
virtual void appendDataToResultStatistics(const QString& uiResultName, const QString& unit, void loadDataAndUpdate() override;
MinMaxAccumulator& minMaxAccumulator, std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
PosNegAccumulator& posNegAccumulator) const override;
virtual std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
virtual void convertToUnitSystem(RiaEclipseUnitTools::UnitSystem neededUnit) override;
protected: protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private: private:
void setupFractureGridCells(); void setupFractureGridCells();
virtual FractureWidthAndConductivity widthAndConductivityAtWellPathIntersection() const override; FractureWidthAndConductivity widthAndConductivityAtWellPathIntersection() const override;
private: private:
cvf::ref<RigFractureGrid> m_fractureGrid; cvf::ref<RigFractureGrid> m_fractureGrid;

27
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@ -39,9 +39,9 @@ namespace caf
template<> template<>
void caf::AppEnum< RimFractureTemplate::FracOrientationEnum>::setUp() void caf::AppEnum< RimFractureTemplate::FracOrientationEnum>::setUp()
{ {
addItem(RimFractureTemplate::AZIMUTH, "Az", "Azimuth"); addItem(RimFractureTemplate::AZIMUTH, "Az", "Azimuth");
addItem(RimFractureTemplate::ALONG_WELL_PATH, "AlongWellPath", "Along Well Path"); addItem(RimFractureTemplate::ALONG_WELL_PATH, "AlongWellPath", "Along Well Path");
addItem(RimFractureTemplate::TRANSVERSE_WELL_PATH, "TransverseWellPath", "Transverse (normal) to Well Path"); addItem(RimFractureTemplate::TRANSVERSE_WELL_PATH, "TransverseWellPath", "Transverse (normal) to Well Path");
setDefault(RimFractureTemplate::TRANSVERSE_WELL_PATH); setDefault(RimFractureTemplate::TRANSVERSE_WELL_PATH);
} }
@ -50,7 +50,7 @@ namespace caf
void caf::AppEnum< RimFractureTemplate::FracConductivityEnum>::setUp() void caf::AppEnum< RimFractureTemplate::FracConductivityEnum>::setUp()
{ {
addItem(RimFractureTemplate::INFINITE_CONDUCTIVITY, "InfiniteConductivity", "Infinite Conductivity"); addItem(RimFractureTemplate::INFINITE_CONDUCTIVITY, "InfiniteConductivity", "Infinite Conductivity");
addItem(RimFractureTemplate::FINITE_CONDUCTIVITY, "FiniteConductivity", "Finite Conductivity"); addItem(RimFractureTemplate::FINITE_CONDUCTIVITY, "FiniteConductivity", "Finite Conductivity");
setDefault(RimFractureTemplate::INFINITE_CONDUCTIVITY); setDefault(RimFractureTemplate::INFINITE_CONDUCTIVITY);
} }
@ -58,8 +58,8 @@ namespace caf
template<> template<>
void caf::AppEnum< RimFractureTemplate::PermeabilityEnum>::setUp() void caf::AppEnum< RimFractureTemplate::PermeabilityEnum>::setUp()
{ {
addItem(RimFractureTemplate::USER_DEFINED_PERMEABILITY, "UserDefinedPermeability", "User Defined"); addItem(RimFractureTemplate::USER_DEFINED_PERMEABILITY, "UserDefinedPermeability", "User Defined");
addItem(RimFractureTemplate::CONDUCTIVITY_FROM_FRACTURE, "FractureConductivity", "Use Fracture Conductivity"); addItem(RimFractureTemplate::CONDUCTIVITY_FROM_FRACTURE, "FractureConductivity", "Use Fracture Conductivity");
setDefault(RimFractureTemplate::CONDUCTIVITY_FROM_FRACTURE); setDefault(RimFractureTemplate::CONDUCTIVITY_FROM_FRACTURE);
} }
@ -67,8 +67,8 @@ namespace caf
template<> template<>
void caf::AppEnum<RimFractureTemplate::WidthEnum>::setUp() void caf::AppEnum<RimFractureTemplate::WidthEnum>::setUp()
{ {
addItem(RimFractureTemplate::USER_DEFINED_WIDTH, "UserDefinedWidth", "User Defined"); addItem(RimFractureTemplate::USER_DEFINED_WIDTH, "UserDefinedWidth", "User Defined");
addItem(RimFractureTemplate::WIDTH_FROM_FRACTURE, "FractureWidth", "Use Fracture Width"); addItem(RimFractureTemplate::WIDTH_FROM_FRACTURE, "FractureWidth", "Use Fracture Width");
setDefault(RimFractureTemplate::WIDTH_FROM_FRACTURE); setDefault(RimFractureTemplate::WIDTH_FROM_FRACTURE);
} }
@ -76,9 +76,9 @@ namespace caf
template<> template<>
void caf::AppEnum<RimFractureTemplate::NonDarcyFlowEnum>::setUp() void caf::AppEnum<RimFractureTemplate::NonDarcyFlowEnum>::setUp()
{ {
addItem(RimFractureTemplate::NON_DARCY_NONE, "None", "None"); addItem(RimFractureTemplate::NON_DARCY_NONE, "None", "None");
addItem(RimFractureTemplate::NON_DARCY_COMPUTED, "Computed", "Compute D-factor from Parameters"); addItem(RimFractureTemplate::NON_DARCY_COMPUTED, "Computed", "Compute D-factor from Parameters");
addItem(RimFractureTemplate::NON_DARCY_USER_DEFINED, "UserDefined", "By User Defined D-factor"); addItem(RimFractureTemplate::NON_DARCY_USER_DEFINED,"UserDefined", "By User Defined D-factor");
setDefault(RimFractureTemplate::NON_DARCY_NONE); setDefault(RimFractureTemplate::NON_DARCY_NONE);
} }
@ -104,7 +104,7 @@ RimFractureTemplate::RimFractureTemplate()
m_nameAndUnit.uiCapability()->setUiHidden(true); m_nameAndUnit.uiCapability()->setUiHidden(true);
m_nameAndUnit.xmlCapability()->disableIO(); m_nameAndUnit.xmlCapability()->disableIO();
CAF_PDM_InitField(&m_fractureTemplateUnit,"UnitSystem", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UNITS_METRIC), "Units System", "", "", ""); CAF_PDM_InitField(&m_fractureTemplateUnit, "UnitSystem", caf::AppEnum<RiaEclipseUnitTools::UnitSystem>(RiaEclipseUnitTools::UNITS_METRIC), "Units System", "", "", "");
m_fractureTemplateUnit.uiCapability()->setUiReadOnly(true); m_fractureTemplateUnit.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField(&m_orientationType, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture Orientation", "", "", ""); CAF_PDM_InitField(&m_orientationType, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture Orientation", "", "", "");
@ -112,10 +112,11 @@ RimFractureTemplate::RimFractureTemplate()
CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 0.0f, "Skin Factor", "", "", ""); CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 0.0f, "Skin Factor", "", "", "");
CAF_PDM_InitField(&m_perforationLength, "PerforationLength", 1.0, "Perforation Length", "", "", ""); CAF_PDM_InitField(&m_perforationLength, "PerforationLength", 1.0, "Perforation Length", "", "", "");
CAF_PDM_InitField(&m_perforationEfficiency, "PerforationEfficiency", 1.0, "Perforation Efficiency", "", "", ""); CAF_PDM_InitField(&m_perforationEfficiency, "PerforationEfficiency", 1.0, "Perforation Efficiency", "", "", "");
m_perforationEfficiency.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_perforationEfficiency.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture", "", "", "");
CAF_PDM_InitField(&m_wellDiameter, "WellDiameter", 0.216, "Well Diameter at Fracture", "", "", "");
CAF_PDM_InitField(&m_conductivityType, "ConductivityType", caf::AppEnum<FracConductivityEnum>(FINITE_CONDUCTIVITY), "Conductivity in Fracture", "", "", ""); CAF_PDM_InitField(&m_conductivityType, "ConductivityType", caf::AppEnum<FracConductivityEnum>(FINITE_CONDUCTIVITY), "Conductivity in Fracture", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_fractureContainment, "FractureContainmentField", "Fracture Containment", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureContainment, "FractureContainmentField", "Fracture Containment", "", "", "");

3
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
View File

@ -100,9 +100,6 @@ public:
NON_DARCY_USER_DEFINED, NON_DARCY_USER_DEFINED,
}; };
public: public:
RimFractureTemplate(); RimFractureTemplate();
virtual ~RimFractureTemplate(); virtual ~RimFractureTemplate();

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

@ -283,20 +283,18 @@ QList<caf::PdmOptionItemInfo> RimStimPlanFractureTemplate::calculateValueOptions
{ {
for (std::pair<QString, QString> nameUnit : uiResultNamesWithUnit()) for (std::pair<QString, QString> nameUnit : uiResultNamesWithUnit())
{ {
//options.push_back(caf::PdmOptionItemInfo(nameUnit.first + " [" + nameUnit.second + "]", nameUnit.first + " " + nameUnit.second));
options.push_back(caf::PdmOptionItemInfo(nameUnit.first, nameUnit.first)); options.push_back(caf::PdmOptionItemInfo(nameUnit.first, nameUnit.first));
} }
} }
else if (fieldNeedingOptions == &m_activeTimeStepIndex) else if (fieldNeedingOptions == &m_activeTimeStepIndex)
{ {
std::vector<double> timeValues = timeSteps(); std::vector<double> timeValues = timeSteps();
int index = 0; int index = 0;
for (double value : timeValues) for (double value : timeValues)
{ {
options.push_back(caf::PdmOptionItemInfo(QString::number(value), index)); options.push_back(caf::PdmOptionItemInfo(QString::number(value), index));
index++; index++;
} }
} }
else if (fieldNeedingOptions == &m_conductivityResultNameOnFile) else if (fieldNeedingOptions == &m_conductivityResultNameOnFile)
{ {
@ -311,7 +309,6 @@ QList<caf::PdmOptionItemInfo> RimStimPlanFractureTemplate::calculateValueOptions
} }
return options; return options;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -703,9 +700,9 @@ std::vector<cvf::Vec3f> RimStimPlanFractureTemplate::fractureBorderPolygon()
{ {
return m_stimPlanFractureDefinitionData->createFractureBorderPolygon(parameterName, return m_stimPlanFractureDefinitionData->createFractureBorderPolygon(parameterName,
parameterUnit, parameterUnit,
m_activeTimeStepIndex, m_activeTimeStepIndex,
m_wellPathDepthAtFracture, m_wellPathDepthAtFracture,
name()); name());
} }
return std::vector<cvf::Vec3f>(); return std::vector<cvf::Vec3f>();
@ -772,4 +769,3 @@ void RimStimPlanFractureTemplate::defineEditorAttribute(const caf::PdmFieldHandl
} }
} }
} }

10
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@ -59,7 +59,6 @@ public:
void setFileName(const QString& fileName); void setFileName(const QString& fileName);
const QString& fileName(); const QString& fileName();
QString fileNameWithOutPath();
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath); void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
@ -80,9 +79,10 @@ public:
std::vector<double> fractureGridResults(const QString& resultName, const QString& unitName, size_t timeStepIndex) const; std::vector<double> fractureGridResults(const QString& resultName, const QString& unitName, size_t timeStepIndex) const;
bool hasConductivity() const; bool hasConductivity() const;
virtual void appendDataToResultStatistics(const QString& uiResultName, const QString& unit, void appendDataToResultStatistics(const QString& uiResultName,
MinMaxAccumulator& minMaxAccumulator, const QString& unit,
PosNegAccumulator& posNegAccumulator) const override; MinMaxAccumulator& minMaxAccumulator,
PosNegAccumulator& posNegAccumulator) const override;
QString mapUiResultNameToFileResultName(const QString& uiResultName) const; QString mapUiResultNameToFileResultName(const QString& uiResultName) const;
void setDefaultConductivityResultIfEmpty(); void setDefaultConductivityResultIfEmpty();
@ -90,7 +90,7 @@ public:
bool showStimPlanMesh() const; bool showStimPlanMesh() const;
virtual void convertToUnitSystem(RiaEclipseUnitTools::UnitSystem neededUnit) override; void convertToUnitSystem(RiaEclipseUnitTools::UnitSystem neededUnit) override;
protected: protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;