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

#2359 Move fields to private, whitespace cleanup

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-10 07:44:26 +01:00
parent 49eebd0c28
commit 30cbd8018f
4 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@ -47,11 +47,11 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate(void)
{
CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
CAF_PDM_InitField(&halfLength, "HalfLength", 0.0f, "Halflength X<sub>f</sub>", "", "", "");
CAF_PDM_InitField(&height, "Height", 0.0f, "Height", "", "", "");
CAF_PDM_InitField(&width, "Width", 0.0f, "Width", "", "", "");
CAF_PDM_InitField(&m_halfLength, "HalfLength", 0.0f, "Halflength X<sub>f</sub>", "", "", "");
CAF_PDM_InitField(&m_height, "Height", 0.0f, "Height", "", "", "");
CAF_PDM_InitField(&m_width, "Width", 0.0f, "Width", "", "", "");
CAF_PDM_InitField(&permeability,"Permeability", 0.0f, "Permeability [mD]", "", "", "");
CAF_PDM_InitField(&m_permeability,"Permeability", 0.0f, "Permeability [mD]", "", "", "");
m_fractureGrid = new RigFractureGrid();
setupFractureGridCells();
@ -79,7 +79,7 @@ void RimEllipseFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* cha
{
RimFractureTemplate::fieldChangedByUi(changedField, oldValue, newValue);
if (changedField == &halfLength || changedField == &height)
if (changedField == &m_halfLength || changedField == &m_height)
{
//Changes to one of these parameters should change all fractures with this fracture template attached.
RimProject* proj;
@ -91,7 +91,7 @@ void RimEllipseFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* cha
setupFractureGridCells();
}
}
if (changedField == &width || changedField == &permeability)
if (changedField == &m_width || changedField == &m_permeability)
{
setupFractureGridCells();
}
@ -111,21 +111,21 @@ void RimEllipseFractureTemplate::fractureTriangleGeometry(std::vector<cvf::Vec3f
if (neededUnit == fractureTemplateUnit())
{
a = halfLength;
b = height / 2.0f;
a = m_halfLength;
b = m_height / 2.0f;
}
else if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC && neededUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
RiaLogging::info(QString("Converting fracture template geometry from metric to field"));
a = RiaEclipseUnitTools::meterToFeet(halfLength);
b = RiaEclipseUnitTools::meterToFeet(height / 2.0f);
a = RiaEclipseUnitTools::meterToFeet(m_halfLength);
b = RiaEclipseUnitTools::meterToFeet(m_height / 2.0f);
}
else if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD && neededUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
RiaLogging::info(QString("Converting fracture template geometry from field to metric"));
a = RiaEclipseUnitTools::feetToMeter(halfLength);
b = RiaEclipseUnitTools::feetToMeter(height / 2.0f);
a = RiaEclipseUnitTools::feetToMeter(m_halfLength);
b = RiaEclipseUnitTools::feetToMeter(m_height / 2.0f);
}
else
{
@ -164,20 +164,20 @@ void RimEllipseFractureTemplate::changeUnits()
{
if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
halfLength = RiaEclipseUnitTools::meterToFeet(halfLength);
height = RiaEclipseUnitTools::meterToFeet(height);
width = RiaEclipseUnitTools::meterToInch(width);
wellDiameter = RiaEclipseUnitTools::meterToInch(wellDiameter);
perforationLength = RiaEclipseUnitTools::meterToFeet(perforationLength);
m_halfLength = RiaEclipseUnitTools::meterToFeet(m_halfLength);
m_height = RiaEclipseUnitTools::meterToFeet(m_height);
m_width = RiaEclipseUnitTools::meterToInch(m_width);
wellDiameter = RiaEclipseUnitTools::meterToInch(wellDiameter);
perforationLength = RiaEclipseUnitTools::meterToFeet(perforationLength);
fractureTemplateUnit = RiaEclipseUnitTools::UNITS_FIELD;
}
else if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
halfLength = RiaEclipseUnitTools::feetToMeter(halfLength);
height = RiaEclipseUnitTools::feetToMeter(height);
width = RiaEclipseUnitTools::inchToMeter(width);
wellDiameter = RiaEclipseUnitTools::inchToMeter(wellDiameter);
perforationLength = RiaEclipseUnitTools::feetToMeter(perforationLength);
m_halfLength = RiaEclipseUnitTools::feetToMeter(m_halfLength);
m_height = RiaEclipseUnitTools::feetToMeter(m_height);
m_width = RiaEclipseUnitTools::inchToMeter(m_width);
wellDiameter = RiaEclipseUnitTools::inchToMeter(wellDiameter);
perforationLength = RiaEclipseUnitTools::feetToMeter(perforationLength);
fractureTemplateUnit = RiaEclipseUnitTools::UNITS_METRIC;
}
@ -196,8 +196,8 @@ void RimEllipseFractureTemplate::setupFractureGridCells()
int numberOfCellsX = 35;
int numberOfCellsY = 35;
double cellSizeX = (halfLength * 2) / numberOfCellsX;
double cellSizeZ = height / numberOfCellsY;
double cellSizeX = (m_halfLength * 2) / numberOfCellsX;
double cellSizeZ = m_height / numberOfCellsY;
double cellArea = cellSizeX * cellSizeZ;
double areaTresholdForIncludingCell = 0.5 * cellArea;
@ -207,10 +207,10 @@ void RimEllipseFractureTemplate::setupFractureGridCells()
{
for (int j = 0; j < numberOfCellsX; j++)
{
double X1 = - halfLength + i * cellSizeX;
double X2 = - halfLength + (i+1) * cellSizeX;
double Y1 = - height / 2 + j * cellSizeZ;
double Y2 = - height / 2 + (j+1) * cellSizeZ;
double X1 = - m_halfLength + i * cellSizeX;
double X2 = - m_halfLength + (i+1) * cellSizeX;
double Y1 = - m_height / 2 + j * cellSizeZ;
double Y2 = - m_height / 2 + (j+1) * cellSizeZ;
std::vector<cvf::Vec3d> cellPolygon;
cellPolygon.push_back(cvf::Vec3d(X1, Y1, 0.0));
@ -222,12 +222,12 @@ void RimEllipseFractureTemplate::setupFractureGridCells()
if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
//Conductivity should be md-m, width is in m
cond = permeability * width;
cond = m_permeability * m_width;
}
else if(fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
//Conductivity should be md-ft, but width is in inches
cond = permeability * RiaEclipseUnitTools::inchToFeet(width);
cond = m_permeability * RiaEclipseUnitTools::inchToFeet(m_width);
}
std::vector<cvf::Vec3f> ellipseFracPolygon = fractureBorderPolygon(fractureTemplateUnit());
@ -282,17 +282,17 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit()
{
if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
width = 0.5f;
permeability = 800000.0f;
halfLength = 300.0f;
height = 225.0f;
m_width = 0.5f;
m_permeability = 800000.0f;
m_halfLength = 300.0f;
m_height = 225.0f;
}
else
{
width = 0.01f;
permeability = 1000000.0f;
halfLength = 100.0f;
height = 75.0f;
m_width = 0.01f;
m_permeability = 1000000.0f;
m_halfLength = 100.0f;
m_height = 75.0f;
}
this->setDefaultWellDiameterFromUnit();
@ -307,37 +307,37 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm
if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC)
{
halfLength.uiCapability()->setUiName("Halflenght X<sub>f</sub> [m]");
height.uiCapability()->setUiName("Height [m]");
width.uiCapability()->setUiName("Width [m]");
m_halfLength.uiCapability()->setUiName("Halflenght X<sub>f</sub> [m]");
m_height.uiCapability()->setUiName("Height [m]");
m_width.uiCapability()->setUiName("Width [m]");
wellDiameter.uiCapability()->setUiName("Well Diameter [m]");
}
else if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD)
{
halfLength.uiCapability()->setUiName("Halflenght X<sub>f</sub> [Ft]");
height.uiCapability()->setUiName("Height [Ft]");
width.uiCapability()->setUiName("Width [inches]");
m_halfLength.uiCapability()->setUiName("Halflenght X<sub>f</sub> [Ft]");
m_height.uiCapability()->setUiName("Height [Ft]");
m_width.uiCapability()->setUiName("Width [inches]");
wellDiameter.uiCapability()->setUiName("Well Diameter [inches]");
}
if (conductivityType == FINITE_CONDUCTIVITY)
{
permeability.uiCapability()->setUiHidden(false);
width.uiCapability()->setUiHidden(false);
m_permeability.uiCapability()->setUiHidden(false);
m_width.uiCapability()->setUiHidden(false);
}
else if (conductivityType == INFINITE_CONDUCTIVITY)
{
permeability.uiCapability()->setUiHidden(true);
width.uiCapability()->setUiHidden(true);
m_permeability.uiCapability()->setUiHidden(true);
m_width.uiCapability()->setUiHidden(true);
}
uiOrdering.add(&name);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Geometry");
geometryGroup->add(&halfLength);
geometryGroup->add(&height);
geometryGroup->add(&m_halfLength);
geometryGroup->add(&m_height);
geometryGroup->add(&orientationType);
geometryGroup->add(&azimuthAngle);
@ -346,8 +346,8 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm
caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Properties");
propertyGroup->add(&conductivityType);
propertyGroup->add(&permeability);
propertyGroup->add(&width);
propertyGroup->add(&m_permeability);
propertyGroup->add(&m_width);
propertyGroup->add(&skinFactor);
propertyGroup->add(&perforationLength);
propertyGroup->add(&perforationEfficiency);

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

