fixup! Use Adapt.jl to change storage and element type

Author: vchuravy

src/Trixi.jl

@@ -43,7 +43,7 @@ import SciMLBase: get_du, get_tmp_cache, u_modified!,
 
 using DelimitedFiles: readdlm
 using Downloads: Downloads
-import Adapt
+using Adapt: Adapt
 using CodeTracking: CodeTracking
 using ConstructionBase: ConstructionBase
 using DiffEqCallbacks: PeriodicCallback, PeriodicCallbackAffect

src/solvers/dgsem_p4est/containers.jl

@@ -201,11 +201,11 @@ mutable struct P4estInterfaceContainer{NDIMS, uEltype <: Real, NDIMSP2,
                                        uArray <: DenseArray{uEltype, NDIMSP2},
                                        IdsMatrix <: DenseMatrix{Int},
                                        IndicesMatrix <:
-                                       DenseMatrix{NTuple{NDIMS, IndexInfo}},
+                                       DenseMatrix{NTuple{NDIMS, Symbol}},
                                        uVector <: DenseVector{uEltype},
                                        IdsVector <: DenseVector{Int},
                                        IndicesVector <:
-                                       DenseVector{NTuple{NDIMS, IndexInfo}},
+                                       DenseVector{NTuple{NDIMS, Symbol}},
                                        ArrayType, Bool} <:
                AbstractHeterogeneousContainer{ArrayType, Bool}
     u::uArray       # [primary/secondary, variable, i, j, interface]
