From 5b34414977a25a4a47a86753ae0e387baec394e0 Mon Sep 17 00:00:00 2001
From: astridkbjorke <abjorke@emgs.com>
Date: Mon, 31 Jul 2017 15:10:07 +0200
Subject: [PATCH] #1713 Using time step from view instead of that from
 export-setting when exporting connection factors for simWell-fracture

---
 .../RicExportFractureCompletionsImpl.cpp              | 11 +++++++++--
 .../RicExportFractureCompletionsImpl.h                |  1 -
 .../RicWellPathExportCompletionDataFeature.cpp        |  4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp b/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp
index e8dfff4647..cff908c583 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp
@@ -18,12 +18,15 @@
 
 #include "RicExportFractureCompletionsImpl.h"
 
+#include "RiaLogging.h"
+
 #include "RicExportCompletionDataSettingsUi.h"
 
 #include "RimEclipseCase.h"
 #include "RimFracture.h"
 #include "RimWellPath.h"
 #include "RimFractureTemplate.h"
+#include "RimEclipseView.h"
 #include "RimEclipseWell.h"
 #include "RimSimWellFractureCollection.h"
 #include "RimStimPlanFractureTemplate.h"
@@ -42,7 +45,6 @@
 #include "RigWellPath.h"
 
 #include <vector>
-#include "RiaLogging.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -68,13 +70,18 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
 //--------------------------------------------------------------------------------------------------
 std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
                                                                                                  const RimEclipseWell* well,
-                                                                                                 size_t timeStep,
                                                                                                  QTextStream* outputStreamForIntermediateResultsText)
 {
     std::vector<RigCompletionData> completionData;
 
     std::vector< std::vector <cvf::Vec3d> > pipeBranchesCLCoords;
     std::vector< std::vector <RigWellResultPoint> > pipeBranchesCellIds;
+    
+    RimEclipseView* view = nullptr;
+    well->firstAncestorOrThisOfTypeAsserted(view);
+    
+    size_t timeStep = view->currentTimeStep();
+
     well->calculateWellPipeDynamicCenterLine(timeStep, pipeBranchesCLCoords, pipeBranchesCellIds);
 
     for (size_t branchIndex = 0; branchIndex < pipeBranchesCLCoords.size(); ++branchIndex)
diff --git a/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.h b/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.h
index 870ecae8cc..52deeebf85 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.h
+++ b/ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.h
@@ -37,7 +37,6 @@ public:
 
     static std::vector<RigCompletionData> generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
                                                                           const RimEclipseWell* well,
-                                                                          size_t timeStep,
                                                                           QTextStream* outputStreamForIntermediateResultsText);
 
 private:
diff --git a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
index 3c60fbc7ee..8a27a2845c 100644
--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
@@ -310,7 +310,9 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
 
     for (auto simWell : simWells)
     {
-        std::vector<RigCompletionData> fractureCompletionData = RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(exportSettings.caseToApply(), simWell, exportSettings.timeStep(), &fractureTransmissibilityExportInformationStream);
+        std::vector<RigCompletionData> fractureCompletionData = RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(exportSettings.caseToApply(), 
+                                                                                                                                  simWell, 
+                                                                                                                                  &fractureTransmissibilityExportInformationStream);
         appendCompletionData(&completionsPerEclipseCell, fractureCompletionData);
     }