@ -46,15 +46,7 @@ public:
RimEllipseFractureTemplate(void);
virtual ~RimEllipseFractureTemplate(void);
caf::PdmField<float> halfLength;
caf::PdmField<float> height;
caf::PdmField<float> width;
caf::PdmField<float> permeability;
void loadDataAndUpdate();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* polygonIndices,
@ -64,11 +56,20 @@ public:
const RigFractureGrid* fractureGrid() const;
void setDefaultValuesFromUnit();
void setDefaultValuesFromUnit();
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
void setupFractureGridCells();
cvf::ref<RigFractureGrid> m_fractureGrid;
void setupFractureGridCells();
private:
cvf::ref<RigFractureGrid> m_fractureGrid;
caf::PdmField<float> m_halfLength;
caf::PdmField<float> m_height;
caf::PdmField<float> m_width;
caf::PdmField<float> m_permeability;
};

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

@ -61,7 +61,7 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimFractureTemplate, "RimFractureTemplate");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFractureTemplate::RimFractureTemplate(void)
RimFractureTemplate::RimFractureTemplate()
{
CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
@ -226,7 +226,7 @@ void RimFractureTemplate::defineEditorAttribute(const caf::PdmFieldHandle* field
{
if (field == &perforationEfficiency)
{
caf::PdmUiDoubleSliderEditorAttribute* myAttr = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>(attribute);
auto myAttr = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>(attribute);
if (myAttr)
{
myAttr->m_minimum = 0;
@ -303,4 +303,4 @@ void RimFractureTemplate::setDefaultWellDiameterFromUnit()
{
wellDiameter = 0.216;
}
}
}

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

@ -45,8 +45,8 @@ class RimFractureTemplate : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimFractureTemplate(void);
virtual ~RimFractureTemplate(void);
RimFractureTemplate();
virtual ~RimFractureTemplate();
caf::PdmField<QString> name;
caf::PdmField<float> azimuthAngle;
@ -91,7 +91,7 @@ protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;