Skip to content

Commit 093a2ad

Browse files
committed
fixup! Add HeterogenousContainer
1 parent 2aecac6 commit 093a2ad

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

src/solvers/dgsem_p4est/containers.jl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ mutable struct P4estElementContainer{NDIMS, RealT <: Real, uEltype <: Real, NDIM
1212
ArrayNDIMSP3 <: DenseArray{RealT, NDIMSP3},
1313
VectorRealT <: DenseVector{RealT},
1414
VectoruEltype <: DenseVector{uEltype},
15-
ArrayType, Bool} <:
16-
AbstractContainer
15+
ArrayType} <:
16+
AbstractHeterogeneousContainer{ArrayType}
1717
# Physical coordinates at each node
1818
node_coordinates::ArrayNDIMSP2 # [orientation, node_i, node_j, node_k, element]
1919
# Jacobian matrix of the transformation
@@ -203,8 +203,8 @@ mutable struct P4estInterfaceContainer{NDIMS, uEltype <: Real, NDIMSP2,
203203
IdsVector <: DenseVector{Int},
204204
IndicesVector <:
205205
DenseVector{NTuple{NDIMS, Symbol}},
206-
ArrayType, Bool} <:
207-
AbstractContainer
206+
ArrayType} <:
207+
AbstractHeterogeneousContainer{ArrayType}
208208
u::uArray # [primary/secondary, variable, i, j, interface]
209209
neighbor_ids::IdsMatrix # [primary/secondary, interface]
210210
node_indices::IndicesMatrix # [primary/secondary, interface]
@@ -323,9 +323,8 @@ mutable struct P4estBoundaryContainer{NDIMS, uEltype <: Real, NDIMSP1,
323323
IdsVector <: DenseVector{Int},
324324
IndicesVector <:
325325
DenseVector{NTuple{NDIMS, Symbol}},
326-
uVector <: DenseVector{uEltype}, ArrayType,
327-
Bool} <:
328-
AbstractContainer
326+
uVector <: DenseVector{uEltype}, ArrayType} <:
327+
AbstractHeterogeneousContainer{ArrayType}
329328
u::uArray # [variables, i, j, boundary]
330329
neighbor_ids::IdsVector # [boundary]
331330
node_indices::IndicesVector # [boundary]
@@ -487,8 +486,8 @@ mutable struct P4estMortarContainer{NDIMS, uEltype <: Real, NDIMSP1, NDIMSP3,
487486
IdsVector <: DenseVector{Int},
488487
IndicesVector <:
489488
DenseVector{NTuple{NDIMS, Symbol}},
490-
ArrayType, Bool} <:
491-
AbstractContainer
489+
ArrayType} <:
490+
AbstractHeterogeneousContainer{ArrayType}
492491
u::uArray # [small/large side, variable, position, i, j, mortar]
493492
neighbor_ids::IdsMatrix # [position, mortar]
494493
node_indices::IndicesMatrix # [small/large, mortar]

src/solvers/dgsem_p4est/containers_parallel.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ mutable struct P4estMPIInterfaceContainer{NDIMS, uEltype <: Real, NDIMSP2,
1111
IndicesVector <:
1212
DenseVector{NTuple{NDIMS, Symbol}},
1313
uVector <: DenseVector{uEltype},
14-
ArrayType, Bool} <:
15-
AbstractContainer
14+
ArrayType} <:
15+
AbstractHeterogeneousContainer{ArrayType}
1616
u::uArray # [primary/secondary, variable, i, j, interface]
1717
local_neighbor_ids::VecInt # [interface]
1818
node_indices::IndicesVector # [interface]
@@ -120,8 +120,8 @@ mutable struct P4estMPIMortarContainer{NDIMS, uEltype <: Real, RealT <: Real, ND
120120
NDIMSP2, NDIMSP3,
121121
uArray <: DenseArray{uEltype, NDIMSP3},
122122
uVector <: DenseVector{uEltype},
123-
ArrayType, Bool} <:
124-
AbstractContainer
123+
ArrayType} <:
124+
AbstractHeterogeneousContainer{ArrayType}
125125
u::uArray # [small/large side, variable, position, i, j, mortar]
126126
local_neighbor_ids::Vector{Vector{Int}} # [mortar][ids]
127127
local_neighbor_positions::Vector{Vector{Int}} # [mortar][positions]

0 commit comments

Comments
 (0)