Remove Ferrite.scalarwrapper

lijas · Jul 1, 2024 · a58b49f · a58b49f
1 parent 4bf03ce
commit a58b49f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/iterators.jl b/src/iterators.jl
@@ -4,7 +4,7 @@ struct IGACellCache{X,G<:Ferrite.AbstractGrid,DH<:Union{Ferrite.AbstractDofHandl
     # Pretty useless to store this since you have it already for the reinit! call, but
     # needed for the CellIterator(...) workflow since the user doesn't necessarily control
     # the loop order in the cell subset.
-    cellid::Ferrite.ScalarWrapper{Int}
+    cellid::Base.RefValue{Int}
     nodes::Vector{Int}
     bezier_cell_data::X
     dh::DH
@@ -20,7 +20,7 @@ function IGACellCache(dh::DofHandler{dim,G}, flags::UpdateFlags=UpdateFlags()) w
     n        = ndofs_per_cell(dh, 1)
     celldofs = zeros(Int, n)
 
-    return IGACellCache(flags, grid, Ferrite.ScalarWrapper(-1), nodes, coords, dh, celldofs)
+    return IGACellCache(flags, grid, Ref(-1), nodes, coords, dh, celldofs)
 end
 
 function Ferrite.reinit!(cc::IGACellCache, i::Int)
@@ -52,12 +52,12 @@ Ferrite.cellid(cc::IGACellCache) = cc.cellid[]
 struct IGAFaceCache{CC}
     cc::CC  # const for julia > 1.8
     dofs::Vector{Int} # aliasing cc.dofs
-    current_faceid::Ferrite.ScalarWrapper{Int}
+    current_faceid::Base.RefValue{Int}
 end
 
 function IGAFaceCache(args...)
     cc = IGACellCache(args...)
-    IGAFaceCache(cc, cc.dofs, Ferrite.ScalarWrapper(0))
+    IGAFaceCache(cc, cc.dofs, Ref(-1))
 end
 
 function Ferrite.reinit!(fc::IGAFaceCache, face::Ferrite.BoundaryIndex)

diff --git a/src/splines/bezier_values.jl b/src/splines/bezier_values.jl
@@ -33,7 +33,7 @@ struct BezierFacetValues{FV, GM, FQR, dim, T, V_FV<:AbstractVector{FV}, V_GM<:Ab
 
     current_beo::Base.RefValue{BezierExtractionOperator{T}}
     current_w::Vector{T}
-    current_facet::Ferrite.ScalarWrapper{Int}
+    current_facet::Base.RefValue{Int}
 end
 
 Ferrite.shape_value_type(cv::BezierCellValues) = Ferrite.shape_value_type(cv.bezier_values)
@@ -92,7 +92,7 @@ function BezierFacetValues(::Type{T}, fqr::FacetQuadratureRule, ip_fun::Interpol
         fun_values, 
         deepcopy(fun_values), 
         deepcopy(fun_values), 
-        geo_mapping, fqr, detJdV, normals, undef_beo, undef_w, Ferrite.ScalarWrapper(-1))
+        geo_mapping, fqr, detJdV, normals, undef_beo, undef_w, Ref(-1))
 end
 
 function BezierFacetValues(qr::FacetQuadratureRule, ip::Interpolation, args...; kwargs...)