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

#3527 Split out the valve locations from RimFishbonesMultipleSubs.h

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-10-19 12:20:09 +02:00
parent fc4620985f
commit 43552fde88
5 changed files with 549 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h
View File

@@ -38,6 +38,7 @@
#include <memory>
class RigFisbonesGeometry;
class RimMultipleValveLocations;
//==================================================================================================
///
@@ -61,7 +62,8 @@ public:
{
FB_SUB_COUNT_END,
FB_SUB_SPACING_END,
FB_SUB_USER_DEFINED
FB_SUB_USER_DEFINED,
FB_SUB_UNDEFINED
};
enum LateralsOrientationType
@@ -95,6 +97,8 @@ public:
size_t icdCount() const { return m_icdCount(); }
std::vector<double> lateralLengths() const;
void valveLocationsUpdated();
const std::vector<SubLateralIndex>& installedLateralIndices() const { return m_subLateralIndices; };
std::vector<cvf::Vec3d> coordsForLateral(size_t subIndex, size_t lateralIndex) const;
std::vector<std::pair<cvf::Vec3d, double>> coordsAndMDForLateral(size_t subIndex, size_t lateralIndex) const;
@@ -129,9 +133,10 @@ private:
void computeRotationAngles();
void computeSubLateralIndices();
static std::vector<double> locationsFromStartSpacingAndCount(double start, double spacing, size_t count);
static int randomValueFromRange(int min, int max);
void initialiseObsoleteFields();
void initValveLocationFromLegacyData();
private:
caf::PdmField<bool> m_isActive;
caf::PdmProxyValueField<QString> m_name;
@@ -153,16 +158,9 @@ private:
caf::PdmField<double> m_icdOrificeDiameter;
caf::PdmField<double> m_icdFlowCoefficient;
caf::PdmField<caf::AppEnum<LocationType> > m_subsLocationMode;
caf::PdmField<double> m_rangeStart;
caf::PdmField<double> m_rangeEnd;
caf::PdmField<double> m_rangeSubSpacing;
caf::PdmField<int> m_rangeSubCount;
caf::PdmChildField<RimMultipleValveLocations*> m_valveLocations;
caf::PdmField<caf::AppEnum<LateralsOrientationType> > m_subsOrientationMode;
caf::PdmField<std::vector<double>> m_locationOfSubs; // Given in measured depth
caf::PdmField<std::vector<double>> m_installationRotationAngles;
caf::PdmField<double> m_fixedInstallationRotationAngle;
@@ -172,4 +170,13 @@ private:
std::unique_ptr<RigFisbonesGeometry> m_rigFishbonesGeometry;
std::vector<SubLateralIndex> m_subLateralIndices;
// Moved to RimMultipleValveLocations
caf::PdmField<caf::AppEnum<LocationType> > m_subsLocationMode_OBSOLETE;
caf::PdmField<double> m_rangeStart_OBSOLETE;
caf::PdmField<double> m_rangeEnd_OBSOLETE;
caf::PdmField<double> m_rangeSubSpacing_OBSOLETE;
caf::PdmField<int> m_rangeSubCount_OBSOLETE;
caf::PdmField<std::vector<double>> m_locationOfSubs_OBSOLETE; // Given in measured depth
};