[BREAKING] Embedded elements

CHANGELOG.md

@@ -8,12 +8,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - `DofHandler` now supports fields on subdomains and mixed grids. ([#667][github-667])
+- Support for embedded elements in `CellValues`. ([#651][github-651])
+- Support for vectorized interpolations with dimension different from the spatial 
+  dimension in `CellValues`. ([#651][github-651])
 - All keyword arguments supported by `WriteVTK.jl` can be given to `vtk_grid` (only `compress` earlier) ([#687][github-687])
 
 ### Removed
 - **BREAKING**: `MixedDofHandler` has been renamed to `DofHandler`. Update by replacing 
 `MixedDofHandler` to `DofHandler`. ([#667][github-667])
 
+### Other improvements
+- **BREAKING**: All `CellValues` have a finer granularity on the different types of
+  dimensions used. Custom `CellValues` and dispatches on their type parameters must be 
+  updated to respect the new type. ([#651][github-651])
 
 ## [0.3.14] - 2023-04-03
 ### Added
@@ -416,6 +423,7 @@ poking into Ferrite internals:
 [github-645]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/645
 [github-647]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/647
 [github-650]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/650
+[github-651]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/651
 [github-653]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/653
 [github-656]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/656
 [github-658]: https://github.com/Ferrite-FEM/Ferrite.jl/pull/658

Project.toml

@@ -9,6 +9,7 @@ NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Tensors = "48a634ad-e948-5137-8d70-aa71f2a747f4"
 WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
 

docs/Manifest.toml

@@ -361,7 +361,7 @@ uuid = "29a986be-02c6-4525-aec4-84b980013641"
 version = "1.2.9"
 
 [[deps.Ferrite]]
-deps = ["EnumX", "LinearAlgebra", "NearestNeighbors", "Preferences", "Reexport", "SparseArrays", "Tensors", "WriteVTK"]
+deps = ["EnumX", "LinearAlgebra", "NearestNeighbors", "Preferences", "Reexport", "SparseArrays", "StaticArrays", "Tensors", "WriteVTK"]
 path = ".."
 uuid = "c061ca5d-56c9-439f-9c0e-210fe06d3992"
 version = "0.3.14"

docs/src/literate/linear_shell.jl

@@ -29,7 +29,7 @@ grid = generate_shell_grid(nels, size)
 ip = Lagrange{RefQuadrilateral,1}()
 qr_inplane = QuadratureRule{2,RefQuadrilateral}(1)
 qr_ooplane = QuadratureRule{1,RefLine}(2)
-cv = CellValues(qr_inplane, ip)
+cv = CellValues(3, qr_inplane, ip)
 
 # Next we distribute displacement dofs,`:u = (x,y,z)` and rotational dofs, `:θ = (θ₁,  θ₂)`.
 #+
@@ -94,11 +94,12 @@ celldofs = zeros(Int, ndofs_shell)
 cellcoords = zeros(Vec{3,Float64}, nnodes)
 
 assembler = start_assemble(K, f)
-for cellid in 1:getncells(grid)
+for cell in CellIterator(grid)
     fill!(ke, 0.0)
+    reinit!(cv, cell)
 
-    celldofs!(celldofs, dh, cellid)
-    getcoordinates!(cellcoords, grid, cellid)
+    celldofs!(celldofs, dh, cellid(cell))
+    getcoordinates!(cellcoords, grid, cellid(cell))
 
     #Call the element routine
     integrate_shell!(ke, cv, qr_ooplane, cellcoords, data)
@@ -124,9 +125,8 @@ end; #end main functions
 function generate_shell_grid(nels, size)
     _grid = generate_grid(Quadrilateral, nels, Vec((0.0,0.0)), Vec(size))
     nodes = [(n.x[1], n.x[2], 0.0) |> Vec{3} |> Node  for n in _grid.nodes]
-    cells = [Quadrilateral3D(cell.nodes) for cell in _grid.cells]
 
-    grid = Grid(cells, nodes)
+    grid = Grid(_grid.cells, nodes)
 
     return grid
 end;
@@ -215,7 +215,6 @@ end;
 # J_{ij} = \frac{\partial x_i}{\partial \xi_j},
 # ```
 function getjacobian(q, N, dNdξ, ζ, X, p, h)
-
     J = zeros(3,3)
     for a in 1:length(N)
         for i in 1:3, j in 1:3
@@ -261,7 +260,6 @@ function strain(dofvec::Vector{T}, N, dNdx, ζ, dζdx, q, ef1, ef2, h) where T
     dudx = q*dudx
     ε = [dudx[1,1], dudx[2,2], dudx[1,2]+dudx[2,1], dudx[2,3]+dudx[3,2], dudx[1,3]+dudx[3,1]]
     return ε
-
 end;
 
 # ##### Main element routine
@@ -280,31 +278,27 @@ function integrate_shell!(ke, cv, qr_ooplane, X, data)
         a = Vec{3}((0.0, 0.0, 1.0))
         p[i] = a/norm(a)
     end
-    
+
     ef1, ef2, ef3 = fiber_coordsys(p)
 
     for iqp in 1:getnquadpoints(cv)
-
-        dNdξ = cv.dNdξ[:,iqp]
         N = cv.N[:,iqp]
+        dNdξ = cv.dNdξ[:,iqp]
+        dNdx = cv.dNdx[:,iqp]
 
         for oqp in 1:length(qr_ooplane.weights)
-
             ζ = qr_ooplane.points[oqp][1]
-
             q = lamina_coordsys(dNdξ, ζ, X, p, h)
+
             J = getjacobian(q, N, dNdξ, ζ, X, p, h)
-            Jinv = inv(J)  
-
+            Jinv = inv(J)
             dζdx = Vec{3}((0.0, 0.0, 1.0)) ⋅ Jinv
-            dNdx = [Vec{3}((dNdξ[i][1], dNdξ[i][2], 0.0)) ⋅ Jinv for i in 1:nnodes]
 
-
             #For simplicity, use automatic differentiation to construct the B-matrix from the strain.
             B = ForwardDiff.jacobian(
                 (a) -> strain(a, N, dNdx, ζ, dζdx, q, ef1, ef2, h), zeros(Float64, ndofs) )
 
-            dV = det(J) * cv.qr.weights[iqp] * qr_ooplane.weights[oqp]
+            dV = qr_ooplane.weights[oqp] * getdetJdV(cv, iqp)
             ke .+= B'*data.C*B * dV
         end
     end

docs/src/literate/postprocessing.jl

@@ -46,7 +46,7 @@ include("heat_equation.jl");
 # Next we define a function that computes the heat flux for each integration point in the domain.
 # Fourier's law is adopted, where the conductivity tensor is assumed to be isotropic with unit
 # conductivity ``\lambda = 1 ⇒ q = - \nabla u``, where ``u`` is the temperature.
-function compute_heat_fluxes(cellvalues::CellValues, dh::DofHandler, a::AbstractVector{T}) where T
+function compute_heat_fluxes(cellvalues::CellValues{<:ScalarInterpolation}, dh::DofHandler, a::AbstractVector{T}) where T
 
     n = getnbasefunctions(cellvalues)
     cell_dofs = zeros(Int, n)