@@ -270,7 +270,7 @@ function init_interfaces(mesh::Union{P4estMesh, T8codeMesh}, equations, basis, e
     _neighbor_ids = Vector{Int}(undef, 2 * n_interfaces)
     neighbor_ids = unsafe_wrap(Array, pointer(_neighbor_ids), (2, n_interfaces))
 
-    _node_indices = Vector{NTuple{NDIMS, IndexInfo}}(undef, 2 * n_interfaces)
+    _node_indices = Vector{NTuple{NDIMS, Symbol}}(undef, 2 * n_interfaces)
     node_indices = unsafe_wrap(Array, pointer(_node_indices), (2, n_interfaces))
 
     interfaces = P4estInterfaceContainer{NDIMS, uEltype, NDIMS + 2,
@@ -328,7 +328,7 @@ mutable struct P4estBoundaryContainer{NDIMS, uEltype <: Real, NDIMSP1,
                                       uArray <: DenseArray{uEltype, NDIMSP1},
                                       IdsVector <: DenseVector{Int},
                                       IndicesVector <:
-                                      DenseVector{NTuple{NDIMS, IndexInfo}},
+                                      DenseVector{NTuple{NDIMS, Symbol}},
                                       uVector <: DenseVector{uEltype}, ArrayType,
                                       Bool} <:
                AbstractHeterogeneousContainer{ArrayType, Bool}
@@ -389,7 +389,7 @@ function init_boundaries(mesh::Union{P4estMesh, T8codeMesh}, equations, basis, e
                      n_boundaries))
 
     neighbor_ids = Vector{Int}(undef, n_boundaries)
-    node_indices = Vector{NTuple{NDIMS, IndexInfo}}(undef, n_boundaries)
+    node_indices = Vector{NTuple{NDIMS, Symbol}}(undef, n_boundaries)
     names = Vector{Symbol}(undef, n_boundaries)
 
     boundaries = P4estBoundaryContainer{NDIMS, uEltype, NDIMS + 1, typeof(u),
@@ -491,11 +491,11 @@ mutable struct P4estMortarContainer{NDIMS, uEltype <: Real, NDIMSP1, NDIMSP3,
                                     uArray <: DenseArray{uEltype, NDIMSP3},
                                     IdsMatrix <: DenseMatrix{Int},
                                     IndicesMatrix <:
-                                    DenseMatrix{NTuple{NDIMS, IndexInfo}},
+                                    DenseMatrix{NTuple{NDIMS, Symbol}},
                                     uVector <: DenseVector{uEltype},
                                     IdsVector <: DenseVector{Int},
                                     IndicesVector <:
-                                    DenseVector{NTuple{NDIMS, IndexInfo}},
+                                    DenseVector{NTuple{NDIMS, Symbol}},
                                     ArrayType, Bool} <:
                AbstractHeterogeneousContainer{ArrayType, Bool}
     u::uArray # [small/large side, variable, position, i, j, mortar]
@@ -558,8 +558,8 @@ function init_mortars(mesh::Union{P4estMesh, T8codeMesh}, equations, basis, elem
     neighbor_ids = unsafe_wrap(Array, pointer(_neighbor_ids),
                                (2^(NDIMS - 1) + 1, n_mortars))
 
-    _node_indices = Vector{NTuple{NDIMS, IndexInfo}}(undef, 2 * n_mortars)
-    node_indices = unsafe_wrap(Array, pointer(_node_indices), (2, n_mortars))
+    _node_indices = Vector{NTuple{NDIMS, Symbol}}(undef, 2 * n_mortars)
+    node_indices = unsafe_wrap(Array, pointer(node_indices), (2, n_mortars))
 
     mortars = P4estMortarContainer{NDIMS, uEltype, NDIMS + 1, NDIMS + 3, typeof(u),
                                    typeof(neighbor_ids), typeof(node_indices),

src/solvers/dgsem_p4est/containers_parallel.jl

@@ -9,7 +9,7 @@ mutable struct P4estMPIInterfaceContainer{NDIMS, uEltype <: Real, NDIMSP2,
                                           uArray <: DenseArray{uEltype, NDIMSP2},
                                           VecInt <: DenseVector{Int},
                                           IndicesVector <:
-                                          DenseVector{NTuple{NDIMS, IndexInfo}},
+                                          DenseVector{NTuple{NDIMS, Symbol}},
                                           uVector <: DenseVector{uEltype},
                                           ArrayType, Bool} <:
                AbstractHeterogeneousContainer{ArrayType, Bool}
@@ -66,7 +66,7 @@ function init_mpi_interfaces(mesh::Union{ParallelP4estMesh, ParallelT8codeMesh},
 
     local_neighbor_ids = Vector{Int}(undef, n_mpi_interfaces)
 
-    node_indices = Vector{NTuple{NDIMS, IndexInfo}}(undef, n_mpi_interfaces)
+    node_indices = Vector{NTuple{NDIMS, Symbol}}(undef, n_mpi_interfaces)
 
     local_sides = Vector{Int}(undef, n_mpi_interfaces)
 
@@ -129,11 +129,11 @@ mutable struct P4estMPIMortarContainer{NDIMS, uEltype <: Real, RealT <: Real, ND
     u::uArray                                      # [small/large side, variable, position, i, j, mortar]
     local_neighbor_ids::Vector{Vector{Int}}        # [mortar][ids]
     local_neighbor_positions::Vector{Vector{Int}}  # [mortar][positions]
-    node_indices::Matrix{NTuple{NDIMS, IndexInfo}} # [small/large, mortar]
+    node_indices::Matrix{NTuple{NDIMS, Symbol}} # [small/large, mortar]
     normal_directions::Array{RealT, NDIMSP2}       # [dimension, i, j, position, mortar]
     # internal `resize!`able storage
     _u::uVector
-    _node_indices::Vector{NTuple{NDIMS, IndexInfo}}
+    _node_indices::Vector{NTuple{NDIMS, Symbol}}
     _normal_directions::Vector{RealT}
 end
 
@@ -190,7 +190,7 @@ function init_mpi_mortars(mesh::Union{ParallelP4estMesh, ParallelT8codeMesh}, eq
     local_neighbor_ids = fill(Vector{Int}(), n_mpi_mortars)
     local_neighbor_positions = fill(Vector{Int}(), n_mpi_mortars)
 
-    _node_indices = Vector{NTuple{NDIMS, IndexInfo}}(undef, 2 * n_mpi_mortars)
+    _node_indices = Vector{NTuple{NDIMS, Symbol}}(undef, 2 * n_mpi_mortars)
     node_indices = unsafe_wrap(Array, pointer(_node_indices), (2, n_mpi_mortars))
 
     _normal_directions = Vector{RealT}(undef,