fix LinearTransform::setData

GEOS-DEV · Oct 29, 2024 · d3c2a8e · d3c2a8e
1 parent f06f420
commit d3c2a8e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/src/geometry/mapping/LinearTransform.hpp b/src/geometry/mapping/LinearTransform.hpp
@@ -108,15 +108,22 @@ class LinearTransform
    * @brief Sets the coordinates of the vertices of the cell
    * @param[in] coords The coordinates of the vertices of the cell
    */
-  constexpr SHIVA_HOST_DEVICE SHIVA_FORCE_INLINE void setData( DataType const & coords )
+  template< typename T >
+  constexpr SHIVA_HOST_DEVICE SHIVA_FORCE_INLINE void setData( T const & coords )
   {
-    for ( int a = 0; a < numVertices; ++a )
+
+    SupportIndexType index;
+    forRange( index = {0, 0, 0}, [&] ( auto const & aa )
     {
+      int const a = aa.data[0];
+      int const b = aa.data[1];
+      int const c = aa.data[2];
+
       for ( int i = 0; i < numDims; ++i )
       {
-        m_vertexCoords[a][i] = coords[a][i];
+        m_vertexCoords(a,b,c,i) = coords[a + 2 * b + 4 * c][i];
       }
-    }
+    });
   }
 
 private:

diff --git a/src/geometry/mapping/unitTests/testLinearTransform.cpp b/src/geometry/mapping/unitTests/testLinearTransform.cpp
@@ -109,21 +109,23 @@ SHIVA_HOST_DEVICE auto makeLinearTransform( REAL_TYPE const (&X)[8][3] )
                                       LagrangeBasis< double, 1, EqualSpacing >,
                                       LagrangeBasis< double, 1, EqualSpacing > > > cell;
 
-  typename decltype(cell)::SupportIndexType index;
+//  typename decltype(cell)::SupportIndexType index;
 
-  auto & transformData = cell.getData();
+//  auto & transformData = cell.getData();
 
-  forRange( index = {0, 0, 0}, [&transformData, &X] ( auto const & i )
-  {
-    int const a = i.data[0];
-    int const b = i.data[1];
-    int const c = i.data[2];
+  cell.setData( X );
 
-    for ( int j = 0; j < 3; ++j )
-    {
-      transformData( a, b, c, j ) = X[ a + 2 * b + 4 * c ][j];
-    }
-  } );
+  // forRange( index = {0, 0, 0}, [&transformData, &X] ( auto const & i )
+  // {
+  //   int const a = i.data[0];
+  //   int const b = i.data[1];
+  //   int const c = i.data[2];
+
+  //   for ( int j = 0; j < 3; ++j )
+  //   {
+  //     transformData( a, b, c, j ) = X[ a + 2 * b + 4 * c ][j];
+  //   }
+  // } );
 
   return cell;
 }