mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-27 07:30:20 -05:00
#12999 Add spacing to system parameters
Add spacing to RicFishbonesSystemParameters Use 12.5 as default, use 18.5 for drillingExtendedParameters Remove duplicated code
This commit is contained in:
1 parent
c921299305
commit
f81a2d8967
7 files changed
+186
-86
No files matched your search
@@ -64,7 +64,7 @@ void caf::AppEnum<RimFishbonesDefines::ValueSource>::setUp()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimFishbonesDefines::RicFishbonesSystemParameters RimFishbonesDefines::drillingStandardParameters()
|
||||
{
|
||||
return { .lateralsPerSub = 3, .lateralLength = 11.0, .holeDiameter = 12.5, .buildAngle = 6.0, .icdsPerSub = 3 };
|
||||
return { .lateralsPerSub = 3, .lateralLength = 11.0, .holeDiameter = 12.5, .buildAngle = 6.0, .icdsPerSub = 3, .spacing = 12.5 };
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -72,7 +72,7 @@ RimFishbonesDefines::RicFishbonesSystemParameters RimFishbonesDefines::drillingS
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimFishbonesDefines::RicFishbonesSystemParameters RimFishbonesDefines::drillingExtendedParameters()
|
||||
{
|
||||
return { .lateralsPerSub = 3, .lateralLength = 18.0, .holeDiameter = 12.5, .buildAngle = 4.0, .icdsPerSub = 3 };
|
||||
return { .lateralsPerSub = 3, .lateralLength = 18.0, .holeDiameter = 12.5, .buildAngle = 4.0, .icdsPerSub = 3, .spacing = 18.5 };
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -80,5 +80,5 @@ RimFishbonesDefines::RicFishbonesSystemParameters RimFishbonesDefines::drillingE
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimFishbonesDefines::RicFishbonesSystemParameters RimFishbonesDefines::acidJettingParameters()
|
||||
{
|
||||
return { .lateralsPerSub = 4, .lateralLength = 12.0, .holeDiameter = 15.0, .buildAngle = 6.0, .icdsPerSub = 4 };
|
||||
return { .lateralsPerSub = 4, .lateralLength = 12.0, .holeDiameter = 15.0, .buildAngle = 6.0, .icdsPerSub = 4, .spacing = 12.5 };
|
||||
}
|
||||
@@ -54,6 +54,7 @@ struct RicFishbonesSystemParameters
|
||||
double holeDiameter;
|
||||
double buildAngle;
|
||||
int icdsPerSub;
|
||||
double spacing;
|
||||
};
|
||||
|
||||
RicFishbonesSystemParameters drillingStandardParameters();
|
||||
|
||||
Reference in new issue
Block a user