Merge pull request #872 from janmodderman/ConstantFE

Fix of ConstantFESpace + tests + export

Author: amartinhuertas

NEWS.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Using broadcasting through in `ODESolver` vector operations. Since PR [#860](https://github.com/gridap/Gridap.jl/pull/860)
 - Fixes to `array_cache(a::Table)`: Now does not use the `zero(T,N)` function, but instead creates new empty vector using the general allocator `Vector{T}(undef,N)`. This allows `Table` to work with complex composite types which don't have an easy `zero(T)` function defined. Since PR [#838](https://github.com/gridap/Gridap.jl/pull/838).
 - Added `get_metadata` to all the instances of `ReferenceFE`. This makes the abstract type more consistent, which is necessary for the new type `FineToCoarseReferenceFE`. Since PR [#838](https://github.com/gridap/Gridap.jl/pull/838).
+- `ConstantFESpace` is now properly exported. Since PR [#872](https://github.com/gridap/Gridap.jl/pull/872).
 
 ## [0.17.16] - 2022-12-22 
 

src/Exports.jl

@@ -172,6 +172,7 @@ using Gridap.CellData: ∫; export ∫
 @publish FESpaces FESolver
 @publish FESpaces SparseMatrixAssembler
 @publish FESpaces FiniteElements
+@publish FESpaces ConstantFESpace
 
 @publish MultiField MultiFieldFESpace
 @publish MultiField num_fields

src/FESpaces/ConstantFESpaces.jl

@@ -1,96 +1,96 @@
 
 """
-    struct ConstantFESpace <: SingleFieldFESpace
-      # private fields
-    end
+struct ConstantFESpace <: SingleFieldFESpace
+  # private fields
+end
 """
 struct ConstantFESpace{V,T,A,B,C} <: SingleFieldFESpace
-  model::DiscreteModel
-  cell_basis::A
-  cell_dof_basis::B
-  cell_dof_ids::C
-  function ConstantFESpace(model;
-                           vector_type::Type{V}=Vector{Float64},
-                           field_type::Type{T}=Float64) where {V,T}
-    function setup_cell_reffe(model::DiscreteModel,
-      reffe::Tuple{<:Gridap.FESpaces.ReferenceFEName,Any,Any}; kwargs...)
-      basis, reffe_args,reffe_kwargs = reffe
-      cell_reffe = ReferenceFE(model,basis,reffe_args...;reffe_kwargs...)
-    end
-    reffe=ReferenceFE(lagrangian,T,0)
-    cell_reffe = setup_cell_reffe(model,reffe)
-    cell_basis_array=lazy_map(get_shapefuns,cell_reffe)
-
-    cell_basis=Gridap.FESpaces.SingleFieldFEBasis(
-      cell_basis_array,
-      Triangulation(model),
-      Gridap.FESpaces.TestBasis(),
-      ReferenceDomain())
-
-    cell_dof_basis_array=lazy_map(get_dof_basis,cell_reffe)
-    cell_dof_basis=Gridap.CellData.CellDof(cell_dof_basis_array,Triangulation(model),ReferenceDomain())
-
-    cell_dof_ids=Fill(Int32[1],num_cells(model))
-    A=typeof(cell_basis)
-    B=typeof(cell_dof_basis)
-    C=typeof(cell_dof_ids)
-    new{V,T,A,B,C}(model,
-                   cell_basis,
-                   cell_dof_basis,
-                   cell_dof_ids)
-  end
+model::DiscreteModel
+cell_basis::A
+cell_dof_basis::B
+cell_dof_ids::C
+function ConstantFESpace(model;
+                       vector_type::Type{V}=Vector{Float64},
+                       field_type::Type{T}=Float64) where {V,T}
+function setup_cell_reffe(model::DiscreteModel,
+  reffe::Tuple{<:ReferenceFEName,Any,Any}; kwargs...)
+  basis, reffe_args,reffe_kwargs = reffe
+  cell_reffe = ReferenceFE(model,basis,reffe_args...;reffe_kwargs...)
+end
+reffe=ReferenceFE(lagrangian,T,0)
+cell_reffe = setup_cell_reffe(model,reffe)
+cell_basis_array=lazy_map(get_shapefuns,cell_reffe)
+
+cell_basis=SingleFieldFEBasis(
+  cell_basis_array,
+  Triangulation(model),
+  TestBasis(),
+  ReferenceDomain())
+
+cell_dof_basis_array=lazy_map(get_dof_basis,cell_reffe)
+cell_dof_basis=CellDof(cell_dof_basis_array,Triangulation(model),ReferenceDomain())
+
+cell_dof_ids=Fill(Int32[1],num_cells(model))
+A=typeof(cell_basis)
+B=typeof(cell_dof_basis)
+C=typeof(cell_dof_ids)
+new{V,T,A,B,C}(model,
+               cell_basis,
+               cell_dof_basis,
+               cell_dof_ids)
+end
 end
 
 # Genuine functions
-function Gridap.FESpaces.TrialFESpace(f::ConstantFESpace)
-  f
+function TrialFESpace(f::ConstantFESpace)
+f
 end
 
 # Delegated functions
-Gridap.FESpaces.get_triangulation(f::ConstantFESpace) = Triangulation(f.model)
+get_triangulation(f::ConstantFESpace) = Triangulation(f.model)
 
-Gridap.FESpaces.ConstraintStyle(::Type{<:ConstantFESpace}) = UnConstrained()
+ConstraintStyle(::Type{<:ConstantFESpace}) = UnConstrained()
 
-Gridap.FESpaces.get_dirichlet_dof_values(f::ConstantFESpace{V}) where V = eltype(V)[]
+get_dirichlet_dof_values(f::ConstantFESpace{V}) where V = eltype(V)[]
 
-Gridap.FESpaces.get_fe_basis(f::ConstantFESpace) = f.cell_basis
+get_fe_basis(f::ConstantFESpace) = f.cell_basis
 
-Gridap.FESpaces.get_fe_dof_basis(f::ConstantFESpace) = f.cell_dof_basis
+get_fe_dof_basis(f::ConstantFESpace) = f.cell_dof_basis
 
-Gridap.FESpaces.get_free_dof_ids(f::ConstantFESpace) = Base.OneTo(length(f.cell_dof_ids[1]))
+get_free_dof_ids(f::ConstantFESpace) = Base.OneTo(length(f.cell_dof_ids[1]))
 
-Gridap.FESpaces.get_vector_type(f::ConstantFESpace{V}) where V = V
+get_vector_type(f::ConstantFESpace{V}) where V = V
 
-Gridap.FESpaces.get_cell_dof_ids(f::ConstantFESpace) = f.cell_dof_ids
+get_cell_dof_ids(f::ConstantFESpace) = f.cell_dof_ids
 
-Gridap.FESpaces.get_dirichlet_dof_ids(f::ConstantFESpace) = Base.OneTo(0)
+get_dirichlet_dof_ids(f::ConstantFESpace) = Base.OneTo(0)
 
-Gridap.FESpaces.num_dirichlet_tags(f::ConstantFESpace) = 0
+num_dirichlet_tags(f::ConstantFESpace) = 0
 
-Gridap.FESpaces.get_dirichlet_dof_tag(f::ConstantFESpace) = Int8[]
+get_dirichlet_dof_tag(f::ConstantFESpace) = Int8[]
 
-function Gridap.FESpaces.scatter_free_and_dirichlet_values(f::ConstantFESpace,fv,dv)
-  cell_dof_ids = get_cell_dof_ids(f)
-  lazy_map(Broadcasting(Gridap.Arrays.PosNegReindex(fv,dv)),cell_dof_ids)
+function scatter_free_and_dirichlet_values(f::ConstantFESpace,fv,dv)
+cell_dof_ids = get_cell_dof_ids(f)
+lazy_map(Broadcasting(PosNegReindex(fv,dv)),cell_dof_ids)
 end
 
-function Gridap.FESpaces.gather_free_and_dirichlet_values(free_vals,
-                                                          dirichlet_vals,
-                                                          f::ConstantFESpace,
-                                                          cell_vals)
-  cell_dofs = get_cell_dof_ids(f)
-  cache_vals = array_cache(cv)
-  cache_dofs = array_cache(cell_dofs)
-  cells = 1:length(cell_vals)
-
-  Gridap.FESpaces._free_and_dirichlet_values_fill!(
-    free_vals,
-    dirichlet_vals,
-    cache_vals,
-    cache_dofs,
-    cv,
-    cell_dofs,
-    cells)
-
-  (free_vals,dirichlet_vals)
+function gather_free_and_dirichlet_values!(free_vals,
+                                                      dirichlet_vals,
+                                                      f::ConstantFESpace,
+                                                      cell_vals)
+cell_dofs = get_cell_dof_ids(f)
+cache_vals = array_cache(cell_vals)
+cache_dofs = array_cache(cell_dofs)
+cells = 1:length(cell_vals)
+
+_free_and_dirichlet_values_fill!(
+free_vals,
+dirichlet_vals,
+cache_vals,
+cache_dofs,
+cell_vals,
+cell_dofs,
+cells)
+
+(free_vals,dirichlet_vals)
 end

src/FESpaces/FESpaces.jl

@@ -208,6 +208,8 @@ export GridWithFEMap
 export add_mesh_displacement!
 export update_coordinates!
 
+export ConstantFESpace
+
 include("FESpaceInterface.jl")
 
 include("SingleFieldFESpaces.jl")
@@ -256,6 +258,8 @@ include("FESpacesWithLinearConstraints.jl")
 
 include("DiscreteModelWithFEMaps.jl")
 
+include("ConstantFESpaces.jl")
+
 export get_free_values
 function get_free_values(args...)
   @unreachable "get_free_values has been removed. Use get_free_dof_values instead."

test/FESpacesTests/ConstantFESpaceTests.jl

@@ -2,7 +2,6 @@
 module ConstantFESpacesTests
 
 using Gridap
-using GridapBiotElasticity
 using Test
 
 domain = (0,1,0,1)

test/FESpacesTests/runtests_2.jl

@@ -26,4 +26,6 @@ using Test
 
 @testset "DiscreteModelWithFEMapsTests" begin include("DiscreteModelWithFEMapsTests.jl") end
 
+@testset "ConstantFESpaceTests" begin include("ConstantFESpaceTests.jl") end
+
 end # module