Changes to MixedDofHandler #279

lijas · 2020-03-15T11:32:34Z

This makes changes to the MixedDofHandler so it will work the same as regular DofHandler for one celltype. This makes it possible to later merge MixedDofHandler/MixedGrid with DofHandler/Grid, which I think is much cleaner than having two versions that basically do the same thing.

I dont think there will any loss in speed becuase of the way dofhandler stores celldofs, cellcoords and collnodes now.

codecov-io · 2020-03-15T11:50:18Z

Codecov Report

Merging #279 into master will decrease coverage by 1.56%.
The diff coverage is 70.90%.

@@            Coverage Diff             @@
##           master     #279      +/-   ##
==========================================
- Coverage   88.50%   86.93%   -1.57%     
==========================================
  Files          22       21       -1     
  Lines        1897     1937      +40     
==========================================
+ Hits         1679     1684       +5     
- Misses        218      253      +35

Impacted Files	Coverage Δ
src/JuAFEM.jl	`100.00% <ø> (ø)`
src/iterators.jl	`65.30% <50.00%> (-23.34%)`	⬇️
src/Dofs/MixedDofHandler.jl	`79.68% <52.08%> (-9.86%)`	⬇️
src/Grid/grid.jl	`85.83% <87.50%> (+0.24%)`	⬆️
src/Dofs/ConstraintHandler.jl	`90.72% <100.00%> (-0.55%)`	⬇️
src/Dofs/DofHandler.jl	`84.15% <100.00%> (+1.17%)`	⬆️
src/Export/VTK.jl	`79.31% <100.00%> (-1.94%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60d4db1...93c6f91. Read the comment docs.

KristofferC · 2020-03-15T12:18:13Z

docs/src/literate/heat_equation.jl

    # It is now time to loop over all the cells in our grid. We do this by iterating
    # over a `CellIterator`. The iterator caches some useful things for us, for example
    # the nodal coordinates for the cell, and the local degrees of freedom.
    #+
-    @inbounds for cell in CellIterator(dh)


Does CellIterator not work for MixedDofHandler?

Not at the moment, but could quite easily fix that so it works for both dofhandler and mixeddofhandler.

lijas · 2020-03-17T12:15:48Z

Updates:

Remove MixedGrid
Updated CellIterator to work with MixedDofHandler.
I also updated DofHandler, even if the plan is to remove it. The reason for this is to be able to make speed comparisons later maybe...
Created AbstractCell because i need to be able to dispatch on Bezier-cells which has the same type s as a QuadraticQuadrilateral 😄

Todo:
Make MixedDofHandler work more smoothly with ConstraintHandler

KristofferC · 2020-03-18T12:36:41Z

src/iterators.jl

    current_cellid::ScalarWrapper{Int}
    nodes::Vector{Int}
    coords::Vector{Vec{dim,T}}
-    dh::DofHandler{dim,N,T,M}
+    cellset::Vector{Int}
+    dh::Union{DofHandler{dim,C,T}, MixedDofHandler{dim,C,T}} #Futre: remove DofHandler and rename MixedDofHandler->DofHandler


Specialize on this instead?

CellIterator{dim, C, T, DH<:AbstractDofHandler}

fredrikekre · 2020-03-18T14:53:10Z

src/Grid/MixedGrid.jl

@@ -1,5 +1,5 @@

-mutable struct MixedGrid{dim,C,T<:Real} <: JuAFEM.AbstractGrid
+#=mutable struct Grid{dim,C,T<:Real} <: JuAFEM.AbstractGrid


Delete this file

lijas · 2020-03-23T10:37:02Z

src/Dofs/ConstraintHandler.jl

@@ -54,13 +54,14 @@ struct ConstraintHandler{DH<:AbstractDofHandler,T}
    free_dofs::Vector{Int}
    values::Vector{T}
    dofmapping::Dict{Int,Int} # global dof -> index into dofs and values
+    bcvalues::Vector{BCValues{T}}


Store bcvalues in ConstraintHandler instead of getting it from DofHandler

lijas · 2020-03-23T10:38:24Z

src/Dofs/ConstraintHandler.jl

@@ -386,68 +393,27 @@ function meandiag(K::AbstractMatrix)
 end


-
-# TODO Remove - almost identical to the previous
-function _update!(values::Vector{Float64}, f::Function, faces::Set{Tuple{Int,Int}}, field::Symbol, local_face_dofs::Vector{Int}, local_face_dofs_offset::Vector{Int},


Delete this function anduse the normal _update! function for both MixedDofHandler and DofHandler

lijas · 2020-03-23T10:40:11Z

All tests work for me and I think it is possible to merge now.

KristofferC · 2020-03-24T08:55:41Z

Are the changes to the heat equation example still supposed to be in here?

fredrikekre · 2020-03-24T08:57:31Z

docs/src/literate/heat_equation.jl

@@ -110,7 +110,7 @@ update!(ch, 0.0);
 # We define a function, `doassemble` to do the assembly, which takes our `cellvalues`,
 # the sparse matrix and our DofHandler as input arguments. The function returns the
 # assembled stiffness matrix, and the force vector.
-function doassemble(cellvalues::CellScalarValues{dim}, K::SparseMatrixCSC, dh::DofHandler) where {dim}
+function doassemble(cellvalues::CellScalarValues{dim,T}, K::SparseMatrixCSC, dh::JuAFEM.AbstractDofHandler) where {dim,T}


Suggested change

function doassemble(cellvalues::CellScalarValues{dim,T}, K::SparseMatrixCSC, dh::JuAFEM.AbstractDofHandler) where {dim,T}

function doassemble(cellvalues::CellScalarValues{dim}, K::SparseMatrixCSC, dh::JuAFEM.AbstractDofHandler) where {dim}

seems unused

fredrikekre · 2020-03-24T08:57:37Z

docs/src/literate/heat_equation.jl

@@ -127,20 +127,28 @@ function doassemble(cellvalues::CellScalarValues{dim}, K::SparseMatrixCSC, dh::D
    f = zeros(ndofs(dh))
    assembler = start_assemble(K, f)

+    #celldofs = zeros(Int, ndofs_per_cell(dh))
+    #cellcoords = zeros(Vec{dim,T}, JuAFEM.nnodes_per_cell(dh))


fredrikekre · 2020-03-24T08:58:04Z

docs/src/literate/heat_equation.jl

        # For each cell we also need to reinitialize the cached values in `cellvalues`.
        #+
-        reinit!(cellvalues, cell)
+        reinit!(cellvalues, cellcoords)


Doesn't work with celldata here?

fredrikekre · 2020-03-24T08:58:11Z

docs/src/literate/heat_equation.jl

        # Always remember to reset the element stiffness matrix and
        # force vector since we reuse them for all elements.
        #+
        fill!(Ke, 0)
        fill!(fe, 0)

+        #JuAFEM.cellcoords!(cellcoords, dh, cellid)
+        #JuAFEM.celldofs!(celldofs, dh, cellid)


fredrikekre · 2020-03-24T08:58:24Z

docs/src/literate/heat_equation.jl

@@ -166,7 +174,7 @@ function doassemble(cellvalues::CellScalarValues{dim}, K::SparseMatrixCSC, dh::D
        # The last step in the element loop is to assemble `Ke` and `fe`
        # into the global `K` and `f` with `assemble!`.
        #+
-        assemble!(assembler, celldofs(cell), fe, Ke)
+        assemble!(assembler, _celldofs, fe, Ke)


change back?

I can revert the entire heat_equation example

fredrikekre · 2020-03-24T09:00:17Z

src/Dofs/ConstraintHandler.jl

@@ -54,13 +54,14 @@ struct ConstraintHandler{DH<:AbstractDofHandler,T}
    free_dofs::Vector{Int}
    values::Vector{T}
    dofmapping::Dict{Int,Int} # global dof -> index into dofs and values
+    bcvalues::Vector{BCValues{T}}


So each new bc will have it's own bcvalues? Isn't it more a property of the field/interpolation?

MixedDofHandler stores bcvalues in the fieldHandler, and DofHandler stores bcvalues itself, so in able to be able to have the same functionality for both Dohandlers, I must save the bcvalues in ConstraintHandler (I think)

Maybe it is better to store it in Dirichlet

…pr_mdh

lijas added 2 commits March 15, 2020 12:25

Make mixeddofhandler work for one celltype in the same way as DofHandler

4079c96

example of mixeddofhandler in heat equation (do not merge this commit)

ef2bd97

KristofferC reviewed Mar 15, 2020

View reviewed changes

lijas added 2 commits March 17, 2020 13:10

Make MixedDofHandler work with CellIterator

adc0489

Example implementation of heatexample with mixeddofhandler

76fae5b

lijas requested a review from KristofferC March 17, 2020 19:12

KristofferC reviewed Mar 18, 2020

View reviewed changes

fredrikekre reviewed Mar 18, 2020

View reviewed changes

lijas added 3 commits March 23, 2020 10:23

clean up celliterator

4cead0e

Make it easier to use ConstraintHandler with mixeddofhandler

8439750

Clean up

a595e9e

lijas commented Mar 23, 2020

View reviewed changes

fix

4941ec6

lijas requested a review from fredrikekre March 24, 2020 07:37

fredrikekre reviewed Mar 24, 2020

View reviewed changes

lijas and others added 3 commits March 24, 2020 16:15

revert heat_equation

ff3bf86

add celldofs! in celliterator again

08fa9c0

Merge branch 'impr_mdh' of https://github.com/lijas/JuAFEM.jl into im…

93c6f91

…pr_mdh

KristofferC merged commit 5867e06 into Ferrite-FEM:master Apr 5, 2020

fredrikekre mentioned this pull request Nov 9, 2020

Misc fixes for CellIterator without DofHandler #301

Merged

fredrikekre mentioned this pull request Apr 11, 2023

Change parameterization of (Abstract)Cell #677

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes to MixedDofHandler #279

Changes to MixedDofHandler #279

lijas commented Mar 15, 2020

codecov-io commented Mar 15, 2020 •

edited

Loading

KristofferC Mar 15, 2020

lijas Mar 16, 2020

lijas commented Mar 17, 2020 •

edited

Loading

KristofferC Mar 18, 2020 •

edited

Loading

fredrikekre Mar 18, 2020

lijas Mar 23, 2020

lijas Mar 23, 2020

lijas commented Mar 23, 2020

KristofferC commented Mar 24, 2020

fredrikekre Mar 24, 2020

fredrikekre Mar 24, 2020

fredrikekre Mar 24, 2020

fredrikekre Mar 24, 2020

fredrikekre Mar 24, 2020

lijas Mar 24, 2020

fredrikekre Mar 24, 2020

lijas Mar 24, 2020

lijas Mar 24, 2020

		@@ -1,5 +1,5 @@

		mutable struct MixedGrid{dim,C,T<:Real} <: JuAFEM.AbstractGrid
		#=mutable struct Grid{dim,C,T<:Real} <: JuAFEM.AbstractGrid

	function doassemble(cellvalues::CellScalarValues{dim,T}, K::SparseMatrixCSC, dh::JuAFEM.AbstractDofHandler) where {dim,T}
	function doassemble(cellvalues::CellScalarValues{dim}, K::SparseMatrixCSC, dh::JuAFEM.AbstractDofHandler) where {dim}

Changes to MixedDofHandler #279

Changes to MixedDofHandler #279

Conversation

lijas commented Mar 15, 2020

codecov-io commented Mar 15, 2020 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lijas commented Mar 17, 2020 • edited Loading

KristofferC Mar 18, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lijas commented Mar 23, 2020

KristofferC commented Mar 24, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Mar 15, 2020 •

edited

Loading

lijas commented Mar 17, 2020 •

edited

Loading

KristofferC Mar 18, 2020 •

edited

Loading