handle Vec<T,2> in more cases

Author: aumuell

lib/vistle/alg/fields.cpp

@@ -131,6 +131,12 @@ class RemapImpl {
                 out = remapDataTempl<T, 1, Mapping>(in1, mapping, inverse);
             }
             break;
+        case 2:
+            if (auto in2 = Vec<T, 2>::as(in)) {
+                found = true;
+                out = remapDataTempl<T, 2, Mapping>(in2, mapping, inverse);
+            }
+            break;
         case 3:
             if (auto in3 = Vec<T, 3>::as(in)) {
                 found = true;

lib/vistle/vtkm/convert.cpp

@@ -237,13 +237,17 @@ struct AddField {
     void operator()(S)
     {
         typedef Vec<S, 1> V1;
-        //typedef Vec<S, 2> V2;
+        typedef Vec<S, 2> V2;
         typedef Vec<S, 3> V3;
         //typedef Vec<S, 4> V4;
 
         viskores::cont::UnknownArrayHandle ah;
         if (auto in = V1::as(object)) {
             ah = in->x().handle();
+        } else if (auto in = V2::as(object)) {
+            auto ax = in->x().handle();
+            auto ay = in->y().handle();
+            ah = viskores::cont::make_ArrayHandleSOA(ax, ay);
         } else if (auto in = V3::as(object)) {
             auto ax = in->x().handle();
             auto ay = in->y().handle();

module/filter/SplitDimensions/SplitDimensions.cpp

@@ -63,7 +63,7 @@ bool SplitDimensions::compute(const std::shared_ptr<BlockTask> &task) const
         return true;
     }
 
-    vistle::Points::ptr out0d(new vistle::Points(size_t(0)));
+    vistle::Points::ptr out0d;
     if (isConnected(*p_out[0])) {
         out0d.reset(new vistle::Points(size_t(0)));
     }
@@ -113,12 +113,12 @@ bool SplitDimensions::compute(const std::shared_ptr<BlockTask> &task) const
 
             switch (type) {
             case cell::POINT:
-                if (out0d) {
+                if (out0d && !ugrid->isGhost(e)) {
                     Index v = icl[begin];
                     vm[0][v] = npoint++;
                     out0d->d()->x[0]->push_back(ugrid->x()[v]);
                     out0d->d()->x[1]->push_back(ugrid->y()[v]);
-                    out0d->d()->x[2]->push_back(ugrid->y()[v]);
+                    out0d->d()->x[2]->push_back(ugrid->z()[v]);
                 }
                 break;
             case cell::BAR:
@@ -188,6 +188,7 @@ bool SplitDimensions::compute(const std::shared_ptr<BlockTask> &task) const
 #endif
     }
 
+    const bool reuseCoord = p_reuse->getValue();
     Object::ptr obj;
     for (int d = 0; d <= 3; ++d) {
         if (d == 0)
@@ -196,10 +197,10 @@ bool SplitDimensions::compute(const std::shared_ptr<BlockTask> &task) const
             obj = out[d];
         if (!obj)
             continue;
+        updateMeta(obj);
         if (!data) {
-            updateMeta(obj);
             task->addObject(p_out[d], obj);
-        } else if (vm[d].empty()) {
+        } else if (reuseCoord && vm[d].empty()) {
             DataBase::ptr dout = data->clone();
             dout->setGrid(out[d]);
             updateMeta(dout);

module/map/BoundingBox/BoundingBox.cpp

@@ -389,6 +389,7 @@ bool Extrema::compute()
         handled = true;
     } else {
         boost::mpl::for_each<Scalars>(Compute<1>(obj, this));
+        boost::mpl::for_each<Scalars>(Compute<2>(obj, this));
         boost::mpl::for_each<Scalars>(Compute<3>(obj, this));
     }