Minor changes

gridap · JordiManyer · Feb 3, 2023 · Feb 3, 2023 · Feb 3, 2023 · Feb 3, 2023
commit ddd0b690657cec00e11304f9cb56fe686dff1c6a
diff --git a/src/LinearSolvers/GMGLinearSolvers.jl b/src/LinearSolvers/GMGLinearSolvers.jl
@@ -236,9 +236,8 @@ function apply_GMG_level!(lev::Integer,xh::Union{PVector,Nothing},rh::Union{PVec
       # Interpolate dxH in finer space
       mul!(dxh,interp,dxH)
 
-      # Update solution
+      # Update solution & residual
       xh .= xh .+ dxh
-      # Update residual
       mul!(Adxh, Ah, dxh)
       rh .= rh .- Adxh
 

diff --git a/src/LinearSolvers/LinearSolvers.jl b/src/LinearSolvers/LinearSolvers.jl
@@ -5,7 +5,6 @@ using LinearAlgebra
 using Gridap
 using Gridap.Algebra
 using PartitionedArrays
-using GridapP4est
 using GridapPETSc
 
 using GridapSolvers.MultilevelTools

diff --git a/src/MultilevelTools/GridapDistributedExtensions.jl b/src/MultilevelTools/GridapDistributedExtensions.jl
@@ -34,42 +34,6 @@ function change_parts(::Type{<:GridapDistributed.DistributedCellField},x,new_par
   return GridapDistributed.DistributedCellField(fields)
 end
 
-"""
-function change_parts(::Type{<:GridapDistributed.DistributedSingleFieldFEFunction},x,new_parts)
-  if isa(x,GridapDistributed.DistributedSingleFieldFEFunction)
-    fields   = change_parts(local_views(x),new_parts)
-    metadata = GridapDistributed.DistributedFEFunctionData(change_parts(x.metadata.free_values,new_parts))
-  else
-    fields   = change_parts(nothing,new_parts;default=void(CellField))
-    metadata = GridapDistributed.DistributedFEFunctionData(change_parts(nothing,new_parts;default=Float64[]))
-  end
-  return GridapDistributed.DistributedCellField(fields,metadata)
-end
-"""
-
-"""
-function change_parts(::Type{<:PRange},x::Union{PRange,Nothing}, new_parts)
-  if isa(x,PRange)
-    ngids = x.ngids
-    partition = change_parts(x.partition,new_parts;default=void(IndexSet))
-    exchanger = x.exchanger
-    gid_to_part = x.gid_to_part
-    ghost = x.ghost
-  else
-    ngids = 0
-    partition = change_parts(nothing,new_parts;default=void(IndexSet))
-    exchanger = empty_exchanger(new_parts)
-    gid_to_part = nothing
-    ghost = false
-  end
-  return PRange(ngids,partition,exchanger,gid_to_part,ghost)
-end
-
-function void(::Type{IndexSet})
-  return IndexSet(0,Int[],Int32[],Int32[],Int32[],Int32[],Dict{Int,Int32}())
-end
-"""
-
 # DistributedFESpaces
 
 function get_test_space(U::GridapDistributed.DistributedSingleFieldFESpace)

diff --git a/src/MultilevelTools/MultilevelTools.jl b/src/MultilevelTools/MultilevelTools.jl
@@ -15,7 +15,6 @@ using GridapDistributed
 
 import LinearAlgebra: mul!
 import GridapDistributed: local_views
-import GridapP4est: i_am_in, i_am_main
 
 
 export change_parts

diff --git a/src/MultilevelTools/RefinementTools.jl b/src/MultilevelTools/RefinementTools.jl
@@ -1,21 +1,4 @@
 
-# DistributedRefinedDiscreteModels
-
-const DistributedAdaptedDiscreteModel{Dc,Dp} = GridapDistributed.DistributedDiscreteModel{Dc,Dp,<:AbstractPData{<:AdaptedDiscreteModel{Dc,Dp}}}
-
-function DistributedAdaptedDiscreteModel(model::GridapDistributed.AbstractDistributedDiscreteModel,
-                                         parent::GridapDistributed.AbstractDistributedDiscreteModel,
-                                         glue::AbstractPData{<:AdaptivityGlue})
-  models = map_parts(local_views(model),local_views(parent),glue) do model, parent, glue
-    AdaptedDiscreteModel(model,parent,glue)
-  end
-  return GridapDistributed.DistributedDiscreteModel(models,get_cell_gids(model))
-end
-
-function Gridap.Adaptivity.get_adaptivity_glue(model::DistributedAdaptedDiscreteModel)
-  return map_parts(Gridap.Adaptivity.get_adaptivity_glue,local_views(model))
-end
-
 # DistributedAdaptedTriangulations
 
 const DistributedAdaptedTriangulation{Dc,Dp} = GridapDistributed.DistributedTriangulation{Dc,Dp,<:AbstractPData{<:AdaptedTriangulation{Dc,Dp}}}

diff --git a/test/mpi/DistributedGridTransferOperatorsTests.jl b/test/mpi/DistributedGridTransferOperatorsTests.jl
@@ -23,7 +23,7 @@ function run(parts,num_parts_x_level,coarse_grid_partition,num_refs_coarse)
     u(x)  = x[1] + x[2]
     reffe = ReferenceFE(lagrangian,Float64,order)
 
-    tests  = TestFESpace(mh,reffe,dirichlet_tags="boundary")
+    tests  = TestFESpace(mh,reffe;dirichlet_tags="boundary")
     trials = TrialFESpace(tests,u)
 
     qdegree = order*2+1

diff --git a/test/mpi/GMGLinearSolversHDivRTTests.jl b/test/mpi/GMGLinearSolversHDivRTTests.jl
@@ -29,7 +29,7 @@ function main(parts, coarse_grid_partition, num_parts_x_level, num_refs_coarse,
 
     qdegree   = 2*(order+1)
     reffe     = ReferenceFE(raviart_thomas,Float64,order)
-    tests     = TestFESpace(mh,reffe,dirichlet_tags="boundary")
+    tests     = TestFESpace(mh,reffe;dirichlet_tags="boundary")
     trials    = TrialFESpace(tests,u)
 
     biform(u,v,dΩ)  = ∫(v⋅u)dΩ + ∫(α*divergence(v)⋅divergence(u))dΩ

diff --git a/test/mpi/GMGLinearSolversLaplacianTests.jl b/test/mpi/GMGLinearSolversLaplacianTests.jl
@@ -29,7 +29,7 @@ function main(parts, coarse_grid_partition, num_parts_x_level, num_refs_coarse,
 
     qdegree   = 2*(order+1)
     reffe     = ReferenceFE(lagrangian,Float64,order)
-    tests     = TestFESpace(mh,reffe,conformity=:H1,dirichlet_tags="boundary")
+    tests     = TestFESpace(mh,reffe;conformity=:H1,dirichlet_tags="boundary")
     trials    = TrialFESpace(tests,u)
 
     biform(u,v,dΩ)  = ∫(v*u)dΩ + ∫(α*∇(v)⋅∇(u))dΩ

diff --git a/test/mpi/GMGLinearSolversMUMPSTests.jl b/test/mpi/GMGLinearSolversMUMPSTests.jl
@@ -49,7 +49,7 @@ function main(parts, coarse_grid_partition, num_parts_x_level, num_refs_coarse,
 
       qdegree   = 2*(order+1)
       reffe     = ReferenceFE(lagrangian,Float64,order)
-      tests     = TestFESpace(mh,reffe,conformity=:H1,dirichlet_tags="boundary")
+      tests     = TestFESpace(mh,reffe;conformity=:H1,dirichlet_tags="boundary")
       trials    = TrialFESpace(tests,u)
 
       biform(u,v,dΩ)  = ∫(∇(v)⋅∇(u))dΩ

diff --git a/test/mpi/GMGLinearSolversPoissonTests.jl b/test/mpi/GMGLinearSolversPoissonTests.jl
@@ -29,7 +29,7 @@ function main(parts, coarse_grid_partition, num_parts_x_level, num_refs_coarse,
 
     qdegree   = 2*(order+1)
     reffe     = ReferenceFE(lagrangian,Float64,order)
-    tests     = TestFESpace(mh,reffe,conformity=:H1,dirichlet_tags="boundary")
+    tests     = TestFESpace(mh,reffe;conformity=:H1,dirichlet_tags="boundary")
     trials    = TrialFESpace(tests,u)
 
     biform(u,v,dΩ)  = ∫(∇(v)⋅∇(u))dΩ

diff --git a/test/mpi/GMGLinearSolversVectorLaplacianTests.jl b/test/mpi/GMGLinearSolversVectorLaplacianTests.jl
@@ -29,7 +29,7 @@ function main(parts, coarse_grid_partition, num_parts_x_level, num_refs_coarse,
 
     qdegree   = 2*(order+1)
     reffe     = ReferenceFE(lagrangian,VectorValue{2,Float64},order)
-    tests     = TestFESpace(mh,reffe,conformity=:H1,dirichlet_tags="boundary")
+    tests     = TestFESpace(mh,reffe;conformity=:H1,dirichlet_tags="boundary")
     trials    = TrialFESpace(tests,u)
 
     biform(u,v,dΩ)  = ∫(v⋅u)dΩ + ∫(α*∇(v)⊙∇(u))dΩ

diff --git a/test/mpi/RefinementToolsTests.jl b/test/mpi/RefinementToolsTests.jl
@@ -23,7 +23,7 @@ function run(parts,num_parts_x_level,coarse_grid_partition,num_refs_coarse)
     order  = 1
     sol(x) = x[1] + x[2]
     reffe  = ReferenceFE(lagrangian,Float64,order)
-    tests  = TestFESpace(mh,reffe,conformity=:H1,dirichlet_tags="boundary")
+    tests  = TestFESpace(mh,reffe;conformity=:H1,dirichlet_tags="boundary")
     trials = TrialFESpace(tests,sol)
 
     quad_order = 3*order+1

diff --git a/test/mpi/RestrictDofsTests.jl b/test/mpi/RestrictDofsTests.jl
@@ -29,7 +29,7 @@ function main(parts, coarse_grid_partition, num_parts_x_level, num_refs_coarse,
 
     qdegree   = 2*(order+1)
     reffe     = ReferenceFE(lagrangian,Float64,order)
-    tests     = TestFESpace(mh,reffe,conformity=:H1,dirichlet_tags="boundary")
+    tests     = TestFESpace(mh,reffe;conformity=:H1,dirichlet_tags="boundary")
     trials    = TrialFESpace(tests,u)
 
     biform(u,v,dΩ)  = ∫(∇(v)⋅∇(u))dΩ

diff --git a/test/mpi/RichardsonSmoothersTests.jl b/test/mpi/RichardsonSmoothersTests.jl
@@ -22,7 +22,7 @@ function main(parts,partition)
     order  = 1
     qorder = order*2 + 1
     reffe  = ReferenceFE(lagrangian,Float64,order)
-    Vh     = TestFESpace(model,reffe,conformity=:H1,dirichlet_tags="boundary")
+    Vh     = TestFESpace(model,reffe;conformity=:H1,dirichlet_tags="boundary")
     Uh     = TrialFESpace(Vh,sol)
     u      = interpolate(sol,Uh)