From 40896e2babff64051b46b7412db27feacc91bc98 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Tue, 15 Mar 2016 13:13:34 -0400
Subject: [PATCH] Allocate the scatter arrays to be proper length.

The previous code would over allocate all the scatter arrays since
it was computing the output range, than using that as the input range.
---
 vtkm/worklet/internal/DispatcherBase.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/vtkm/worklet/internal/DispatcherBase.h b/vtkm/worklet/internal/DispatcherBase.h
index 3beb5f50b..503adeabd 100644
--- a/vtkm/worklet/internal/DispatcherBase.h
+++ b/vtkm/worklet/internal/DispatcherBase.h
@@ -445,6 +445,7 @@ protected:
   {
     this->InvokeTransportParameters(
           invocation,
+          numInstances,
           this->Worklet.GetScatter().GetOutputRange(numInstances),
           device);
   }
@@ -469,6 +470,7 @@ protected:
   {
     this->InvokeTransportParameters(
           invocation,
+          dimensions,
           this->Worklet.GetScatter().GetOutputRange(dimensions),
           device);
   }
@@ -480,10 +482,11 @@ private:
   DispatcherBase(const MyType &);
   void operator=(const MyType &);
 
-  template<typename Invocation, typename RangeType, typename DeviceAdapter>
+  template<typename Invocation, typename InputRangeType, typename OutputRangeType, typename DeviceAdapter>
   VTKM_CONT_EXPORT
   void InvokeTransportParameters(const Invocation &invocation,
-                                 RangeType range,
+                                 const InputRangeType& inputRange,
+                                 const OutputRangeType& outputRange,
                                  DeviceAdapter device) const
   {
     // The first step in invoking a worklet is to transport the arguments to
@@ -504,13 +507,13 @@ private:
         TransportFunctorType>::type ExecObjectParameters;
 
     ExecObjectParameters execObjectParameters =
-        parameters.StaticTransformCont(TransportFunctorType(range));
+        parameters.StaticTransformCont(TransportFunctorType(outputRange));
 
     // Get the arrays used for scattering input to output.
     typename WorkletType::ScatterType::OutputToInputMapType outputToInputMap =
-        this->Worklet.GetScatter().GetOutputToInputMap(range);
+        this->Worklet.GetScatter().GetOutputToInputMap(inputRange);
     typename WorkletType::ScatterType::VisitArrayType visitArray =
-        this->Worklet.GetScatter().GetVisitArray(range);
+        this->Worklet.GetScatter().GetVisitArray(inputRange);
 
     // Replace the parameters in the invocation with the execution object and
     // pass to next step of Invoke. Also add the scatter information.
@@ -519,7 +522,7 @@ private:
           .ChangeParameters(execObjectParameters)
           .ChangeOutputToInputMap(outputToInputMap.PrepareForInput(device))
           .ChangeVisitArray(visitArray.PrepareForInput(device)),
-          range,
+          outputRange,
           device);
   }