diff --git a/test/AdaptivityTests/FineToCoarseFieldsTests.jl b/test/AdaptivityTests/FineToCoarseFieldsTests.jl index e09b54f8d..89beb196b 100644 --- a/test/AdaptivityTests/FineToCoarseFieldsTests.jl +++ b/test/AdaptivityTests/FineToCoarseFieldsTests.jl @@ -91,13 +91,13 @@ eh2 = u_c - u_fc eh3 = u_c - u_fc2 @test sum(∫(eh3⋅eh3)*dΩ_c) < 1.e-12 -modelH=CartesianDiscreteModel((0,1,0,1),(1,1)) -modelh=refine(modelH,2) -reffe=LagrangianRefFE(Float64,QUAD,1) -XH = TestFESpace(modelH,reffe) -xH = get_fe_basis(XH) +modelH = CartesianDiscreteModel((0,1,0,1),(1,1)) +modelh = refine(modelH,2) +reffe = LagrangianRefFE(Float64,QUAD,1) +XH = TestFESpace(modelH,reffe) +xH = get_fe_basis(XH) xHh = change_domain(xH,get_triangulation(modelh),ReferenceDomain()) -evaluate(Gridap.CellData.get_data(xHh)[1], - [Point(0.0,0.0),Point(0.5,0.5)]) +evaluate(Gridap.CellData.get_data(xHh)[1],[Point(0.0,0.0),Point(0.5,0.5)]) +evaluate(Gridap.CellData.get_data(xHh)[1],Point(0.5,0.5)) end \ No newline at end of file diff --git a/test/AdaptivityTests/MacroFETests.jl b/test/AdaptivityTests/MacroFETests.jl index 09d455f6b..e7ec83f7a 100644 --- a/test/AdaptivityTests/MacroFETests.jl +++ b/test/AdaptivityTests/MacroFETests.jl @@ -13,7 +13,12 @@ function test_macro_reffe(model,fmodel,rrule,order) reffe = LagrangianRefFE(Float64,poly,order) sub_reffes = Fill(reffe,num_subcells(rrule)) macro_reffe = Adaptivity.MacroReferenceFE(rrule,sub_reffes) + ReferenceFEs.test_reference_fe(macro_reffe) + macro_quad = Quadrature(poly,Adaptivity.CompositeQuadrature(),rrule,2*order) + macro_quad_bis = Adaptivity.CompositeQuadrature(Quadrature(poly,4*order),rrule) + ReferenceFEs.test_quadrature(macro_quad) + ReferenceFEs.test_quadrature(macro_quad_bis) Ω = Triangulation(model) Ωf = Triangulation(fmodel) diff --git a/test/AdaptivityTests/RefinementRulesTests.jl b/test/AdaptivityTests/RefinementRulesTests.jl index a93e903a2..3a100d322 100644 --- a/test/AdaptivityTests/RefinementRulesTests.jl +++ b/test/AdaptivityTests/RefinementRulesTests.jl @@ -24,4 +24,16 @@ for poly in polys end end +rr_bc2 = Adaptivity.BarycentricRefinementRule(TRI) +Adaptivity.test_refinement_rule(rr_bc2) + +rr_bc3 = Adaptivity.BarycentricRefinementRule(TET) +Adaptivity.test_refinement_rule(rr_bc3) + +rr_ps2 = Adaptivity.PowellSabinRefinementRule(TRI) +Adaptivity.test_refinement_rule(rr_ps2) + +rr_ps3 = Adaptivity.PowellSabinRefinementRule(TET) +Adaptivity.test_refinement_rule(rr_ps3) + end \ No newline at end of file