Cleanup

Author: JordiManyer

src/DivAndCurlConformingFESpaces.jl

@@ -58,7 +58,6 @@ include("Visualization.jl")
 
 include("FESpaces.jl")
 
-#include("DivAndCurlConformingFESpaces.jl") # superseded by Pullbacks.jl
 include("Pullbacks.jl")
 
 include("MultiField.jl")

src/GridapDistributed.jl

@@ -20,78 +20,77 @@ function get_analytical_functions(Dc)
 end
 
 function solve_hcurl_projection(model::GridapDistributed.DistributedDiscreteModel{Dc},order) where {Dc}
-    u_ex, f_ex=get_analytical_functions(Dc)
+  u_ex, f_ex=get_analytical_functions(Dc)
 
-    V = FESpace(model,
-                ReferenceFE(nedelec,order),
-                conformity=:Hcurl,
-                dirichlet_tags="boundary")
-    
-    U = TrialFESpace(V,u_ex)
-    
-    trian = Triangulation(model)
-    degree = 2*(order+1)
-    dΩ = Measure(trian,degree)
-        
-    a(u,v) = ∫( (∇×u)⋅(∇×v) + u⋅v )dΩ
-    l(v) = ∫(f_ex⋅v)dΩ
+  V = FESpace(
+    model, ReferenceFE(nedelec,order), conformity=:Hcurl, dirichlet_tags="boundary"
+  )
+  
+  U = TrialFESpace(V,u_ex)
+  
+  trian = Triangulation(model)
+  degree = 2*(order+1)
+  dΩ = Measure(trian,degree)
+      
+  a(u,v) = ∫( (∇×u)⋅(∇×v) + u⋅v )dΩ
+  l(v) = ∫(f_ex⋅v)dΩ
 
-    op = AffineFEOperator(a,l,U,V)
-    if (num_free_dofs(U)==0)
-      # UMFPACK cannot handle empty linear systems
-      uh = zero(U)
-    else
-      uh = solve(op)
-    end
-    uh,U
-  end 
+  op = AffineFEOperator(a,l,U,V)
+  if (num_free_dofs(U)==0)
+    # UMFPACK cannot handle empty linear systems
+    uh = zero(U)
+  else
+    uh = solve(op)
+  end
+  uh,U
+end 
 
-  function check_error_hcurl_projection(model::GridapDistributed.DistributedDiscreteModel{Dc},order,uh) where {Dc}
-    trian = Triangulation(model)
-    degree = 2*(order+1)
-    dΩ = Measure(trian,degree)
+function check_error_hcurl_projection(model::GridapDistributed.DistributedDiscreteModel{Dc},order,uh) where {Dc}
+  trian = Triangulation(model)
+  degree = 2*(order+1)
+  dΩ = Measure(trian,degree)
 
-    u_ex, f_ex = get_analytical_functions(Dc)
-    
-    eu = u_ex - uh
+  u_ex, f_ex = get_analytical_functions(Dc)
+  
+  eu = u_ex - uh
 
-    l2(v) = sqrt(sum(∫(v⋅v)*dΩ))
-    hcurl(v) = sqrt(sum(∫(v⋅v + (∇×v)⋅(∇×v))*dΩ))
-    
-    eu_l2 = l2(eu)
-    eu_hcurl = hcurl(eu)
-    
-    tol = 1.0e-6
-    @test eu_l2 < tol
-    @test eu_hcurl < tol
+  l2(v) = sqrt(sum(∫(v⋅v)*dΩ))
+  hcurl(v) = sqrt(sum(∫(v⋅v + (∇×v)⋅(∇×v))*dΩ))
+  
+  eu_l2 = l2(eu)
+  eu_hcurl = hcurl(eu)
+  
+  tol = 1.0e-6
+  @test eu_l2 < tol
+  @test eu_hcurl < tol
 end
 
- function test_2d(ranks,parts,order)
-    domain = (0,1,0,1)
-    model = CartesianDiscreteModel(ranks,parts,domain,(4,4))
-    solve_hcurl_projection(model,order) |> x -> check_error_hcurl_projection(model,order,x[1])
- end 
+function test_2d(ranks,parts,order)
+  domain = (0,1,0,1)
+  model = CartesianDiscreteModel(ranks,parts,domain,(4,4))
+  solve_hcurl_projection(model,order) |> x -> check_error_hcurl_projection(model,order,x[1])
+end 
 
- function test_3d(ranks,parts,order)
-    domain = (0,1,0,1,0,1)
-    model = CartesianDiscreteModel(ranks,parts,domain,(4,4,4))
-    solve_hcurl_projection(model,order) |> x -> check_error_hcurl_projection(model,order,x[1])
- end 
+function test_3d(ranks,parts,order)
+  domain = (0,1,0,1,0,1)
+  model = CartesianDiscreteModel(ranks,parts,domain,(4,4,4))
+  solve_hcurl_projection(model,order) |> x -> check_error_hcurl_projection(model,order,x[1])
+end 
 
 function main(distribute,parts)
   ranks = distribute(LinearIndices((prod(parts),)))
 
   if length(parts)==2 
-      for order=0:2
-        test_2d(ranks,parts,order)
-      end
+    for order=0:2
+      test_2d(ranks,parts,order)
+    end
   elseif length(parts)==3
-      for order=0:2
-        test_3d(ranks,parts,order)
-      end
+    for order=0:2
+      test_3d(ranks,parts,order)
+    end
   else 
       @assert false 
   end 
 end
-  
+
 end #module

test/HcurlProjectionTests.jl

@@ -1,4 +1,4 @@
-module DivAndCurlConformingTests
+module PullbackTests
 using SparseMatricesCSR
 
 using Gridap

test/DivAndCurlConformingTests.jl test/PullbackTests.jltest/DivAndCurlConformingTests.jl renamed to test/PullbackTests.jl

@@ -1,7 +1,9 @@
 module FESpacesTestsSeq
 using PartitionedArrays
+
 include("../FESpacesTests.jl")
 with_debug() do distribute
   FESpacesTests.main(distribute,(2,2))
 end
+
 end # module

test/sequential/DivAndCurlConformingTests.jl

@@ -0,0 +1,9 @@
+module PullbackTestsSeq
+using PartitionedArrays
+
+include("../PullbackTests.jl")
+with_debug() do distribute
+  PullbackTests.main(distribute,2)
+end
+
+end # module

test/sequential/FESpacesTests.jl

@@ -11,6 +11,7 @@ end
 
 if TESTCASE ∈ ("all", "seq-fespaces")
   @time @testset "FESpaces"         begin include("FESpacesTests.jl") end
+  @time @testset "Pullbacks"        begin include("PullbackTests.jl") end
   @time @testset "MultiField"       begin include("MultiFieldTests.jl") end
   @time @testset "issue_142"        begin include("issue_142.jl") end
   @time @testset "ZeroMeanFESpaces" begin include("ZeroMeanFESpacesTests.jl") end
@@ -20,7 +21,6 @@ end
 if TESTCASE ∈ ("all", "seq-physics")
   @time @testset "Poisson"                     begin include("PoissonTests.jl") end
   @time @testset "PLaplacian"                  begin include("PLaplacianTests.jl") end
-  @time @testset "DivAndCurlConformingTests"   begin include("DivAndCurlConformingTests.jl") end
   @time @testset "SurfaceCouplingTests"        begin include("SurfaceCouplingTests.jl") end
   @time @testset "StokesHdivDGTests"           begin include("StokesHdivDGTests.jl") end
   @time @testset "StokesOpenBoundary"          begin include("StokesOpenBoundaryTests.jl") end