From cda9d8297166230931ecc4259370724855cf62e4 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 8 Dec 2017 10:49:32 +0100
Subject: [PATCH] Use int instead of size_t to represent time step

---
 .../ProjectDataModel/RimSimWellInView.cpp     | 19 +++++++++------
 .../RigSimulationWellCenterLineCalculator.cpp | 23 ++++++++++---------
 .../RigSimulationWellCenterLineCalculator.h   |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
index 539d99b326..15443e52c3 100644
--- a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
@@ -166,20 +166,25 @@ caf::PdmFieldHandle* RimSimWellInView::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimSimWellInView::calculateWellPipeStaticCenterLine(std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
-                                                       std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
+void RimSimWellInView::calculateWellPipeStaticCenterLine(std::vector<std::vector<cvf::Vec3d>>&         pipeBranchesCLCoords,
+                                                         std::vector<std::vector<RigWellResultPoint>>& pipeBranchesCellIds)
 {
-    RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(this, pipeBranchesCLCoords, pipeBranchesCellIds);
+    RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(this,
+                                                                             pipeBranchesCLCoords, 
+                                                                             pipeBranchesCellIds);
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimSimWellInView::calculateWellPipeDynamicCenterLine(size_t timeStepIdx, 
-                                                 std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
-                                                 std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) const
+void RimSimWellInView::calculateWellPipeDynamicCenterLine(size_t                                        timeStepIdx,
+                                                          std::vector<std::vector<cvf::Vec3d>>&         pipeBranchesCLCoords,
+                                                          std::vector<std::vector<RigWellResultPoint>>& pipeBranchesCellIds) const
 {
-    RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(this, timeStepIdx, pipeBranchesCLCoords, pipeBranchesCellIds);
+    RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(this, 
+                                                                              static_cast<int>(timeStepIdx),
+                                                                              pipeBranchesCLCoords, 
+                                                                              pipeBranchesCellIds);
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
index b22118d734..f9c0929aff 100644
--- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
@@ -21,18 +21,19 @@
 
 #include "RigCell.h"
 #include "RigEclipseCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"
+#include "RimSimWellInViewCollection.h"
 
-#include "cvfRay.h"
 #include "cvfBoundingBoxTree.h"
-#include "RigMainGrid.h"
+#include "cvfGeometryTools.h"
+#include "cvfRay.h"
+
 #include <deque>
 #include <list>
-#include "cvfGeometryTools.h"
 
 //--------------------------------------------------------------------------------------------------
 /// Based on the points and cells, calculate a pipe centerline
@@ -43,7 +44,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(Ri
                                                                         std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
                                                                         std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) 
 {
-    calculateWellPipeDynamicCenterline(rimWell, cvf::UNDEFINED_SIZE_T, pipeBranchesCLCoords, pipeBranchesCellIds);
+    calculateWellPipeDynamicCenterline(rimWell, -1, pipeBranchesCLCoords, pipeBranchesCellIds);
 }
 
 
@@ -51,7 +52,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(Ri
 /// 
 //--------------------------------------------------------------------------------------------------
 void RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(const RimSimWellInView* rimWell, 
-                                                                               size_t timeStepIndex, 
+                                                                               int timeStepIndex, 
                                                                                std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
                                                                                std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
 {
@@ -71,7 +72,7 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeDynamicCenterline(c
 
     calculateWellPipeCenterlineFromWellFrame(eclipseCaseData,
                                              simWellData,
-                                             static_cast<int>(timeStepIndex),
+                                             timeStepIndex,
                                              isAutoDetectBranches,
                                              useAllCellCenters,
                                              pipeBranchesCLCoords, 
@@ -102,14 +103,14 @@ void RigSimulationWellCenterLineCalculator::calculateWellPipeCenterlineFromWellF
     
     if (timeStepIndex < 0) 
     {
-        wellFramePtr =  &wellResults->staticWellCells();
+        wellFramePtr = &wellResults->staticWellCells();
     }
     else
     {
-        wellFramePtr =  &(wellResults->wellResultFrame(timeStepIndex));
+        wellFramePtr = &(wellResults->wellResultFrame(timeStepIndex));
     }
 
-    bool isMultiSegmentWell             = wellResults->isMultiSegmentWell();
+    bool isMultiSegmentWell = wellResults->isMultiSegmentWell();
 
     #if 0 // Fancy branch splitting, but with artifacts. Needs a bit more work to be better overall than the one we have.
     RigWellResultFrame splittedWellFrame;
@@ -1098,4 +1099,4 @@ RigWellResultFrame RigSimulationWellCenterLineCalculator::splitIntoBranches(cons
     BranchSplitter splitter(wellResultFrame, eclipseCaseData);
 
     return splitter.splittedWellResultFrame();
-}
\ No newline at end of file
+}
diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h
index a2d435df28..9a2d85a2a8 100644
--- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h
+++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.h
@@ -33,7 +33,7 @@ public:
                                                   std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ;
 
     static void calculateWellPipeDynamicCenterline(const RimSimWellInView* rimWell, 
-                                                   size_t timeStepIndex,
+                                                   int timeStepIndex,
                                                    std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
                                                    std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) ;