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

#1529 Use diameter instead of radius in GUI

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-05-30 09:49:58 +02:00
parent dc9c1a0b42
commit 8092eac2a6
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@@ -326,7 +326,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateF
grid->ijkFromCellIndex(intersection.cellIndex, &i, &j, &k);
RigCompletionData completion(wellPath->name(), IJKCellIndex(i, j, k));
completion.addMetadata(location.fishbonesSubs->name(), QString("Sub: %1 Lateral: %2").arg(location.subIndex).arg(lateral.lateralIndex));
double diameter = location.fishbonesSubs->holeRadius() / 1000 * 2;
double diameter = location.fishbonesSubs->holeDiameter() / 1000;
CellDirection direction = wellPathCellDirectionToCellDirection(intersection.direction);
completion.setFromFishbone(diameter, direction);
completionData.push_back(completion);
@@ -344,7 +344,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateF
{
std::vector<RigCompletionData> completionData;
double diameter = wellPath->fishbonesCollection()->wellPathCollection()->holeRadius() / 1000 * 2;
double diameter = wellPath->fishbonesCollection()->wellPathCollection()->holeDiameter() / 1000;
for (const RimFishboneWellPath* fishbonesPath : wellPath->fishbonesCollection()->wellPathCollection()->wellPaths())
{
std::vector<WellPathCellIntersectionInfo> intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), fishbonesPath->coordinates());
@@ -380,7 +380,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateP
settings.caseToApply->eclipseCaseData()->mainGrid()->ijkFromCellIndex(cell.cellIndex, &i, &j, &k);
RigCompletionData completion(wellPath->name(), IJKCellIndex(i, j, k));
completion.addMetadata("Perforation", QString("StartMD: %1 - EndMD: %2").arg(interval->startMD()).arg(interval->endMD()));
double diameter = interval->radius() * 2;
double diameter = interval->diameter();
CellDirection direction = wellPathCellDirectionToCellDirection(cell.direction);
completion.setFromPerforation(diameter, direction);
completionData.push_back(completion);

12
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.cpp
View File

@@ -67,7 +67,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs()
CAF_PDM_InitField(&m_lateralExitAngle, "LateralExitAngle", 35.0, "Exit Angle [deg]", "", "", "");
CAF_PDM_InitField(&m_lateralBuildAngle, "LateralBuildAngle", 5.0, "Build Angle [deg/m]", "", "", "");
CAF_PDM_InitField(&m_lateralTubingRadius, "LateralTubingRadius", 8.0, "Tubing Radius [mm]", "", "", "");
CAF_PDM_InitField(&m_lateralTubingDiameter, "LateralTubingDiameter", 8.0, "Tubing Diameter [mm]", "", "", "");
CAF_PDM_InitField(&m_lateralOpenHoleRoghnessFactor, "LateralOpenHoleRoghnessFactor", 0.001, "Open Hole Roghness Factor [m]", "", "", "");
CAF_PDM_InitField(&m_lateralTubingRoghnessFactor, "LateralTubingRoghnessFactor", 1e-5, "Tubing Roghness Factor [m]", "", "", "");
@@ -76,7 +76,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs()
CAF_PDM_InitField(&m_lateralInstallFraction, "LateralInstallFraction", 0.7, "Install Fraction [0..1]", "", "", "");
CAF_PDM_InitField(&m_icdCount, "IcdCount", size_t(2), "ICD Count", "", "", "");
CAF_PDM_InitField(&m_icdOrificeRadius, "IcdOrificeRadius", 8.0, "ICD Orifice Radius [mm]", "", "", "");
CAF_PDM_InitField(&m_icdOrificeDiameter, "IcdOrificeDiameter", 8.0, "ICD Orifice Diameter [mm]", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_locationOfSubs, "LocationOfSubs", "Measured Depths [m]", "", "", "");
m_locationOfSubs.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
@@ -171,9 +171,9 @@ double RimFishbonesMultipleSubs::buildAngle() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFishbonesMultipleSubs::tubingRadius() const
double RimFishbonesMultipleSubs::tubingDiameter() const
{
return m_lateralTubingRadius;
return m_lateralTubingDiameter;
}
//--------------------------------------------------------------------------------------------------
@@ -393,11 +393,11 @@ void RimFishbonesMultipleSubs::defineUiOrdering(QString uiConfigName, caf::PdmUi
{
caf::PdmUiGroup* mswGroup = uiOrdering.addNewGroup("Multi Segment Wells");
mswGroup->setCollapsedByDefault(true);
mswGroup->add(&m_lateralTubingRadius);
mswGroup->add(&m_lateralTubingDiameter);
mswGroup->add(&m_lateralOpenHoleRoghnessFactor);
mswGroup->add(&m_lateralTubingRoghnessFactor);
mswGroup->add(&m_icdCount);
mswGroup->add(&m_icdOrificeRadius);
mswGroup->add(&m_icdOrificeDiameter);
}
// Visibility

8
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.h
View File

@@ -70,8 +70,8 @@ public:
double exitAngle() const;
double buildAngle() const;
double tubingRadius() const;
double holeRadius() const { return m_pipeProperties()->holeRadius(); }
double tubingDiameter() const;
double holeDiameter() const { return m_pipeProperties()->holeDiameter(); }
double openHoleRoughnessFactor() const { return m_lateralOpenHoleRoghnessFactor(); }
double lateralCountPerSub() const;
std::vector<double> lateralLengths() const;
@@ -106,7 +106,7 @@ private:
caf::PdmField<double> m_lateralExitAngle;
caf::PdmField<double> m_lateralBuildAngle;
caf::PdmField<double> m_lateralTubingRadius;
caf::PdmField<double> m_lateralTubingDiameter;
caf::PdmField<double> m_lateralOpenHoleRoghnessFactor;
caf::PdmField<double> m_lateralTubingRoghnessFactor;
@@ -115,7 +115,7 @@ private:
caf::PdmField<double> m_lateralInstallFraction;
caf::PdmField<size_t> m_icdCount;
caf::PdmField<double> m_icdOrificeRadius;
caf::PdmField<double> m_icdOrificeDiameter;
caf::PdmField<caf::AppEnum<LocationType> > m_subsLocationMode;
caf::PdmField<double> m_rangeStart;

6
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesPipeProperties.cpp
View File

@@ -30,8 +30,8 @@ RimFishbonesPipeProperties::RimFishbonesPipeProperties()
{
CAF_PDM_InitObject("FishbonesPipeProperties", "", "", "");
CAF_PDM_InitField(&m_lateralHoleRadius, "LateralHoleRadius", 12.0, "Hole Radius [mm]", "", "", "");
CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 1.0, "Skin Factor [0..1]", "", "", "");
CAF_PDM_InitField(&m_lateralHoleDiameter, "LateralHoleDiameter", 12.0, "Hole Diameter [mm]", "", "", "");
CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 1.0, "Skin Factor [0..1]", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@@ -47,6 +47,6 @@ RimFishbonesPipeProperties::~RimFishbonesPipeProperties()
//--------------------------------------------------------------------------------------------------
void RimFishbonesPipeProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering & uiOrdering)
{
uiOrdering.add(&m_lateralHoleRadius);
uiOrdering.add(&m_lateralHoleDiameter);
uiOrdering.add(&m_skinFactor);
}

