From d82cd53894b4d5946e40628c23d56ec86f8264c8 Mon Sep 17 00:00:00 2001 From: Anne Boschman Date: Fri, 29 Nov 2024 09:21:33 +1100 Subject: [PATCH] fixed missing argument in set_up_bulk_ghost_penalty_lhs --- bulk_ghost_penalty_canvas.jl | 6 +++--- bulk_ghost_penalty_canvas_div.jl | 5 +++-- bulk_ghost_penalty_stab_tools.jl | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bulk_ghost_penalty_canvas.jl b/bulk_ghost_penalty_canvas.jl index 3ef8553..0a31b4f 100644 --- a/bulk_ghost_penalty_canvas.jl +++ b/bulk_ghost_penalty_canvas.jl @@ -234,7 +234,7 @@ for (i,cells) in enumerate(aggregate_to_local_cells) end end -function set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, +function set_up_bulk_ghost_penalty_lhs(aggregate_to_local_cells, agg_cells_to_aggregate, ref_agg_cell_to_ref_bb_map, dΩagg_cells, @@ -262,14 +262,14 @@ function set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, lazy_map(ass_lhs_map,aggregate_to_local_cells) end -p_lhs=set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, +p_lhs=set_up_bulk_ghost_penalty_lhs(aggregate_to_local_cells, agg_cells_to_aggregate, ref_agg_cell_to_ref_bb_map, dΩagg_cells, pbb, qbb) -u_lhs=set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, +u_lhs=set_up_bulk_ghost_penalty_lhs(aggregate_to_local_cells, agg_cells_to_aggregate, ref_agg_cell_to_ref_bb_map, dΩagg_cells, diff --git a/bulk_ghost_penalty_canvas_div.jl b/bulk_ghost_penalty_canvas_div.jl index e3f35f8..4565484 100644 --- a/bulk_ghost_penalty_canvas_div.jl +++ b/bulk_ghost_penalty_canvas_div.jl @@ -13,6 +13,7 @@ order = 2 uex(x) = -VectorValue(2*x[1],2*x[2]) pex(x) = (x[1]^2 + x[2]^2) divuex(x) = -4.0 + # Select geometry R = 0.2 geom = disk(R, x0=Point(0.5,0.5)) @@ -84,14 +85,14 @@ vbb=get_fe_basis(Vbb) aggregate_to_local_cells=setup_aggregate_to_local_cells(aggregate_to_cells) -p_lhs=set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, +p_lhs=set_up_bulk_ghost_penalty_lhs(aggregate_to_local_cells, agg_cells_to_aggregate, ref_agg_cell_to_ref_bb_map, dΩagg_cells, pbb, qbb) -u_lhs=set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, +u_lhs=set_up_bulk_ghost_penalty_lhs(aggregate_to_local_cells, agg_cells_to_aggregate, ref_agg_cell_to_ref_bb_map, dΩagg_cells, diff --git a/bulk_ghost_penalty_stab_tools.jl b/bulk_ghost_penalty_stab_tools.jl index 6af1e4e..c56248e 100644 --- a/bulk_ghost_penalty_stab_tools.jl +++ b/bulk_ghost_penalty_stab_tools.jl @@ -112,6 +112,8 @@ function div_penalty_stabilization_collect_cell_matrix(agg_cells_to_aggregate, U_agg_cells_to_aggregate_dof_ids, h_U, γ) + Ωagg_cells=dΩagg_cells.quad.trian + ## +DIVU STABILIZATION ## Compute ∫( (div_dv)*(div_du-div_du_l2_proj_agg_cells))*dΩ_agg_cells (simplified, equivalent version) # Manually set up the arrays that collect_cell_matrix would return automatically @@ -212,7 +214,7 @@ function div_penalty_stabilization_collect_cell_matrix(agg_cells_to_aggregate, w,r,c end -function set_up_bulk_ghost_penalty_lhs(aggregates_bounding_box_model, +function set_up_bulk_ghost_penalty_lhs(aggregate_to_local_cells, agg_cells_to_aggregate, ref_agg_cell_to_ref_bb_map, dΩagg_cells,