From 25f7411a1fc7c46ee2fc07ee0c452d8f589ff178 Mon Sep 17 00:00:00 2001
From: Sam Reeve <6740307+streeve@users.noreply.github.com>
Date: Thu, 16 Nov 2023 09:50:45 -0500
Subject: [PATCH] fixup: simplify deprecated sparse Cajita wrappers

---
 grid/src/Cabana_Grid_IndexSpace.hpp  |  7 -------
 grid/src/Cabana_Grid_SparseArray.hpp | 26 ++++++++++----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/grid/src/Cabana_Grid_IndexSpace.hpp b/grid/src/Cabana_Grid_IndexSpace.hpp
index 9253257a6..94f0043f9 100644
--- a/grid/src/Cabana_Grid_IndexSpace.hpp
+++ b/grid/src/Cabana_Grid_IndexSpace.hpp
@@ -501,13 +501,6 @@ CAJITA_DEPRECATED auto createView( Args&&... args )
     return Cabana::Grid::createView( std::forward<Args>( args )... );
 }
 
-template <class Scalar, class... Params>
-CAJITA_DEPRECATED auto createView( const std::string& label,
-                                   const IndexSpace<1>& index_space )
-{
-    return Cabana::Grid::createView<Scalar, Params...>( label, index_space );
-}
-
 template <class... Args>
 CAJITA_DEPRECATED auto createSubview( Args&&... args )
 {
diff --git a/grid/src/Cabana_Grid_SparseArray.hpp b/grid/src/Cabana_Grid_SparseArray.hpp
index 75783d67d..f730c54e8 100644
--- a/grid/src/Cabana_Grid_SparseArray.hpp
+++ b/grid/src/Cabana_Grid_SparseArray.hpp
@@ -721,38 +721,32 @@ using SparseArrayLayout CAJITA_DEPRECATED =
     Cabana::Grid::Experimental::SparseArrayLayout<DataTypes, EntityType,
                                                   MeshType, SparseMapType>;
 
-template <class DataTypes, class EntityType, class MeshType,
-          class SparseMapType>
-CAJITA_DEPRECATED auto createSparseArrayLayout(
-    const std::string label,
-    SparseArrayLayout<DataTypes, EntityType, MeshType, SparseMapType>& layout )
+template <class... Args>
+CAJITA_DEPRECATED auto createSparseArrayLayout( Args&&... args )
 {
-    return Cabana::Grid::Experimental::createSparseArrayLayout( label, layout );
+    return Cabana::Grid::Experimental::createSparseArrayLayout(
+        std::forward<Args>( args )... );
 }
 
 template <class T>
 using is_sparse_array_layout CAJITA_DEPRECATED =
     Cabana::Grid::Experimental::is_sparse_array_layout<T>;
 
-template <class DataTypes, class DeviceType, class EntityType, class MeshType,
+template <class DataTypes, class MemorySpace, class EntityType, class MeshType,
           class SparseMapType>
 using SparseArray CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::SparseArray<DataTypes, DeviceType, EntityType,
+    Cabana::Grid::Experimental::SparseArray<DataTypes, MemorySpace, EntityType,
                                             MeshType, SparseMapType>;
 
 template <class T>
 using is_sparse_array CAJITA_DEPRECATED =
     Cabana::Grid::Experimental::is_sparse_array<T>;
 
-template <class DeviceType, class DataTypes, class EntityType, class MeshType,
-          class SparseMapType>
-CAJITA_DEPRECATED auto
-createSparseArray( const std::string label,
-                   SparseArray<DataTypes, DeviceType, EntityType, MeshType,
-                               SparseMapType>& layout )
+template <class MemorySpace, class... Args>
+CAJITA_DEPRECATED auto createSparseArray( Args&&... args )
 {
-    return Cabana::Grid::Experimental::createSparseArray<DeviceType>( label,
-                                                                      layout );
+    return Cabana::Grid::Experimental::createSparseArray<MemorySpace>(
+        std::forward<Args>( args )... );
 }
 //! \endcond
 } // namespace Experimental