4
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesPipeProperties.h
View File

@@ -41,12 +41,12 @@ public:
virtual ~RimFishbonesPipeProperties();
double skinFactor() const { return m_skinFactor(); }
double holeRadius() const { return m_lateralHoleRadius(); }
double holeDiameter() const { return m_lateralHoleDiameter(); }
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmField<double> m_skinFactor;
caf::PdmField<double> m_lateralHoleRadius;
caf::PdmField<double> m_lateralHoleDiameter;
};

2
ApplicationCode/ProjectDataModel/RimFishboneWellPathCollection.h
View File

@@ -45,7 +45,7 @@ public:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
std::vector<const RimFishboneWellPath*> wellPaths() const;
double holeRadius() const { return m_pipeProperties->holeRadius(); }
double holeDiameter() const { return m_pipeProperties->holeDiameter(); }
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;

4
ApplicationCode/ProjectDataModel/RimPerforationInterval.cpp
View File

@@ -38,7 +38,7 @@ RimPerforationInterval::RimPerforationInterval()
CAF_PDM_InitField(&m_startMD, "StartMeasuredDepth", 0.0, "Start MD [m]", "", "", "");
CAF_PDM_InitField(&m_endMD, "EndMeasuredDepth", 0.0, "End MD [m]", "", "", "");
CAF_PDM_InitField(&m_radius, "Radius", 0.0, "Radius [m]", "", "", "");
CAF_PDM_InitField(&m_diameter, "Diameter", 0.0, "Diameter [m]", "", "", "");
CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 0.0, "Skin Factor", "", "", "");
m_name.uiCapability()->setUiReadOnly(true);
@@ -105,7 +105,7 @@ void RimPerforationInterval::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
{
uiOrdering.add(&m_startMD);
uiOrdering.add(&m_endMD);
uiOrdering.add(&m_radius);
uiOrdering.add(&m_diameter);
uiOrdering.add(&m_skinFactor);
uiOrdering.skipRemainingFields();

4
ApplicationCode/ProjectDataModel/RimPerforationInterval.h
View File

@@ -40,7 +40,7 @@ public:
void setStartAndEndMD(double startMD, double endMD);
double startMD() const { return m_startMD(); }
double endMD() const { return m_endMD(); }
double radius() const { return m_radius(); }
double diameter() const { return m_diameter(); }
double skinFactor() const { return m_skinFactor(); }
virtual cvf::BoundingBox boundingBoxInDomainCoords() override;
@@ -53,6 +53,6 @@ protected:
private:
caf::PdmField< double > m_startMD;
caf::PdmField< double > m_endMD;
caf::PdmField< double > m_radius;
caf::PdmField< double > m_diameter;
caf::PdmField< double > m_skinFactor;
};