]> https://gitweb.dealii.org/ - dealii.git/commitdiff
tests: rename ConstraintMatrix to AffineConstraints
authorMatthias Maier <tamiko@43-1.org>
Fri, 15 Jun 2018 19:02:29 +0000 (14:02 -0500)
committerMatthias Maier <tamiko@43-1.org>
Fri, 15 Jun 2018 22:23:59 +0000 (17:23 -0500)
602 files changed:
tests/arpack/arpack_advection_diffusion.cc
tests/arpack/parpack_advection_diffusion_petsc.cc
tests/arpack/parpack_advection_diffusion_trilinos.cc
tests/arpack/step-36_ar.cc
tests/arpack/step-36_ar_shift.cc
tests/arpack/step-36_parpack.cc
tests/arpack/step-36_parpack_mf.cc
tests/arpack/step-36_parpack_mf_02.cc
tests/arpack/step-36_parpack_mf_03.cc
tests/arpack/step-36_parpack_trilinos.cc
tests/bits/christian_1.cc
tests/bits/face_orientation_and_fe_nedelec_01.cc
tests/bits/face_orientation_and_fe_q_01.cc
tests/bits/face_orientation_and_fe_q_02.cc
tests/bits/face_orientation_crash.cc
tests/bits/fe_field_function_02.cc
tests/bits/fe_field_function_02_vector.cc
tests/bits/fe_q_constraints.cc
tests/bits/fe_system.cc
tests/bits/fe_tools_05.cc
tests/bits/fe_tools_06.cc
tests/bits/fe_tools_06b.cc
tests/bits/fe_tools_07.cc
tests/bits/fe_tools_08.cc
tests/bits/joa_1.cc
tests/bits/make_boundary_constraints_01.cc
tests/bits/make_boundary_constraints_02.cc
tests/bits/make_boundary_constraints_03.cc
tests/bits/periodicity_01.cc
tests/bits/periodicity_02.cc
tests/bits/periodicity_03.cc
tests/bits/periodicity_04.cc
tests/bits/periodicity_05.cc
tests/bits/periodicity_06.cc
tests/bits/periodicity_07.cc
tests/bits/solution_transfer.cc
tests/bits/static_condensation.cc
tests/bits/step-11.cc
tests/bits/step-13.cc
tests/bits/step-14.cc
tests/bits/step-51.cc
tests/bits/step-51p.cc
tests/bits/step-6-racoptimize-2.cc
tests/bits/step-6-racoptimize.cc
tests/bits/step-6.cc
tests/bits/step-7.cc
tests/bits/step-8.cc
tests/codim_one/gradients.cc
tests/codim_one/gradients_1.cc
tests/codim_one/hanging_nodes_01.cc
tests/codim_one/projection.cc
tests/codim_one/projection_dgp.cc
tests/cuda/matrix_vector_common.h
tests/data_out/data_out_postprocessor_tensor_01.cc
tests/data_out/data_out_postprocessor_vector_03.cc
tests/dofs/block_relaxation_01.cc
tests/dofs/dof_constraints_01.cc
tests/dofs/dof_constraints_02.cc
tests/dofs/dof_constraints_03.cc
tests/dofs/dof_constraints_04.cc
tests/dofs/dof_constraints_05.cc
tests/dofs/dof_constraints_06.cc
tests/dofs/dof_constraints_07.cc
tests/dofs/dof_constraints_08.cc
tests/dofs/dof_constraints_09.cc
tests/dofs/dof_constraints_10.cc
tests/dofs/dof_constraints_11.cc
tests/dofs/dof_constraints_11_x.cc
tests/dofs/dof_test.cc
tests/dofs/dof_tools_01a_constraints_false.cc
tests/dofs/dof_tools_01a_constraints_true.cc
tests/dofs/dof_tools_01a_subdomain.cc
tests/dofs/dof_tools_02a_constraints_false.cc
tests/dofs/dof_tools_02a_constraints_true.cc
tests/dofs/dof_tools_02a_subdomain.cc
tests/dofs/dof_tools_03.cc
tests/dofs/dof_tools_04.cc
tests/dofs/dof_tools_04a.cc
tests/dofs/dof_tools_18a_1d.cc
tests/dofs/dof_tools_19.cc
tests/dofs/dof_tools_21.cc
tests/dofs/dof_tools_21_b.cc
tests/dofs/dof_tools_21_b_x.cc
tests/dofs/dof_tools_21_b_x_q3.cc
tests/dofs/dof_tools_21_b_y.cc
tests/dofs/dof_tools_21_c.cc
tests/dofs/dof_tools_22a.cc
tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc
tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc
tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc
tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc
tests/dofs/interpolate_dgq_02.cc
tests/dofs/interpolate_q_02.cc
tests/dofs/interpolate_q_system_02.cc
tests/dofs/interpolate_q_system_mask_02.cc
tests/dofs/range_based_for_step-6.cc
tests/dofs/sparsity_pattern.cc
tests/dofs/sparsity_pattern_01.cc
tests/dofs/sparsity_pattern_05.cc
tests/fail/abf_approximation_01.cc
tests/fail/circular_01.cc
tests/fail/hp-step-14.cc
tests/fail/hp-step-15.cc
tests/fail/rt_crash_01.cc
tests/fail/rt_distorted_01.cc
tests/fail/rt_distorted_02.cc
tests/fail/step-15.cc
tests/fe/abf_01.cc
tests/fe/abf_02.cc
tests/fe/crash_01.cc
tests/fe/curl_curl_01.cc
tests/fe/deformed_projection.h
tests/fe/fe_enriched_05.cc
tests/fe/fe_enriched_07.cc
tests/fe/fe_enriched_08.cc
tests/fe/fe_enriched_08a.cc
tests/fe/fe_enriched_step-36.cc
tests/fe/fe_enriched_step-36b.cc
tests/fe/fe_face_orientation_nedelec.h
tests/fe/fe_face_orientation_nedelec_0.cc
tests/fe/fe_nedelec_sz_non_rect_2d.cc
tests/fe/fe_nedelec_sz_non_rect_face.cc
tests/fe/fe_nothing.cc
tests/fe/fe_project_2d.cc
tests/fe/fe_project_3d.cc
tests/fe/fe_q_dg0.cc
tests/fe/fe_tools_test.cc
tests/fe/fe_values_function_manifold.cc
tests/fe/fe_values_view_28.cc
tests/fe/fe_values_view_29.cc
tests/fe/fe_values_view_30.cc
tests/fe/nedelec_2.cc
tests/fe/nedelec_crash_01.cc
tests/fe/nedelec_crash_hp.cc
tests/fe/nedelec_non_rect_2d.cc
tests/fe/nedelec_non_rect_face.cc
tests/fe/rt_approximation_01.cc
tests/gla/block_mat_02.cc
tests/gla/block_mat_03.cc
tests/gla/block_vec_02.cc
tests/gla/mat_03.cc
tests/gla/mat_04.cc
tests/grid/grid_parallelepiped_04.cc
tests/grid/intergrid_constraints.cc
tests/hp/crash_06.cc
tests/hp/crash_07.cc
tests/hp/crash_08.cc
tests/hp/crash_09.cc
tests/hp/crash_10.cc
tests/hp/crash_11.cc
tests/hp/crash_12.cc
tests/hp/crash_17.cc
tests/hp/crash_18.cc
tests/hp/crash_21.cc
tests/hp/create_laplace_matrix_01.cc
tests/hp/create_laplace_matrix_01b.cc
tests/hp/create_laplace_matrix_02.cc
tests/hp/create_laplace_matrix_02b.cc
tests/hp/create_laplace_matrix_03.cc
tests/hp/create_laplace_matrix_03b.cc
tests/hp/create_laplace_matrix_04.cc
tests/hp/create_laplace_matrix_04b.cc
tests/hp/create_laplace_matrix_constraints_02.cc
tests/hp/create_laplace_matrix_constraints_02b.cc
tests/hp/create_mass_matrix_01.cc
tests/hp/create_mass_matrix_01b.cc
tests/hp/create_mass_matrix_02.cc
tests/hp/create_mass_matrix_02b.cc
tests/hp/create_mass_matrix_03.cc
tests/hp/create_mass_matrix_03b.cc
tests/hp/create_mass_matrix_04.cc
tests/hp/create_mass_matrix_04b.cc
tests/hp/create_mass_matrix_05.cc
tests/hp/create_mass_matrix_constraints_02.cc
tests/hp/create_mass_matrix_constraints_02b.cc
tests/hp/face_domination_01.cc
tests/hp/face_domination_02.cc
tests/hp/face_domination_04.cc
tests/hp/fe_nothing_03.cc
tests/hp/fe_nothing_05.cc
tests/hp/fe_nothing_06.cc
tests/hp/fe_nothing_07.cc
tests/hp/fe_nothing_12.cc
tests/hp/fe_nothing_13.cc
tests/hp/fe_nothing_14.cc
tests/hp/fe_nothing_17.cc
tests/hp/fe_nothing_18.cc
tests/hp/fe_nothing_19.cc
tests/hp/hp_constraints_common.h
tests/hp/hp_constraints_common_no_support.h
tests/hp/hp_constraints_neither_dominate_01.cc
tests/hp/hp_constraints_neither_dominate_02.cc
tests/hp/hp_hanging_nodes_01.cc
tests/hp/hp_hanging_nodes_02.cc
tests/hp/hp_q_hierarchical_constraints.cc
tests/hp/interpolate_dgq_02.cc
tests/hp/interpolate_q_02.cc
tests/hp/interpolate_q_system_02.cc
tests/hp/matrices.cc
tests/hp/matrices_hp.cc
tests/hp/project_01.cc
tests/hp/project_01_curved_boundary.cc
tests/hp/project_02.cc
tests/hp/solution_transfer.cc
tests/hp/solution_transfer_02.cc
tests/hp/solution_transfer_12.cc
tests/hp/step-11.cc
tests/hp/step-13.cc
tests/hp/step-27.cc
tests/hp/step-3a.cc
tests/hp/step-3a_mapping_collection.cc
tests/hp/step-3b.cc
tests/hp/step-3c.cc
tests/hp/step-6.cc
tests/hp/step-7.cc
tests/hp/step-8.cc
tests/integrators/assembler_simple_system_inhom_01.cc
tests/integrators/cochain_01.cc
tests/integrators/laplacian_02.cc
tests/lac/constrained_linear_operator_01.cc
tests/lac/constraint_graph.cc
tests/lac/constraint_graph_zero.cc
tests/lac/constraint_matrix_copy_01.cc
tests/lac/constraint_matrix_distribute_complex.cc
tests/lac/constraints.cc
tests/lac/constraints_01.cc
tests/lac/constraints_02.cc
tests/lac/constraints_block_01.cc
tests/lac/constraints_c1.cc
tests/lac/constraints_c1_02.cc
tests/lac/constraints_get_lines.cc
tests/lac/constraints_hanging_nodes_bc.cc
tests/lac/constraints_inhomogeneous.cc
tests/lac/constraints_local_to_global.cc
tests/lac/constraints_local_to_global_chunk.cc
tests/lac/constraints_local_to_global_rect.cc
tests/lac/constraints_merge.cc
tests/lac/constraints_merge_02.cc
tests/lac/constraints_merge_03.cc
tests/lac/constraints_merge_04.cc
tests/lac/constraints_merge_05.cc
tests/lac/constraints_merge_06.cc
tests/lac/constraints_merge_07.cc
tests/lac/constraints_merge_08.cc
tests/lac/constraints_merge_09.cc
tests/lac/constraints_merge_10.cc
tests/lac/constraints_merge_11.cc
tests/lac/constraints_merge_12.cc
tests/lac/constraints_move.cc
tests/lac/constraints_shift_01.cc
tests/lac/constraints_zero.cc
tests/lac/constraints_zero_condense.cc
tests/lac/constraints_zero_merge.cc
tests/lac/diagonal_matrix_02.cc
tests/lac/inhomogeneous_constraints.cc
tests/lac/inhomogeneous_constraints_02.cc
tests/lac/inhomogeneous_constraints_03.cc
tests/lac/inhomogeneous_constraints_04.cc
tests/lac/inhomogeneous_constraints_block.cc
tests/lac/inhomogeneous_constraints_nonsymmetric.cc
tests/lac/inhomogeneous_constraints_vector.cc
tests/lac/linear_operator_11.cc
tests/lac/linear_operator_12.cc
tests/lac/linear_operator_12a.cc
tests/lac/linear_operator_13.cc
tests/lac/linear_operator_14.cc
tests/lac/matrices_02.cc
tests/lac/schur_complement_03.cc
tests/lac/utilities_02.cc
tests/mappings/mapping_q_convergence.cc
tests/mappings/mapping_q_eulerian_08.cc
tests/mappings/mapping_q_eulerian_09.cc
tests/mappings/mapping_q_manifold_01.cc
tests/matrix_free/cell_categorization.cc
tests/matrix_free/compare_faces_by_cells.cc
tests/matrix_free/compress_constraints.cc
tests/matrix_free/compress_mapping.cc
tests/matrix_free/copy.cc
tests/matrix_free/copy_feevaluation.cc
tests/matrix_free/dg_pbc_01.cc
tests/matrix_free/dg_pbc_02.cc
tests/matrix_free/estimate_condition_number_mass.cc
tests/matrix_free/faces_value_optimization.cc
tests/matrix_free/faces_value_optimization_02.cc
tests/matrix_free/fe_evaluation_dofs_per_cell.cc
tests/matrix_free/get_functions_cartesian.cc
tests/matrix_free/get_functions_circle.cc
tests/matrix_free/get_functions_common.h
tests/matrix_free/get_functions_constraints.cc
tests/matrix_free/get_functions_faces.cc
tests/matrix_free/get_functions_float.cc
tests/matrix_free/get_functions_gl.cc
tests/matrix_free/get_functions_mappingq.cc
tests/matrix_free/get_functions_multife.cc
tests/matrix_free/get_functions_multife2.cc
tests/matrix_free/get_functions_notempl.cc
tests/matrix_free/get_functions_q_hierarchical.cc
tests/matrix_free/get_functions_rect.cc
tests/matrix_free/get_functions_variants.cc
tests/matrix_free/get_functions_variants_gl.cc
tests/matrix_free/get_values_plain.cc
tests/matrix_free/integrate_functions.cc
tests/matrix_free/integrate_functions_multife.cc
tests/matrix_free/integrate_functions_multife2.cc
tests/matrix_free/interpolate_constant.cc
tests/matrix_free/interpolate_cubic.cc
tests/matrix_free/interpolate_functions_common.h
tests/matrix_free/interpolate_linear.cc
tests/matrix_free/interpolate_quadratic.cc
tests/matrix_free/interpolate_to_mg.cc
tests/matrix_free/inverse_mass_01.cc
tests/matrix_free/inverse_mass_02.cc
tests/matrix_free/inverse_mass_03.cc
tests/matrix_free/jxw_values.cc
tests/matrix_free/laplace_operator_01.cc
tests/matrix_free/laplace_operator_02.cc
tests/matrix_free/mass_operator_01.cc
tests/matrix_free/mass_operator_02.cc
tests/matrix_free/mass_operator_03.cc
tests/matrix_free/mass_operator_04.cc
tests/matrix_free/matrix_vector_01.cc
tests/matrix_free/matrix_vector_02.cc
tests/matrix_free/matrix_vector_03.cc
tests/matrix_free/matrix_vector_04.cc
tests/matrix_free/matrix_vector_04b.cc
tests/matrix_free/matrix_vector_05.cc
tests/matrix_free/matrix_vector_06.cc
tests/matrix_free/matrix_vector_06_notempl.cc
tests/matrix_free/matrix_vector_07.cc
tests/matrix_free/matrix_vector_08.cc
tests/matrix_free/matrix_vector_09.cc
tests/matrix_free/matrix_vector_10.cc
tests/matrix_free/matrix_vector_11.cc
tests/matrix_free/matrix_vector_12.cc
tests/matrix_free/matrix_vector_13.cc
tests/matrix_free/matrix_vector_14.cc
tests/matrix_free/matrix_vector_14_notempl.cc
tests/matrix_free/matrix_vector_14b.cc
tests/matrix_free/matrix_vector_15.cc
tests/matrix_free/matrix_vector_16.cc
tests/matrix_free/matrix_vector_17.cc
tests/matrix_free/matrix_vector_18.cc
tests/matrix_free/matrix_vector_19.cc
tests/matrix_free/matrix_vector_20.cc
tests/matrix_free/matrix_vector_21.cc
tests/matrix_free/matrix_vector_22.cc
tests/matrix_free/matrix_vector_23.cc
tests/matrix_free/matrix_vector_blocks.cc
tests/matrix_free/matrix_vector_common.h
tests/matrix_free/matrix_vector_curl.cc
tests/matrix_free/matrix_vector_div.cc
tests/matrix_free/matrix_vector_faces_01.cc
tests/matrix_free/matrix_vector_faces_02.cc
tests/matrix_free/matrix_vector_faces_03.cc
tests/matrix_free/matrix_vector_faces_04.cc
tests/matrix_free/matrix_vector_faces_05.cc
tests/matrix_free/matrix_vector_faces_06.cc
tests/matrix_free/matrix_vector_faces_07.cc
tests/matrix_free/matrix_vector_faces_08.cc
tests/matrix_free/matrix_vector_faces_09.cc
tests/matrix_free/matrix_vector_faces_10.cc
tests/matrix_free/matrix_vector_faces_11.cc
tests/matrix_free/matrix_vector_faces_12.cc
tests/matrix_free/matrix_vector_faces_13.cc
tests/matrix_free/matrix_vector_faces_14.cc
tests/matrix_free/matrix_vector_faces_15.cc
tests/matrix_free/matrix_vector_faces_16.cc
tests/matrix_free/matrix_vector_faces_17.cc
tests/matrix_free/matrix_vector_faces_18.cc
tests/matrix_free/matrix_vector_faces_19.cc
tests/matrix_free/matrix_vector_faces_20.cc
tests/matrix_free/matrix_vector_faces_21.cc
tests/matrix_free/matrix_vector_faces_22.cc
tests/matrix_free/matrix_vector_faces_23.cc
tests/matrix_free/matrix_vector_faces_common.h
tests/matrix_free/matrix_vector_float.cc
tests/matrix_free/matrix_vector_hp.cc
tests/matrix_free/matrix_vector_large_degree_01.cc
tests/matrix_free/matrix_vector_large_degree_02.cc
tests/matrix_free/matrix_vector_mg.cc
tests/matrix_free/matrix_vector_stokes.cc
tests/matrix_free/matrix_vector_stokes_base.cc
tests/matrix_free/matrix_vector_stokes_flux.cc
tests/matrix_free/matrix_vector_stokes_noflux.cc
tests/matrix_free/matrix_vector_stokes_notempl.cc
tests/matrix_free/matrix_vector_stokes_onedof.cc
tests/matrix_free/matrix_vector_stokes_qdg0.cc
tests/matrix_free/matrix_vector_stokes_qdg0b.cc
tests/matrix_free/multigrid_dg_periodic.cc
tests/matrix_free/multigrid_dg_sip_01.cc
tests/matrix_free/multigrid_dg_sip_02.cc
tests/matrix_free/no_index_initialize.cc
tests/matrix_free/parallel_multigrid.cc
tests/matrix_free/parallel_multigrid_02.cc
tests/matrix_free/parallel_multigrid_adaptive_01.cc
tests/matrix_free/parallel_multigrid_adaptive_02.cc
tests/matrix_free/parallel_multigrid_adaptive_03.cc
tests/matrix_free/parallel_multigrid_adaptive_04.cc
tests/matrix_free/parallel_multigrid_adaptive_05.cc
tests/matrix_free/parallel_multigrid_adaptive_06.cc
tests/matrix_free/parallel_multigrid_adaptive_06ref.cc
tests/matrix_free/parallel_multigrid_adaptive_07.cc
tests/matrix_free/parallel_multigrid_mf.cc
tests/matrix_free/quadrature_points.cc
tests/matrix_free/step-48.cc
tests/matrix_free/step-48b.cc
tests/matrix_free/step-48c.cc
tests/matrix_free/stokes_computation.cc
tests/matrix_free/thread_correctness.cc
tests/matrix_free/thread_correctness_dg.cc
tests/matrix_free/thread_correctness_hp.cc
tests/matrix_free/update_mapping_only.cc
tests/meshworker/step-11-mesh_loop.cc
tests/meshworker/step-50-mesh_loop.cc
tests/mpi/condense_01.cc
tests/mpi/constraint_matrix_condense_01.cc
tests/mpi/constraint_matrix_crash_01.cc
tests/mpi/constraint_matrix_set_zero_01.cc
tests/mpi/constraint_matrix_set_zero_02.cc
tests/mpi/constraint_matrix_trilinos_bug.cc
tests/mpi/constraints_consistent_01.cc
tests/mpi/crash_05.cc
tests/mpi/crash_06.cc
tests/mpi/data_out_faces_01.cc
tests/mpi/fe_tools_extrapolate_common.h
tests/mpi/hp_step-40.cc
tests/mpi/interpolate_to_different_mesh_02.cc
tests/mpi/make_zero_boundary_values.cc
tests/mpi/muelu_periodicity.cc
tests/mpi/multigrid_adaptive.cc
tests/mpi/multigrid_uniform.cc
tests/mpi/no_flux_constraints.cc
tests/mpi/no_flux_constraints_02.cc
tests/mpi/no_flux_constraints_03.cc
tests/mpi/normal_flux_constraints.cc
tests/mpi/p4est_2d_constraintmatrix_01.cc
tests/mpi/p4est_2d_constraintmatrix_02.cc
tests/mpi/p4est_2d_constraintmatrix_03.cc
tests/mpi/p4est_2d_constraintmatrix_04.cc
tests/mpi/p4est_2d_constraintmatrix_05.cc
tests/mpi/p4est_3d_constraintmatrix_01.cc
tests/mpi/p4est_3d_constraintmatrix_02.cc
tests/mpi/p4est_3d_constraintmatrix_03.cc
tests/mpi/p4est_3d_constraintmatrix_04.cc
tests/mpi/parallel_block_vector_05.cc
tests/mpi/parallel_block_vector_06.cc
tests/mpi/parallel_block_vector_07.cc
tests/mpi/parallel_block_vector_08.cc
tests/mpi/parallel_block_vector_09.cc
tests/mpi/parallel_block_vector_10.cc
tests/mpi/parallel_block_vector_11.cc
tests/mpi/parallel_block_vector_12.cc
tests/mpi/parallel_vector_back_interpolate.cc
tests/mpi/periodicity_01.cc
tests/mpi/periodicity_02.cc
tests/mpi/periodicity_03.cc
tests/mpi/periodicity_04.cc
tests/mpi/petsc_distribute_01.cc
tests/mpi/petsc_distribute_01_block.cc
tests/mpi/petsc_distribute_01_inhomogenous.cc
tests/mpi/petsc_locally_owned_elements.cc
tests/mpi/renumber_z_order_01.cc
tests/mpi/renumber_z_order_02.cc
tests/mpi/step-37.cc
tests/mpi/step-40.cc
tests/mpi/step-40_cuthill_mckee.cc
tests/mpi/step-40_cuthill_mckee_MPI-subset.cc
tests/mpi/step-40_direct_solver.cc
tests/mpi/trilinos_distribute_01.cc
tests/mpi/trilinos_distribute_01_block.cc
tests/mpi/trilinos_distribute_01_inhomogenous.cc
tests/mpi/trilinos_distribute_03.cc
tests/mpi/trilinos_distribute_04.cc
tests/multigrid/events_01.cc
tests/multigrid/interface_matrix_entry_01.cc
tests/multigrid/mg_coarse_01.cc
tests/multigrid/step-16-02.cc
tests/multigrid/step-16-03.cc
tests/multigrid/step-16-04.cc
tests/multigrid/step-16-05.cc
tests/multigrid/step-16-06.cc
tests/multigrid/step-16-07.cc
tests/multigrid/step-16-50-mpi-linear-operator.cc
tests/multigrid/step-16-50-mpi-smoother.cc
tests/multigrid/step-16-50-mpi.cc
tests/multigrid/step-16-50-serial.cc
tests/multigrid/step-16-bdry1.cc
tests/multigrid/step-16.cc
tests/multigrid/step-50_01.cc
tests/multigrid/step-50_02.cc
tests/multigrid/transfer_04.cc
tests/non_matching/coupling_02.cc
tests/non_matching/coupling_03.cc
tests/non_matching/coupling_04.cc
tests/non_matching/coupling_05.cc
tests/non_matching/coupling_06.cc
tests/non_matching/coupling_07.cc
tests/numerics/assemble_matrix_parallel_01.cc
tests/numerics/assemble_matrix_parallel_02.cc
tests/numerics/assemble_matrix_parallel_03.cc
tests/numerics/assemble_matrix_parallel_04.cc
tests/numerics/create_laplace_matrix_01.cc
tests/numerics/create_laplace_matrix_01b.cc
tests/numerics/create_laplace_matrix_02.cc
tests/numerics/create_laplace_matrix_02b.cc
tests/numerics/create_laplace_matrix_03.cc
tests/numerics/create_laplace_matrix_03b.cc
tests/numerics/create_laplace_matrix_04.cc
tests/numerics/create_laplace_matrix_04b.cc
tests/numerics/create_laplace_matrix_constraints_01.cc
tests/numerics/create_laplace_matrix_constraints_02.cc
tests/numerics/create_laplace_matrix_constraints_02b.cc
tests/numerics/create_laplace_matrix_constraints_03.cc
tests/numerics/create_laplace_matrix_constraints_04.cc
tests/numerics/create_mass_matrix_01.cc
tests/numerics/create_mass_matrix_01b.cc
tests/numerics/create_mass_matrix_02.cc
tests/numerics/create_mass_matrix_02b.cc
tests/numerics/create_mass_matrix_03.cc
tests/numerics/create_mass_matrix_03b.cc
tests/numerics/create_mass_matrix_04.cc
tests/numerics/create_mass_matrix_04b.cc
tests/numerics/create_mass_matrix_05.cc
tests/numerics/create_mass_matrix_constraints_01.cc
tests/numerics/create_mass_matrix_constraints_02.cc
tests/numerics/create_mass_matrix_constraints_02b.cc
tests/numerics/create_mass_matrix_constraints_03.cc
tests/numerics/create_mass_matrix_constraints_04.cc
tests/numerics/error_estimator_02.cc
tests/numerics/error_estimator_02_complex.cc
tests/numerics/no_flux_01.cc
tests/numerics/no_flux_02.cc
tests/numerics/no_flux_03.cc
tests/numerics/no_flux_04.cc
tests/numerics/no_flux_05.cc
tests/numerics/no_flux_06.cc
tests/numerics/no_flux_07.cc
tests/numerics/no_flux_08.cc
tests/numerics/no_flux_09.cc
tests/numerics/no_flux_10.cc
tests/numerics/no_flux_11.cc
tests/numerics/no_flux_12.cc
tests/numerics/no_flux_13.cc
tests/numerics/no_flux_14.cc
tests/numerics/no_flux_15.cc
tests/numerics/no_flux_hp_01.cc
tests/numerics/no_flux_hp_02.cc
tests/numerics/no_flux_hp_03.cc
tests/numerics/no_flux_hp_04.cc
tests/numerics/no_flux_hp_05.cc
tests/numerics/normal_flux_01.cc
tests/numerics/normal_flux_02.cc
tests/numerics/normal_flux_03.cc
tests/numerics/normal_flux_hp_01.cc
tests/numerics/normal_flux_inhom_01.cc
tests/numerics/project_01.cc
tests/numerics/project_01_curved_boundary.cc
tests/numerics/project_02.cc
tests/numerics/project_03.cc
tests/numerics/project_bv_curl_conf.cc
tests/numerics/project_bv_curl_conf_02.cc
tests/numerics/project_bv_div_conf.cc
tests/numerics/project_common.h
tests/numerics/project_parallel_common.h
tests/numerics/project_parallel_qp_common.h
tests/numerics/project_parallel_qpmf_common.h
tests/numerics/tangential_flux_inhom_01.cc
tests/petsc_complex/assemble_01.cc
tests/petsc_complex/fe_get_function_values.cc
tests/physics/step-18-rotation_matrix.cc
tests/physics/step-18.cc
tests/physics/step-44-standard_tensors-material_push_forward.cc
tests/physics/step-44-standard_tensors-spatial.cc
tests/physics/step-44.cc
tests/quick_tests/step-petsc.cc
tests/quick_tests/step-slepc.cc
tests/quick_tests/step-trilinos.cc
tests/quick_tests/step.cc
tests/slepc/step-36_parallel.cc
tests/slepc/step-36_parallel_02.cc
tests/slepc/step-36_parallel_03.cc
tests/trilinos/assemble_matrix_parallel_01.cc
tests/trilinos/assemble_matrix_parallel_02.cc
tests/trilinos/assemble_matrix_parallel_03.cc
tests/trilinos/assemble_matrix_parallel_04.cc
tests/trilinos/assemble_matrix_parallel_05.cc
tests/trilinos/assemble_matrix_parallel_06.cc
tests/trilinos/assemble_matrix_parallel_07.cc
tests/trilinos/direct_solver.cc
tests/trilinos/direct_solver_2.cc
tests/trilinos/direct_solver_3.cc
tests/trilinos/n_nonzeros_02.cc
tests/trilinos/n_nonzeros_02_parallel.cc
tests/trilinos/precondition.cc
tests/trilinos/precondition_amg_smoother.cc
tests/trilinos/precondition_muelu_q_iso_q1.cc
tests/trilinos/precondition_muelu_smoother.cc
tests/trilinos/precondition_q_iso_q1.cc
tests/trilinos/renumbering_01.cc
tests/trilinos/solver_control_06.cc
tests/trilinos/trilinos_sparsity_pattern_02.cc
tests/trilinos/trilinos_sparsity_pattern_05.cc

index 6a554640e0568296627a41f00c1d8e4b80902720..b32b20244f69073c71a19461b58243cac56f334f 100644 (file)
@@ -99,7 +99,7 @@ private:
   std::vector<Vector<double>>       eigenvectors;
   std::vector<std::complex<double>> eigenvalues;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   unsigned int n_eigenvalues;
 };
index e2b0c25a32f1b9d1a31efe01edb4c8f9b3256c1f..73f6381bf5a7fd1a36278249a0d185dc983a893d 100644 (file)
@@ -148,12 +148,12 @@ test()
     dealii::Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  dealii::Triangulation<dim> triangulation;
-  dealii::DoFHandler<dim>    dof_handler(triangulation);
-  dealii::FE_Q<dim>          fe(1);
-  dealii::ConstraintMatrix   constraints;
-  dealii::IndexSet           locally_owned_dofs;
-  dealii::IndexSet           locally_relevant_dofs;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::DoFHandler<dim>           dof_handler(triangulation);
+  dealii::FE_Q<dim>                 fe(1);
+  dealii::AffineConstraints<double> constraints;
+  dealii::IndexSet                  locally_owned_dofs;
+  dealii::IndexSet                  locally_relevant_dofs;
 
   std::vector<dealii::PETScWrappers::MPI::Vector> eigenfunctions;
   std::vector<dealii::PETScWrappers::MPI::Vector> arpack_vectors;
index 5b9b448bfd9f0aa14636f818f18feb7229e4ad0b..671d9db0e2453935dfd54ba9d7b3aa028bd7f78a 100644 (file)
@@ -122,12 +122,12 @@ test()
     Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  Triangulation<dim> triangulation;
-  DoFHandler<dim>    dof_handler(triangulation);
-  FE_Q<dim>          fe(1);
-  ConstraintMatrix   constraints;
-  IndexSet           locally_owned_dofs;
-  IndexSet           locally_relevant_dofs;
+  Triangulation<dim>        triangulation;
+  DoFHandler<dim>           dof_handler(triangulation);
+  FE_Q<dim>                 fe(1);
+  AffineConstraints<double> constraints;
+  IndexSet                  locally_owned_dofs;
+  IndexSet                  locally_relevant_dofs;
 
   std::vector<TrilinosWrappers::MPI::Vector> eigenfunctions;
   std::vector<TrilinosWrappers::MPI::Vector> arpack_vectors;
index e6de73ad02acbc2e87ede4fea50349c6ad9fcb34..1c3b1e34e62c5995b7224d03d24c672d219b51ed 100644 (file)
@@ -92,7 +92,7 @@ namespace Step36
     std::vector<Vector<double>>       eigenfunctions;
     std::vector<std::complex<double>> eigenvalues;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
   };
 
 
index c055645a3feaa22c189f09336130ff79e479bb61..feb484adcfe616eb43b9c24b325d69afde5566df 100644 (file)
@@ -85,7 +85,7 @@ namespace Step36
     std::vector<Vector<double>>       eigenfunctions;
     std::vector<std::complex<double>> eigenvalues;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
   };
 
 
index 62fbd6b9d7916123fc437ed532dc913d7f224fe0..3a708d2a215976fcf359d408782b189572521dbb 100644 (file)
@@ -151,12 +151,12 @@ test()
     dealii::Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  dealii::Triangulation<dim> triangulation;
-  dealii::DoFHandler<dim>    dof_handler(triangulation);
-  dealii::FE_Q<dim>          fe(1);
-  dealii::ConstraintMatrix   constraints;
-  dealii::IndexSet           locally_owned_dofs;
-  dealii::IndexSet           locally_relevant_dofs;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::DoFHandler<dim>           dof_handler(triangulation);
+  dealii::FE_Q<dim>                 fe(1);
+  dealii::AffineConstraints<double> constraints;
+  dealii::IndexSet                  locally_owned_dofs;
+  dealii::IndexSet                  locally_relevant_dofs;
 
   std::vector<dealii::PETScWrappers::MPI::Vector> eigenfunctions;
   std::vector<PetscScalar>                        eigenvalues;
index f6ffb8aece5e738c742a19eff204f44ac01e725a..03cbbb55ff071a0efb30edbfc729d265974a961d 100644 (file)
@@ -87,7 +87,7 @@ test()
 
   IndexSet locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   VectorTools::interpolate_boundary_values(dof_handler,
index 55bb6257a85f4d698be236b71c3aab8fb5c9dfd5..52c8772ab77120f83e693c6da10170aee9837f68 100644 (file)
@@ -86,7 +86,7 @@ test()
 
   IndexSet locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   VectorTools::interpolate_boundary_values(dof_handler,
index 293f273dca171843350d588c3e13ae1bc168e568..4b2ff0bf315be3785f194c52ee8c94aad44afcb8 100644 (file)
@@ -87,7 +87,7 @@ test()
 
   IndexSet locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   VectorTools::interpolate_boundary_values(dof_handler,
index b222df74f50ef8136e637d829fa6a57c72b89ede..9af1726d6fcf680ab332eb3004aeb5e167f4fa41 100644 (file)
@@ -125,12 +125,12 @@ test()
     Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  Triangulation<dim> triangulation;
-  DoFHandler<dim>    dof_handler(triangulation);
-  FE_Q<dim>          fe(1);
-  ConstraintMatrix   constraints;
-  IndexSet           locally_owned_dofs;
-  IndexSet           locally_relevant_dofs;
+  Triangulation<dim>        triangulation;
+  DoFHandler<dim>           dof_handler(triangulation);
+  FE_Q<dim>                 fe(1);
+  AffineConstraints<double> constraints;
+  IndexSet                  locally_owned_dofs;
+  IndexSet                  locally_relevant_dofs;
 
   std::vector<TrilinosWrappers::MPI::Vector> eigenfunctions;
   std::vector<double>                        eigenvalues;
index d61b7716233777fb1549fbc9270a7d620372a6c4..2f88ab96fe0af9c2a25c8be1d9b3297a5b2a87a8 100644 (file)
@@ -172,7 +172,7 @@ main()
   DoFToolsEx::transfer(dof, sol, both_dof, both_sol);
 
   // handle hanging nodes
-  ConstraintMatrix both_constraints;
+  AffineConstraints<double> both_constraints;
   DoFTools::make_hanging_node_constraints(both_dof, both_constraints);
   both_constraints.close();
   both_constraints.distribute(both_sol);
index 508d0910eb3eb713e4de2e95d2c0a9b8203e6cbf..a77b91afc55a925bd1914f84ee2c9ba0e788cf61 100644 (file)
@@ -120,7 +120,7 @@ do_project(const Triangulation<dim> &triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index a5c96e85ad9d531d95dd39aeac2d0522d1ed6d3f..bdcd55d4c843ba51fd0047171b8ab8f90352c742 100644 (file)
@@ -123,7 +123,7 @@ do_project(const Triangulation<dim> &triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 8ba66ac751c4bdd2f806bd7beb53791658bce0fb..36182bbc7f7b076d8327a1e9841815707c659472 100644 (file)
@@ -111,7 +111,7 @@ do_project(const Triangulation<dim> &triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 17fd7f51e874c225f64ad8286a9599ebe5b277c0..abb9149e9fe637dec9a5fe9b7ddac8c866d6af7d 100644 (file)
@@ -75,7 +75,7 @@ check()
       // constraints. this should trip the
       // new code using the hp constraints,
       // added in late July 2006
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof, constraints);
 
       for (unsigned int j = 0; j < dof.n_dofs(); ++j)
index b8e7272749490ad08c73046e51ec06106862844d..66dc1b20979e4f8a152e6c47d657cf1afcd6c62c 100644 (file)
@@ -75,7 +75,7 @@ test()
   // consequently subtracting the vector from
   // itself should yield zero
   {
-    ConstraintMatrix cm;
+    AffineConstraints<double> cm;
     cm.close();
     VectorTools::project(dh, cm, QGauss<dim>(3), fef, v2);
   }
index 3bf5f3899bbd8f724f581e119aba13c1c30010a2..b7d373d441994bbe6689d3edc0fa50ae59cb59d3 100644 (file)
@@ -93,7 +93,7 @@ test()
   // consequently subtracting the vector from
   // itself should yield zero
   {
-    ConstraintMatrix cm;
+    AffineConstraints<double> cm;
     cm.close();
     VectorTools::project(dh, cm, QGauss<dim>(3), fef, v2);
   }
index be3e3808a1692f3914e8cfe9bd05d95b0abd73dd..e8fbe2157dd51894e4e1566438c0462240691dd0 100644 (file)
@@ -113,10 +113,10 @@ private:
   void
   test();
 
-  Triangulation<dim> triangulation;
-  FE_Q<dim>          fe;
-  DoFHandler<dim>    dof_handler;
-  ConstraintMatrix   hanging_node_constraints;
+  Triangulation<dim>        triangulation;
+  FE_Q<dim>                 fe;
+  DoFHandler<dim>           dof_handler;
+  AffineConstraints<double> hanging_node_constraints;
 };
 
 template <int dim>
index 42bfc4c48890a7a41d587df1b207dcf15b9df9f3..aa643cccdc79834e486be29ec4aec171ca9cb043 100644 (file)
@@ -54,7 +54,7 @@ test()
 
   dofh.distribute_dofs(fe);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   DoFTools::make_hanging_node_constraints(dofh, cm);
   cm.close();
index f13c4188beb28d65e5a5ff928ee27c67246270c3..06c3cfbadcec8532dcf8805e320952f8f2cd6faa 100644 (file)
@@ -46,7 +46,7 @@ check_this(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
   std::unique_ptr<Triangulation<dim>> tria(make_tria<dim>());
   std::unique_ptr<DoFHandler<dim>>    dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>>    dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                    cm;
+  AffineConstraints<double>           cm;
   DoFTools::make_hanging_node_constraints(*dof2, cm);
   cm.close();
 
index 5e4466782c5a663f847b1ab495a6b417c90c1ac6..4a072a454b757ccbf6d9e12ecddfd538ea036187 100644 (file)
@@ -48,7 +48,7 @@ check_this(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
   std::unique_ptr<Triangulation<dim>> tria(make_tria<dim>());
   std::unique_ptr<DoFHandler<dim>>    dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>>    dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                    cm1, cm2;
+  AffineConstraints<double>           cm1, cm2;
   DoFTools::make_hanging_node_constraints(*dof1, cm1);
   DoFTools::make_hanging_node_constraints(*dof2, cm2);
   cm1.close();
index 56633c7bbb5dafe4ab772891a8eebf4fe102f31b..392f2d77a44daea7b4fbd741c98568ae62d034f9 100644 (file)
@@ -49,7 +49,7 @@ check_this(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
   std::unique_ptr<Triangulation<dim>> tria(make_tria<dim>());
   std::unique_ptr<DoFHandler<dim>>    dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>>    dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                    cm1, cm2;
+  AffineConstraints<double>           cm1, cm2;
   DoFTools::make_hanging_node_constraints(*dof1, cm1);
   DoFTools::make_hanging_node_constraints(*dof2, cm2);
   cm1.close();
index 04cce17a93c9747adf92993486250fc640b04b1a..56cfe83f415fa8ef0b993c5e5dad8669fa34fddb 100644 (file)
@@ -46,7 +46,7 @@ check_this(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
   std::unique_ptr<Triangulation<dim>> tria(make_tria<dim>());
   std::unique_ptr<DoFHandler<dim>>    dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>>    dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                    cm1, cm2;
+  AffineConstraints<double>           cm1, cm2;
   DoFTools::make_hanging_node_constraints(*dof1, cm1);
   DoFTools::make_hanging_node_constraints(*dof2, cm2);
   cm1.close();
index c567e4e46cf57e2449935fa09b868ce3270f8eea..7c51785c5322727dd1aef1de94083af7b0d99864 100644 (file)
@@ -52,7 +52,7 @@ check_this(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
   std::unique_ptr<Triangulation<dim>> tria(make_tria<dim>());
   std::unique_ptr<DoFHandler<dim>>    dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>>    dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                    cm;
+  AffineConstraints<double>           cm;
   DoFTools::make_hanging_node_constraints(*dof2, cm);
   cm.close();
 
index ef422c66e3a0b5710c663005aee777cd7efbcc09..9dca934c55664f30d40f248a85ae396edadc562d 100644 (file)
@@ -159,7 +159,7 @@ private:
   // object which holds a list of
   // constraints originating from
   // the hanging nodes:
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
@@ -463,14 +463,14 @@ LaplaceProblem<dim>::setup_system()
   // The next step is <code>closing</code>
   // this object. For this note that,
   // in principle, the
-  // <code>ConstraintMatrix</code> class can
+  // <code>AffineConstraints<double></code> class can
   // hold other constraints as well,
   // i.e. constraints that do not
   // stem from hanging
   // nodes. Sometimes, it is useful
   // to use such constraints, in
   // which case they may be added to
-  // the <code>ConstraintMatrix</code> object
+  // the <code>AffineConstraints<double></code> object
   // after the hanging node
   // constraints were computed. After
   // all constraints have been added,
index 87edad98cb43acd56807ad2d42a6afb6d2854956..4b04a497ca2491d7e3ad98e111e9b9e8dd0e26d0 100644 (file)
@@ -91,7 +91,7 @@ test()
                                            0,
                                            Functions::ConstantFunction<dim>(1.),
                                            boundary_values);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   DoFTools::make_zero_boundary_constraints(dof_handler, constraints);
   constraints.close();
index 2615911485ed29d8fdb842db4c6eb5986d95ab8e..09da428c2a17730fe69531553734d808383bde3e 100644 (file)
@@ -97,7 +97,7 @@ test()
                                            1,
                                            Functions::ConstantFunction<dim>(1.),
                                            boundary_values);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   DoFTools::make_zero_boundary_constraints(dof_handler, 1, constraints);
   constraints.close();
index 5c93cf5b9ef3a5fee57ce4baa7e0a5451a8398ea..0f8e8f1a3a2657ba373e8efbf25056666d37af8f 100644 (file)
@@ -61,7 +61,7 @@ test()
   // DoFRenumbering::component_wise(dof_handler);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix           constraints;
+  AffineConstraints<double>  constraints;
   FEValuesExtractors::Vector velocities(1);
   ComponentMask              mask = fe.component_mask(velocities);
 
index fd79935b4567aa8a446ae18b80fd62346de5fdfd..0e389d2b2603b28032c333ecf8a80e2d298545b4 100644 (file)
@@ -53,7 +53,7 @@ test()
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0),
                                          (++dof_handler.begin(0))->face(1),
                                          cm);
index a03fb505cf06e480ab6cfc3485cc52512779888c..d088f8175aaa6087f4d7f08889fa4569a8f6530f 100644 (file)
@@ -58,7 +58,7 @@ test()
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0),
                                          (++dof_handler.begin(0))->face(1),
                                          cm);
index f1128fa0caa938f2362095932dd8ef33e564e9ba..bfdb6f2bea1cfb4ac86bb14f684e922ed28bfee8 100644 (file)
@@ -60,7 +60,7 @@ test()
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0),
                                          (++dof_handler.begin(0))->face(1),
                                          cm);
index 5cc151278316f43836ae3a50680eb226311e69ea..8736065ac8a899314a49ca48009aac0af2d6530c 100644 (file)
@@ -67,7 +67,7 @@ test()
 
   std::vector<bool> mask(2, true);
   mask[1] = false;
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0),
                                          (++dof_handler.begin(0))->face(1),
                                          cm,
index 60fcb11ae229c307bde0e3b0e0d0e2db01fede5c..e1ea506f595207a3d931e9271009da20054c0706 100644 (file)
@@ -79,10 +79,10 @@ private:
   void
   setup_system();
 
-  Triangulation<2> triangulation;
-  FE_Q<2>          fe;
-  DoFHandler<2>    dof_handler;
-  ConstraintMatrix constraints;
+  Triangulation<2>          triangulation;
+  FE_Q<2>                   fe;
+  DoFHandler<2>             dof_handler;
+  AffineConstraints<double> constraints;
 };
 
 Deal2PeriodicBug::Deal2PeriodicBug()
index e87dcd6120f695b3b5e6ed8efcdd5f9aacf5e1ba..deaa21b1662d90e567b364d52b8da88feec351e3 100644 (file)
 
 using namespace dealii;
 
-ConstraintMatrix
+AffineConstraints<double>
 make_constraint_matrix(const DoFHandler<2> &dof_handler, int version)
 {
-  constexpr int    dim = 2;
-  ConstraintMatrix constraints;
+  constexpr int             dim = 2;
+  AffineConstraints<double> constraints;
   constraints.clear();
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
@@ -240,7 +240,7 @@ main(int argc, char *argv[])
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  std::vector<ConstraintMatrix> constraints(8);
+  std::vector<AffineConstraints<double>> constraints(8);
 
   PeriodicReference<dim> periodic_function;
 
index d471bca1fc08c505d33f63892b1a024b028ff6bc..1b91c0d4a1d40cd067a7c9122a616b009149a7a7 100644 (file)
 
 using namespace dealii;
 
-ConstraintMatrix
+AffineConstraints<double>
 make_constraint_matrix(const DoFHandler<3> &dof_handler, int version)
 {
   constexpr int dim = 3;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
@@ -269,7 +269,7 @@ main(int argc, char *argv[])
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  std::vector<ConstraintMatrix> constraints(4);
+  std::vector<AffineConstraints<double>> constraints(4);
 
   PeriodicReference<dim> periodic_function;
 
index af2d7ef89321934e4c317195df03cd69f7025298..77d02cdcc88f4a891fb006b73f797801acf42653 100644 (file)
@@ -71,15 +71,15 @@ transfer(std::ostream &out)
   Triangulation<dim> tria;
   GridGenerator::hyper_cube(tria);
   tria.refine_global(5 - dim);
-  FE_Q<dim>            fe_q(1);
-  FE_DGQ<dim>          fe_dgq(1);
-  DoFHandler<dim>      q_dof_handler(tria);
-  DoFHandler<dim>      dgq_dof_handler(tria);
-  Vector<double>       q_solution;
-  Vector<double>       dgq_solution;
-  MappingQGeneric<dim> mapping(1);
-  DataOut<dim>         q_data_out, dgq_data_out;
-  ConstraintMatrix     cm;
+  FE_Q<dim>                 fe_q(1);
+  FE_DGQ<dim>               fe_dgq(1);
+  DoFHandler<dim>           q_dof_handler(tria);
+  DoFHandler<dim>           dgq_dof_handler(tria);
+  Vector<double>            q_solution;
+  Vector<double>            dgq_solution;
+  MappingQGeneric<dim>      mapping(1);
+  DataOut<dim>              q_data_out, dgq_data_out;
+  AffineConstraints<double> cm;
   cm.close();
 
   q_dof_handler.distribute_dofs(fe_q);
index d1ad23da483126ab76d881fd8687d8a51921479a..96dabf410e91032b75b247a53761ee10a6a12b4d 100644 (file)
@@ -211,23 +211,23 @@ private:
   void
   process_solution(const unsigned int cycle);
 
-  Triangulation<dim>   triangulation;
-  FE_Q<dim>            fe;
-  DoFHandler<dim>      dof_handler;
-  ConstraintMatrix     constraints;
-  SparsityPattern      sparsity_pattern;
-  SparseMatrix<double> system_matrix;
-  Vector<double>       solution;
-  Vector<double>       system_rhs;
-
-  FE_TraceQ<dim>       fe_trace;
-  DoFHandler<dim>      dof_handler_trace;
-  ConstraintMatrix     constraints_trace;
-  SparsityPattern      sparsity_pattern_trace;
-  SparseMatrix<double> system_matrix_trace;
-  Vector<double>       solution_trace_full;
-  Vector<double>       solution_trace;
-  Vector<double>       system_rhs_trace;
+  Triangulation<dim>        triangulation;
+  FE_Q<dim>                 fe;
+  DoFHandler<dim>           dof_handler;
+  AffineConstraints<double> constraints;
+  SparsityPattern           sparsity_pattern;
+  SparseMatrix<double>      system_matrix;
+  Vector<double>            solution;
+  Vector<double>            system_rhs;
+
+  FE_TraceQ<dim>            fe_trace;
+  DoFHandler<dim>           dof_handler_trace;
+  AffineConstraints<double> constraints_trace;
+  SparsityPattern           sparsity_pattern_trace;
+  SparseMatrix<double>      system_matrix_trace;
+  Vector<double>            solution_trace_full;
+  Vector<double>            solution_trace;
+  Vector<double>            system_rhs_trace;
 
   const RefinementMode refinement_mode;
 
index 70e70e4326fe230842e47abb41761866ca0bc548..7f78c529d70a1cfc811b4175eabdd48686cae671 100644 (file)
@@ -75,9 +75,9 @@ private:
   DoFHandler<dim>    dof_handler;
   MappingQ<dim>      mapping;
 
-  SparsityPattern      sparsity_pattern;
-  SparseMatrix<double> system_matrix;
-  ConstraintMatrix     mean_value_constraints;
+  SparsityPattern           sparsity_pattern;
+  SparseMatrix<double>      system_matrix;
+  AffineConstraints<double> mean_value_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index 9ba4830c181d42c0a4bcdb824b0b0d52fcbba1a0..530325a04b395303e4219ea59a42aa031daa454e 100644 (file)
@@ -281,10 +281,10 @@ namespace LaplaceSolver
       void
       solve(Vector<double> &solution) const;
 
-      ConstraintMatrix     hanging_node_constraints;
-      SparsityPattern      sparsity_pattern;
-      SparseMatrix<double> matrix;
-      Vector<double>       rhs;
+      AffineConstraints<double> hanging_node_constraints;
+      SparsityPattern           sparsity_pattern;
+      SparseMatrix<double>      matrix;
+      Vector<double>            rhs;
     };
 
     void
@@ -445,7 +445,7 @@ namespace LaplaceSolver
   {
     hanging_node_constraints.clear();
 
-    void (*mhnc_p)(const DoFHandler<dim> &, ConstraintMatrix &) =
+    void (*mhnc_p)(const DoFHandler<dim> &, AffineConstraints<double> &) =
       &DoFTools::make_hanging_node_constraints;
 
     Threads::Thread<> mhnc_thread =
index 9e1a14c058f24c6d43c64f92b5300c332edb1994..4c623a28588690b7cbfb68822765d38602c762fc 100644 (file)
@@ -363,10 +363,10 @@ namespace LaplaceSolver
       void
       solve(Vector<double> &solution) const;
 
-      ConstraintMatrix     hanging_node_constraints;
-      SparsityPattern      sparsity_pattern;
-      SparseMatrix<double> matrix;
-      Vector<double>       rhs;
+      AffineConstraints<double> hanging_node_constraints;
+      SparsityPattern           sparsity_pattern;
+      SparseMatrix<double>      matrix;
+      Vector<double>            rhs;
     };
 
     void
@@ -527,7 +527,7 @@ namespace LaplaceSolver
   {
     hanging_node_constraints.clear();
 
-    void (*mhnc_p)(const DoFHandler<dim> &, ConstraintMatrix &) =
+    void (*mhnc_p)(const DoFHandler<dim> &, AffineConstraints<double> &) =
       &DoFTools::make_hanging_node_constraints;
 
     Threads::Thread<> mhnc_thread =
@@ -1576,7 +1576,7 @@ namespace LaplaceSolver
     const PrimalSolver<dim> &primal_solver = *this;
     const DualSolver<dim> &  dual_solver   = *this;
 
-    ConstraintMatrix primal_hanging_node_constraints;
+    AffineConstraints<double> primal_hanging_node_constraints;
     DoFTools::make_hanging_node_constraints(primal_solver.dof_handler,
                                             primal_hanging_node_constraints);
     primal_hanging_node_constraints.close();
@@ -1610,7 +1610,7 @@ namespace LaplaceSolver
     const PrimalSolver<dim> &primal_solver = *this;
     const DualSolver<dim> &  dual_solver   = *this;
 
-    ConstraintMatrix dual_hanging_node_constraints;
+    AffineConstraints<double> dual_hanging_node_constraints;
     DoFTools::make_hanging_node_constraints(dual_solver.dof_handler,
                                             dual_hanging_node_constraints);
     dual_hanging_node_constraints.close();
@@ -1621,7 +1621,7 @@ namespace LaplaceSolver
                          dual_hanging_node_constraints,
                          primal_solution);
 
-    ConstraintMatrix primal_hanging_node_constraints;
+    AffineConstraints<double> primal_hanging_node_constraints;
     DoFTools::make_hanging_node_constraints(primal_solver.dof_handler,
                                             primal_hanging_node_constraints);
     primal_hanging_node_constraints.close();
index 5ba33ff924d35fc6f45f5ed11ad5c1292d533b9c..dd4e316d1c73b7edf063595e39a2de972809dac3 100644 (file)
@@ -313,7 +313,7 @@ namespace Step51
     DoFHandler<dim> dof_handler_u_post;
     Vector<double>  solution_u_post;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     SparsityPattern      sparsity_pattern;
     SparseMatrix<double> system_matrix;
index f7c18cab594962beb1e46dd52017dd045f587ce0..246ea3414ec415ee3773202c6e0c0752406a340f 100644 (file)
@@ -313,7 +313,7 @@ namespace Step51
     DoFHandler<dim> dof_handler_u_post;
     Vector<double>  solution_u_post;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     SparsityPattern      sparsity_pattern;
     SparseMatrix<double> system_matrix;
index 301468646dddb97bf70075afd16b4c06add09e83..73730a40ea396eef212401481079748a72fa4f82 100644 (file)
@@ -85,7 +85,7 @@ private:
   DoFHandler<dim> dof_handler;
   FE_Q<dim>       fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 1d31b1a68a594553befd3b8d5a23b1ef413bdfd2..a4d14aec1b93a33544d31adac5609f0e6d5f0201 100644 (file)
@@ -85,7 +85,7 @@ private:
   DoFHandler<dim> dof_handler;
   FE_Q<dim>       fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index bc62e4d2aa558664191ccf5465e7afceb342bc3f..d176601cf53c28ebd32b20f6ec551cbb467873fd 100644 (file)
@@ -80,7 +80,7 @@ private:
   DoFHandler<dim> dof_handler;
   FE_Q<dim>       fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index e1d52ec324190b4a96b2fbe9fbe08b3c1c5beffb..87c0e2f35b89b0acfbd47d8d807215974a461312 100644 (file)
@@ -210,7 +210,7 @@ private:
 
   SmartPointer<const FiniteElement<dim>> fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 5b06d37924bc64ee9a7a3c1612198262ae388385..f64bc4efc2881b8ea01b3bf84692dfaaf7d41365 100644 (file)
@@ -83,7 +83,7 @@ private:
 
   FESystem<dim> fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index a359aa3e31f7bd5a1899613031d81774b006c695..96a07b983580db590cfc917858db769b6220f2e1 100644 (file)
@@ -110,8 +110,8 @@ test(std::string filename)
     exp[2] = 0;
   Functions::Monomial<spacedim> monomial(exp);
 
-  const QGauss<dim> quad(5);
-  ConstraintMatrix  constraints;
+  const QGauss<dim>         quad(5);
+  AffineConstraints<double> constraints;
   constraints.close();
   VectorTools::project(dof_handler, constraints, quad, monomial, projected_one);
 
index bf783d674028d2a50d497e12a160ce565b0251d4..4f12d8a2cde3cc57c353652946c57d5e550f8550 100644 (file)
@@ -91,8 +91,8 @@ test(std::string filename, unsigned int degree = 1)
   //     exp[2]=0;
   // Functions::Monomial<spacedim> the_function(exp);
 
-  const QGauss<dim> quad(2 * fe.degree + 1);
-  ConstraintMatrix  constraints;
+  const QGauss<dim>         quad(2 * fe.degree + 1);
+  AffineConstraints<double> constraints;
   constraints.close();
   VectorTools::project(
     mapping, dof_handler, constraints, quad, the_function, projected_one);
index 2fc0967498fdda07490e48d45a4ee7e7b1d60ac2..7d02c523b6de4d2c7802919b733ca09937bfda88 100644 (file)
@@ -67,7 +67,7 @@ main()
   /*****************************************************************/
   FE_Q<dim, spacedim>       fe(1);
   DoFHandler<dim, spacedim> dh(boundary_mesh);
-  ConstraintMatrix          hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   dh.distribute_dofs(fe);
   hanging_node_constraints.clear();
index 5274437b082e4cd050ede213f45e88bed6e6e856..c59014867c41dd0699d5361fe93205f19fdc7b24 100644 (file)
@@ -71,7 +71,7 @@ test(std::string filename, unsigned int n)
 
   Functions::CosineFunction<spacedim> cosine;
   QGauss<dim>                         quad(5);
-  ConstraintMatrix                    constraints;
+  AffineConstraints<double>           constraints;
   constraints.close();
   VectorTools::project(dof_handler, constraints, quad, cosine, projected_one);
 
index 55c772c220cac3354137b1858600d51faa42d978..20a0e267cf1ef719e30b9db1db0a41f75592b4ab 100644 (file)
@@ -72,7 +72,7 @@ test(std::string filename, unsigned int n)
 
   Functions::CosineFunction<spacedim> cosine;
   QGauss<dim>                         quad(5);
-  ConstraintMatrix                    constraints;
+  AffineConstraints<double>           constraints;
   constraints.close();
   VectorTools::project(
     dof_handler, constraints, quad, cosine, interpolated_one);
index 0d57fe9f5c5d468ae1a7677426d78d8cbc314c53..1fe3f76aacbbc315188de1d267d139554a3ca782 100644 (file)
@@ -55,7 +55,8 @@ test();
 
 template <int dim, int fe_degree, typename Number, int n_q_points_1d>
 void
-do_test(const DoFHandler<dim> &dof, const ConstraintMatrix &constraints)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
 
index ff620df6c7599e601b0e58791faf5ad3db42202c..678c1a35d8fac629d51d3b0eb67c7b81ef44a4fe 100644 (file)
@@ -86,7 +86,7 @@ namespace Step8
 
     FESystem<dim> fe;
 
-    ConstraintMatrix hanging_node_constraints;
+    AffineConstraints<double> hanging_node_constraints;
 
     SparsityPattern      sparsity_pattern;
     SparseMatrix<double> system_matrix;
index 6c1d051dc2dea431889db7b4085dad155b6c5a20..6bad89ee0ea4b43a417734569666a6c7cde9f92a 100644 (file)
@@ -87,7 +87,7 @@ private:
   DoFHandler<dim> dof_handler;
   FE_Q<dim>       fe;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 040b45565a8212f3a0718ca459c95ce13acb045f..15a4affea1877a103a7abb004738d7daade9d2c3 100644 (file)
@@ -54,7 +54,7 @@ make_stokes_matrix(const DoFHandler<dim> &dof_handler,
   const unsigned int        degree = fe.degree;
   system_matrix                    = 0;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
   FEValues<dim>      fe_values(fe,
                           quadrature_formula,
index 3dda2e709f00f49d1a0f5556a876905e9fac17b6..825e0ce2448b58d84a9a5ad85c0564c089226912 100644 (file)
@@ -68,7 +68,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 7813c868c384403bfcc34f3e2a869af0a38e447b..18b11759957515f0b134e28b56de13a6d59fb12b 100644 (file)
@@ -66,7 +66,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index ad22e28ea37511573381ce7e83dcd4fac7f71e14..a0c6a09fa2cddb73f8930a7137fb5e04f92c9176 100644 (file)
@@ -63,7 +63,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 9e16baa5cb1c45218352e4166f31f0c05e99bbea..5928f5e85b8107b04235cadd3d94b33d4fa3dbf1 100644 (file)
@@ -61,7 +61,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 1a1b301adc6613c82a4da98a692faf5316da1624..19f635e6a1af8b6e915aad23d863f83a799f1991 100644 (file)
@@ -61,7 +61,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 9e1576558d497065381d2fbdee65ac445aa3ef20..91bf9697a8a614586409b6760c11f3d08e2c98de 100644 (file)
@@ -59,7 +59,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 08a25607a345773fd8dff608c9dfcac45571f6d3..a36802caa02717a57826edcf7d1260e6bc257f7e 100644 (file)
@@ -63,7 +63,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index bb957af19a2f42236a923d3bc98de2fc082a77be..ed2d45ab95ae464d04752e6a410b69d838def350 100644 (file)
@@ -62,7 +62,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 244501d7b8a5314d636017a87a40eda33457fc2f..762afdd612a1befbbc1a6c34f760c107848dadb2 100644 (file)
@@ -63,7 +63,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index a8a6551c56209d62eb6bcbb76bc8536607a22457..66fffc7b3c308b885b1d857f5d153dc8a633e720 100644 (file)
@@ -61,7 +61,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 54007e31b95d69877fb1ecbeb1e82ae19a8a21c9..75f1d56675930a2b1e6f82e4025eb9b43b8f4855 100644 (file)
@@ -62,7 +62,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index 81127ba0cdf995c1fe33b4c9a0a960e7e08f1ce1..31ecc8d2788309bcfda0d11c490d78f71d52da86 100644 (file)
@@ -60,7 +60,7 @@ test()
   dof_handler.distribute_dofs(fe);
   deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
   deallog << "Number of constraints: " << constraints.n_constraints()
index e48dc4ffb00f273bdefce406132914cb6a6022ac..a5a6c417f64e7a15fd8a8958a0dfff7be77f9e29 100644 (file)
@@ -328,7 +328,7 @@ TestCases<dim>::run(const unsigned int test_case)
 
   // computing constraints
   deallog << "    Computing constraints..." << std::endl;
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(*dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index e77d21059fb27362df1cc4e4f01e6ec10549c181..3d98de1ce0e8da2912d01bb02cf95b241fa8d00c 100644 (file)
@@ -23,7 +23,7 @@
 //   DoFTools::
 //   make_sparsity_pattern (const DoFHandler<dim> &,
 //                      SparsityPattern       &,
-//                          ConstraintMatrix,
+//                          AffineConstraints<double>,
 //                          true);
 
 
@@ -32,7 +32,7 @@ template <int dim>
 void
 check_this(const DoFHandler<dim> &dof_handler)
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index f7b06a317fd54e80b87d6205b30d89a5df3c8146..3d3bd7cc5b53d39d7700682b00067710e9604c43 100644 (file)
@@ -23,7 +23,7 @@
 //   DoFTools::
 //   make_sparsity_pattern (const DoFHandler<dim> &,
 //                      SparsityPattern       &,
-//                          ConstraintMatrix,
+//                          AffineConstraints<double>,
 //                          true);
 
 
@@ -32,7 +32,7 @@ template <int dim>
 void
 check_this(const DoFHandler<dim> &dof_handler)
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index 9b7456a5eafa1f8cf2244080e49f40a29547474d..4c5cc5b9ceecc2ee03dcccd4eb87444077586c3b 100644 (file)
@@ -38,7 +38,8 @@ check_this(const DoFHandler<dim> &dof_handler)
   // pass a subdomain id; note that
   // the framework sets the subdomain
   // id to the level of each cell
-  DoFTools::make_sparsity_pattern(dof_handler, sp, ConstraintMatrix(), true, 2);
+  DoFTools::make_sparsity_pattern(
+    dof_handler, sp, AffineConstraints<double>(), true, 2);
   sp.compress();
 
   // write out 10 lines of this
index 5d2710cf90a2cb4e6c0e0f8fa145b6384eee41ef..9354aec95b3b23b23e4173973c0e576e5aed5eb5 100644 (file)
@@ -24,7 +24,7 @@
 //   make_sparsity_pattern (const DoFHandler<dim> &,
 //                          std::vector<std::vector<bool> > &,
 //                      SparsityPattern       &,
-//                          ConstraintMatrix,
+//                          AffineConstraints<double>,
 //                          true);
 
 
@@ -42,7 +42,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   for (unsigned int i = 0; i < n_components; ++i)
     mask[i][i] = mask[i][n_components - i - 1] = DoFTools::always;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index 008594ad90aa25497c477a0f02944475528a4479..6fe34bad83655ca70965f635c54d678d9c942a99 100644 (file)
@@ -24,7 +24,7 @@
 //   make_sparsity_pattern (const DoFHandler<dim> &,
 //                          Table<2,DoFTools::Coupling> &,
 //                      SparsityPattern       &,
-//                          ConstraintMatrix,
+//                          AffineConstraints<double>,
 //                          true);
 
 
@@ -42,7 +42,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   for (unsigned int i = 0; i < n_components; ++i)
     mask[i][i] = mask[i][n_components - i - 1] = DoFTools::always;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index 25b095613f709e08c33e3b5c1d980ef227e23b7b..b45d72073aa8e064ffca95805a3fc9da2855cbb2 100644 (file)
@@ -50,7 +50,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   // the framework sets the subdomain
   // id to the level of each cell
   DoFTools::make_sparsity_pattern(
-    dof_handler, mask, sp, ConstraintMatrix(), true, 2);
+    dof_handler, mask, sp, AffineConstraints<double>(), true, 2);
   sp.compress();
 
   // write out 10 lines of this
index 18c3b394d5b0ba8a14b5b2e67e4517b72755b527..917d811436cf0c54964e14319d6459cd36d4386a 100644 (file)
@@ -23,7 +23,7 @@
 // check
 //   DoFTools::
 //   make_hanging_node_constraints (const DoFHandler<dim> &,
-//                              ConstraintMatrix      &);
+//                              AffineConstraints<double>      &);
 
 
 
@@ -47,7 +47,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().constraints_are_implemented() == false)
     return;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index cba41c337d87b4ab7174ecddab1335fc7a7a36df..a601a5996e006832357ff4322fa7a84d3476d3a4 100644 (file)
@@ -31,7 +31,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   std::vector<bool> hanging_node_dofs(n_dofs);
   DoFTools::extract_hanging_node_dofs(dof_handler, hanging_node_dofs);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 1112eee21c44b6cfd6e8b4025d355fcbbfe9a831..2716d76cd0f5e4fd42aa1646c114ca86bf072f68 100644 (file)
@@ -56,7 +56,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   std::vector<bool> is_hanging_node_constrained(n_dofs);
   DoFTools::extract_hanging_node_dofs(dof_handler, is_hanging_node_constrained);
 
-  ConstraintMatrix constraints(locally_relevant_dofs);
+  AffineConstraints<double> constraints(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index abc8d1c12e2ceeedb5eb8985d6acff57c347aa5e..f6e6e088982be1378595af2098fb1fe61d8f4c83 100644 (file)
@@ -39,7 +39,7 @@
 //   DoFTools::
 //   make_flux_sparsity_pattern (const DoFHandler<dim> &,
 //                           SparsityPattern       &,
-//                           ConstraintMatrix      &);
+//                           AffineConstraints<double>      &);
 // this used to fail at one point because we forgot that in 1d
 // neighboring cells can be more than one level apart. with
 // FE_DGQ(0) elements, we get the following mesh and DoF indices:
@@ -59,7 +59,9 @@ check_this(const DoFHandler<dim> &dof_handler)
   // create sparsity pattern
   SparsityPattern sp(dof_handler.n_dofs(),
                      dof_handler.max_couplings_between_dofs() * 2);
-  DoFTools::make_flux_sparsity_pattern(dof_handler, sp, ConstraintMatrix());
+  DoFTools::make_flux_sparsity_pattern(dof_handler,
+                                       sp,
+                                       AffineConstraints<double>());
   sp.compress();
 
   // write out 20 lines of this
index 3697f52513bc537b10855ff2caa08508dcf07d05..b0cd221068efababb57ea4b321a8c94cf45dcbbb 100644 (file)
@@ -30,7 +30,7 @@
 // check
 //   DoFTools::
 //   make_hanging_node_constraints (const DoFHandler<dim> &,
-//                              ConstraintMatrix      &);
+//                              AffineConstraints<double>      &);
 //
 // As the results of dof_tools_03 seem unclear, this test aims
 // at verifying the constraints by projecting a constant function
@@ -65,7 +65,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().constraints_are_implemented() == false)
     return;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index 29c551d6c1ff969265a128c87f7e34360a631066..8a628b05d2bae753da49db62de6a6f52d217ed3c 100644 (file)
@@ -34,7 +34,7 @@
 //   DoFTools::
 //   make_periodicity_constraints (const FaceIterator       &,
 //                                 const FaceIterator       &,
-//                                 dealii::ConstraintMatrix &,
+//                                 dealii::AffineConstraints<double> &,
 //                                 const std::vector<bool>  &)
 //
 // We project an already periodic function onto the FE space of
@@ -50,7 +50,7 @@ check_this(const DoFHandler<dim> &dof_handler)
 {
   Functions::CosineFunction<dim> test_func(dof_handler.get_fe().n_components());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   // Apply periodic boundary conditions only in the one direction where
   // we can match the (locally refined) faces:
index 1d776b23ff932b97c6c8fdb2b2491f7be3d0ca7d..058a13a687f9218710670f4e8282b779e443204f 100644 (file)
@@ -41,7 +41,7 @@ using namespace dealii;
 //   DoFTools::
 //   make_periodicity_constraints (const FaceIterator       &,
 //                                 const FaceIterator       &,
-//                                 dealii::ConstraintMatrix &,
+//                                 dealii::AffineConstraints<double> &,
 //                                 const std::vector<bool>  &,
 //                                 bool, bool, bool)
 // for correct behaviour on non standard oriented meshes.
@@ -194,9 +194,9 @@ print_matching(DoFHandler<dim> &dof_handler,
   const FiniteElement<dim> &fe = dof_handler.get_fe();
   MappingQ<dim>             mapping(1);
 
-  ConstraintMatrix        constraint_matrix;
-  ConstraintMatrix        constraint_matrix_reverse;
-  std::vector<Point<dim>> support_points(dof_handler.n_dofs());
+  AffineConstraints<double> constraint_matrix;
+  AffineConstraints<double> constraint_matrix_reverse;
+  std::vector<Point<dim>>   support_points(dof_handler.n_dofs());
   DoFTools::map_dofs_to_support_points<dim>(mapping,
                                             dof_handler,
                                             support_points);
index c67a6fef8c0d6c485142a1b18dc2f9eb29ce70d4..f25517c88af233978a10a1951015dae96c3c02d6 100644 (file)
@@ -18,7 +18,7 @@
 //   DoFTools::
 //   make_periodicity_constraints (const FaceIterator       &,
 //                                 const FaceIterator       &,
-//                                 dealii::ConstraintMatrix &,
+//                                 dealii::AffineConstraints<double> &,
 //                                 const std::vector<bool>  &,
 //                                 bool, bool, bool)
 // for correct behaviour on non standard oriented meshes.
@@ -121,8 +121,8 @@ print_matching(DoFHandler<dim> &dof_handler)
   const FiniteElement<dim> &fe = dof_handler.get_fe();
   MappingQ<dim>             mapping(1);
 
-  ConstraintMatrix        constraint_matrix;
-  std::vector<Point<dim>> support_points(dof_handler.n_dofs());
+  AffineConstraints<double> constraint_matrix;
+  std::vector<Point<dim>>   support_points(dof_handler.n_dofs());
   DoFTools::map_dofs_to_support_points<dim>(mapping,
                                             dof_handler,
                                             support_points);
index 720a66e3590ef3701f4a2060441e6ded614b627a..4aa026cf706f683bbfa832335dc21c3fc7a14a92 100644 (file)
@@ -18,7 +18,7 @@
 //   DoFTools::
 //   make_periodicity_constraints (const FaceIterator       &,
 //                                 const FaceIterator       &,
-//                                 dealii::ConstraintMatrix &,
+//                                 dealii::AffineConstraints<double> &,
 //                                 const std::vector<bool>  &,
 //                                 bool, bool, bool)
 // for correct behaviour on non standard oriented meshes.
@@ -155,8 +155,8 @@ print_matching(DoFHandler<dim> &dof_handler)
   const FiniteElement<dim> &fe = dof_handler.get_fe();
   MappingQ<dim>             mapping(1);
 
-  ConstraintMatrix        constraint_matrix;
-  std::vector<Point<dim>> support_points(dof_handler.n_dofs());
+  AffineConstraints<double> constraint_matrix;
+  std::vector<Point<dim>>   support_points(dof_handler.n_dofs());
   DoFTools::map_dofs_to_support_points<dim>(mapping,
                                             dof_handler,
                                             support_points);
index 8cf9ffa5caedff599f08cd9e101cf3476f1271d6..553d54ac21d86ba5f5bbdf1bddcb0a24ca3e9f6e 100644 (file)
@@ -18,7 +18,7 @@
 //   DoFTools::
 //   make_periodicity_constraints (const FaceIterator       &,
 //                                 const FaceIterator       &,
-//                                 dealii::ConstraintMatrix &,
+//                                 dealii::AffineConstraints<double> &,
 //                                 const std::vector<bool>  &,
 //                                 bool, bool, bool)
 // for correct behaviour on non standard oriented meshes.
@@ -120,8 +120,8 @@ print_matching(DoFHandler<dim> &dof_handler)
   const FiniteElement<dim> &fe = dof_handler.get_fe();
   MappingQ<dim>             mapping(1);
 
-  ConstraintMatrix        constraint_matrix;
-  std::vector<Point<dim>> support_points(dof_handler.n_dofs());
+  AffineConstraints<double> constraint_matrix;
+  std::vector<Point<dim>>   support_points(dof_handler.n_dofs());
   DoFTools::map_dofs_to_support_points<dim>(mapping,
                                             dof_handler,
                                             support_points);
index f05d56ee8fc5fdf46cef69a730a5acde44719f8a..62537c29f02b93bc2299a15e894fb90dae8c1f2e 100644 (file)
@@ -41,7 +41,7 @@ using namespace dealii;
 //   DoFTools::
 //   make_periodicity_constraints (const FaceIterator       &,
 //                                 const FaceIterator       &,
-//                                 dealii::ConstraintMatrix &,
+//                                 dealii::AffineConstraints<double> &,
 //                                 const std::vector<bool>  &,
 //                                 bool, bool, bool)
 //
@@ -199,9 +199,9 @@ print_matching(DoFHandler<dim> &dof_handler,
   const FiniteElement<dim> &fe = dof_handler.get_fe();
   MappingQ<dim>             mapping(1);
 
-  ConstraintMatrix        constraint_matrix;
-  ConstraintMatrix        constraint_matrix_reverse;
-  std::vector<Point<dim>> support_points(dof_handler.n_dofs());
+  AffineConstraints<double> constraint_matrix;
+  AffineConstraints<double> constraint_matrix_reverse;
+  std::vector<Point<dim>>   support_points(dof_handler.n_dofs());
   DoFTools::map_dofs_to_support_points<dim>(mapping,
                                             dof_handler,
                                             support_points);
index d157ab433a9c6aa72baf82f604b8be78bc4e114a..fcb767a5ba92c2660e9cbe7b209d3296cc97af61 100644 (file)
@@ -16,7 +16,7 @@
 // This test was written by Sam Cox.
 
 // Tests the behaviour of DoFTools::make_flux_sparsity_pattern (DoFHandler,
-//                          SparsityPattern, ConstraintMatrix, bool,
+//                          SparsityPattern, AffineConstraints<double>, bool,
 //                          coupling, flux_coupling, subdomain_id)
 
 #include <deal.II/base/point.h>
@@ -97,7 +97,7 @@ test()
   DoFTools::extract_locally_relevant_dofs(dh, relevant_partitioning);
 
   // Generate hanging node constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   DoFTools::make_hanging_node_constraints(dh, constraints);
   constraints.close();
index d5cbbbd5a437df12a4cff3a5e3c2656c7425db81..f714954cb3a4b3305f21dcd6cec5a6bec8af7476 100644 (file)
@@ -74,7 +74,7 @@ test(const unsigned int flag)
   FE_Q<dim> fe(2);
   dh.distribute_dofs(fe);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dh, cm);
 
   IndexSet support = DoFTools::extract_dofs_with_support_contained_within(
index 89fc0cb3c5b38c0f787eee4f0afd286ecfb12349..3b10a65d84705224112cf6a235b370662194c69f 100644 (file)
@@ -98,7 +98,7 @@ test(const unsigned int flag)
   IndexSet locally_relevant_set;
   DoFTools::extract_locally_relevant_dofs(dh, locally_relevant_set);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.reinit(locally_relevant_set);
   DoFTools::make_hanging_node_constraints(dh, cm);
   cm.close();
index 99ac9dde050b75ddb0b24bec249d9b08d8e6933b..0ca03a928fc25acc1d5ab2c09e6224d187675d9e 100644 (file)
@@ -91,7 +91,7 @@ test(const bool left = true)
   FE_Q<dim> fe(2);
   dh.distribute_dofs(fe);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dh, cm);
 
   IndexSet support =
index 8ca30ea8cc3830b97888731e92d1b463a64f8ee0..497a07c4f0eeeb7dba1468f625bfead370b719ac 100644 (file)
@@ -101,7 +101,7 @@ test()
   IndexSet        locally_relevant_set;
   DoFTools::extract_locally_relevant_dofs(dh, locally_relevant_set);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.reinit(locally_relevant_set);
   DoFTools::make_hanging_node_constraints(dh, cm);
   cm.close();
index ddf28ee744342e616416f1ccfe2f37aadb07c8d1..2f6a0fc6f6ae69f05ca68b9d0b7d2aab59ecbe3a 100644 (file)
@@ -85,7 +85,7 @@ test()
       DoFHandler<dim> dof_handler(triangulation);
       dof_handler.distribute_dofs(fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index c1c5d873370cef1a443f8f558fa0a665edabca3b..af69b42a720c27e1cc2767dc47cecd74506c8126 100644 (file)
@@ -85,7 +85,7 @@ test()
       DoFHandler<dim> dof_handler(triangulation);
       dof_handler.distribute_dofs(fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index b671903539b76ed6bf15a4a18fbe9baf09998212..9d842262d3d76208f27a9a6517eff9deb124858a 100644 (file)
@@ -91,7 +91,7 @@ test()
       DoFHandler<dim> dof_handler(triangulation);
       dof_handler.distribute_dofs(fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index 9f6d816249b07a797cb0c0fee31f5dff94ed8460..3dd37bab007af06e646560afb32c97eb5e966f99 100644 (file)
@@ -105,7 +105,7 @@ test()
       mask2.set(1, true);
       mask2.set(2, true);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index 659b6f5fc7282118af10475e1bdb830ea5db033d..b3ec2c9b2a7aaef3e3132c4167fc6f06fa253935 100644 (file)
@@ -84,7 +84,7 @@ private:
   DoFHandler<dim> dof_handler;
   FE_Q<dim>       fe;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index c2262bce085372856dbf4d505882935cbea8a2bb..76fc825146b851ecaee2e80d783f6786bd15adf7 100644 (file)
@@ -115,7 +115,7 @@ check()
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(element);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index f8bde1f985b64b51cfc2583273d091ff07d378d7..e1445b52f27ca755109c9f8367460d7ec946f7eb 100644 (file)
@@ -115,7 +115,7 @@ check()
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(element);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index c9987d234507db3cbbcf811dffd013890f0e3918..498f0f2040fd794a43ccb7ecb15031fe808101b5 100644 (file)
@@ -85,7 +85,7 @@ check()
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(element);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 6f58f023d4013252d31a8fff8d0c87940736de36..263db7e7230e880da40e50070808da4f95642b2c 100644 (file)
@@ -355,7 +355,7 @@ double TestProjection(Mapping<2> &mapping, DoFHandler<2> *dof_handler)
       TestPoly<2> pol(deg);
 
       // Project solution onto RT FE field
-      ConstraintMatrix hn_constraints;
+      AffineConstraints<double> hn_constraints;
       hn_constraints.clear();
       DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints);
       hn_constraints.close();
@@ -465,7 +465,7 @@ main()
   solution_q.reinit(dof_handler->n_dofs());
   deformation.reinit(dof_handler_def->n_dofs());
 
-  ConstraintMatrix hn_constraints_def;
+  AffineConstraints<double> hn_constraints_def;
   hn_constraints_def.clear();
   DoFTools::make_hanging_node_constraints(*dof_handler_def, hn_constraints_def);
   hn_constraints_def.close();
index 02f6e744f9bac36c60331fc40da206c142291741..e6f6a53f3d12702d8a37bf7843d0252827da1f44 100644 (file)
@@ -96,7 +96,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 18f78174a23d49f74e8d11e489a68bbe312cf86a..d630eedaf8dc3f8d84485b12eac6cbd56005a65a 100644 (file)
@@ -366,10 +366,10 @@ namespace LaplaceSolver
       void
       solve(Vector<double> &solution) const;
 
-      ConstraintMatrix     hanging_node_constraints;
-      SparsityPattern      sparsity_pattern;
-      SparseMatrix<double> matrix;
-      Vector<double>       rhs;
+      AffineConstraints<double> hanging_node_constraints;
+      SparsityPattern           sparsity_pattern;
+      SparseMatrix<double>      matrix;
+      Vector<double>            rhs;
     };
 
     void
@@ -533,7 +533,7 @@ namespace LaplaceSolver
   {
     hanging_node_constraints.clear();
 
-    void (*mhnc_p)(const hp::DoFHandler<dim> &, ConstraintMatrix &) =
+    void (*mhnc_p)(const hp::DoFHandler<dim> &, AffineConstraints<double> &) =
       &DoFTools::make_hanging_node_constraints;
 
     Threads::Thread<> mhnc_thread =
@@ -1597,7 +1597,7 @@ namespace LaplaceSolver
     const PrimalSolver<dim> &primal_solver = *this;
     const DualSolver<dim> &  dual_solver   = *this;
 
-    ConstraintMatrix primal_hanging_node_constraints;
+    AffineConstraints<double> primal_hanging_node_constraints;
     DoFTools::make_hanging_node_constraints(primal_solver.dof_handler,
                                             primal_hanging_node_constraints);
     primal_hanging_node_constraints.close();
@@ -1631,7 +1631,7 @@ namespace LaplaceSolver
     const PrimalSolver<dim> &primal_solver = *this;
     const DualSolver<dim> &  dual_solver   = *this;
 
-    ConstraintMatrix dual_hanging_node_constraints;
+    AffineConstraints<double> dual_hanging_node_constraints;
     DoFTools::make_hanging_node_constraints(dual_solver.dof_handler,
                                             dual_hanging_node_constraints);
     dual_hanging_node_constraints.close();
@@ -1642,7 +1642,7 @@ namespace LaplaceSolver
                          dual_hanging_node_constraints,
                          primal_solution);
 
-    ConstraintMatrix primal_hanging_node_constraints;
+    AffineConstraints<double> primal_hanging_node_constraints;
     DoFTools::make_hanging_node_constraints(primal_solver.dof_handler,
                                             primal_hanging_node_constraints);
     primal_hanging_node_constraints.close();
index 0011f7f460b88e175ead6a684b5ea8b07fbbb49a..2c458a1d7d51258b0ab17467f3330fb8ffdbfbe7 100644 (file)
@@ -129,7 +129,7 @@ private:
   hp::FECollection<dim> fe;
   hp::DoFHandler<dim>   dof_handler;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> matrix;
index 13d40a27b172364988eec07a9b9aab242ea611f1..ce8e8f07eb2e0b7478551a7a854983983e851d05 100644 (file)
@@ -55,7 +55,7 @@ check_this(const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().constraints_are_implemented() == false)
     return;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.close();
 
index db21bc7709e4542961472fddc9edccd3561da4ee..3ea6bec8000c359edfa4ad32ddbefe355b28e4c3 100644 (file)
@@ -343,7 +343,7 @@ main(int /*argc*/, char ** /*argv*/)
   deformation.reinit(dof_handler_def->n_dofs());
 
   // Project solution onto RT FE field
-  ConstraintMatrix hn_constraints;
+  AffineConstraints<double> hn_constraints;
   hn_constraints.clear();
   DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints);
   hn_constraints.close();
@@ -351,7 +351,7 @@ main(int /*argc*/, char ** /*argv*/)
     *dof_handler, hn_constraints, QGauss<2>(6), TestMap1<2>(2), solution);
 
   // Project reference solution onto RT FE field
-  ConstraintMatrix hn_constraints_def;
+  AffineConstraints<double> hn_constraints_def;
   hn_constraints_def.clear();
   DoFTools::make_hanging_node_constraints(*dof_handler_def, hn_constraints_def);
   hn_constraints_def.close();
index f78381354ae866c1f30fa3701eb4f88dd6e300dc..230838d463f06d7d895fe5cd7ae08b829490b6dc 100644 (file)
@@ -367,7 +367,7 @@ main()
   deformation.reinit(dof_handler_def.n_dofs());
 
   // Project solution onto RT FE field
-  ConstraintMatrix hn_constraints;
+  AffineConstraints<double> hn_constraints;
   hn_constraints.clear();
   DoFTools::make_hanging_node_constraints(dof_handler, hn_constraints);
   hn_constraints.close();
@@ -375,7 +375,7 @@ main()
     dof_handler, hn_constraints, QGauss<2>(6), TestMap1<2>(2), solution);
 
   // Project reference solution onto RT FE field
-  ConstraintMatrix hn_constraints_def;
+  AffineConstraints<double> hn_constraints_def;
   hn_constraints_def.clear();
   DoFTools::make_hanging_node_constraints(dof_handler_def, hn_constraints_def);
   hn_constraints_def.close();
index b890029db04f4663f15c317d9eeb84b4b9e7b49f..6c148a0d6985cb50d46c538a476a2163a29e433d 100644 (file)
@@ -126,7 +126,7 @@ private:
   FE_Q<dim>       fe;
   DoFHandler<dim> dof_handler;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> matrix;
index 77a6cba792f2200e506d23a1ff90530fe1b59415..2b788cf734b564d875a967f7d57bb2b1d3ead0e2 100644 (file)
@@ -426,15 +426,15 @@ create_right_hand_side(const Mapping<dim> &   mapping,
 
 template <int dim>
 void
-project(const Mapping<dim> &    mapping,
-        const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const Quadrature<dim> & quadrature,
-        const Function<dim> &   function,
-        Vector<double> &        vec,
-        const bool              enforce_zero_boundary = false,
-        const Quadrature<dim - 1> &                   = QGauss<dim - 1>(2),
-        const bool project_to_boundary_first          = false)
+project(const Mapping<dim> &             mapping,
+        const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const Quadrature<dim> &          quadrature,
+        const Function<dim> &            function,
+        Vector<double> &                 vec,
+        const bool                       enforce_zero_boundary = false,
+        const Quadrature<dim - 1> &          = QGauss<dim - 1>(2),
+        const bool project_to_boundary_first = false)
 {
   Assert(dof.get_fe().n_components() == function.n_components,
          ExcInternalError());
@@ -630,7 +630,7 @@ main(int /*argc*/, char ** /*argv*/)
   solution = 1;
 
   // Project solution onto FE field
-  ConstraintMatrix hn_constraints;
+  AffineConstraints<double> hn_constraints;
   hn_constraints.clear();
   DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints);
   hn_constraints.close();
index 7218a84feddf83e08274376fab3146a91405f350..ccbee14a3d94500cc7aa5c8856843e36b68efd59 100644 (file)
@@ -407,15 +407,15 @@ create_right_hand_side(const Mapping<dim> &   mapping,
 
 template <int dim>
 void
-project(const Mapping<dim> &    mapping,
-        const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const Quadrature<dim> & quadrature,
-        const Function<dim> &   function,
-        Vector<double> &        vec,
-        const bool              enforce_zero_boundary = false,
-        const Quadrature<dim - 1> &                   = QGauss<dim - 1>(2),
-        const bool project_to_boundary_first          = false)
+project(const Mapping<dim> &             mapping,
+        const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const Quadrature<dim> &          quadrature,
+        const Function<dim> &            function,
+        Vector<double> &                 vec,
+        const bool                       enforce_zero_boundary = false,
+        const Quadrature<dim - 1> &          = QGauss<dim - 1>(2),
+        const bool project_to_boundary_first = false)
 {
   Assert(dof.get_fe().n_components() == function.n_components,
          ExcInternalError());
@@ -538,7 +538,7 @@ main()
   solution = 1;
 
   // Project solution onto FE field
-  ConstraintMatrix hn_constraints;
+  AffineConstraints<double> hn_constraints;
   hn_constraints.clear();
   DoFTools::make_hanging_node_constraints(dof_handler, hn_constraints);
   hn_constraints.close();
index a1c77254a22e929ade46cd868c6d57ecc3c95a4a..fb9aae88f52e15b7b6f739e8af6b96e968ee6232 100644 (file)
@@ -82,7 +82,7 @@ test(FiniteElement<dim> &fe)
   tria.refine_global(1);
   DoFHandler<dim> dof_handler(tria);
   dof_handler.distribute_dofs(fe);
-  ConstraintMatrix             constraints;
+  AffineConstraints<double>    constraints;
   Functions::ZeroFunction<dim> boundary_values(fe.n_components());
   VectorTools::project_boundary_values_curl_conforming(
     dof_handler, 0, boundary_values, 0, constraints);
index f4914d05e16f765cc6d811de9424d42026d7a627..a7d0dd173826aeab5dc2190c719859480ec6e60e 100644 (file)
@@ -91,15 +91,15 @@ private:
   void
   solve();
   void
-                       process_solution(const unsigned int cycle);
-  Triangulation<dim>   triangulation;
-  DoFHandler<dim>      dof_handler;
-  FE_Nedelec<dim>      fe;
-  ConstraintMatrix     constraints;
-  SparsityPattern      sparsity_pattern;
-  SparseMatrix<double> system_matrix;
-  Vector<double>       solution;
-  Vector<double>       system_rhs;
+                            process_solution(const unsigned int cycle);
+  Triangulation<dim>        triangulation;
+  DoFHandler<dim>           dof_handler;
+  FE_Nedelec<dim>           fe;
+  AffineConstraints<double> constraints;
+  SparsityPattern           sparsity_pattern;
+  SparseMatrix<double>      system_matrix;
+  Vector<double>            solution;
+  Vector<double>            system_rhs;
 
   unsigned int p_order;
   unsigned int quad_order;
index 5f650ad1dae6fc93c28e4735a874b9e40def6282..735a464ae8b0f76ee5d118593302a9663ae5f9dd 100644 (file)
@@ -480,16 +480,16 @@ create_right_hand_side(const Mapping<dim> &   mapping,
 
 template <int dim>
 void
-project(const Mapping<dim> &    mapping,
-        const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const Quadrature<dim> & quadrature,
-        const Function<dim> &   function,
-        Vector<double> &        vec,
-        const unsigned int      min_convergence_steps,
-        const bool              enforce_zero_boundary = false,
-        const Quadrature<dim - 1> &                   = QGauss<dim - 1>(2),
-        const bool project_to_boundary_first          = false)
+project(const Mapping<dim> &             mapping,
+        const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const Quadrature<dim> &          quadrature,
+        const Function<dim> &            function,
+        Vector<double> &                 vec,
+        const unsigned int               min_convergence_steps,
+        const bool                       enforce_zero_boundary = false,
+        const Quadrature<dim - 1> &          = QGauss<dim - 1>(2),
+        const bool project_to_boundary_first = false)
 {
   Assert(dof.get_fe().n_components() == function.n_components,
          ExcInternalError());
@@ -739,7 +739,7 @@ check(const FiniteElement<2> &           fe,
       Vector<double> solution(dof_handler->n_dofs());
 
       // Project solution onto FE field
-      ConstraintMatrix hn_constraints;
+      AffineConstraints<double> hn_constraints;
       hn_constraints.clear();
       DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints);
       hn_constraints.close();
index 5e9dbfd46f1547541cf5742d9bb2b2e1d47a69f4..efd756ec2d994a360050d3ca2e2967b3bda785f9 100644 (file)
@@ -101,7 +101,7 @@ test4()
 
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 6bd3ee04e875804578b02bac3c6be397bba0fdd5..78515622cf8874fcac4fbffd5f34816121834eaa 100644 (file)
@@ -131,7 +131,7 @@ test6(const bool         do_href,
 
   deallog << "n_cells: " << triangulation.n_active_cells() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index b0d8b33b64fd454e214f11477d31700825487bb6..b079bba23735ac3eeea4bfb7afbe7a4bec8452a6 100644 (file)
@@ -119,7 +119,7 @@ test2cells(const unsigned int p_feq = 2, const unsigned int p_feen = 1)
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 07d4796e25c4f08800587de097658fae0222b79f..42812d1e84955844ef626b32ad5eaf97f6aed48b 100644 (file)
@@ -86,7 +86,7 @@ test2cellsFESystem(const unsigned int p_feq = 2, const unsigned int p_feen = 1)
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 81c5c577157df2d8ef007a7407c14073541504a3..b32b45f3617df80bdf717499778d56e14887bc42 100644 (file)
@@ -182,7 +182,7 @@ namespace Step36
     std::vector<PetscScalar>                eigenvalues;
     PETScWrappers::MPI::SparseMatrix        stiffness_matrix, mass_matrix;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     MPI_Comm           mpi_communicator;
     const unsigned int n_mpi_processes;
index 37f46fc3ddbdf2a7ff518a8bf8f3ac5663b9c684..92b339dbaa2c8bafeda044f43cf126f0a1261092 100644 (file)
@@ -188,7 +188,7 @@ namespace Step36
     std::vector<PetscScalar>                eigenvalues;
     PETScWrappers::MPI::SparseMatrix        stiffness_matrix, mass_matrix;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     MPI_Comm           mpi_communicator;
     const unsigned int n_mpi_processes;
index b4f6b1c9a1b9f57b415d0929687845cf76363cc3..fafbf541f28240d9e8707bae0558691478daf9af 100644 (file)
@@ -235,7 +235,7 @@ set_solution(Vector<double> &      vector,
              const DoFHandler<3> & dof_handler_ref,
              const Vector<double> &u_ref)
 {
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   constraints.close();
 
index 139cc17bd0098e08fe437edc7dfc399188669704..26b0ef65c95b3855c2054eb95eb320f6a1849342 100644 (file)
@@ -152,7 +152,7 @@ set_solution(Vector<double> &      vector,
              const DoFHandler<3> & dof_handler_ref,
              const Vector<double> &u_ref)
 {
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   constraints.close();
 
index 0a5f280accac4528db58d5f92f7fd5d78f8cbd03..7ced94da2e0c1aa169ca4b848a3888e5d7c1673a 100644 (file)
@@ -151,14 +151,14 @@ namespace polytest
     unsigned int p_order;
     unsigned int quad_order;
 
-    Triangulation<dim>   tria;
-    DoFHandler<dim>      dof_handler;
-    FE_NedelecSZ<dim>    fe;
-    ConstraintMatrix     constraints;
-    SparsityPattern      sparsity_pattern;
-    SparseMatrix<double> system_matrix;
-    Vector<double>       solution;
-    Vector<double>       system_rhs;
+    Triangulation<dim>        tria;
+    DoFHandler<dim>           dof_handler;
+    FE_NedelecSZ<dim>         fe;
+    AffineConstraints<double> constraints;
+    SparsityPattern           sparsity_pattern;
+    SparseMatrix<double>      system_matrix;
+    Vector<double>            solution;
+    Vector<double>            system_rhs;
   };
 
   template <int dim>
index d6dc592431feb167db7b1fbaae9b7df25d58a8d3..998c3f73af3fd9eff463ba36b0f04440b09edfd1 100644 (file)
@@ -166,15 +166,15 @@ namespace Maxwell
     double
     calcErrorHcurlNorm();
 
-    Triangulation<dim>   triangulation;
-    MappingQ<dim>        mapping;
-    DoFHandler<dim>      dof_handler;
-    FE_NedelecSZ<dim>    fe;
-    ConstraintMatrix     constraints;
-    SparsityPattern      sparsity_pattern;
-    SparseMatrix<double> system_matrix;
-    Vector<double>       solution;
-    Vector<double>       system_rhs;
+    Triangulation<dim>        triangulation;
+    MappingQ<dim>             mapping;
+    DoFHandler<dim>           dof_handler;
+    FE_NedelecSZ<dim>         fe;
+    AffineConstraints<double> constraints;
+    SparsityPattern           sparsity_pattern;
+    SparseMatrix<double>      system_matrix;
+    Vector<double>            solution;
+    Vector<double>            system_rhs;
 
     ConvergenceTable convergence_table;
 
index cc7a45290145e56b37ab088cecc4f6268111094b..aad575ebb5a8e2846833424531a0f3465632072a 100644 (file)
@@ -56,7 +56,7 @@ test2cells(const unsigned int p1 = 2, const unsigned int p2 = 1)
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index cd4b9517255e7d8605edc25ac071e1e29895c0db..79e05fb9ddbc4a17e06ca8d4fae220f0788afc09 100644 (file)
@@ -187,7 +187,7 @@ test(const FiniteElement<dim> &fe,
     {
       dof_handler.distribute_dofs(fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index f715e5c50f623aacfccd111db56231d4b5f847a3..7878cfc8ecc89bea24ae7be83802c140d72c02ef 100644 (file)
@@ -257,7 +257,7 @@ test(const FiniteElement<dim> &fe,
     {
       dof_handler.distribute_dofs(fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index 0f8c879e849cccf6e9ef8157ab21452550c71972..4b3375f4d76a6898a5d7bfe8cadfdc2143513fe5 100644 (file)
@@ -108,7 +108,7 @@ namespace Step22
     FESystem<dim> &    fe;
     DoFHandler<dim>    dof_handler;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     BlockSparsityPattern      sparsity_pattern;
     BlockSparseMatrix<double> system_matrix;
index 6932895923087290f686219f74ad6d0e7c93ceaa..e4f975f01e6977bcd0baf6656f6eda5f6395819e 100644 (file)
@@ -115,11 +115,11 @@ test(const Triangulation<dim> &tria,
   Vector<double> function1_back(dof_handler1.n_dofs());
   Vector<double> function2(dof_handler2.n_dofs());
 
-  ConstraintMatrix constraints1;
+  AffineConstraints<double> constraints1;
   DoFTools::make_hanging_node_constraints(dof_handler1, constraints1);
   constraints1.close();
 
-  ConstraintMatrix constraints2;
+  AffineConstraints<double> constraints2;
   DoFTools::make_hanging_node_constraints(dof_handler2, constraints2);
   constraints2.close();
 
index 995ece2dbac2483c48c178bd454ded6bfec48071..5f62e4c8377b7b8d08008f4f156ce2c508914aa5 100644 (file)
@@ -225,11 +225,11 @@ protected:
   QGauss<dim>                    cell_quadrature;
   MappingQGeneric<dim>           cell_mapping;
 
-  ConstraintMatrix     all_constraints;
-  SparsityPattern      sparsity_pattern;
-  SparseMatrix<double> system_matrix;
-  Vector<double>       system_rhs;
-  Vector<double>       solution;
+  AffineConstraints<double> all_constraints;
+  SparsityPattern           sparsity_pattern;
+  SparseMatrix<double>      system_matrix;
+  Vector<double>            system_rhs;
+  Vector<double>            solution;
 
   void
   setup_dofs();
index dc108f9c5de42f92af9025db47f527ff1927f9ce..805a8321ed1c1acf4f9449811969687bebde17ec 100644 (file)
@@ -85,7 +85,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
   Vector<double> fe_function(dof.n_dofs());
   // set the elements of the vector in such a way that the function
   // equals the vector function (0,x^2)
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::project(dof, cm, QGauss<2>(4), F(), fe_function);
 
index 0e67282b34956d4b59fe1c7c8bcdc6efa74fce05..78ee65b918e21a37471a975233e92c9e231bd2c1 100644 (file)
@@ -87,7 +87,7 @@ test(const Triangulation<dim> &tr,
   Vector<double> fe_function(dof.n_dofs());
   // set the elements of the vector in such a way that the function
   // equals the vector function (0,x^2)
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::project(dof, cm, QGauss<2>(2 + degree), F(), fe_function);
 
index c87dbdd061e695d807a290ff05e1ddcf7f536b4d..7b884a22be1ed20d0524315cff7ecdd31d8c4a35 100644 (file)
@@ -127,7 +127,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
                           update_values | update_gradients |
                             update_3rd_derivatives);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 398c9dc962aa47cc0ebe50df975a8a407e2892e6..b94eccb76f3aabc8ae4ed56dbc2d204ecb8d7197 100644 (file)
@@ -90,7 +90,7 @@ plot(const Triangulation<dim> &tr, const unsigned int p)
   FE_Nedelec<dim> fe_ned(p);
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(fe_ned);
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof, cm);
   cm.close();
 
index c467103e06e364a1f3dc1d269e3ae4d53f149481..fbba6e7f510325e6aa494c9f949ce8b433d72036 100644 (file)
@@ -53,7 +53,7 @@ main()
   DoFHandler<3> dof(tr);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index bc13920f8123957b646869b497d11b9ba9c50cca..2e73a59b3509fa1afacdf5b5a3dbb5ace34a0b44 100644 (file)
@@ -96,7 +96,7 @@ test()
 
         dof_handler.distribute_dofs(fe);
 
-        ConstraintMatrix constraints;
+        AffineConstraints<double> constraints;
         DoFTools::make_hanging_node_constraints(dof_handler, constraints);
         constraints.close();
 
index 72b7ab6e5d45f911ec0a9ad0b5c10901bca27dbf..e3155d0dd01036dd6c1c5e80221af16fe251b8b2 100644 (file)
@@ -149,14 +149,14 @@ namespace polytest
     unsigned int p_order;
     unsigned int quad_order;
 
-    Triangulation<dim>   tria;
-    DoFHandler<dim>      dof_handler;
-    FE_Nedelec<dim>      fe;
-    ConstraintMatrix     constraints;
-    SparsityPattern      sparsity_pattern;
-    SparseMatrix<double> system_matrix;
-    Vector<double>       solution;
-    Vector<double>       system_rhs;
+    Triangulation<dim>        tria;
+    DoFHandler<dim>           dof_handler;
+    FE_Nedelec<dim>           fe;
+    AffineConstraints<double> constraints;
+    SparsityPattern           sparsity_pattern;
+    SparseMatrix<double>      system_matrix;
+    Vector<double>            solution;
+    Vector<double>            system_rhs;
   };
 
   template <int dim>
index a52dfcb0d735583b68fa11b3a2b2e00cd47dfa8d..5b4e7b3127a41bdf88b22c9fac6ca387fedfd487 100644 (file)
@@ -167,15 +167,15 @@ namespace Maxwell
     double
     calcErrorHcurlNorm();
 
-    Triangulation<dim>   triangulation;
-    MappingQ<dim>        mapping;
-    DoFHandler<dim>      dof_handler;
-    FE_Nedelec<dim>      fe;
-    ConstraintMatrix     constraints;
-    SparsityPattern      sparsity_pattern;
-    SparseMatrix<double> system_matrix;
-    Vector<double>       solution;
-    Vector<double>       system_rhs;
+    Triangulation<dim>        triangulation;
+    MappingQ<dim>             mapping;
+    DoFHandler<dim>           dof_handler;
+    FE_Nedelec<dim>           fe;
+    AffineConstraints<double> constraints;
+    SparsityPattern           sparsity_pattern;
+    SparseMatrix<double>      system_matrix;
+    Vector<double>            solution;
+    Vector<double>            system_rhs;
 
     ConvergenceTable convergence_table;
 
index 4b44d30c118599db3fc598028a3d230e96e2c0c1..06b224d3d9acaba212c1df907b7e8f21f5aa04b9 100644 (file)
@@ -354,7 +354,7 @@ double TestProjection(Mapping<2> &mapping, DoFHandler<2> *dof_handler)
       TestPoly<2> pol(deg);
 
       // Project solution onto RT FE field
-      ConstraintMatrix hn_constraints;
+      AffineConstraints<double> hn_constraints;
       hn_constraints.clear();
       DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints);
       hn_constraints.close();
@@ -463,7 +463,7 @@ main()
   solution_q.reinit(dof_handler->n_dofs());
   deformation.reinit(dof_handler_def->n_dofs());
 
-  ConstraintMatrix hn_constraints_def;
+  AffineConstraints<double> hn_constraints_def;
   hn_constraints_def.clear();
   DoFTools::make_hanging_node_constraints(*dof_handler_def, hn_constraints_def);
   hn_constraints_def.close();
index 49a96f359e1375fc51b62a2444b2c6be8ab2ce97..535ff8d8a817f4fd87759af62064a0d9bc25e93f 100644 (file)
@@ -100,7 +100,7 @@ test()
 
   stokes_relevant_set.print(deallog.get_file_stream());
 
-  ConstraintMatrix cm(stokes_relevant_set);
+  AffineConstraints<double> cm(stokes_relevant_set);
 
   DoFTools::make_hanging_node_constraints(stokes_dof_handler, cm);
 
@@ -196,7 +196,7 @@ test_LA_Trilinos()
     stokes_relevant_set.get_view(n_u, n_u + n_p));
   stokes_relevant_set.print(deallog.get_file_stream());
 
-  ConstraintMatrix cm(stokes_relevant_set);
+  AffineConstraints<double> cm(stokes_relevant_set);
 
   DoFTools::make_hanging_node_constraints(stokes_dof_handler, cm);
 
index 92e8ea0d962006e00d20683b5a9f3f1be94fed58..16d22ac92647ee844646a33ec35a17a40493b5cb 100644 (file)
@@ -208,7 +208,7 @@ test_alt()
   locally_relevant_dofs.print(deallog);
 
 
-  ConstraintMatrix constraints(locally_relevant_dofs);
+  AffineConstraints<double> constraints(locally_relevant_dofs);
   constraints.close();
 
   TrilinosWrappers::BlockSparsityPattern sp(locally_owned_partitioning,
index 0a6a2536abd65072475b18549bdb05f8d9154bcf..aec9f7d5b021c7a9538e0581e08e1c25a95a2d3f 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// block vectors: test ConstraintMatrix::distribute (fails currently)
+// block vectors: test AffineConstraints<double>::distribute (fails currently)
 
 #include <deal.II/base/index_set.h>
 
index 3a5d96b9020111f9df5ddd4bbd3a997e7eced9a9..dcb913c1134abc6d890c5b09cc7fc3c764bab479 100644 (file)
@@ -16,7 +16,7 @@
 
 
 // document bug in assembling a LA::MPI::SparseMatrix
-// this was due to handing a wrong IndexSet to the ConstraintMatrix
+// this was due to handing a wrong IndexSet to the AffineConstraints<double>
 
 #include <deal.II/base/index_set.h>
 
@@ -51,7 +51,7 @@ test()
   if (myid == 0)
     deallog << "numproc=" << numproc << std::endl;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   parallel::distributed::Triangulation<dim> triangulation(
index f288707a57aadfcddbea5c3a93adb93ab606ae07..133fe1fc7cf4b64a7ed55035e27fe2167b68bb7c 100644 (file)
@@ -52,7 +52,7 @@ test()
   if (myid == 0)
     deallog << "numproc=" << numproc << std::endl;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   parallel::distributed::Triangulation<dim> triangulation(
@@ -113,7 +113,7 @@ test_trilinos_alternative()
   if (myid == 0)
     deallog << "numproc=" << numproc << std::endl;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   parallel::distributed::Triangulation<dim> triangulation(
index ecb62dfb2208d10e83a92c4f0ed3a0c5240b4fe9..89ac251cfdc47de48e073e08900c5a2bb2843260 100644 (file)
@@ -124,8 +124,8 @@ check_parallelepiped(bool colorize, bool log, const unsigned int (&subd)[dim])
       dh.distribute_dofs(fe);
       DataOut<dim> d_o;
       d_o.attach_dof_handler(dh);
-      Vector<double>   vec(dh.n_dofs());
-      ConstraintMatrix constraints;
+      Vector<double>            vec(dh.n_dofs());
+      AffineConstraints<double> constraints;
       for (unsigned int c = 0; c < 6; ++c)
         VectorTools::interpolate_boundary_values(
           dh, c, Functions::ConstantFunction<dim>(c), constraints);
index a15305993eabbd42aeb57404e6cba723d7c7d8dd..913b007c5971406e0c4a3b1511d03cf1339da1a7 100644 (file)
@@ -115,7 +115,7 @@ check()
       // now compute intergrid constraints
       InterGridMap<DoFHandler<dim>> intergrid_map;
       intergrid_map.make_mapping(dof_1, dof_2);
-      ConstraintMatrix intergrid_constraints;
+      AffineConstraints<double> intergrid_constraints;
 
       if (dim != 3)
         {
index f900dd7a1f9f2888cab00e6d1dc3f99b748645a8..5fdc48e4b580f8a1d3959d673212cc6b6621b180 100644 (file)
@@ -80,7 +80,7 @@ do_check(const Triangulation<dim> &   triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index b032680057e44fc6b18af5e15c8c71c3e148b978..7b9edc2526d20d0c78fa0d25008982cc8b161d81 100644 (file)
@@ -136,7 +136,7 @@ main()
     }
 
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 17d0c345e2583dce97861ab4812ddf6f28653be7..7cbbe57313d954b31f8b8ac30f4d20b0b957a2fc 100644 (file)
@@ -148,7 +148,7 @@ main()
 
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 501c01f9c419442a3418465c71136bae38e79c6c..5701e66584594a429ea634fff4b26e4a993e2f4c 100644 (file)
@@ -147,7 +147,7 @@ main()
         }
 done:
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index 167105a1b92ae56e95a3734acffc4c3ab66808cb..0a7bd2b563e5a3436fa66bb7295466225ff61936 100644 (file)
@@ -43,10 +43,10 @@ template <int dim>
 void
 test()
 {
-  Triangulation<dim>    triangulation;
-  hp::FECollection<dim> fe;
-  hp::DoFHandler<dim>   dof_handler(triangulation);
-  ConstraintMatrix      hanging_node_constraints;
+  Triangulation<dim>        triangulation;
+  hp::FECollection<dim>     fe;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  AffineConstraints<double> hanging_node_constraints;
 
   FE_Q<dim> fe_1(1), fe_2(2), fe_3(QIterated<1>(QTrapez<1>(), 3)),
     fe_4(QIterated<1>(QTrapez<1>(), 4));
index 9522ecf53686328033d78a9fa901e26a99df315b..af5008c1f9086f33217c1897291666b909351b47 100644 (file)
@@ -134,7 +134,7 @@ main()
         }
 done:
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index db25fe29b15f725c4988113bb08bdc25e38e2342..1a738df6d86cbd857b8bc0ebca8db352469defee 100644 (file)
@@ -104,7 +104,7 @@ test()
 
         dof_handler.distribute_dofs(fe);
 
-        ConstraintMatrix constraints;
+        AffineConstraints<double> constraints;
         DoFTools::make_hanging_node_constraints(dof_handler, constraints);
         constraints.close();
 
index 98e7788f7ab2f3e63e13f697300cd53b29031d75..3a16a026d043d93fa1fb3564300a4d1fbaa6c45e 100644 (file)
@@ -96,7 +96,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index bbeb4a033b03937e76d4fd48dbc564d512a7a216..ebf0e0d0acbc5143d13b85ea9cfb9549b471feb7 100644 (file)
@@ -99,7 +99,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 8196e39e4a73f9e618db5fc109c6ca07c8dc99da..d88bb4a127d0b85f7aab214a969f607da8153068 100644 (file)
@@ -74,7 +74,7 @@ namespace Step
     hp::QCollection<dim>     quadrature_collection;
     hp::QCollection<dim - 1> face_quadrature_collection;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     SparsityPattern      sparsity_pattern;
     SparseMatrix<double> system_matrix;
index 8222eaacb60e2af47fab4926eab2fbcb50adb340..016e6ddbdcb83a0dfdeb6cd7114fecf8b0b61304 100644 (file)
@@ -100,7 +100,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index aba4b74dbc0836dcf17e7ea3e1377eb1d6b9551f..b68d10851b6eafabc379281e2db5d86610643d2e 100644 (file)
@@ -101,7 +101,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 5e24b7c99708ce931cabb67ee96d03ff7ce000ed..2bee72ea8d1473bb5771bcf82f92da378abea0e7 100644 (file)
@@ -107,7 +107,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index b9ec1133e72ea434b4d1b0cbe0b9b2ee9c24a90c..cb3a493879f10dad6c2006145d085172ba117fed 100644 (file)
@@ -108,7 +108,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 07eee2d946f7aa2c70fa749e9a281a7aee46b80e..0eba53d967f5fdbb3a4bf45a167a983d4f7bfaa7 100644 (file)
@@ -100,7 +100,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 05c10d368c607b274472a40d297101dbb453696b..dadabc2dcced0c735b8f2bd2b2489d6845207946 100644 (file)
@@ -101,7 +101,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index caf48b8e2b13aa96353acc28040d83d4d5dcd586..4292b80bc2146ff351871046d0c3f21f3bd329ef 100644 (file)
@@ -107,7 +107,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index ece342a37dcbf57e912a852ccf095100a2a75c0c..116fc56305e45cf644a9318a2cd840bf0c8456d5 100644 (file)
@@ -108,7 +108,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index c71de9e320b7e8e7f02ef4d61ed6fe4e4a61f740..d4d16ee4e6fe00d3e0346c642b55327f235e0b75 100644 (file)
@@ -88,7 +88,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index 322e021caede918defd79d632ef74c9bfcc4172a..f119709809fe929696d4aab33f02636cdf0b822d 100644 (file)
@@ -88,7 +88,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index bbea846f7c22e3a5298c8ec394996e7b46e81478..77200dce177c07b52e67527fcb394640d5bae7a8 100644 (file)
@@ -100,7 +100,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 894e7453c6a8f08b8ddcc2ad53fc47097677b07c..8738b57ad3c133bc64220c209f510195cc97c00c 100644 (file)
@@ -101,7 +101,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 4632356f8a366b785544bfff28640d04e319fac9..e8b7d1b6691a21610e6c8e51a5f2e9bd8663d2f0 100644 (file)
@@ -107,7 +107,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 9e2360859fe560ed2b0fda0b730f83046446fabc..4c9158c9d7ce5675589fa6b23ad8c7f7a28c4ad4 100644 (file)
@@ -108,7 +108,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 30354049b82ec231d605272be926cf472b7ebef4..bb015547e720416940283dac76346f5026b70d10 100644 (file)
@@ -100,7 +100,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index ad38f35c908955b49b382711ed7aff87ea1e8ab6..12b7cc614b88378595a8765046c9ff509af62d96 100644 (file)
@@ -103,7 +103,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 42ad3ff07edec7f5c3ae9b07c490d58c2172a74f..182760d2670fb37b123add476412fb64b972e9d0 100644 (file)
@@ -107,7 +107,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 10d50e78414e5f672b49aff239ebd259488ef4a6..afda48272352ecff4f1aa90cecfe69488ea557ba 100644 (file)
@@ -108,7 +108,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 773b1c4254ada14eb0c0caf7d56f5a6a840f8c95..2b26917c03d25f46a0a045f496f8a1ea24ca97b5 100644 (file)
@@ -107,7 +107,7 @@ check()
       mask[dim + i][dim + j] = DoFTools::always;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index b95769f545b04174a07b13198bda49aff588c1c4..f78fe7ba85936cc8f8fc4b5c86dc3f6cd5997bf0 100644 (file)
@@ -88,7 +88,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index bfa492389d5e7f83b036d4838a43c3cc969a2c22..ca526172f6b1252a4b4a57857e7caf122481478b 100644 (file)
@@ -88,7 +88,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index 99a0ed31816930e9abad9426b330d1dacf11d5d0..876182910fc1822a73e07c6260f723eda3c8a53f 100644 (file)
@@ -82,7 +82,7 @@ main()
   print_dofs(dof_handler.begin_active());
   print_dofs(++dof_handler.begin_active());
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index a1105dae95235bfc23f2da1f1162303f7f0ca32e..a17fdefb6e1fcf457cc771c43fef680ee83cf431 100644 (file)
@@ -84,7 +84,7 @@ main()
   print_dofs(dof_handler.begin_active());
   print_dofs(++dof_handler.begin_active());
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 4b1ce3f5f25963e00df7cb5d28a6b93cb1190fc1..2433d0604d46483f6c85f38b7312febb70dd7186 100644 (file)
@@ -91,7 +91,7 @@ main()
       print_dofs(dof_handler.begin_active());
       print_dofs(++dof_handler.begin_active());
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       constraints.clear();
       dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
index a2fb14dcb03f580ab4120032c843d2000ab7dbc1..a15b81a304cc9f056d70027d54f3c468be089315 100644 (file)
@@ -86,7 +86,7 @@ test()
 
   // .... test constraint handling
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index b03d62019a67042e6616524ccda6d3c4990f6923..6066d23788dd24c32b5101800eb6755877d7d954 100644 (file)
@@ -136,7 +136,7 @@ test()
 
   // .... test constraint handling
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index 3746278f33da85af00e672532f4d7b2ce4216dc8..c525e421a09b18a05902a6fafc80208487238ff4 100644 (file)
@@ -138,7 +138,7 @@ test()
 
   // .... test constraint handling
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index ccd48f0fb82b2875e50e265e8bc1ffcb75780da8..cb3f8f5d0e15ed69e7d36b928a2b3119596d7d7d 100644 (file)
@@ -144,7 +144,7 @@ test()
 
   // .... test constraint handling
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index 6fd8e6bf068b567c37a0d85bd0fb107a7a6faba9..f65bfde68125c0dd18122696843c78cfca6616f0 100644 (file)
@@ -84,7 +84,7 @@ test()
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index 643c8d1f157842baabd7d372c36fbcc6c4929bae..140b10c5044fc5e79ac3b0db5a10b724be27ef26 100644 (file)
@@ -89,7 +89,7 @@ test()
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index a3d52b6722d1f9c095d59bd1f2dc8be29f42b72a..262a639c8a2563b543c60d8019f74ed2e08e83a7 100644 (file)
@@ -102,7 +102,7 @@ test()
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
index 7a8bb687aac15a051f0df3a69b01837f2e7d5b3a..c01e005b290415fd29af3ac7ef7aaa5ea5dd1c25 100644 (file)
@@ -55,8 +55,8 @@ transfer(std::ostream &out)
   FESystem<dim>   fe(FE_Q<dim>(1), 1, FE_Nothing<dim>(), 1);
   DoFHandler<dim> dof_handler(tria);
 
-  Vector<double>   solution;
-  ConstraintMatrix cm;
+  Vector<double>            solution;
+  AffineConstraints<double> cm;
   cm.close();
 
   dof_handler.distribute_dofs(fe);
index 555002231363ff653785db406282bc036b25766b..e58e6d5ba4ff22c298aad36978a8e67492d1aef1 100644 (file)
@@ -105,9 +105,10 @@ private:
   hp::FECollection<dim> fe; // used to stack several other elements together to
                             // form one vector-valued finite element.
 
-  ConstraintMatrix hanging_node_constraints; // object to hold hanging node
-                                             // constraints after refinement
-  ConstraintMatrix constraints;
+  AffineConstraints<double>
+    hanging_node_constraints; // object to hold hanging node
+                              // constraints after refinement
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern sparsity_pattern; // store sparsity pattern
 
index be732ea02ecbe663060fd8055e6ad71a2d140bc6..dfc50eedb797c2836ce17645db79bddfc2a71c6c 100644 (file)
@@ -69,7 +69,7 @@ test()
       deallog << std::endl;
     }
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
   DoFTools::make_hanging_node_constraints(dof_handler,
                                           hanging_node_constraints);
   hanging_node_constraints.close();
index 35e24e2d330fba79d67bbe2d00f9d55cd83d98f7..73b13df47a09f7665448d81eeebd9563e8f6c186 100644 (file)
@@ -79,7 +79,7 @@ do_check(const Triangulation<dim> &   triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
@@ -381,7 +381,7 @@ test_interpolation_base(const hp::FECollection<dim> &    fe,
 
         dof_handler.distribute_dofs(fe);
 
-        ConstraintMatrix constraints;
+        AffineConstraints<double> constraints;
         DoFTools::make_hanging_node_constraints(dof_handler, constraints);
         constraints.close();
 
index 49e80361092672275a5227c9bf122c5b4074b226..1aa7be3f6930992c726f409f50cb9f165b736b9a 100644 (file)
@@ -80,7 +80,7 @@ do_check(const Triangulation<dim> &   triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
@@ -377,7 +377,7 @@ test_interpolation_base(const hp::FECollection<dim> &    fe,
 
         dof_handler.distribute_dofs(fe);
 
-        ConstraintMatrix constraints;
+        AffineConstraints<double> constraints;
         DoFTools::make_hanging_node_constraints(dof_handler, constraints);
         constraints.close();
 
index 4b5a2619ebd00a10619c67bfff1d29d82b329a23..6370f7414d372a218e9aec5a5c7b1a045cb528c7 100644 (file)
@@ -112,7 +112,7 @@ test2cells(const unsigned int p1 = 2, const unsigned int p2 = 1)
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index fd8f68e8e58aa08f125db6f373a14a341def4d12..cde61136132091e12fa88d23b8f7b48d3e9ab830 100644 (file)
@@ -159,7 +159,7 @@ test2cells(const FiniteElement<dim> &fe_0,
     }
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 7b93f2d5acf4e847ee9063988a75c9976cee545f..2e860cd4bef1efa26d948cf6d7f5d08e175ed34a 100644 (file)
@@ -112,7 +112,7 @@ test_constraints(hp::FECollection<dim> &fe_coll)
   deallog << "DoFs: " << dof_handler.n_dofs() << std::endl;
 
   // Create the constraints.
-  ConstraintMatrix constraint_matrix;
+  AffineConstraints<double> constraint_matrix;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraint_matrix);
 
@@ -146,7 +146,7 @@ test_constraints_old(FiniteElement<dim> &fe)
   deallog << "DoFs: " << dof_handler.n_dofs() << std::endl;
 
   // Create the constraints.
-  ConstraintMatrix constraint_matrix;
+  AffineConstraints<double> constraint_matrix;
 
   DoFTools::make_hanging_node_constraints(dof_handler, constraint_matrix);
 
index 4291ffeddbf53bc173510acfd0582ad0c0ad2e3c..52dcc7fa0d0af6f1731ede8e4b8026cda213c1a1 100644 (file)
@@ -16,7 +16,7 @@
 
 
 // compute hanging node constraints (before and after the processing
-// we do in ConstraintMatrix::close()) for some grids with and without
+// we do in AffineConstraints<double>::close()) for some grids with and without
 // random distribution of FEs
 
 #include <deal.II/base/function.h>
@@ -57,10 +57,10 @@ template <int dim>
 void
 run(bool random_p, unsigned int *indx)
 {
-  Triangulation<dim>    triangulation;
-  hp::FECollection<dim> fe;
-  hp::DoFHandler<dim>   dof_handler(triangulation);
-  ConstraintMatrix      hanging_node_constraints;
+  Triangulation<dim>        triangulation;
+  hp::FECollection<dim>     fe;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  AffineConstraints<double> hanging_node_constraints;
 
   FE_Q<dim> fe_1(QIterated<1>(QTrapez<1>(), indx[0])),
     fe_2(QIterated<1>(QTrapez<1>(), indx[1])),
index 27f185878779defdef29a74ab51ad57438eb446d..b31e2e73302de6e0151a272f0ca17066bfb63e41 100644 (file)
@@ -52,9 +52,9 @@ test(const bool apply_constrains, const unsigned int hp)
                                         triangulation);
   }
 
-  hp::FECollection<dim> fe;
-  hp::DoFHandler<dim>   dof_handler(triangulation);
-  ConstraintMatrix      constraints; // for boundary conditions
+  hp::FECollection<dim>     fe;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  AffineConstraints<double> constraints; // for boundary conditions
 
 
   // populate fe system:
index aac7d0d6318e3e03d43735c706a0a17a96393d38..0d63b05649f035da7729bf7279917b14b62e8f38 100644 (file)
@@ -88,7 +88,7 @@ test()
       hp::DoFHandler<dim>   dof_handler(triangulation);
       dof_handler.distribute_dofs(hp_fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index 22c38bf4adff20f3a2423e1a19d7926b4c44000b..b81f05e22e343a23d86b3b00c7bee3fec235d513 100644 (file)
@@ -88,7 +88,7 @@ test()
       hp::DoFHandler<dim>   dof_handler(triangulation);
       dof_handler.distribute_dofs(hp_fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index e21196ecbc429cf3313ecb35ab63919ff56bcf65..d3373f22d5d6fd3f56d36a15479d4f86b3143b55 100644 (file)
@@ -94,7 +94,7 @@ test()
       hp::DoFHandler<dim>   dof_handler(triangulation);
       dof_handler.distribute_dofs(hp_fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index 731a48bd4e4a6d0c00dd82f114bfc0a51af2db2f..1e02295103ed729b86fbe6df1e7dc6cad7c147c8 100644 (file)
@@ -171,7 +171,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index c01322a5233873ce083b169b30496c03e308ab51..25b201848b85fa49c1263bde71fecafb1b4e6a44 100644 (file)
@@ -183,7 +183,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index db35d6aa15e63e5c813d796d309fe65dc4dcaff6..0879ef64e6c734529927a4c5a6f78723c8b4bf55 100644 (file)
@@ -77,7 +77,7 @@ test()
 
   Vector<double> v(dh.n_dofs());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::project(
     dh, cm, hp::QCollection<dim>(QGauss<dim>(3)), F<dim>(), v);
index fb452c510658adfda7a61978361097c0d7c25023..e9f5992ddcdfcc678cd402197408ba46b9b21ef9 100644 (file)
@@ -88,7 +88,7 @@ test()
 
   Vector<double> v(dh.n_dofs());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   // use the implicit Q1 mapping. this will yield a zero solution
index fbc2271d3afa358a702910e3642d8d171dc32e99..c27b803ad70f594554fd876aa6637b8071300d5f 100644 (file)
@@ -80,7 +80,7 @@ test()
   v.block(1).reinit(dh.n_dofs() - dh.n_dofs() / 2);
   v.collect_sizes();
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::project(
     dh, cm, hp::QCollection<dim>(QGauss<dim>(3)), F<dim>(), v);
index a5647b5a6b567f6ee7c1c372946a6fa6337a6609..f4c606f2f142dbeedc7543791b76ab03c0a80505 100644 (file)
@@ -124,7 +124,7 @@ transfer(std::ostream &out)
   dgq_dof_handler.distribute_dofs(fe_dgq);
   dgq_solution.reinit(dgq_dof_handler.n_dofs());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::interpolate(mapping, q_dof_handler, function, q_solution);
   VectorTools::interpolate(mapping, dgq_dof_handler, function, dgq_solution);
index 8ef3b909ec7a45b6aa91f7542acf0321c4dd60eb..4ad67e2e823eb9ebd7cfc0bdefd13855ce23a65e 100644 (file)
@@ -64,8 +64,8 @@ transfer(std::ostream &out)
   hp::DoFHandler<dim> dof_handler(tria);
   dof_handler.begin(0)->child(0)->set_active_fe_index(1);
 
-  Vector<double>   solution;
-  ConstraintMatrix cm;
+  Vector<double>            solution;
+  AffineConstraints<double> cm;
   cm.close();
 
   dof_handler.distribute_dofs(fe);
index 7f27e0b202fd164536d065ed873fe58ee2c172a2..a6487ed58eee5616e6cead1e223b481a17dfbdf3 100644 (file)
@@ -118,7 +118,7 @@ transfer(std::ostream &out)
   q_dof_handler.distribute_dofs(fe_q);
   q_solution.reinit(q_dof_handler.n_dofs());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   // interpolation is not straight forward for FE_Q_Hierarchical.
index 4d0d2f42c53a479763fba0efcc3bd45c49d199a6..3a36c118b33237ecd610944e44e8e5499cc3752b 100644 (file)
@@ -76,9 +76,9 @@ private:
   hp::DoFHandler<dim>        dof_handler;
   hp::MappingCollection<dim> mapping;
 
-  SparsityPattern      sparsity_pattern;
-  SparseMatrix<double> system_matrix;
-  ConstraintMatrix     mean_value_constraints;
+  SparsityPattern           sparsity_pattern;
+  SparseMatrix<double>      system_matrix;
+  AffineConstraints<double> mean_value_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index 4ee791f1e98c62c4e1bf2506c0f62a2b5afe9f6a..fa982b6e7916af3f19298b5cda757332dc1ab17f 100644 (file)
@@ -280,10 +280,10 @@ namespace LaplaceSolver
       void
       solve(Vector<double> &solution) const;
 
-      ConstraintMatrix     hanging_node_constraints;
-      SparsityPattern      sparsity_pattern;
-      SparseMatrix<double> matrix;
-      Vector<double>       rhs;
+      AffineConstraints<double> hanging_node_constraints;
+      SparsityPattern           sparsity_pattern;
+      SparseMatrix<double>      matrix;
+      Vector<double>            rhs;
     };
 
     void
@@ -447,7 +447,7 @@ namespace LaplaceSolver
   {
     hanging_node_constraints.clear();
 
-    void (*mhnc_p)(const hp::DoFHandler<dim> &, ConstraintMatrix &) =
+    void (*mhnc_p)(const hp::DoFHandler<dim> &, AffineConstraints<double> &) =
       &DoFTools::make_hanging_node_constraints;
 
     Threads::Thread<> mhnc_thread =
index fd728135d6e4e52b746281ea42e302792c6e0fd9..9bb4f36505f5b5b9c10cdc8ab82756cf8781975f 100644 (file)
@@ -100,7 +100,7 @@ namespace Step27
     std::vector<double>                     ln_k;
     Table<dim, std::complex<double>>        fourier_coefficients;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     SparsityPattern      sparsity_pattern;
     SparseMatrix<double> system_matrix;
index 2cfd8f2083c5d37fb8ce9c203c1ff467fa3d644b..b1c44b819814970d9e399b0126723b04eec5f978 100644 (file)
@@ -83,7 +83,7 @@ private:
   // Although we do not have h-refinement,
   // hanging nodes will inevitably appear
   // due to different polynomial degrees.
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index 721b39e515b03d901a711096e7024f16257d713c..25cebac443225f66f4f74c52f8c01ed8d45e7487 100644 (file)
@@ -84,7 +84,7 @@ private:
   // Although we do not have h-refinement,
   // hanging nodes will inevitably appear
   // due to different polynomial degrees.
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index 31ccc4fb33987813e0594b463aec117e6e248d2d..697747bea6546612233e051e212cb5d77de2536a 100644 (file)
@@ -83,7 +83,7 @@ private:
   // Although we do not have h-refinement,
   // hanging nodes will inevitably appear
   // due to different polynomial degrees.
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index e59fd44f1a7da34e7f7362c1cd815e84f6b41cda..516d5ebb51139182163d72943827d1c09e33b9ba 100644 (file)
@@ -80,7 +80,7 @@ private:
   // Although we do not have h-refinement,
   // hanging nodes will inevitably appear
   // due to different polynomial degrees.
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index 5ff1cc89ac0b3297d398298054ee0208bafd08a3..e0be366309a1e258379e3bd95dbe53c47068e471 100644 (file)
@@ -82,7 +82,7 @@ private:
   hp::DoFHandler<dim>   dof_handler;
   hp::FECollection<dim> fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 2036b7f011c6a10ef0660e56f94f3e0884cb26b0..62113abdb8e3d20a6ea9eee6b5efe19d1889ccc6 100644 (file)
@@ -209,7 +209,7 @@ private:
 
   SmartPointer<const hp::FECollection<dim>> fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index ec89801b966f2ccacc706a2751e14e16683fea6b..80a6e340bf4ba91d79518f832308fe7bab830edc 100644 (file)
@@ -83,7 +83,7 @@ private:
 
   hp::FECollection<dim> fe;
 
-  ConstraintMatrix hanging_node_constraints;
+  AffineConstraints<double> hanging_node_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index a8830df3c12881bd045c075388584a4f483ca236..dff2b7160ebe1e75439631039f307a9b48ec0267 100644 (file)
@@ -483,11 +483,13 @@ RHSIntegrator<dim>::face(MeshWorker::DoFInfo<dim> &,
  * Main class
  */
 template <int dim>
-class MeshWorkerConstraintMatrixTest
+class MeshWorkerAffineConstraints<double> Test
 {
 public:
-  MeshWorkerConstraintMatrixTest(const FiniteElement<dim> &fe);
-  ~MeshWorkerConstraintMatrixTest();
+  MeshWorkerAffineConstraints<double>
+  Test(const FiniteElement<dim> &fe);
+  ~MeshWorkerAffineConstraints<double>
+  Test();
 
   void
   run();
@@ -516,15 +518,16 @@ private:
   Vector<double> rhs;
   Vector<double> error_rhs;
 
-  ConstraintMatrix constraintsInhom;
-  ConstraintMatrix constraints;
-  ConstraintMatrix constraintsAll;
+  AffineConstraints<double> constraintsInhom;
+  AffineConstraints<double> constraints;
+  AffineConstraints<double> constraintsAll;
 };
 
 
 template <int dim>
-MeshWorkerConstraintMatrixTest<dim>::MeshWorkerConstraintMatrixTest(
-  const FiniteElement<dim> &fe)
+MeshWorkerAffineConstraints<double>
+  Test<dim>::MeshWorkerAffineConstraints<double>
+  Test(const FiniteElement<dim> &fe)
   : mapping()
   , dof_handler(triangulation)
   , fe(fe)
@@ -540,15 +543,17 @@ MeshWorkerConstraintMatrixTest<dim>::MeshWorkerConstraintMatrixTest(
 
 
 template <int dim>
-MeshWorkerConstraintMatrixTest<dim>::~MeshWorkerConstraintMatrixTest()
+MeshWorkerAffineConstraints<double>
+  Test<dim>::~MeshWorkerAffineConstraints<double>
+  Test()
 {
   dof_handler.clear();
 }
 
 
 template <int dim>
-void
-MeshWorkerConstraintMatrixTest<dim>::setup_system()
+void MeshWorkerAffineConstraints<double>
+     Test<dim>::setup_system()
 {
   dof_handler.distribute_dofs(fe);
 
@@ -587,8 +592,8 @@ MeshWorkerConstraintMatrixTest<dim>::setup_system()
  * Assemble with SystemSimple
  */
 template <int dim>
-void
-MeshWorkerConstraintMatrixTest<dim>::assemble_system_MeshWorker()
+void MeshWorkerAffineConstraints<double>
+     Test<dim>::assemble_system_MeshWorker()
 {
   MeshWorker::IntegrationInfoBox<dim> info_box;
 
@@ -623,8 +628,8 @@ MeshWorkerConstraintMatrixTest<dim>::assemble_system_MeshWorker()
  * Assemble matrix and vector separately
  */
 template <int dim>
-void
-MeshWorkerConstraintMatrixTest<dim>::assemble_MeshWorker()
+void MeshWorkerAffineConstraints<double>
+     Test<dim>::assemble_MeshWorker()
 {
   MeshWorker::IntegrationInfoBox<dim> info_box;
 
@@ -667,8 +672,8 @@ MeshWorkerConstraintMatrixTest<dim>::assemble_MeshWorker()
 
 
 template <int dim>
-void
-MeshWorkerConstraintMatrixTest<dim>::createInhomConstraints()
+void MeshWorkerAffineConstraints<double>
+     Test<dim>::createInhomConstraints()
 {
   this->constraintsInhom.clear();
   // boundary constraints
@@ -701,8 +706,8 @@ MeshWorkerConstraintMatrixTest<dim>::createInhomConstraints()
 
 
 template <int dim>
-void
-MeshWorkerConstraintMatrixTest<dim>::run()
+void MeshWorkerAffineConstraints<double>
+     Test<dim>::run()
 {
   setup_system();
   createInhomConstraints();
@@ -743,13 +748,13 @@ main()
 
   FE_Q<2> fe(1);
   deallog.push(fe.get_name());
-  MeshWorkerConstraintMatrixTest<2> test(fe);
+  MeshWorkerAffineConstraints<double> Test<2> test(fe);
   test.run();
   deallog.pop();
 
   FE_DGQ<2> fe2(1);
   deallog.push(fe2.get_name());
-  MeshWorkerConstraintMatrixTest<2> test2(fe2);
+  MeshWorkerAffineConstraints<double> Test<2> test2(fe2);
   test2.run();
   deallog.pop();
 }
index f883e136e4ac65488be5f5bee24454cf53c44e70..8bf3da3c5418230408db4f597dd9353da9f08bb7 100644 (file)
@@ -107,7 +107,7 @@ test_cochain(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
   dof.initialize_local_block_info();
 
   // Initialize hanging node constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   //  DoFTools::make_zero_boundary_constraints(dof, constraints);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
index fd3692d08eb578ec40a09b8574ed935e18b68b90..7fd227eca5a4e6f57488948e0473f389dbf475fa 100644 (file)
@@ -42,7 +42,7 @@ test_boundary(const FiniteElement<dim> &fe, bool diff = false)
 
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_zero_boundary_constraints(dof, constraints);
 
   QGauss<dim - 1>   quadrature(fe.tensor_degree() + 1);
@@ -81,7 +81,7 @@ test_face(const FiniteElement<dim> &fe, bool diff = false)
 
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_zero_boundary_constraints(dof, constraints);
 
   QGauss<dim - 1>   quadrature(fe.tensor_degree() + 1);
index 658d6b2f6e572dae2c567f8c1544c0846bbccef2..d1bd5762d6358992ccda35b7f2bf105ee0b0bb82 100644 (file)
@@ -77,10 +77,10 @@ private:
   void
   refine_grid();
 
-  Triangulation<dim> triangulation;
-  FE_Q<dim>          fe;
-  DoFHandler<dim>    dof_handler;
-  ConstraintMatrix   constraints;
+  Triangulation<dim>        triangulation;
+  FE_Q<dim>                 fe;
+  DoFHandler<dim>           dof_handler;
+  AffineConstraints<double> constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index 6c010ed8671c3e38edae8b4b297e02170e07319d..86a55e3c69b09a53bb225c3b057316f0c3765df8 100644 (file)
@@ -66,7 +66,7 @@ test()
 
   dof_handler.distribute_dofs(fe_collection);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dof_handler, cm);
   cm.write_dot(deallog.get_file_stream());
 }
index 65a9595493bfdd6683a688eb9b3f2d756dd8a60a..ebce2023f3be16e4dcd0584507a59d98dae95395 100644 (file)
@@ -33,7 +33,7 @@
 void
 test()
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   // a "regular" constraint
   cm.add_line(1);
index 23e91804e6c85fe23ed7c92e330fefa7ba6795b9..e02e52019ce44c4228cf6cd61efafe83df4d9274 100644 (file)
@@ -23,7 +23,7 @@
 void
 test()
 {
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   constraints.add_line(1);
   constraints.add_entry(1, 2, 1.);
@@ -39,7 +39,7 @@ test()
   constraints.close();
 
   // copy the object above
-  ConstraintMatrix constraints_2;
+  AffineConstraints<double> constraints_2;
   constraints_2.copy_from(constraints);
 
   // let both objects describe themselves in string form
index 109028c328b9768ba0c6a53cea65fa1b632308f1..84235109a44cef17a8a192753895ac2fe9a24b7c 100644 (file)
@@ -42,7 +42,7 @@ main()
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index b050b34b3631ad6093ce40f03e535fbe3634d663..d68a6b57ccf8f672acf30f62729cb6463e3148e2 100644 (file)
@@ -279,7 +279,7 @@ main()
           DoFHandler<3> dof(tria);
           dof.distribute_dofs(*fe);
 
-          ConstraintMatrix constraints;
+          AffineConstraints<double> constraints;
           DoFTools::make_hanging_node_constraints(dof, constraints);
           constraints.close();
 
index 992851c0101360de7e974635144f1de6f18101af..06a5449b7b0205aeb2e00403d7bff655ba2c4479 100644 (file)
@@ -20,7 +20,7 @@
 #include "../tests.h"
 
 
-// bug in ConstraintMatrix
+// bug in AffineConstraints<double>
 
 // index=18466 line_index=652 lines_cache[line_index]=919940456 lines.size()=21
 
@@ -31,7 +31,7 @@ test()
   std::ifstream f(SOURCE_DIR "/constraints_01/is.23");
   rel.read(f);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.clear();
   cm.reinit(rel);
 
index 659f9696cce2505f1d2ce1a92e662083cd53de7b..c9201dc598763c41ba586a485b42a820a87c6cb4 100644 (file)
@@ -23,7 +23,7 @@
 void
 test()
 {
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   constraints.add_line(1);
   constraints.add_entry(1, 2, 1.);
index d2e91661d6d493717b11fd3182b3a3df2622aeda..12118c218ecd6c44936a51ca4b7cef767f956a66 100644 (file)
@@ -229,7 +229,7 @@ main()
    * The interface check is simplified for this 2x2 case
    */
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   const unsigned int dofs_per_fl_msh_face = fluid_fe->dofs_per_face;
   const unsigned int dofs_per_solid_face  = solid_fe->dofs_per_face;
index f0b2845206d73b021ebeea7fffc88b4e8e6207a7..306b665b5eae16e9ece451a0df52c8f752ab5f24 100644 (file)
@@ -39,7 +39,7 @@ template <int dim>
 void
 setup_constraints(const DoFHandler<dim> &dof_handler)
 {
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.clear();
   const FiniteElement<dim> &fe = dof_handler.get_fe();
 
index ce2e3004135fa78db08e14cee2bef7b009a054b2..49d3b9c77527b92134c10bad89eb1b4fe0b53ea6 100644 (file)
@@ -35,7 +35,7 @@ using namespace dealii;
 void
 run()
 {
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   {
     constraints.add_line(7);
index f907a4b885cbbe5638b383f451a12f40322c34a6..8724953fd97edd2e06b62878c4ca4b83283f8328 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// test: test the ConstraintMatrix::get_lines() range object
+// test: test the AffineConstraints<double>::get_lines() range object
 
 
 #include <deal.II/lac/affine_constraints.h>
@@ -26,7 +26,7 @@
 void
 test()
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   // an inhomogeneous constraint
   cm.add_line(4);
index 01d78507a9d2f4b520ce6a07c03410c145e4eb39..b1fd64aa7d731fb20ad6dd5537117f8e47084c90 100644 (file)
@@ -74,7 +74,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix correct_constraints, library_constraints;
+  AffineConstraints<double> correct_constraints, library_constraints;
 
   DoFTools::make_hanging_node_constraints(dof, correct_constraints);
   library_constraints.merge(correct_constraints);
index b82a119f2183a435cc76498fad9b8a7402619d1f..ebdcbca8d5fdc0b142f087b7787fcb1279ed8931 100644 (file)
@@ -28,7 +28,7 @@
 void
 test()
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   // an inhomogeneous constraint
   cm.add_line(4);
index 4bfaba9e4919151d842e1584cf3c8ab190b9b0f8..d808d81a3b6be5399f7b74711ef2a748d38dc410 100644 (file)
 
 
 // this function tests the correctness of the implementation of
-// ConstraintMatrix::distribute_local_to_global for FullMatrix by comparing
-// the results with a sparse matrix. As a test case, we use a square mesh that
-// is refined once globally and then the first cell is refined adaptively.
+// AffineConstraints<double>::distribute_local_to_global for FullMatrix by
+// comparing the results with a sparse matrix. As a test case, we use a square
+// mesh that is refined once globally and then the first cell is refined
+// adaptively.
 
 #include <deal.II/base/function.h>
 
@@ -61,7 +62,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            1,
index ab73862f42713eadc1db99d62dc0894646252698..e8a222d2e6e9372d3650e6f07338e615056db82d 100644 (file)
@@ -16,9 +16,9 @@
 
 
 // this function tests the correctness of the implementation of
-// ConstraintMatrix::distribute_local_to_global for ChunkSparseMatrix by
-// comparing the results with a sparse matrix. As a test case, we use a square
-// mesh that is refined once globally and then the first cell is refined
+// AffineConstraints<double>::distribute_local_to_global for ChunkSparseMatrix
+// by comparing the results with a sparse matrix. As a test case, we use a
+// square mesh that is refined once globally and then the first cell is refined
 // adaptively.
 
 #include <deal.II/base/function.h>
@@ -63,7 +63,7 @@ test(unsigned int chunk_size)
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            1,
index f667c12218f567213075214d28f7c6553c9b6b07..69ef9006fdf78ba49b56b8b95843333036c38f6d 100644 (file)
@@ -16,8 +16,8 @@
 
 
 // this function tests the correctness of the implementation of
-// ConstraintMatrix::distribute_local_to_global for row and column indices
-// with different constraints on the rows and columns.
+// AffineConstraints<double>::distribute_local_to_global for row and column
+// indices with different constraints on the rows and columns.
 
 #include <deal.II/base/function.h>
 
@@ -37,8 +37,8 @@ test()
   local(0, 1) = 2.;
   local(1, 0) = -2.;
   local(1, 1) = 12.;
-  FullMatrix<double> global1(4, 6), global2(4, 6);
-  ConstraintMatrix   cm1, cm2;
+  FullMatrix<double>        global1(4, 6), global2(4, 6);
+  AffineConstraints<double> cm1, cm2;
   cm1.add_line(2);
   cm1.add_entry(2, 1, 0.5);
   cm1.add_entry(2, 3, 0.5);
index bc8644b507d800400bce6619be403f35e8099deb..567fc5cece316fd3b0a69e18e13767a71a5ee2e0 100644 (file)
@@ -29,7 +29,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -40,7 +40,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
index 4c5c00c73cbc07c30b0a038d6eb43c9a8526bfb3..85cbd7492379306b99bd6ad5e24e04c6835e05f5 100644 (file)
@@ -30,7 +30,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -41,7 +41,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
index 778c19e9f583a197e89bb687e6c07e220416dc91..3920285a1f16741003a7d1ebc3602bf5f8922b84 100644 (file)
@@ -30,7 +30,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -41,7 +41,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
@@ -65,7 +65,7 @@ merge_check()
       // results
       try
         {
-          c1.merge(c2, ConstraintMatrix::no_conflicts_allowed);
+          c1.merge(c2, AffineConstraints<double>::no_conflicts_allowed);
         }
       catch (...)
         {
index 31eecb9d705aa0676abe67971de6861ff819b2a5..24e2df052dc4b1289a9bfd7eb0335d5ef1ba38f1 100644 (file)
@@ -30,7 +30,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -41,7 +41,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
@@ -65,7 +65,7 @@ merge_check()
       // results
       try
         {
-          c1.merge(c2, ConstraintMatrix::left_object_wins);
+          c1.merge(c2, AffineConstraints<double>::left_object_wins);
         }
       catch (...)
         {
index 5c0bdb859e6da204cd88d8369460a6353243c724..ea4a72cf8d7f02762907f3ec4e8c89f694954df8 100644 (file)
@@ -30,7 +30,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -41,7 +41,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
@@ -65,7 +65,7 @@ merge_check()
       // results
       try
         {
-          c1.merge(c2, ConstraintMatrix::right_object_wins);
+          c1.merge(c2, AffineConstraints<double>::right_object_wins);
         }
       catch (...)
         {
index e8c0976228a4863439e29233e5ba0657955e1615..b9b503721ac5a138552ea59a98993be3fcd05eb0 100644 (file)
@@ -32,7 +32,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -43,7 +43,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
@@ -71,7 +71,7 @@ merge_check()
       // results
       try
         {
-          c1.merge(c2, ConstraintMatrix::right_object_wins);
+          c1.merge(c2, AffineConstraints<double>::right_object_wins);
         }
       catch (...)
         {
index 3895dc4267cfc3e61613e36d5502cec3f2a32952..d8eff94700e85dfdb97dd345ce715e5ae163a5c9 100644 (file)
@@ -33,7 +33,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge" << std::endl;
+  deallog << "Checking AffineConstraints<double>::merge" << std::endl;
 
   // check twice, once with closed
   // objects, once with open ones
@@ -44,7 +44,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1, c2;
+      AffineConstraints<double> c1, c2;
 
       // enter simple line
       c1.add_line(0);
@@ -76,7 +76,7 @@ merge_check()
       // results
       try
         {
-          c1.merge(c2, ConstraintMatrix::right_object_wins);
+          c1.merge(c2, AffineConstraints<double>::right_object_wins);
         }
       catch (...)
         {
index 42b9c64b298f58bb85715e3963fbaf63086282bf..4d5fbacc19d98811093c6176c74f0892336af926 100644 (file)
@@ -31,7 +31,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge with localized lines"
+  deallog << "Checking AffineConstraints<double>::merge with localized lines"
           << std::endl;
 
   // set local lines to a very large range that
@@ -65,7 +65,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1(local_lines), c2(local_lines);
+      AffineConstraints<double> c1(local_lines), c2(local_lines);
 
       // enter simple line
       c1.add_line(index_0);
index e5007cf762676cb61b02653f01b7aa23b2d42525..61357fc5189444bdbf82ad07cbe9817e9637f66e 100644 (file)
@@ -33,7 +33,7 @@ std::ofstream logfile("output");
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge with localized lines"
+  deallog << "Checking AffineConstraints<double>::merge with localized lines"
           << std::endl;
 
   // set local lines to a very large range that
@@ -63,7 +63,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1(local_lines), c2(local_lines);
+      AffineConstraints<double> c1(local_lines), c2(local_lines);
 
       // enter simple line
       c1.add_line(index_0);
@@ -91,7 +91,7 @@ merge_check()
       // results
       try
         {
-          c1.merge(c2, ConstraintMatrix::right_object_wins);
+          c1.merge(c2, AffineConstraints<double>::right_object_wins);
         }
       catch (...)
         {
index 2ee0b7cf03ed3d74fbbbb0d85020baeae1541584..8088e58bea4f29dcf9c78f6ea510f883d4a1d71c 100644 (file)
@@ -27,7 +27,7 @@
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge with localized lines"
+  deallog << "Checking AffineConstraints<double>::merge with localized lines"
           << std::endl;
 
   // set local lines to a very large range that
@@ -66,7 +66,7 @@ merge_check()
 
       // check that the `merge' function
       // works correctly
-      ConstraintMatrix c1(local_lines1), c2(local_lines2);
+      AffineConstraints<double> c1(local_lines1), c2(local_lines2);
 
       // enter simple line
       c1.add_line(index_0);
@@ -103,7 +103,7 @@ merge_check()
 
       // now merge the two and print the
       // results
-      c1.merge(c2, ConstraintMatrix::no_conflicts_allowed, true);
+      c1.merge(c2, AffineConstraints<double>::no_conflicts_allowed, true);
       c1.print(deallog.get_file_stream());
     };
 }
index e1e1f5d4411dd00526a888691ada40e1a55b3a10..ca4a4d92f0364c0cbb48eaa6acb36be9214f9a22 100644 (file)
@@ -15,8 +15,8 @@
 
 
 
-// Try to merge two empty ConstraintMatrix objects initialized with IndexSets
-// that don't match.
+// Try to merge two empty AffineConstraints<double> objects initialized with
+// IndexSets that don't match.
 
 #include <deal.II/lac/affine_constraints.h>
 
@@ -27,7 +27,7 @@
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge with localized lines"
+  deallog << "Checking AffineConstraints<double>::merge with localized lines"
           << std::endl;
 
   // set local lines to a very large range that
@@ -46,11 +46,11 @@ merge_check()
   local_lines2.print(deallog.get_file_stream());
 
   // works correctly
-  ConstraintMatrix c1(local_lines1), c2(local_lines2);
+  AffineConstraints<double> c1(local_lines1), c2(local_lines2);
 
   // now merge the two and print the
   // results
-  c1.merge(c2, ConstraintMatrix::no_conflicts_allowed, true);
+  c1.merge(c2, AffineConstraints<double>::no_conflicts_allowed, true);
   c1.print(deallog.get_file_stream());
 
   deallog << "OK" << std::endl;
index a43303c82d595ba31d6bac15f733d1875f96b9a6..14b6191f2a73dfd60a540d7d87c8dff2a2fe97f2 100644 (file)
@@ -15,9 +15,9 @@
 
 
 
-// Merge two ConstraintMatrix objects initialized with IndexSets where entries
-// have been added in a way that local_lines extends beyond the end of the
-// IndexSet
+// Merge two AffineConstraints<double> objects initialized with IndexSets where
+// entries have been added in a way that local_lines extends beyond the end of
+// the IndexSet
 
 #include <deal.II/lac/affine_constraints.h>
 
@@ -28,7 +28,7 @@
 void
 merge_check()
 {
-  deallog << "Checking ConstraintMatrix::merge with localized lines"
+  deallog << "Checking AffineConstraints<double>::merge with localized lines"
           << std::endl;
 
   // set local lines to a very large range that surely triggers an error if
@@ -38,7 +38,7 @@ merge_check()
   local_lines.compress();
 
   // works correctly
-  ConstraintMatrix c1(local_lines), c2(local_lines);
+  AffineConstraints<double> c1(local_lines), c2(local_lines);
   for (types::global_dof_index i = 99999800; i < local_lines.size(); ++i)
     if (i % 2 == 1)
       c1.add_line(i);
@@ -48,7 +48,7 @@ merge_check()
   c2.add_line(99999802);
 
   // now merge the two and print the results
-  c2.merge(c1, ConstraintMatrix::right_object_wins);
+  c2.merge(c1, AffineConstraints<double>::right_object_wins);
   c2.print(deallog.get_file_stream());
 
   deallog << "OK" << std::endl;
index 952e0cc8698ea5667804431be4d555fb485dcca3..2755b8a55fe39ff9e21a008f8ff9a53b0b7d294e 100644 (file)
@@ -27,9 +27,9 @@ main()
 
   deallog.attach(logfile);
 
-  ConstraintMatrix constraints;
-  unsigned int     IDs[]  = {1, 2, 3, 5, 8, 13, 21};
-  double           vals[] = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0};
+  AffineConstraints<double> constraints;
+  unsigned int              IDs[]  = {1, 2, 3, 5, 8, 13, 21};
+  double                    vals[] = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0};
   for (unsigned int i = 0; i < sizeof(IDs) / sizeof(IDs[0]); ++i)
     {
       constraints.add_line(IDs[i]);
@@ -39,7 +39,7 @@ main()
   constraints.print(deallog.get_file_stream());
   deallog << std::endl;
 
-  ConstraintMatrix cm(std::move(constraints));
+  AffineConstraints<double> cm(std::move(constraints));
   cm.print(deallog.get_file_stream());
   deallog << constraints.n_constraints() << std::endl << std::endl;
 
index 90a42abdd6b60d3448708a62271decaf2354b90b..b105a46bd3dde67758cae2a99ddf5c806bf45bf2 100644 (file)
@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------
 
 
-// test ConstraintMatrix::shift for a ConstraintMatrix object
+// test AffineConstraints<double>::shift for a AffineConstraints<double> object
 // initialized with an IndexSet object
 
 #include <deal.II/base/index_set.h>
@@ -40,14 +40,14 @@ test()
   index_set.print(deallog);
 
   deallog
-    << "Create ConstraintMatrix with constraints u(2)=.5*u(5), u(5)=.7*u(8)"
+    << "Create AffineConstraints<double> with constraints u(2)=.5*u(5), u(5)=.7*u(8)"
     << std::endl;
-  dealii::ConstraintMatrix constraints1(index_set);
+  dealii::AffineConstraints<double> constraints1(index_set);
   constraints1.add_line(5);
   constraints1.add_entry(5, 8, .7);
   constraints1.add_line(2);
   constraints1.add_entry(2, 5, .5);
-  dealii::ConstraintMatrix constraints2(constraints1);
+  dealii::AffineConstraints<double> constraints2(constraints1);
   constraints1.print(deallog.get_file_stream());
 
   constraints1.shift(size / 2);
@@ -55,7 +55,7 @@ test()
   constraints1.print(deallog.get_file_stream());
 
   constraints1.merge(constraints2,
-                     ConstraintMatrix::no_conflicts_allowed,
+                     AffineConstraints<double>::no_conflicts_allowed,
                      true);
   deallog << "Shifted and merged constraints" << std::endl;
   constraints1.print(deallog.get_file_stream());
index 6d1115f3cc4ceace0ddaf0e42721cfdb96352dc2..d552ea216b6dda7ecdbb5cf2034aba7b4a054ae4 100644 (file)
@@ -33,7 +33,7 @@
 void
 test()
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   // a "regular" constraint
   cm.add_line(1);
index b52d3098aa08be0557cd61a8e005c831140d8203..b35d9aa3388821cc27a4772da145935baed5fd3e 100644 (file)
@@ -33,7 +33,7 @@ test()
 {
   // constrain each dof to zero. this
   // should yield a diagonal matrix
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   for (unsigned int i = 0; i < 5; ++i)
     cm.add_line(i);
index 1639ccb59fb08a851854e23f8c40c2e1b511d968..1a2e87e9db18abd09e820bbb49374ac5500f57c9 100644 (file)
@@ -30,7 +30,7 @@
 void
 test()
 {
-  ConstraintMatrix cm1, cm2;
+  AffineConstraints<double> cm1, cm2;
 
   // a "regular" and a singular
   // constraint to each of the
index a6f35fe49b6f7756b08443e7c3c2a14d34110f10..e34af9249bc23d5688fc8319f97a58eb8122681c 100644 (file)
@@ -71,7 +71,7 @@ test(const bool hanging_nodes = true)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index b0923ca7cb0d310994562358db85432755b0aaf2..dda508494834468fa178370b523cc803a586d244 100644 (file)
@@ -98,8 +98,8 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix hanging_nodes_only;
-  ConstraintMatrix test_all_constraints;
+  AffineConstraints<double> hanging_nodes_only;
+  AffineConstraints<double> test_all_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> reference_matrix;
index 1f364a1dec84a4788555e082a7124d8df9df7f57..02cfbaca84ae82fc6ec8af2282844beddf77b5ea 100644 (file)
@@ -61,7 +61,7 @@ using namespace dealii;
 void
 test(bool use_inhomogeneity_for_rhs)
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   cm.add_line(2);
   cm.set_inhomogeneity(2, 3.0);
index 96f5b0396643f71f9495287e1fa89a04d803e65e..570ee7326729cfda001451174fdb362b86c22aba 100644 (file)
@@ -65,7 +65,7 @@ using namespace dealii;
 void
 test(bool use_inhomogeneity_for_rhs)
 {
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
 
   cm.add_line(1);
   cm.set_inhomogeneity(1, -5.0);
index dbfbb485c1735542082727e27b4eaa0eb93abb96..0eb81cc7fd631efb0466c6e9e52cec409b13c0e8 100644 (file)
@@ -92,7 +92,7 @@ test(bool use_constraint_matrix)
 
   if (use_constraint_matrix == true)
     {
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
 
       cm.add_line(1);
       cm.set_inhomogeneity(1, -5.0);
index b412bd87b85327a96669534ca27f8299e8645da8..3849de952b203c841fb773067c30bd5510b3e7f7 100644 (file)
@@ -80,8 +80,8 @@ private:
   DoFHandler<dim> dof_handler;
   FESystem<dim>   fe;
 
-  ConstraintMatrix hanging_nodes_only;
-  ConstraintMatrix test_all_constraints;
+  AffineConstraints<double> hanging_nodes_only;
+  AffineConstraints<double> test_all_constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> reference_matrix;
index 7289ae98a873423eedfac7c4ff07aa330f7ad017..b50218b818da0c59a35d0c067fefae74d7762a9c 100644 (file)
@@ -79,8 +79,8 @@ private:
   DoFHandler<dim> dof_handler;
   FE_Q<dim>       fe;
 
-  ConstraintMatrix hanging_nodes_only;
-  ConstraintMatrix test_all_constraints;
+  AffineConstraints<double> hanging_nodes_only;
+  AffineConstraints<double> test_all_constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> reference_matrix;
index 95feedd6679d752690bf4fd03db1831418d5c06f..0a49f86b3f412bf9e190a47d3a5655301bc9582f 100644 (file)
 
 // this function tests the correctness of the implementation of
 // inhomogeneous constraints with
-// ConstraintMatrix::distribute_local_to_global operating only on a vector,
-// based on a modification of the step-5 tutorial program. It assumes
-// correctness of the function ConstraintMatrix::distribute_local_to_global
-// operating on both the matrix and vector simultaneously.
+// AffineConstraints<double>::distribute_local_to_global operating only on a
+// vector, based on a modification of the step-5 tutorial program. It assumes
+// correctness of the function
+// AffineConstraints<double>::distribute_local_to_global operating on both the
+// matrix and vector simultaneously.
 
 #include <deal.II/base/function.h>
 #include <deal.II/base/quadrature_lib.h>
@@ -79,9 +80,9 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  Vector<double>   solution;
-  Vector<double>   system_rhs;
-  ConstraintMatrix constraints;
+  Vector<double>            solution;
+  Vector<double>            system_rhs;
+  AffineConstraints<double> constraints;
 };
 
 template <int dim>
index 6fef76bf628fe0447ef518f10f0ce600edc5ab61..504437367bdb886b0a7c88df170426c6403a9c1c 100644 (file)
@@ -66,7 +66,7 @@ private:
   FE_Q<dim>          fe;
   DoFHandler<dim>    dof_handler;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
   TrilinosWrappers::MPI::Vector  solution;
index ee4db525ce772eab0ace36d8860c67ba7331a274..9e620bb6e022af79949caece8eafe1699484d65c 100644 (file)
@@ -72,8 +72,8 @@ private:
   FE_Q<dim>                                 fe;
   DoFHandler<dim>                           dof_handler;
 
-  ConstraintMatrix constraints;
-  SparsityPattern  sparsity_pattern;
+  AffineConstraints<double> constraints;
+  SparsityPattern           sparsity_pattern;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index d6a1625a8060646037e8c02e665feb197ea9b7da..b8919349367271461c55f2006b764c890bcf74ec 100644 (file)
@@ -73,8 +73,8 @@ private:
   FE_Q<dim>                                 fe;
   DoFHandler<dim>                           dof_handler;
 
-  ConstraintMatrix constraints;
-  SparsityPattern  sparsity_pattern;
+  AffineConstraints<double> constraints;
+  SparsityPattern           sparsity_pattern;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index ac6bbf71dfd7885071eb0a450c20fb0b45d2c4d0..e960a385679e2c956ffcdd35f7db6c3474f69665 100644 (file)
@@ -64,11 +64,11 @@ build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix,
   block_component[1] = 1;
 
   // Initialise
-  const FESystem<dim> fe(fe_test, 1, fe_trial, 1);
-  Triangulation<dim>  triangulation;
-  QGauss<dim>         quadrature_formula(fe_trial.degree + 1);
-  DoFHandler<dim>     dof_handler(triangulation);
-  ConstraintMatrix    constraints;
+  const FESystem<dim>       fe(fe_test, 1, fe_trial, 1);
+  Triangulation<dim>        triangulation;
+  QGauss<dim>               quadrature_formula(fe_trial.degree + 1);
+  DoFHandler<dim>           dof_handler(triangulation);
+  AffineConstraints<double> constraints;
 
   const unsigned int dofs_per_cell = fe.dofs_per_cell;
 
index cc9f654e75fe9eeb5dcc70f5d2d24417c4209e39..e35c5ec3dbc71b3351423c68d8b798a2faaa19e4 100644 (file)
@@ -84,9 +84,9 @@ build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix,
     typename Triangulation<dim>::MeshSmoothing(
       Triangulation<dim>::smoothing_on_refinement |
       Triangulation<dim>::smoothing_on_coarsening));
-  QGauss<dim>      quadrature_formula(fe_trial.degree + 1);
-  DoFHandler<dim>  dof_handler(triangulation);
-  ConstraintMatrix constraints;
+  QGauss<dim>               quadrature_formula(fe_trial.degree + 1);
+  DoFHandler<dim>           dof_handler(triangulation);
+  AffineConstraints<double> constraints;
 
   const unsigned int dofs_per_cell = fe.dofs_per_cell;
 
index df948e7b2e1a5ee9e77821bf11263f00d04bc50f..8fc78996787b7b9bb9d6cefe235f81b73a17aaeb 100644 (file)
@@ -160,7 +160,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 063faffe543606fa1f6d86ed032d0a375834434a..7056e4dc7b53f2df424da57a1a843ef8d415eb22 100644 (file)
@@ -81,7 +81,7 @@ namespace Step22
     Triangulation<dim>        triangulation;
     FESystem<dim>             fe;
     DoFHandler<dim>           dof_handler;
-    ConstraintMatrix          constraints;
+    AffineConstraints<double> constraints;
     BlockSparsityPattern      sparsity_pattern;
     BlockSparseMatrix<double> system_matrix;
     BlockVector<double>       solution;
index 1eac700ce491d3998c26e4fa207521625b501536..829df9a24b98470f066573760b53acb8dfc0071b 100644 (file)
@@ -98,7 +98,7 @@ test()
 
   IndexSet locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   VectorTools::interpolate_boundary_values(dof_handler,
index f208d61c8728683f7cea59a59074e1236227be6a..980fa6811f458cd1ad939af1435b1cce3d5c591e 100644 (file)
@@ -199,7 +199,7 @@ test(const FiniteElement<dim> &fe)
 {
   Geometry<dim>                           geometry;
   TranscendentalManufacturedSolution<dim> fe_function;
-  ConstraintMatrix                        constraints;
+  AffineConstraints<double>               constraints;
   constraints.close();
 
   deallog << "FE degree: " << fe.degree << std::endl;
index e5ea9887a8220029e369c1ece1fc2db5a0ca8bd1..532fea53f298b0e12ec068db7480c3e5b3ec0df0 100644 (file)
@@ -173,12 +173,12 @@ test(const unsigned int n_ref = 0)
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
 
   // constraints:
-  ConstraintMatrix constraints_euler;
+  AffineConstraints<double> constraints_euler;
   constraints_euler.reinit(locally_relevant_dofs_euler);
   DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler);
   constraints_euler.close();
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints_euler.close();
@@ -285,8 +285,8 @@ test(const unsigned int n_ref = 0)
         update_values | update_gradients | update_JxW_values |
         update_quadrature_points;
 
-      ConstraintMatrix level_constraints;
-      IndexSet         relevant_dofs;
+      AffineConstraints<double> level_constraints;
+      IndexSet                  relevant_dofs;
       DoFTools::extract_locally_relevant_level_dofs(dof_handler,
                                                     level,
                                                     relevant_dofs);
index 193c27afb565470ba8dea0383678f8eb01e5cbaa..3ad4a3f2e79f8d911a5033c9c9e6d243439ae840 100644 (file)
@@ -111,12 +111,12 @@ test()
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
 
   // constraints:
-  ConstraintMatrix constraints_euler;
+  AffineConstraints<double> constraints_euler;
   constraints_euler.reinit(locally_relevant_dofs_euler);
   DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler);
   constraints_euler.close();
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints_euler.close();
index 216869b51f3170817d11ca574cf55a6d7a5f6572..df4dabb17148cd14db68143b549fb23701ec161f 100644 (file)
@@ -195,7 +195,7 @@ test(const FiniteElement<dim> &fe)
     {
       MappingQ<dim> mapping(mapping_p, true);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof_handler, constraints);
       constraints.close();
 
index 1bbca998336acefe094c9bc581802544bef8d849..45d37eaeb30da58edb6946eed13c5af4794b583b 100644 (file)
@@ -68,7 +68,7 @@ test()
   FE_DGQ<dim>     fe(1);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   MatrixFree<dim>                          mf_data;
index 790f253414787661ea466d299a7b6ff905e727c3..a24cf3dc948c185158b6dd54db863d93b07df21b 100644 (file)
@@ -71,7 +71,7 @@ public:
       update_JxW_values | update_normal_vectors | update_jacobians;
     addit_data.mapping_update_flags_faces_by_cells =
       update_JxW_values | update_normal_vectors | update_jacobians;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
 
     data.reinit(mapping, dof_handler, constraints, quad, addit_data);
index ad10315bc5f3ced52dab4b09c28f70f9758727c6..8778984713fae182ede329dc31505a8ad117dc2c 100644 (file)
@@ -74,7 +74,7 @@ test()
   FE_Q<dim>       fe(2);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index fad6fe8809a2426c7ee95cdd10a2b32a4293c0d5..81dae4a9a1958e82e3635c2e3c845457f2e0e7cd 100644 (file)
@@ -72,7 +72,7 @@ test()
   FE_Q<dim>       fe(1);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
@@ -109,7 +109,7 @@ test_cube()
   FE_Q<dim>       fe(1);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
@@ -153,7 +153,7 @@ test_parallelogram()
   FE_Q<dim>       fe(1);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 2faa7bd80b0f22469e101c0167eee8eb38f7ed5a..4b33d8c3346ca271d83733ce20ceaf1343c82d39 100644 (file)
@@ -67,7 +67,7 @@ sub_test()
       tria.execute_coarsening_and_refinement();
 
       dof.distribute_dofs(fe);
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof, constraints);
       VectorTools::interpolate_boundary_values(dof,
                                                0,
index de4c70009221a8376be3e06d4c92f69c7b32789a..3ba33e1fdf6daf86f494146912ce26cd62b54433 100644 (file)
@@ -158,7 +158,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints, constraints_u, constraints_p;
+  AffineConstraints<double> constraints, constraints_u, constraints_p;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -306,7 +306,7 @@ test()
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_handler_u);
     dofs.push_back(&dof_handler_p);
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&constraints_u);
     constraints.push_back(&constraints_p);
     QGauss<1> quad(fe_degree + 2);
index 1dbe4cccf25c04e5941a4f5809a5ceb2f2da60cc..699d1798ae45ebb012440e13076e5e8d9d9362f5 100644 (file)
@@ -68,7 +68,7 @@ test()
   FE_DGQ<dim>     fe(0);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   MappingQ<dim> mapping(fe_degree + 1);
index 94eed1a597e88f4ba99d70e85d14bc977f788afd..d95b361a430303fc188e44000cff39ec0effc1dc 100644 (file)
@@ -83,7 +83,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
   dof.distribute_mg_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   const QGauss<1>                          quad(1);
index ef5bc79029ce737cc89be6224772f7cd7acc14eb..bd0c8b503c35348a0817c4306c9f3a0a2e4264f1 100644 (file)
@@ -112,7 +112,7 @@ test(const FiniteElement<dim> &fe, const unsigned int n_iterations)
 
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
index c4b838966e4458917623ff9bb78bfda71911c466..40cbab8677e640b7bd23eedb6eda47ad167b3c6d 100644 (file)
@@ -210,7 +210,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   typedef double number;
index e3a7beea38fb7a36053306e5a2412da1c4bc6bdd..2f8a6a3a031945a726b4e3fedcf05974ecb06107 100644 (file)
@@ -210,7 +210,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   typedef double number;
index d31db4bf67913ac035a8d8ed7cecbbbe3ed8deb8..84ed749912b2709668a3e44f9a82eb2da01484f8 100644 (file)
@@ -79,7 +79,7 @@ test()
       dof.distribute_dofs(*fes[i]);
       MatrixFree<dim> matrix_free;
       matrix_free.reinit(dof,
-                         ConstraintMatrix(),
+                         AffineConstraints<double>(),
                          QGauss<1>(degree + 3),
                          typename MatrixFree<dim>::AdditionalData());
       if (i < 2)
index 1050c05b6cb80ffad7f76f63efb2c1ba38653b3b..247d03312fa8fa764895631263a38418d1e9b030 100644 (file)
@@ -41,7 +41,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
   do_test<dim, fe_degree, double>(dof, constraints);
 }
index 50bec5a7777838c4a6f3b6a14edf9f6e0114e345..c689788c3d6a2dea2fd88dc4583f67e30f31ae99 100644 (file)
@@ -53,7 +53,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 8af1a7f749ca6eec2d3dbc618206c4a89d679725..0947b1dedd27fc077a18746f07b94c06e7abab8f 100644 (file)
@@ -233,7 +233,8 @@ public:
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> &dof, const ConstraintMatrix &constraints)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   // use this for info on problem
index 722c6259130894536192bef4d8952a9e0fe2968f..b8f27f335b253d7e877d35ab2ee995049a335b32 100644 (file)
@@ -44,7 +44,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index a7993ad610f62436f8959368ba57bb1959aaf1ba..be4f4d4203ff77be4537093186ab48e680d4f2a5 100644 (file)
@@ -132,7 +132,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   MatrixFree<dim, double> mf_data;
index c34b21fe87f3087bc6db119b01cca0509fc59523..d4235a9125e705807470338d6a30a2cf77fab26d 100644 (file)
@@ -55,7 +55,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            1,
index 4aa88bc9be998767b77f544f3bf3f55dfa093bbe..76269635ad8d5d3e2836f834214bd8ba824abe3f 100644 (file)
@@ -56,7 +56,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 9b4dc841d5ebfe4c2f39000b0c1b48c3ad7e12ab..c45627abf3c83f5d97807cfbe5721bd9dc3120e8 100644 (file)
@@ -54,7 +54,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 00949ae055f99e53c4d578faaaa85d92b2bcbd4c..9f51a9abd598064142a09e70e01467bef47d6fbb 100644 (file)
@@ -240,12 +240,12 @@ test()
   for (unsigned int no = 0; no < dof.size(); ++no)
     src[no].reinit(dof[no]->n_dofs());
 
-  std::vector<const ConstraintMatrix *> constraints(2);
-  ConstraintMatrix                      constraint0;
+  std::vector<const AffineConstraints<double> *> constraints(2);
+  AffineConstraints<double>                      constraint0;
   DoFTools::make_hanging_node_constraints(*dof[0], constraint0);
   constraint0.close();
   constraints[0] = &constraint0;
-  ConstraintMatrix constraint1;
+  AffineConstraints<double> constraint1;
   DoFTools::make_hanging_node_constraints(*dof[1], constraint1);
   constraint1.close();
   constraints[1] = &constraint1;
index 94639d5037d4b554ffff5defd757098ab0f50773..08336cf52a3f7b13f1442fd46a61c40238502bc1 100644 (file)
@@ -284,16 +284,16 @@ test()
   for (unsigned int i = 0; i < dof.size(); ++i)
     src[i].reinit(dof[i]->n_dofs());
 
-  std::vector<const ConstraintMatrix *> constraints(3);
-  ConstraintMatrix                      constraint0;
+  std::vector<const AffineConstraints<double> *> constraints(3);
+  AffineConstraints<double>                      constraint0;
   DoFTools::make_hanging_node_constraints(*dof[0], constraint0);
   constraint0.close();
   constraints[0] = &constraint0;
-  ConstraintMatrix constraint1;
+  AffineConstraints<double> constraint1;
   DoFTools::make_hanging_node_constraints(*dof[1], constraint1);
   constraint1.close();
   constraints[1] = &constraint1;
-  ConstraintMatrix constraint2;
+  AffineConstraints<double> constraint2;
   DoFTools::make_hanging_node_constraints(*dof[2], constraint2);
   constraint2.close();
   constraints[2] = &constraint2;
index c7beab690bc76c39ae33b5597a785f464b76f39c..7a643e4e4699d021ebe354be2aca466eb0e06b5e 100644 (file)
@@ -31,10 +31,10 @@ std::ofstream logfile("output");
 
 template <int dim, int fe_degree, int n_q_points_1d, typename number>
 void
-sub_test(const DoFHandler<dim> &  dof,
-         const ConstraintMatrix & constraints,
-         MatrixFree<dim, number> &mf_data,
-         Vector<number> &         solution)
+sub_test(const DoFHandler<dim> &          dof,
+         const AffineConstraints<double> &constraints,
+         MatrixFree<dim, number> &        mf_data,
+         Vector<number> &                 solution)
 {
   deallog << "Test with fe_degree " << fe_degree
           << ", n_q_points_1d: " << (n_q_points_1d) << std::endl;
@@ -76,7 +76,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 3745f1cfd4fcff50f62d22fa168ec16d03f51734..10970a472e613a2184fc640ca4870fb8f83ffb1f 100644 (file)
@@ -62,7 +62,7 @@ test()
   DoFHandler<dim>        dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 051d2a734c14aa826dc244b491ea0362c587a297..5c987c2da471bddb5e68d5b5626afd7769595097 100644 (file)
@@ -31,10 +31,10 @@ std::ofstream logfile("output");
 
 template <int dim, int fe_degree, int n_q_points_1d, typename number>
 void
-sub_test(const DoFHandler<dim> &  dof,
-         const ConstraintMatrix & constraints,
-         MatrixFree<dim, number> &mf_data,
-         Vector<number> &         solution)
+sub_test(const DoFHandler<dim> &          dof,
+         const AffineConstraints<double> &constraints,
+         MatrixFree<dim, number> &        mf_data,
+         Vector<number> &                 solution)
 {
   deallog << "Test with fe_degree " << fe_degree
           << ", n_q_points_1d: " << (n_q_points_1d) << std::endl;
@@ -76,7 +76,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index c65309261f59bbaded6eb88caa8b80edca60509c..060c8be341119f3d7e3919aa74cc6b6b1504d8af 100644 (file)
@@ -178,8 +178,8 @@ test()
       solution_dist(i)   = entry;
     }
 
-  ConstraintMatrix constraints;
-  MatrixFree<dim>  mf_data;
+  AffineConstraints<double> constraints;
+  MatrixFree<dim>           mf_data;
   {
     const QGauss<1>                          quad(fe_degree + 1);
     typename MatrixFree<dim>::AdditionalData data;
index 6ed298554fac2855cdeba8975097a2a876b752c4..642653b58d5074b77e5c9829b5da5df4cd849e10 100644 (file)
@@ -174,8 +174,8 @@ test()
       solution_dist(i)   = entry;
     }
 
-  ConstraintMatrix constraints;
-  MatrixFree<dim>  mf_data;
+  AffineConstraints<double> constraints;
+  MatrixFree<dim>           mf_data;
   {
     const QGaussLobatto<1>                   quad(fe_degree + 1);
     typename MatrixFree<dim>::AdditionalData data;
index 3d05d97ef933e464b806a3ecc044a3b30be03cfc..4820501b64020f368ae6ae6f63dd3f088150bbaa 100644 (file)
@@ -115,7 +115,8 @@ protected:
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> &dof, const ConstraintMatrix &constraints)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   // std::cout << "Number of cells: " <<
@@ -177,7 +178,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            1,
index ae50b908f4ec97f74a3baf449d73a7675c319e6f..88609f0ef36426dbc469348d4c8152ccb7fac25e 100644 (file)
@@ -197,7 +197,7 @@ test()
   // std::cout << "Number of cells: " << tria.n_active_cells() << std::endl;
   // std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index e0a0c8f26e65d5ebdc606dc8f90c993a7b6d516d..4151c1f63a5d38d4932c23c8109df5ae2387cea2 100644 (file)
@@ -301,12 +301,12 @@ test()
   dst[4].reinit(dst[0]);
   dst[5].reinit(dst[0]);
 
-  std::vector<const ConstraintMatrix *> constraints(2);
-  ConstraintMatrix                      constraint0;
+  std::vector<const AffineConstraints<double> *> constraints(2);
+  AffineConstraints<double>                      constraint0;
   DoFTools::make_hanging_node_constraints(*dof[0], constraint0);
   constraint0.close();
   constraints[0] = &constraint0;
-  ConstraintMatrix constraint1;
+  AffineConstraints<double> constraint1;
   DoFTools::make_hanging_node_constraints(*dof[1], constraint1);
   constraint1.close();
   constraints[1] = &constraint1;
index 92dfa70c93ea6253bceec0641379d8b753a03dd5..30084f692881c4291a95f120ffdb39252f31e279 100644 (file)
@@ -291,11 +291,11 @@ test()
   dst[4].reinit(dst[0]);
   dst[5].reinit(dst[0]);
 
-  std::vector<const ConstraintMatrix *> constraints(2);
-  ConstraintMatrix                      constraint0;
+  std::vector<const AffineConstraints<double> *> constraints(2);
+  AffineConstraints<double>                      constraint0;
   constraint0.close();
   constraints[0] = &constraint0;
-  ConstraintMatrix constraint1;
+  AffineConstraints<double> constraint1;
   DoFTools::make_hanging_node_constraints(*dof[1], constraint1);
   constraint1.close();
   constraints[1] = &constraint1;
index 364d2a3c1ace909b94cf6b29c58ea109350178cb..49edb17e78e0af2ea5613e26d7e391218e0606da 100644 (file)
@@ -64,7 +64,7 @@ test()
       DoFHandler<dim> dof(tria);
       dof.distribute_dofs(fe);
 
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       constraints.close();
       do_test<dim, fe_degree, double>(dof, constraints);
     }
@@ -73,7 +73,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -83,7 +83,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, -1, double>(dof, constraints);
   }
index f7a32d28ecf4f8085d79f72b71479114e4930287..4e6c71ab61e963a3394336b7dfb2ae0bfc8ce241 100644 (file)
@@ -102,7 +102,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -111,7 +111,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -121,7 +121,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, -1, double>(dof, constraints);
   }
index 94d159bb26e633517004b9e04b504e7d2cf23868..914fbf42180aa0c3c166a638cb6276bf643d1213 100644 (file)
@@ -309,7 +309,8 @@ protected:
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> &dof, const ConstraintMatrix &constraints)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   // use this for info on problem
index b3f2c19b19ea99cb249d279f628f3fc448f954b8..35825c446d955f299d64ea4b5eeee768e506f5ff 100644 (file)
@@ -73,7 +73,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -82,7 +82,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -92,7 +92,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, -1, double>(dof, constraints);
   }
index 2adcf27e595e8b86f8e2958defe94d38aeb5cd29..a19b0b0fd6d6e888a0022c02779f250cb518daf6 100644 (file)
@@ -85,7 +85,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -94,7 +94,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, fe_degree, double>(dof, constraints);
   }
@@ -104,7 +104,7 @@ test()
     DoFHandler<dim> dof(tria);
     dof.distribute_dofs(fe);
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
     do_test<dim, -1, double>(dof, constraints);
   }
index f4a29de4dd779467daf58970687a14be37ddda45..da435b733ccd55006eed36a22e6f9d0b68cfcf87 100644 (file)
@@ -136,7 +136,7 @@ test(const unsigned int n_glob_ref = 2, const unsigned int n_ref = 0)
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
 
   // constraints:
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 74b38e258dff7b62d8305785927fd6ea0e994a8b..e1e87c6cccf34b339fed064f4271974256852d42 100644 (file)
@@ -144,7 +144,7 @@ do_test(const DoFHandler<dim> &dof)
     data.tasks_parallel_scheme =
       MatrixFree<dim, number>::AdditionalData::partition_color;
     data.tasks_block_size = 3;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     mf_data.reinit(mapping, dof, constraints, quad, data);
   }
index 14d12aba05014d9f595cbd17573ba2c9ecf699f8..d105f4f30c419e7d8276c8334a7240a60b3f0da6 100644 (file)
@@ -143,7 +143,7 @@ do_test(const DoFHandler<dim> &dof)
     data.tasks_parallel_scheme =
       MatrixFree<dim, number>::AdditionalData::partition_color;
     data.tasks_block_size = 3;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     mf_data.reinit(dof, constraints, quad, data);
   }
index 9881fb80df01f23e10bbe775b88c408dbf7d4a61..f2d3571119427f7aa8b3d754ca42ae3247ddad4e 100644 (file)
@@ -159,7 +159,7 @@ do_test(const DoFHandler<dim> &dof)
     data.tasks_parallel_scheme =
       MatrixFree<dim, number>::AdditionalData::partition_color;
     data.tasks_block_size = 3;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     mf_data.reinit(mapping, dof, constraints, quad, data);
   }
index 5f516f5cee94fcca1441aadbc91a694980d8f1c1..7ea5a0d5e8377ed666cda82bc4cd4cbe533953f0 100644 (file)
@@ -61,7 +61,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index f5ec4a9e3a00126c29bcb276425642cf9a1f42ef..3d65339ec4672eab42c3b1f94c3e2d51e4ce9a1d 100644 (file)
@@ -91,7 +91,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 04a267aed3d281ea98d3c57f89f97177a93d06f5..5b1770cd5a0d52845e98947e1f13ba09cb0c2f3f 100644 (file)
@@ -132,7 +132,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 795d7ad37a004f88ff549be36f1b6218f8def74c..31676da9c8c9c48aff7adab64b462a221021674c 100644 (file)
@@ -99,7 +99,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index c736752c45055f7d4347e7700826accd1f80f807..2fff37b8586ca32bd6d2c24b564a3e332c636550 100644 (file)
@@ -64,7 +64,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 311f87ce2eed2757a6209e3ef898701985bb5bb5..0bc6d1ea1ec9c2fc86130cd6ca2a4def53ef6aff 100644 (file)
@@ -65,7 +65,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 409bd59ba87cb180a5e39378ac8e7d5feca5376f..7fc3d09f693e6125794209e02395612264447096 100644 (file)
@@ -59,7 +59,8 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints_0(relevant_set), constraints_1(relevant_set);
+  AffineConstraints<double> constraints_0(relevant_set),
+    constraints_1(relevant_set);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
                                            Functions::ZeroFunction<dim>(),
@@ -79,8 +80,8 @@ test()
   mf_data_0->reinit(dof, constraints_0, quad, data);
   mf_data_1->reinit(dof, constraints_1, quad, data);
   {
-    std::vector<const DoFHandler<dim> *>  dof_handlers(2, &dof);
-    std::vector<const ConstraintMatrix *> constraint(2);
+    std::vector<const DoFHandler<dim> *>           dof_handlers(2, &dof);
+    std::vector<const AffineConstraints<double> *> constraint(2);
     constraint[0] = &constraints_0;
     constraint[1] = &constraints_1;
     mf_data_combined->reinit(dof_handlers, constraint, quad, data);
index 2b2848ac200bf373ae5df26572e504410f62f30b..5afe04dd70e6d3c845a6e690673aa8bdf5fe0977 100644 (file)
@@ -38,7 +38,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   do_test<dim, fe_degree, double, fe_degree + 1>(dof, constraints);
index 6a2377c3fa964bcc9588593fa7fa109712185e9d..b8f8a1d39ce1d8e6d8d989dc07d07aa8893d53a2 100644 (file)
@@ -40,7 +40,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   VectorTools::interpolate_boundary_values(dof,
                                            0,
                                            Functions::ZeroFunction<dim>(),
index 241a53472839a1d80adc559fefc9016137ae5209..6886d05aadaa92856ebd7c3adc23314fcbcb8221 100644 (file)
@@ -66,7 +66,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index cdc1d0eb37737c55acc96bad8267865777f80399..0a64a3174ca78ecf430e46caa79c54763658a456 100644 (file)
@@ -42,7 +42,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index eb477f1540d08921808b6a1e4d00f7b7964bc6cc..57e3e838428c43ff33b1e635f0fa6f73cf3e755f 100644 (file)
@@ -40,7 +40,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index d68bde1e018c882b61d0418f65100389b4c1f22f..d46f5c155d96fa515a1783eb476fcc797e12df14 100644 (file)
@@ -72,7 +72,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 4cf774e549057932ecbda8c6c750649bc49f263b..ac3c8744f52c1a92f0519cba9cefea2b41cda650 100644 (file)
@@ -66,7 +66,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 3eefec09ecd6711caa8cac6cdad9f0979f389ba1..c1a846dccad3becbc692567b3f74c429a0b4b0d4 100644 (file)
@@ -62,7 +62,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 13c628353deaecee1f49dccaea8e2b419afb427c..4a63bc1577a47b241f25c52c30913c5e6c2b0a70 100644 (file)
@@ -80,7 +80,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   // there should not be any hanging nodes or
   // boundary conditions for FE_DGQ as there are
   // only interior DoFs on the elements, but try
index 1263b68ba192bad8f028c8d3e55fd4719541aedc..f5479f387ab0837605d0f7285072a43ca2e301ef 100644 (file)
@@ -65,7 +65,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 49597338ccd2665754931cb8d766837ab8453aa1..79deecbad712a875b9982481ff622f26d32606ea 100644 (file)
@@ -64,7 +64,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 054793d8b6b96beda509fe13844fec35b0c0045f..ed61292cf8737881213c91cf690aca2f3da904d4 100644 (file)
@@ -97,7 +97,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index fb9167c29bd7e64beb007cd5d9ec20f35dc92343..99a8c6e509e8eafa4eecb1afc9e67f9a28c49e83 100644 (file)
@@ -90,7 +90,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 9c4325be234186b567865bbd1bd2b6a3f42a0ea0..9372a9be23591226e49c73ab8128421937cd4bdc 100644 (file)
@@ -157,7 +157,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index ff002a8c78a719e54ff8eae69c265d4f23f496ed..c391df4808a71c68b25f2b3918848fd0739b370e 100644 (file)
@@ -155,7 +155,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 98d6ebf0767649dffc03c41af0e9f31f3f08f106..43ea839fb288a3ef08e52e39feef7364b2e6261d 100644 (file)
@@ -60,7 +60,7 @@ test()
   FE_DGP<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   do_test<dim, fe_degree, double, fe_degree + 1>(dof, constraints);
 }
index 8b55075dd5a752dc9405e1d7bc0f894d7fe0a216..2d32356c3f75941d77231ba154ae49c2b3cc1ffb 100644 (file)
@@ -57,7 +57,7 @@ test()
   FE_DGP<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   do_test<dim, -1, double, fe_degree + 1>(dof, constraints);
 }
index aa07916c948f87eec0fb3cc403892e1ea52d47c2..282003a9cc5ea0edc96e2700831f19b45cf6aba3 100644 (file)
@@ -56,7 +56,7 @@ test()
   FE_DGP<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   do_test<dim, fe_degree, double, fe_degree + 3>(dof, constraints);
 }
index 8c72daf29c728ce9a3313e89278b76e7b1464e00..698da9c78ac962f4093f34f09e58b24c184dac02 100644 (file)
@@ -54,8 +54,8 @@ template <int dim,
 class MatrixFreeTest
 {
 public:
-  MatrixFreeTest(const DoFHandler<dim> & dof_handler,
-                 const ConstraintMatrix &constraints)
+  MatrixFreeTest(const DoFHandler<dim> &          dof_handler,
+                 const AffineConstraints<double> &constraints)
     : dof_handler(dof_handler)
     , constraints(constraints)
   {}
@@ -90,17 +90,17 @@ public:
   };
 
 private:
-  const DoFHandler<dim> & dof_handler;
-  const ConstraintMatrix &constraints;
+  const DoFHandler<dim> &          dof_handler;
+  const AffineConstraints<double> &constraints;
 };
 
 
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const unsigned int      parallel_option = 0)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const unsigned int               parallel_option = 0)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   if (parallel_option > 0)
@@ -212,7 +212,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index f31c624515fa9ffa5e859b504af850f9420d126d..339e0bce7391ae5d7e98487c6001150bceaeaae2 100644 (file)
@@ -54,8 +54,8 @@ template <int dim,
 class MatrixFreeTest
 {
 public:
-  MatrixFreeTest(const DoFHandler<dim> & dof_handler,
-                 const ConstraintMatrix &constraints)
+  MatrixFreeTest(const DoFHandler<dim> &          dof_handler,
+                 const AffineConstraints<double> &constraints)
     : dof_handler(dof_handler)
     , constraints(constraints)
   {}
@@ -92,17 +92,17 @@ public:
   };
 
 private:
-  const DoFHandler<dim> & dof_handler;
-  const ConstraintMatrix &constraints;
+  const DoFHandler<dim> &          dof_handler;
+  const AffineConstraints<double> &constraints;
 };
 
 
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const unsigned int      parallel_option = 0)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const unsigned int               parallel_option = 0)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   if (parallel_option > 0)
@@ -219,7 +219,7 @@ test()
   FESystem<dim>      fe(FE_Q<dim>(degree), dim);
   DoFHandler<dim>    dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 265480b70db0803dbb9fd6dd522f77dda3bcd14e..3c0fbe48cbe51ea7e4ae41cd8a8be8a8c256f00f 100644 (file)
@@ -59,7 +59,7 @@ test()
   FE_Q_DG0<dim>   fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 925d8db76720978151fa331cd1f6b42a6b93632d..edea1e308cc38f6128a0b915a69638d54ced126e 100644 (file)
@@ -106,9 +106,9 @@ private:
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const unsigned int      parallel_option = 0)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const unsigned int               parallel_option = 0)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   if (parallel_option > 0)
@@ -237,7 +237,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 35b203356b706fbc51656e2d79626237bf4b0828..46017dc698fe534c05cbe8d95c5a4f283a82c062 100644 (file)
@@ -91,7 +91,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 222147226a9cd9c6f2a1c67096fe2f55e2dc962b..05a6a32eb548c24798a9eaa38abeea80eccb6ced 100644 (file)
@@ -160,7 +160,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 649a500a73aa6a0f8ab2e8487455597a8ebe8600..4266bda7481c5dfe9d30ae8a3a791936af2af2ae 100644 (file)
@@ -150,7 +150,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 3464be724cfd675d190a67af543ecddcae1bb12a..89ac7ef7d1f13c40324e77227af57eab5c91a65d 100644 (file)
@@ -158,7 +158,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 10cefd8003ce268bbd558614dbd0b050624bf8b4..0fc5b02e96aac57f89abd961e355d891d14e876d 100644 (file)
@@ -170,7 +170,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index fd4d8ddeee859101a55e0e71e3ca3bf3def5180e..abf99eca125445445184816fb3d8075c570cb328 100644 (file)
@@ -132,7 +132,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index f9676bd1d2dd0b170c4c696a013d8ed4434e3a9c..2df716fbab4a2d434689ee58e0825b1b97ad2f69 100644 (file)
@@ -54,9 +54,9 @@ test();
 
 template <int dim, int fe_degree, typename number, int n_q_points_1d>
 void
-do_test(const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const unsigned int      parallel_option = 0)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const unsigned int               parallel_option = 0)
 {
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
   if (parallel_option > 0)
index b2f55d2604cdd500ee22719f59091bb4c8bb38aa..62c4ce88568308f92f8a027972fd90c05d9479bd 100644 (file)
@@ -142,7 +142,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
index fdaf14dfcb9e2649ab6575dad14c8efb0c92e89e..d1f9c00332ab7f3b143a651972c2b18954325e28 100644 (file)
@@ -138,7 +138,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
index ac866fec27078080987c0b472c430feea2a9eab3..62ce23abc03a2b31d2257268cd19622d7c99ee8e 100644 (file)
@@ -40,7 +40,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   do_test<dim, fe_degree, fe_degree + 1, double>(dof, constraints, true);
index 84f2d744d3969faeee98d69cb7df399401c2ec82..afa440fa8848183ec4c63c099e76c67f5b4017fe 100644 (file)
@@ -67,7 +67,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // test with threads enabled as well
index 7b3a18ae1c0433fb2c9b14fff5d60e306d47928d..3e076d10dc2ecede35adf94ea9ec599ccb82cf8a 100644 (file)
@@ -69,7 +69,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // also test with threads
index 62f1b64b7033fc5bcf433902f48d613cbc0e8df0..a383b6f4437fded07738e83d903b36c0f6b9d9e1 100644 (file)
@@ -43,7 +43,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // test with threads enabled as well
index 789bf670528e418842b5eaa09108c591e0984b4b..3b1bfc0afc730096bba35a30ddad35f10ac7b223 100644 (file)
@@ -42,7 +42,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // test with threads enabled as well
index 0bd0e808fa20de785c0fd96e16535c8922068a13..1c3e776f398dc711b710f61e5ad50d7b2581f9ec 100644 (file)
@@ -65,7 +65,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   do_test<dim, fe_degree, fe_degree, double>(dof, constraints, true);
index a242fc4a98378df34cca01c1c68cb5f5c8705dcc..f2a64d4501726b1cc2549f433023937dd026fa5b 100644 (file)
@@ -70,7 +70,7 @@ test()
   FE_DGQArbitraryNodes<dim> fe(QGauss<1>(fe_degree + 1));
   DoFHandler<dim>           dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // also test with threads
index cf72f27c66a4c0742f7af17bab5425432671e267..8f4437a8ef3c9f80ed7b2785c46ef81fb3d0e96b 100644 (file)
@@ -70,7 +70,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // also test with threads
index 9a878952e8ee5dd9675692fae454d2e8ad0151a4..b68858efc22178e8cdde07f193f945d5b263b70f 100644 (file)
@@ -70,7 +70,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index bdfb9c1323fbac1c48af18f0bfe7c82db51b91be..a7fde26d24b9a61be5095de1be5f2fe0c49186c2 100644 (file)
@@ -66,7 +66,7 @@ test()
   FE_DGQHermite<dim> fe(fe_degree);
   DoFHandler<dim>    dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index ab0ddc9204dc13cfc11dd6d541912386a0fc3928..dd13faca185c2ed29afec4f8ea218753e368fc9e 100644 (file)
@@ -67,7 +67,7 @@ test()
   FE_DGQHermite<dim> fe(fe_degree);
   DoFHandler<dim>    dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index 1f459093ea36675bb3eb6993c9998836976b5eb4..c58ec2df746035859fbcb7c4757ad39cf49fe7dd 100644 (file)
@@ -291,7 +291,7 @@ test()
   FE_DGQ<dim>     fe(fe_degree);
   DoFHandler<dim> dof(triangulation);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   // cannot test threads right now
index dc237156fdffdff35fadae1caa18299a75187a89..12094e5090673287a7e90e3230149c44c85fb0ad 100644 (file)
@@ -65,7 +65,7 @@ test()
   FE_DGQHermite<dim> fe(fe_degree);
   DoFHandler<dim>    dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index daa17610d8038cc3a025a2b77551057e5ca9e1ed..c5120a553a8dcf23887396897a7e8ce8be883b18 100644 (file)
@@ -66,9 +66,9 @@ test()
 
   tria.refine_global(3 - dim);
 
-  FE_DGQHermite<dim> fe(fe_degree);
-  DoFHandler<dim>    dof(tria);
-  ConstraintMatrix   constraints;
+  FE_DGQHermite<dim>        fe(fe_degree);
+  DoFHandler<dim>           dof(tria);
+  AffineConstraints<double> constraints;
   constraints.close();
 
   for (unsigned int test = 0; test < 2; ++test)
index b88aa9b78e4b628d57190958bd07dd33f8eb8429..2bc35feb71793b1aa91453baf3d93616267b2b60 100644 (file)
@@ -67,7 +67,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof_orig.distribute_dofs(fe);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index 99aa86c4c51c94caec9439d8432f1d46630db021..85be228881f2573f4aeee2bb7e779b23b2cf6e98 100644 (file)
@@ -66,7 +66,7 @@ test()
   FE_DGQ<mydim>     fe(1);
   DoFHandler<mydim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index 5546f41820f534ecd4e72fe71f68cf69824d38e9..a1feee7540a2be721a5ae4b458c3244b9e6695ce 100644 (file)
@@ -62,7 +62,7 @@ test()
   DoFHandler<dim>           dof(tria);
   dof_orig.distribute_dofs(fe);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index aa51b97e64bed3c8858c9f10509f3ba89368c7bb..ac54e2426b54b9df951df6aa742ff5eb87bf5784 100644 (file)
@@ -154,7 +154,7 @@ test()
   DoFHandler<dim> dof(triangulation);
   dof_orig.distribute_dofs(fe);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index 5935b32b45dd99f1cf12f7bbf5f35ce2491cd10e..dd57db9387a1b30a492de41bbf49a156bc162565 100644 (file)
@@ -65,7 +65,7 @@ test()
   FE_DGQHermite<dim> fe(fe_degree);
   DoFHandler<dim>    dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name();
index ef35da9443ecdd2d6ee892c08e6352c447f730be..b08e7cae78012e2d1237a43105b529e0e4fa9135 100644 (file)
@@ -68,11 +68,11 @@ test()
 
   tria.refine_global(3 - dim);
 
-  FE_DGQHermite<dim> fe(fe_degree);
-  FESystem<dim>      fe_system(fe, dim);
-  DoFHandler<dim>    dof(tria);
-  DoFHandler<dim>    dof_system(tria);
-  ConstraintMatrix   constraints;
+  FE_DGQHermite<dim>        fe(fe_degree);
+  FESystem<dim>             fe_system(fe, dim);
+  DoFHandler<dim>           dof(tria);
+  DoFHandler<dim>           dof_system(tria);
+  AffineConstraints<double> constraints;
   constraints.close();
 
   for (unsigned int test = 0; test < 3; ++test)
index 856d13d4a9519224afba0a46eee8329c083b2853..65f04d3ab004ba9cc8f5d4eedd9e51a296fe41de 100644 (file)
@@ -69,11 +69,11 @@ test()
 
   tria.refine_global(3 - dim);
 
-  FE_DGQHermite<dim> fe(fe_degree);
-  FESystem<dim>      fe_system(fe, dim);
-  DoFHandler<dim>    dof(tria);
-  DoFHandler<dim>    dof_system(tria);
-  ConstraintMatrix   constraints;
+  FE_DGQHermite<dim>        fe(fe_degree);
+  FESystem<dim>             fe_system(fe, dim);
+  DoFHandler<dim>           dof(tria);
+  DoFHandler<dim>           dof_system(tria);
+  AffineConstraints<double> constraints;
   constraints.close();
 
   for (unsigned int test = 0; test < 3; ++test)
index 8dc018bf020eceaf555a2054ebc159c491be4bd4..55ff4040426fd9ef4f3a164f83dff2ceca586560 100644 (file)
@@ -67,11 +67,11 @@ test()
 
   tria.refine_global(3 - dim);
 
-  FE_DGQ<dim>      fe(fe_degree);
-  FESystem<dim>    fe_system(fe, dim);
-  DoFHandler<dim>  dof(tria);
-  DoFHandler<dim>  dof_system(tria);
-  ConstraintMatrix constraints;
+  FE_DGQ<dim>               fe(fe_degree);
+  FESystem<dim>             fe_system(fe, dim);
+  DoFHandler<dim>           dof(tria);
+  DoFHandler<dim>           dof_system(tria);
+  AffineConstraints<double> constraints;
   constraints.close();
 
   for (unsigned int test = 0; test < 3; ++test)
index 4a36f32100bdc31d6b3dd489e21eae8a850b3b2b..5f5d566ed96b15404f75f04f3f85aa238807dada 100644 (file)
@@ -69,11 +69,11 @@ test()
 
   tria.refine_global(3 - dim);
 
-  FE_DGQ<dim>      fe(fe_degree);
-  FESystem<dim>    fe_system(fe, dim);
-  DoFHandler<dim>  dof(tria);
-  DoFHandler<dim>  dof_system(tria);
-  ConstraintMatrix constraints;
+  FE_DGQ<dim>               fe(fe_degree);
+  FESystem<dim>             fe_system(fe, dim);
+  DoFHandler<dim>           dof(tria);
+  DoFHandler<dim>           dof_system(tria);
+  AffineConstraints<double> constraints;
   constraints.close();
 
   for (unsigned int test = 0; test < 3; ++test)
index e4ae6b71bede39bfb249d3c2ca3bf4926f452eec..6054c09199cfbcd01a92f4be5857b1d046aae575 100644 (file)
@@ -658,9 +658,9 @@ MatrixIntegrator<dim>::boundary(
 
 template <int dim, int fe_degree, int n_q_points_1d, typename number>
 void
-do_test(const DoFHandler<dim> & dof,
-        const ConstraintMatrix &constraints,
-        const bool              also_test_parallel = false)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints,
+        const bool                       also_test_parallel = false)
 {
   if (types_are_equal<number, float>::value == true)
     deallog.push("float");
index 9c6f6ba285e15608d2671977fb553b44b04af28a..10f9251715345331f03136451887886df0813477 100644 (file)
@@ -64,7 +64,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 81653f494b12c5ed51a5309a2aafa9a9aaa1a0fa..281796ef05e3c04d9f56bae26d35bb529398fb7b 100644 (file)
@@ -166,7 +166,7 @@ test()
 
   // setup DoFs
   dof.distribute_dofs(fe_collection);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index b7bfbe51414246f33ee81e7bc9ad1e2402b16231..8610b65a21594bc9cfa2a7e0af51e06637b5f3c7 100644 (file)
@@ -52,7 +52,7 @@ test()
   FE_Q<dim>       fe(fe_degree);
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
index 7c9aa72ba059b219bcbbae2c240d76bba71a0631..db37da936a41d994a89b028012834e31043045e2 100644 (file)
@@ -75,7 +75,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 924c4c67ce21304e6762850c77582087d20a1a23..37c0f13ef09ac5c1d5a1488907de2b15620b455f 100644 (file)
@@ -56,7 +56,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
   dof.distribute_mg_dofs(fe);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   VectorTools::interpolate_boundary_values(dof,
                                            0,
                                            Functions::ZeroFunction<dim>(),
@@ -85,12 +85,12 @@ test()
   system_matrix.reinit(sparsity);
 
   // setup MG levels
-  const unsigned int                  nlevels = tria.n_levels();
-  typedef MatrixFree<dim>             MatrixFreeTestType;
-  MGLevelObject<MatrixFreeTestType>   mg_matrices;
-  MGLevelObject<ConstraintMatrix>     mg_constraints;
-  MGLevelObject<SparsityPattern>      mg_sparsities;
-  MGLevelObject<SparseMatrix<double>> mg_ref_matrices;
+  const unsigned int                       nlevels = tria.n_levels();
+  typedef MatrixFree<dim>                  MatrixFreeTestType;
+  MGLevelObject<MatrixFreeTestType>        mg_matrices;
+  MGLevelObject<AffineConstraints<double>> mg_constraints;
+  MGLevelObject<SparsityPattern>           mg_sparsities;
+  MGLevelObject<SparseMatrix<double>>      mg_ref_matrices;
   mg_matrices.resize(0, nlevels - 1);
   mg_constraints.resize(0, nlevels - 1);
   mg_sparsities.resize(0, nlevels - 1);
index 412788570864271c567967fd8d50866f065ffb64..1f20c774a466e673f44069bf08730852cdb22fb6 100644 (file)
@@ -145,7 +145,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -282,9 +282,9 @@ test()
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_handler_u);
     dofs.push_back(&dof_handler_p);
-    ConstraintMatrix dummy_constraints;
+    AffineConstraints<double> dummy_constraints;
     dummy_constraints.close();
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&dummy_constraints);
     constraints.push_back(&dummy_constraints);
     QGauss<1> quad(fe_degree + 2);
index 6486f5fb1b7fa277c54eb8393810bcda923fcefa..c4469f0d2e0070ef94288c14977d75efdf12878a 100644 (file)
@@ -128,7 +128,7 @@ test()
   std::shared_ptr<MatrixFree<dim, double>> mf_data;
 
   dof.distribute_dofs(fe);
-  ConstraintMatrix constraints, constraints_u, constraints_p;
+  AffineConstraints<double> constraints, constraints_u, constraints_p;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -261,7 +261,7 @@ test()
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_u);
     dofs.push_back(&dof_p);
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&constraints_u);
     constraints.push_back(&constraints_p);
     QGauss<1> quad(degree + 2);
index 4dd9762585ca79f9c22f64062590ee8e4285fc1d..6dde5249e835b3602805b06fd0a50cea4cd925c6 100644 (file)
@@ -146,7 +146,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
index fa180d96a4424dea1aa955657ef2916071a50673..bd6650b1cafebeb04cecd1e4d5c7a0d6cbf9b84a 100644 (file)
@@ -152,7 +152,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints, constraints_u, constraints_p;
+  AffineConstraints<double> constraints, constraints_u, constraints_p;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -301,7 +301,7 @@ test()
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_handler_u);
     dofs.push_back(&dof_handler_p);
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&constraints_u);
     constraints.push_back(&constraints_p);
     QGauss<1> quad(fe_degree + 2);
index 7b745c95246cfb5ed7e721b686abf40169e6eefa..008795ed057bf4952f51ea60eb95d21fe5af2dc9 100644 (file)
@@ -148,7 +148,7 @@ test(const unsigned int fe_degree)
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints, constraints_u, constraints_p;
+  AffineConstraints<double> constraints, constraints_u, constraints_p;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -297,7 +297,7 @@ test(const unsigned int fe_degree)
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_handler_u);
     dofs.push_back(&dof_handler_p);
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&constraints_u);
     constraints.push_back(&constraints_p);
     QGauss<1> quad(fe_degree + 2);
index 8ee4fad55665d981ab2548a058638f2e5ea7e289..9dc414bd5ac552e8d2a74ae0bbb832e71e7380aa 100644 (file)
@@ -151,7 +151,7 @@ test(const FESystem<dim> &fe)
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints, constraints_u, constraints_p;
+  AffineConstraints<double> constraints, constraints_u, constraints_p;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
index ee32de1d36aaad51f6288df56ee3877f9cab0eb5..a5bf54c39470f51f32373c02f2d94926d19c1f71 100644 (file)
@@ -147,7 +147,7 @@ test()
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -284,9 +284,9 @@ test()
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_handler_u);
     dofs.push_back(&dof_handler_p);
-    ConstraintMatrix dummy_constraints;
+    AffineConstraints<double> dummy_constraints;
     dummy_constraints.close();
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&dummy_constraints);
     constraints.push_back(&dummy_constraints);
     QGauss<1> quad(fe_degree + 2);
index fa25565779c75a9f00cd5c213b453e52bdd0eb4e..7b47c103f597a5ed80a6566b2f0969d178f506bf 100644 (file)
@@ -144,7 +144,7 @@ test(const unsigned int fe_degree)
 
   MatrixFree<dim, double> mf_data;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> system_matrix;
@@ -281,9 +281,9 @@ test(const unsigned int fe_degree)
     std::vector<const DoFHandler<dim> *> dofs;
     dofs.push_back(&dof_handler_u);
     dofs.push_back(&dof_handler_p);
-    ConstraintMatrix dummy_constraints;
+    AffineConstraints<double> dummy_constraints;
     dummy_constraints.close();
-    std::vector<const ConstraintMatrix *> constraints;
+    std::vector<const AffineConstraints<double> *> constraints;
     constraints.push_back(&dummy_constraints);
     constraints.push_back(&dummy_constraints);
     QGauss<1> quad(fe_degree + 2);
index 90dc4fb65933d2fae60e8efcea3c4a6b33292171..79199c7c12e23c2c97d1b6cbbac961f66f4f2bbd 100644 (file)
@@ -82,7 +82,7 @@ public:
       (update_gradients | update_JxW_values);
     addit_data.mapping_update_flags_boundary_faces =
       (update_gradients | update_JxW_values);
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
 
     data.reinit(mapping, dof_handler, constraints, quad, addit_data);
index 48c48b2441e35ec307b38c45d15354b8ab1a2676..5c65da9159dc4943cf86bf75fe0d8f7f1d82461f 100644 (file)
@@ -81,7 +81,7 @@ public:
       (update_gradients | update_JxW_values);
     addit_data.mapping_update_flags_boundary_faces =
       (update_gradients | update_JxW_values);
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
 
     data.reinit(mapping, dof_handler, constraints, quad, addit_data);
index 29d6a61558a52695a7152d418efa3f8dded64d00..3afcea7283054ca36bbb7be7b3fc66716232ac58 100644 (file)
@@ -84,7 +84,7 @@ public:
       update_JxW_values | update_normal_vectors | update_jacobians;
     addit_data.mapping_update_flags_faces_by_cells =
       update_JxW_values | update_normal_vectors | update_jacobians;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     constraints.close();
 
     data.reinit(mapping, dof_handler, constraints, quad, addit_data);
index 9738ed81cf6cae7da4548c56bb353113559634da..01e9952e93dfd99f3fdec141b36f46e43903d644 100644 (file)
@@ -118,7 +118,8 @@ protected:
 
 template <int dim, int fe_degree, typename number>
 void
-do_test(const DoFHandler<dim> &dof, const ConstraintMatrix &constraints)
+do_test(const DoFHandler<dim> &          dof,
+        const AffineConstraints<double> &constraints)
 {
   // use this for info on problem
   // std::cout << "Number of cells: " <<
@@ -204,7 +205,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 4de10c0d433eecbe372a2547a6c4a994eadd279c..f4ca2503d9fe6cf384063ef156df9ba8afa9cf00 100644 (file)
@@ -74,7 +74,7 @@ public:
     addit_data.level_mg_handler = level;
 
     // extract the constraints due to Dirichlet boundary conditions
-    ConstraintMatrix                                    constraints;
+    AffineConstraints<double>                           constraints;
     Functions::ZeroFunction<dim>                        zero;
     std::map<types::boundary_id, const Function<dim> *> functions;
     for (std::set<types::boundary_id>::const_iterator it =
index 7d7b4962dfa57b358d4249560f04c703bcd864df..30c1a778b94d408dea07cefec44950c5e26f2fbb 100644 (file)
@@ -108,7 +108,7 @@ do_test(const DoFHandler<dim> &dof)
   dirichlet_boundary[0] = &zero_function;
 
   // fine-level constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
@@ -172,8 +172,8 @@ do_test(const DoFHandler<dim> &dof)
         MatrixFree<dim, number>::AdditionalData::none;
       mg_additional_data.level_mg_handler = level;
 
-      ConstraintMatrix level_constraints;
-      IndexSet         relevant_dofs;
+      AffineConstraints<double> level_constraints;
+      IndexSet                  relevant_dofs;
       DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs);
       level_constraints.reinit(relevant_dofs);
       level_constraints.add_lines(
index 3f3e2043f539685f73ba2d9fb301e4eb30b0965d..f22561aeb9d10639d17869d5ce357afd031db4e6 100644 (file)
@@ -76,7 +76,7 @@ public:
       MatrixFree<dim, number>::AdditionalData::none;
     addit_data.tasks_block_size = 3;
     addit_data.level_mg_handler = level;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     if (level == numbers::invalid_unsigned_int)
       {
         IndexSet relevant_dofs;
@@ -507,8 +507,8 @@ do_test(const DoFHandler<dim> &dof)
   deallog << std::endl;
   deallog << "Number of degrees of freedom: " << dof.n_dofs() << std::endl;
 
-  ConstraintMatrix hanging_node_constraints;
-  IndexSet         locally_relevant_dofs;
+  AffineConstraints<double> hanging_node_constraints;
+  IndexSet                  locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs);
   hanging_node_constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
index 22bed125950c312ee0cb571daa7fef7e0198e418..4331103dd9c8a9153c5ef5c64f4182de092e3e8c 100644 (file)
@@ -145,7 +145,7 @@ do_test(const DoFHandler<dim> &dof)
   dirichlet_boundary[0] = &zero_function;
 
   // fine-level constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
@@ -189,7 +189,7 @@ do_test(const DoFHandler<dim> &dof)
   // set constant rhs vector
   {
     // this is to make it consistent with parallel_multigrid_adaptive.cc
-    ConstraintMatrix hanging_node_constraints;
+    AffineConstraints<double> hanging_node_constraints;
     hanging_node_constraints.reinit(locally_relevant_dofs);
     DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
     hanging_node_constraints.close();
@@ -222,8 +222,8 @@ do_test(const DoFHandler<dim> &dof)
       mg_additional_data.tasks_block_size = 3;
       mg_additional_data.level_mg_handler = level;
 
-      ConstraintMatrix level_constraints;
-      IndexSet         relevant_dofs;
+      AffineConstraints<double> level_constraints;
+      IndexSet                  relevant_dofs;
       DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs);
       level_constraints.reinit(relevant_dofs);
       level_constraints.add_lines(
index d0bdb75227dd05339b35966af7b9a44320a6ab58..27f489502708ed653a9ba174a3214e0e83032afd 100644 (file)
@@ -82,7 +82,7 @@ public:
         MatrixFree<dim, number>::AdditionalData::none;
     addit_data.tasks_block_size = 3;
     addit_data.level_mg_handler = level;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     if (level == numbers::invalid_unsigned_int)
       {
         IndexSet relevant_dofs;
@@ -514,8 +514,8 @@ do_test(const DoFHandler<dim> &dof, const bool threaded)
   deallog << std::endl;
   deallog << "Number of degrees of freedom: " << dof.n_dofs() << std::endl;
 
-  ConstraintMatrix hanging_node_constraints;
-  IndexSet         locally_relevant_dofs;
+  AffineConstraints<double> hanging_node_constraints;
+  IndexSet                  locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs);
   hanging_node_constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
index d92a6aaa077b1bde9f9fe1ccd1f6aa4d8923c0bf..ee68fbb7a0240c99fc74372ef86fc0dbd4cca3e0 100644 (file)
@@ -145,7 +145,7 @@ do_test(const DoFHandler<dim> &dof)
   dirichlet_boundary[0] = &zero_function;
 
   // fine-level constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
@@ -189,7 +189,7 @@ do_test(const DoFHandler<dim> &dof)
   // set constant rhs vector
   {
     // this is to make it consistent with parallel_multigrid_adaptive.cc
-    ConstraintMatrix hanging_node_constraints;
+    AffineConstraints<double> hanging_node_constraints;
     hanging_node_constraints.reinit(locally_relevant_dofs);
     DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
     hanging_node_constraints.close();
@@ -222,8 +222,8 @@ do_test(const DoFHandler<dim> &dof)
       mg_additional_data.tasks_block_size = 3;
       mg_additional_data.level_mg_handler = level;
 
-      ConstraintMatrix level_constraints;
-      IndexSet         relevant_dofs;
+      AffineConstraints<double> level_constraints;
+      IndexSet                  relevant_dofs;
       DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs);
       level_constraints.reinit(relevant_dofs);
       level_constraints.add_lines(
index d22ff0af5333bf4ceb4ef2d5a0a8a6e74e886b3b..99216ffc32fb62239af2c0dad92f6234281abc4c 100644 (file)
@@ -79,7 +79,7 @@ public:
         MatrixFree<dim, number>::AdditionalData::none;
     addit_data.tasks_block_size = 3;
     addit_data.level_mg_handler = level;
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
     if (level == numbers::invalid_unsigned_int)
       {
         IndexSet relevant_dofs;
@@ -511,8 +511,8 @@ do_test(const DoFHandler<dim> &dof, const bool threaded)
   deallog << std::endl;
   deallog << "Number of degrees of freedom: " << dof.n_dofs() << std::endl;
 
-  ConstraintMatrix hanging_node_constraints;
-  IndexSet         locally_relevant_dofs;
+  AffineConstraints<double> hanging_node_constraints;
+  IndexSet                  locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs);
   hanging_node_constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
index 74f87b3f8703baa1f5777f406ba0f86880314bd1..47ba3889e8ad1aceb166156dac646bc0871e27d8 100644 (file)
@@ -230,7 +230,7 @@ do_test(const DoFHandler<dim> &dof, const unsigned int nb)
   dirichlet_boundary[0] = &zero_function;
 
   // fine-level constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
@@ -278,7 +278,7 @@ do_test(const DoFHandler<dim> &dof, const unsigned int nb)
   // set constant rhs vector
   {
     // this is to make it consistent with parallel_multigrid_adaptive.cc
-    ConstraintMatrix hanging_node_constraints;
+    AffineConstraints<double> hanging_node_constraints;
     hanging_node_constraints.reinit(locally_relevant_dofs);
     DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
     hanging_node_constraints.close();
@@ -313,8 +313,8 @@ do_test(const DoFHandler<dim> &dof, const unsigned int nb)
       mg_additional_data.tasks_block_size = 3;
       mg_additional_data.level_mg_handler = level;
 
-      ConstraintMatrix level_constraints;
-      IndexSet         relevant_dofs;
+      AffineConstraints<double> level_constraints;
+      IndexSet                  relevant_dofs;
       DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs);
       level_constraints.reinit(relevant_dofs);
       level_constraints.add_lines(
index e39c034fd8af0275d2f25c343a2997fe575b5979..ec5293a713724d0e76433f8b7332fff6addf55b8 100644 (file)
@@ -146,7 +146,7 @@ do_test(const DoFHandler<dim> &dof)
   dirichlet_boundary[0] = &zero_function;
 
   // fine-level constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
@@ -190,7 +190,7 @@ do_test(const DoFHandler<dim> &dof)
   // set constant rhs vector
   {
     // this is to make it consistent with parallel_multigrid_adaptive.cc
-    ConstraintMatrix hanging_node_constraints;
+    AffineConstraints<double> hanging_node_constraints;
     hanging_node_constraints.reinit(locally_relevant_dofs);
     DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints);
     hanging_node_constraints.close();
@@ -223,8 +223,8 @@ do_test(const DoFHandler<dim> &dof)
       mg_additional_data.tasks_block_size = 3;
       mg_additional_data.level_mg_handler = level;
 
-      ConstraintMatrix level_constraints;
-      IndexSet         relevant_dofs;
+      AffineConstraints<double> level_constraints;
+      IndexSet                  relevant_dofs;
       DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs);
       level_constraints.reinit(relevant_dofs);
       level_constraints.add_lines(
index bdf54bb181d6d05b39d407316b50b6eda860b9b1..83c1285c4ed237ba4c29cc8389ef551fa2d95d30 100644 (file)
@@ -248,8 +248,8 @@ do_test(const std::vector<const DoFHandler<dim> *> &dof)
   dirichlet_boundary[0] = &zero_function;
 
   // fine-level constraints
-  std::vector<ConstraintMatrix>         constraints(dof.size());
-  std::vector<const ConstraintMatrix *> constraints_ptrs(dof.size());
+  std::vector<AffineConstraints<double>>         constraints(dof.size());
+  std::vector<const AffineConstraints<double> *> constraints_ptrs(dof.size());
   for (unsigned int i = 0; i < dof.size(); ++i)
     {
       constraints[i].reinit(locally_relevant_dofs[i]);
@@ -299,7 +299,7 @@ do_test(const std::vector<const DoFHandler<dim> *> &dof)
     for (unsigned int b = 0; b < nb; ++b)
       {
         // this is to make it consistent with parallel_multigrid_adaptive.cc
-        ConstraintMatrix hanging_node_constraints;
+        AffineConstraints<double> hanging_node_constraints;
 
         hanging_node_constraints.reinit(locally_relevant_dofs[b]);
         DoFTools::make_hanging_node_constraints(*dof[b],
@@ -340,8 +340,9 @@ do_test(const std::vector<const DoFHandler<dim> *> &dof)
       mg_additional_data.tasks_block_size = 3;
       mg_additional_data.level_mg_handler = level;
 
-      std::vector<ConstraintMatrix>         level_constraints(dof.size());
-      std::vector<const ConstraintMatrix *> level_constraints_ptrs(dof.size());
+      std::vector<AffineConstraints<double>> level_constraints(dof.size());
+      std::vector<const AffineConstraints<double> *> level_constraints_ptrs(
+        dof.size());
       for (unsigned int i = 0; i < dof.size(); ++i)
         {
           IndexSet relevant_dofs;
index 0aabeca98c99673264f5081ee13e64f7fdf35c3e..bab7e2cd47fa607393232ef7641ec2cbc6b98d38 100644 (file)
@@ -73,7 +73,7 @@ public:
     addit_data.level_mg_handler = level;
 
     // extract the constraints due to Dirichlet boundary conditions
-    ConstraintMatrix                                    constraints;
+    AffineConstraints<double>                           constraints;
     Functions::ZeroFunction<dim>                        zero;
     std::map<types::boundary_id, const Function<dim> *> functions;
     for (std::set<types::boundary_id>::const_iterator it =
index 94f8224e992c4faa72c7d49035c83393bf8d68dd..6397662cdd980c5805e42a7852bb9e647aea6afc 100644 (file)
@@ -70,7 +70,7 @@ test()
   // std::cout << "Number of cells: " << tria.n_active_cells() << std::endl;
   // std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index ace6dc894279aafac618c8afc6f41e166362bb40..c6a590ef887c9b29ac5deb576c7a2fad439e482c 100644 (file)
@@ -224,10 +224,10 @@ namespace Step48
 #else
     Triangulation<dim> triangulation;
 #endif
-    FE_Q<dim>        fe;
-    DoFHandler<dim>  dof_handler;
-    ConstraintMatrix constraints;
-    IndexSet         locally_relevant_dofs;
+    FE_Q<dim>                 fe;
+    DoFHandler<dim>           dof_handler;
+    AffineConstraints<double> constraints;
+    IndexSet                  locally_relevant_dofs;
 
     MatrixFree<dim, double> matrix_free_data;
 
index 31b6d66ddbb836ad2257306286fd36999c14a2bb..b8106a0c5bc6c52c6a2e5e030a5cdb5d976041a3 100644 (file)
@@ -220,11 +220,11 @@ namespace Step48
     void
     output_norm();
 
-    Triangulation<dim> triangulation;
-    FE_Q<dim>          fe;
-    DoFHandler<dim>    dof_handler;
-    ConstraintMatrix   constraints;
-    IndexSet           locally_relevant_dofs;
+    Triangulation<dim>        triangulation;
+    FE_Q<dim>                 fe;
+    DoFHandler<dim>           dof_handler;
+    AffineConstraints<double> constraints;
+    IndexSet                  locally_relevant_dofs;
 
     MatrixFree<dim, double> matrix_free_data;
 
index 0fc5dcf0556a72aee7ee02621b47a895558c58ef..8a7c492841c2d9eb389f6cb1619d8c3d6a91f883 100644 (file)
@@ -212,10 +212,10 @@ namespace Step48
 #else
     Triangulation<dim> triangulation;
 #endif
-    FE_Q<dim>        fe;
-    DoFHandler<dim>  dof_handler;
-    ConstraintMatrix constraints;
-    IndexSet         locally_relevant_dofs;
+    FE_Q<dim>                 fe;
+    DoFHandler<dim>           dof_handler;
+    AffineConstraints<double> constraints;
+    IndexSet                  locally_relevant_dofs;
 
     MatrixFree<dim, double> matrix_free_data;
 
index 2252ecd56b4b238a44f5ad2c0d0f66a929db3358..0f742e65d13cdb378ce9ae197ab89acf45f51455 100644 (file)
@@ -960,8 +960,8 @@ namespace StokesClass
     std::vector<IndexSet> owned_partitioning;
     std::vector<IndexSet> relevant_partitioning;
 
-    ConstraintMatrix constraints_u;
-    ConstraintMatrix constraints_p;
+    AffineConstraints<double> constraints_u;
+    AffineConstraints<double> constraints_p;
 
     block_vector_t solution;
     block_vector_t system_rhs;
@@ -1071,7 +1071,7 @@ namespace StokesClass
     std::vector<const DoFHandler<dim> *> stokes_dofs;
     stokes_dofs.push_back(&dof_handler_u);
     stokes_dofs.push_back(&dof_handler_p);
-    std::vector<const ConstraintMatrix *> stokes_constraints;
+    std::vector<const AffineConstraints<double> *> stokes_constraints;
     stokes_constraints.push_back(&constraints_u);
     stokes_constraints.push_back(&constraints_p);
 
@@ -1122,7 +1122,7 @@ namespace StokesClass
         DoFTools::extract_locally_relevant_level_dofs(dof_handler_u,
                                                       level,
                                                       relevant_dofs);
-        ConstraintMatrix level_constraints;
+        AffineConstraints<double> level_constraints;
         level_constraints.reinit(relevant_dofs);
         level_constraints.add_lines(
           mg_constrained_dofs.get_boundary_indices(level));
@@ -1177,8 +1177,8 @@ namespace StokesClass
                                  update_JxW_values | update_quadrature_points);
 
     // Create constraints with no Dirchlet info
-    ConstraintMatrix constraints_u_no_dirchlet;
-    IndexSet         locally_relevant_dofs_u;
+    AffineConstraints<double> constraints_u_no_dirchlet;
+    IndexSet                  locally_relevant_dofs_u;
     DoFTools::extract_locally_relevant_dofs(dof_handler_u,
                                             locally_relevant_dofs_u);
     constraints_u_no_dirchlet.reinit(locally_relevant_dofs_u);
@@ -1186,7 +1186,7 @@ namespace StokesClass
                                             constraints_u_no_dirchlet);
     constraints_u_no_dirchlet.close();
 
-    std::vector<const ConstraintMatrix *> constraints_no_dirchlet;
+    std::vector<const AffineConstraints<double> *> constraints_no_dirchlet;
     constraints_no_dirchlet.push_back(&constraints_u_no_dirchlet);
     constraints_no_dirchlet.push_back(&constraints_p);
     std::vector<const DoFHandler<dim> *> dofs;
index b12277cab35f40eb70fbd5e3b1a578a3536d3a21..3cb881996c00b100309a813229b590f2f5da6dc2 100644 (file)
@@ -70,7 +70,7 @@ sub_test()
       tria.execute_coarsening_and_refinement();
 
       dof.distribute_dofs(fe);
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       DoFTools::make_hanging_node_constraints(dof, constraints);
       VectorTools::interpolate_boundary_values(dof,
                                                0,
index bca548198ca0f30d9e82e37c157f49f407a70931..81fe436714901b61b9bbc59932e94a8d035d0bdf 100644 (file)
@@ -73,7 +73,7 @@ sub_test()
       tria.execute_coarsening_and_refinement();
 
       dof.distribute_dofs(fe);
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       constraints.close();
 
       // std::cout << "Number of cells: " <<
index 169bdd83bd4109934681e9180a8e4a95e534cbe2..50fcdc14d0dd6983fba549c85be312d312071877 100644 (file)
@@ -131,7 +131,7 @@ do_test(const unsigned int parallel_option)
 
   // setup DoFs
   dof.distribute_dofs(fe_collection);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 2c1f75441feb237050030d79ec4ece9302043488..210d70327482d7d68fad2a41c8f719851865e8c9 100644 (file)
@@ -41,7 +41,7 @@ test()
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.close();
 
   deallog << "Testing " << dof.get_fe().get_name() << std::endl;
index 9b4c8be1fb94ca67694bf22f3ddb91a399cfd926..3fddc06c29c7e614b40e95a66f5ff49a96ce45d7 100644 (file)
@@ -100,9 +100,9 @@ namespace Step11
     DoFHandler<dim>    dof_handler;
     MappingQ<dim>      mapping;
 
-    SparsityPattern      sparsity_pattern;
-    SparseMatrix<double> system_matrix;
-    ConstraintMatrix     constraints;
+    SparsityPattern           sparsity_pattern;
+    SparseMatrix<double>      system_matrix;
+    AffineConstraints<double> constraints;
 
     Vector<double> solution;
     Vector<double> system_rhs;
index b96594ea2939532e43d33fcc457470a4600cbcf8..061d3844f0516a38a0674e07e920e3abd456528b 100644 (file)
@@ -152,7 +152,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -362,7 +362,7 @@ namespace Step50
   void
   LaplaceProblem<dim>::assemble_system_and_multigrid()
   {
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
index 7cff32f43b3acd54332a60aa9bfd9216d7dfda47..b90088b7a8418e7fbbb1e2370801ffa85032c84b 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// test ConstraintMatrix::condense(in, out)
+// test AffineConstraints<double>::condense(in, out)
 
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/utilities.h>
index 25a104b60c7f88fea2d60d56727df1626ad0fc6b..8707c12e20d2ac1d3efe3a00d151d66edeb78974 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix::condense(Vector) for parallel vectors. this
+// check AffineConstraints<double>::condense(Vector) for parallel vectors. this
 // function used to crash
 //
 // original test case by Daniel Arndt
index ab7191a08d5ded660351bd17ef175f11c8b63552..32ae145e2dc6bff34762f9ffcf38a704e1c2ac84 100644 (file)
@@ -15,8 +15,8 @@
 
 
 
-// ConstraintMatrix::add_line crashes in release mode (missing compress inside
-// ConstraintMatrix)
+// AffineConstraints<double>::add_line crashes in release mode (missing compress
+// inside AffineConstraints<double>)
 
 #include <deal.II/dofs/dof_tools.h>
 
@@ -39,7 +39,7 @@ test()
   local_active_together.add_range(0, 3);
   // local_active_together.compress();
 
-  ConstraintMatrix cm(local_active_together);
+  AffineConstraints<double> cm(local_active_together);
   cm.add_line(1);
   cm.close();
   deallog << "OK" << std::endl;
index 215aa2a8dfe1da3262661f6aadb3b5a71f475502..70d83806b2a65784d9b654909bb154c702e12e34 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix::set_zero(Vector) for parallel vectors.
+// check AffineConstraints<double>::set_zero(Vector) for parallel vectors.
 // this documents a bug introduced in r29678 for block vectors
 // that was fixed in 29940.
 
index 18c13e4da1b97d092a9193929a2759466e08b8c1..fb01253382353016818e26af203e2789eadb8e8a 100644 (file)
@@ -15,7 +15,8 @@
 
 
 
-// check ConstraintMatrix::set_zero(Vector) for parallel distributed vectors
+// check AffineConstraints<double>::set_zero(Vector) for parallel distributed
+// vectors
 
 #include <deal.II/dofs/dof_tools.h>
 
@@ -61,7 +62,7 @@ test()
   local_active_together.add_range(myid, myid + 1);
   local_active_together.add_range(numproc + myid * 2, numproc + myid * 2 + 2);
 
-  ConstraintMatrix cm(local_active_together);
+  AffineConstraints<double> cm(local_active_together);
   cm.add_line(numproc + myid * 2);
   cm.close();
 
index e1fe6b330976b825efbe7d3fa3b0c3a2b68e756b..e74c83c379a9510d3c3c2c06471daf99ee01798c 100644 (file)
@@ -15,8 +15,8 @@
 
 
 
-// ConstraintMatrix.distribute() produces a different result when using a
-// Trilinos::Vector with ghost elements (e.g. owned vs. active), which is a
+// AffineConstraints<double>.distribute() produces a different result when using
+// Trilinos::Vector with ghost elements (e.g. owned vs. active), which is a
 // bug. Now distribute() throws an Exception when called with a Vector with
 // ghost elements. check that this happens.
 
@@ -92,7 +92,7 @@ test()
   TrilinosWrappers::MPI::Vector x_rel;
   x_rel.reinit(relevant_set, MPI_COMM_WORLD);
 
-  ConstraintMatrix cm(relevant_set);
+  AffineConstraints<double> cm(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, cm);
   std::vector<bool> velocity_mask(dim + 1, true);
 
index 1ffde3af4ee3e30a82f478f282555a145cc053d4..e79143a77d3bb3d39f5c33eaf120d4a66f17ce06 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// test ConstraintMatrix::is_consistent_in_parallel
+// test AffineConstraints<double>::is_consistent_in_parallel
 
 #include <deal.II/base/utilities.h>
 
@@ -58,7 +58,7 @@ check(parallel::distributed::Triangulation<dim> &tria)
   IndexSet locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   constraints.clear();
   constraints.reinit(locally_relevant_dofs);
index 26a86229b47af2d741570abd98bccd07207ce01f..61e409adcfefb1eb36aadff2b8f1d51294714159 100644 (file)
 905: An error occurred in line <1898> of file
 </scratch/deal-trunk/deal.II/include/deal.II/lac/affine_constraints.h> in
 function 905:     void
-dealii::ConstraintMatrix::add_line(dealii::ConstraintMatrix::size_type) 905: The
-violated condition was: 905:     line != numbers::invalid_size_type 905: The
-name and call sequence of the exception was: 905:     ExcInternalError() 905:
-Additional Information: 905: (none) 905:
+dealii::AffineConstraints<double>::add_line(dealii::AffineConstraints<double>::size_type)
+905: The violated condition was: 905:     line != numbers::invalid_size_type
+905: The name and call sequence of the exception was: 905: ExcInternalError()
+905: Additional Information: 905: (none) 905:
 --------------------------------------------------------
 */
 
@@ -74,7 +74,7 @@ test()
 
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
   IndexSet relevant_set;
index b3c0466afd9ad14274e4a09626fc7ad461c9d995..4c0055c1912989f9b22f26c853212b5cf378971d 100644 (file)
@@ -68,7 +68,7 @@ test(FiniteElement<dim> &fe)
 
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
 
   if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
index 9311f2e0f31aa60950b6f005bf7a13fa2f4007f1..d6b98c6e69a5d615bce9cdaa5d43612fd5c06b00 100644 (file)
@@ -72,7 +72,7 @@ namespace pdd
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::Vector locally_relevant_solution;
   };
index fe0150822e2a2129b324cfe7d865014b630b8408..a07afb29c09acfd44ea12dc7ae4689686e7b2c55 100644 (file)
@@ -193,10 +193,10 @@ check_this(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
 
   std::unique_ptr<DoFHandler<dim>> dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>> dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                 cm1;
+  AffineConstraints<double>        cm1;
   DoFTools::make_hanging_node_constraints(*dof1, cm1);
   cm1.close();
-  ConstraintMatrix cm2;
+  AffineConstraints<double> cm2;
   DoFTools::make_hanging_node_constraints(*dof2, cm2);
   cm2.close();
 
@@ -324,10 +324,10 @@ check_this_dealii(const FiniteElement<dim> &fe1, const FiniteElement<dim> &fe2)
 
   std::unique_ptr<DoFHandler<dim>> dof1(make_dof_handler(*tria, fe1));
   std::unique_ptr<DoFHandler<dim>> dof2(make_dof_handler(*tria, fe2));
-  ConstraintMatrix                 cm1;
+  AffineConstraints<double>        cm1;
   DoFTools::make_hanging_node_constraints(*dof1, cm1);
   cm1.close();
-  ConstraintMatrix cm2;
+  AffineConstraints<double> cm2;
   DoFTools::make_hanging_node_constraints(*dof2, cm2);
   cm2.close();
 
index 97827465d6d0c1c33023a741200653fceb54b460..2e4ebbc9ef494ab07bca820ff9117d2b120374b7 100644 (file)
@@ -97,7 +97,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
index df29a858e71e3e18bc58a14582b6e76f3c91c66b..6c3f8379ab949e3a7da2eab6cdf949b36fa2b5d1 100644 (file)
@@ -68,7 +68,7 @@ private:
   FE_Q<dim>                                         fe;
   IndexSet                                          locally_owned_dofs;
   IndexSet                                          locally_relevant_dofs;
-  ConstraintMatrix                                  constraints;
+  AffineConstraints<double>                         constraints;
   TrilinosWrappers::SparseMatrix                    system_matrix;
   TrilinosWrappers::MPI::Vector                     locally_relevant_solution;
   TrilinosWrappers::MPI::Vector interpolated_locally_relevant_solution;
index 44859cd1993c06e44f89dacf2c6e7d83607c0d1b..da1dc70c2dd93fee9263568ae79a7a1ce6140d48 100644 (file)
@@ -44,7 +44,7 @@ test()
   dofh.distribute_dofs(fe);
 
   {
-    ConstraintMatrix boundary_values;
+    AffineConstraints<double> boundary_values;
     DoFTools::make_zero_boundary_constraints(dofh, boundary_values);
     if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
       boundary_values.print(deallog.get_file_stream());
@@ -55,7 +55,7 @@ test()
   {
     IndexSet relevant_set(dofh.n_dofs());
     DoFTools::extract_locally_relevant_dofs(dofh, relevant_set);
-    ConstraintMatrix boundary_values(relevant_set);
+    AffineConstraints<double> boundary_values(relevant_set);
     DoFTools::make_zero_boundary_constraints(dofh, boundary_values);
     if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
       boundary_values.print(deallog.get_file_stream());
index 4ed552bb3d6a2f8d2b89f3c21427228c0314ba4d..9e49099e4a8ee407e4a6f5df958875400530b590 100644 (file)
@@ -88,9 +88,9 @@ namespace Step22
     FESystem<dim>                             fe;
     DoFHandler<dim>                           dof_handler;
 
-    ConstraintMatrix      constraints;
-    std::vector<IndexSet> owned_partitioning;
-    std::vector<IndexSet> relevant_partitioning;
+    AffineConstraints<double> constraints;
+    std::vector<IndexSet>     owned_partitioning;
+    std::vector<IndexSet>     relevant_partitioning;
 
     TrilinosWrappers::BlockSparsityPattern sparsity_pattern;
     TrilinosWrappers::BlockSparseMatrix    system_matrix;
index f73820a02d8e6f09f75cf0c7b542255ac3aae01e..9ce3bc7b66b1302438d48811a838a307db73ca8e 100644 (file)
@@ -99,7 +99,7 @@ namespace Step50
 
     matrix_t system_matrix;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -323,9 +323,9 @@ namespace Step50
     const Coefficient<dim> coefficient;
     std::vector<double>    coefficient_values(n_q_points);
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
       {
         boundary_constraints[level].add_lines(
index 39dad0705e9592ee53f86b4d40604a81e4954046..32925e848fa9e06ad0cfaa33733fe1cd86c0788b 100644 (file)
@@ -99,7 +99,7 @@ namespace Step50
 
     matrix_t system_matrix;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -323,9 +323,9 @@ namespace Step50
     const Coefficient<dim> coefficient;
     std::vector<double>    coefficient_values(n_q_points);
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_levels());
-    std::vector<ConstraintMatrix> boundary_interface_constraints(
+    std::vector<AffineConstraints<double>> boundary_interface_constraints(
       triangulation.n_levels());
     for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
       {
index 1567ec26d1fd35904a2d9fee200c2e2d6f712ffc..73ad0ebe6990374417c8805a96ea8363075a1cf6 100644 (file)
@@ -15,9 +15,9 @@
 
 
 
-// check ConstraintMatrix for a distributed mesh on hyper shell with both
-// hanging nodes and no-normal-flux constraints on the outer boundary of the
-// shell.
+// check AffineConstraints<double> for a distributed mesh on hyper shell with
+// both hanging nodes and no-normal-flux constraints on the outer boundary of
+// the shell.
 
 #include <deal.II/base/tensor.h>
 
@@ -109,7 +109,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dofh, relevant_set);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, constraints);
   std::set<types::boundary_id> no_normal_flux_boundaries;
index e20b3bbeb115eb9cff19383d74d8a46e1fd234bb..843204a5a4ff7bd153c584c39de7106c53b56be6 100644 (file)
 
 
 
-// check ConstraintMatrix for a distributed mesh on hyper shell with both
-// hanging nodes and no-normal-flux constraints on the outer boundary of the
-// shell.
-// Also see test renumber_z_order_02
+// check AffineConstraints<double> for a distributed mesh on hyper shell with
+// both hanging nodes and no-normal-flux constraints on the outer boundary of
+// the shell. Also see test renumber_z_order_02
 
 #include <deal.II/base/tensor.h>
 
@@ -112,7 +111,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dofh, relevant_set);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, constraints);
   std::set<types::boundary_id> no_normal_flux_boundaries;
index 8e3f5aea027b8a9169ebf0e6d390ab95bedfa6ad..377abd1dcf2e132096ea9de6fcdb45d714ba4264 100644 (file)
@@ -15,9 +15,9 @@
 
 
 
-// check that the ConstraintMatrix with hanging nodes and no-normal-flux
-// constraints on an adaptively refined hyper_cube are the same independet
-// of the number of CPUs
+// check that the AffineConstraints<double> with hanging nodes and
+// no-normal-flux constraints on an adaptively refined hyper_cube are the same
+// independet of the number of CPUs
 
 #include <deal.II/base/tensor.h>
 
@@ -87,7 +87,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dofh, relevant_set);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, constraints);
   std::set<types::boundary_id> no_normal_flux_boundaries;
index 3ad5237c59bcfac0c310a8b1a66c10b94ef6e4d2..51d04fc127bda8cd598447a567358d864fc6f759 100644 (file)
@@ -15,8 +15,8 @@
 
 
 
-// check ConstraintMatrix for a distributed mesh on hyper shell with both
-// hanging nodes and normal-flux constraints on the outer boundary of the
+// check AffineConstraints<double> for a distributed mesh on hyper shell with
+// both hanging nodes and normal-flux constraints on the outer boundary of the
 // shell.
 
 #include <deal.II/base/tensor.h>
@@ -108,7 +108,7 @@ test()
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dofh, relevant_set);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, constraints);
   std::set<types::boundary_id> no_normal_flux_boundaries;
index 59bcca1917fc4a48262f05a7680e4d62a3419c66..6ef25316bc3b84319f2595949f9b5ae30ac6fd8c 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix for a distributed mesh,
+// check AffineConstraints<double> for a distributed mesh,
 // also compare with/without sparse line_cache via IndexSet.
 // Simple mesh.
 
@@ -64,9 +64,9 @@ test()
   IndexSet dof_set;
   DoFTools::extract_locally_relevant_dofs(dofh, dof_set);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dofh, cm);
-  ConstraintMatrix cm2(dof_set);
+  AffineConstraints<double> cm2(dof_set);
   DoFTools::make_hanging_node_constraints(dofh, cm2);
 
   {
index 28b51109671a4b5511af8f6c1f62817f6a9c5365..f56ce5b4671c3dcf8a999e2f1d761135431b9a35 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix for a distributed mesh,
+// check AffineConstraints<double> for a distributed mesh,
 // also compare with/without sparse line_cache via IndexSet.
 // Refine one corner.
 
@@ -66,9 +66,9 @@ test()
       IndexSet dof_set;
       DoFTools::extract_locally_relevant_dofs(dofh, dof_set);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       DoFTools::make_hanging_node_constraints(dofh, cm);
-      ConstraintMatrix cm2(dof_set);
+      AffineConstraints<double> cm2(dof_set);
       DoFTools::make_hanging_node_constraints(dofh, cm2);
 
       if (myid == 0)
index 05cb398ea23c75d050541c988e876a12fdef5257..cd673308f9f1078998d6a68b18ccda7e429adbb6 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a distributed mesh
+// check AffineConstraints<double>.distribute() for a distributed mesh
 // with Trilinos
 // Mesh: shell with random refinement
 
@@ -104,7 +104,7 @@ test()
   TrilinosWrappers::MPI::Vector x_rel;
   x_rel.reinit(relevant_set, MPI_COMM_WORLD);
 
-  ConstraintMatrix cm(relevant_set);
+  AffineConstraints<double> cm(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, cm);
   std::vector<bool> velocity_mask(dim + 1, true);
 
index 6a7c13830689e18ce566a9250cc86675ba004c7c..c2f7d4bcc2f8e45eddba69efb7bdba62df977e9b 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a distributed mesh
+// check AffineConstraints<double>.distribute() for a distributed mesh
 // with Trilinos; manual check of the graphical output...
 // Mesh: shell with random refinement
 
@@ -253,7 +253,7 @@ test()
 
       x_rel.reinit(relevant_set, MPI_COMM_WORLD);
 
-      ConstraintMatrix cm(relevant_set);
+      AffineConstraints<double> cm(relevant_set);
       DoFTools::make_hanging_node_constraints(dofh, cm);
       /*  std::vector<bool> velocity_mask (dim+1, true);
 
index 863100f1b7b13fc6b493e6847a32a8b5ea8174f1..03338954f3f2014b4e6fbdc327c9a04011a86a29 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check that ConstraintMatrix.distribute() is not doing anything in a
+// check that AffineConstraints<double>.distribute() is not doing anything in a
 // distributed computation for a vector that already has the entries set
 // correctly
 
@@ -68,10 +68,10 @@ test()
   TrilinosWrappers::MPI::Vector x1(x_ref);
 
   // we have interpolated values, so
-  // ConstraintMatrix::distribute should not do
+  // AffineConstraints<double>::distribute should not do
   // anything
   x1 = x_ref;
-  ConstraintMatrix cm(relevant_set);
+  AffineConstraints<double> cm(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, cm);
   cm.close();
   cm.distribute(x1);
index 0455854cc7a82c6ec334cfa1ea42271641f4d184..c152ee4452c4f69e2731bf64eb8ed2d67f1fb59c 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix for a distributed mesh,
+// check AffineConstraints<double> for a distributed mesh,
 // also compare with/without sparse line_cache via IndexSet.
 // Mesh: 3d Random refinement.
 
@@ -74,9 +74,9 @@ test()
   IndexSet dof_set;
   DoFTools::extract_locally_relevant_dofs(dofh, dof_set);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   DoFTools::make_hanging_node_constraints(dofh, cm);
-  ConstraintMatrix cm2(dof_set);
+  AffineConstraints<double> cm2(dof_set);
   DoFTools::make_hanging_node_constraints(dofh, cm2);
 
   {
index 2ecd7a7836a81a3fe8b0deae19a33e6260de40a0..5deec6e44a3b726b898c97307e7a13646667a41e 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a distributed mesh
+// check AffineConstraints<double>.distribute() for a distributed mesh
 // with Trilinos
 
 #include <deal.II/base/tensor.h>
@@ -87,7 +87,7 @@ test()
   TrilinosWrappers::MPI::Vector x_rel;
   x_rel.reinit(relevant_set, MPI_COMM_WORLD);
 
-  ConstraintMatrix cm(relevant_set);
+  AffineConstraints<double> cm(relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, cm);
   cm.close();
 
index 3653a31ce722204b8333e34fd1876e6ef72688bc..c205e6aaeecf391deb0766c651f2f6348b26a8d7 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a distributed mesh
+// check AffineConstraints<double>.distribute() for a distributed mesh
 // with Trilinos; manual check of the graphical output...
 // Mesh: shell with random refinement
 
@@ -253,7 +253,7 @@ test()
 
       x_rel.reinit(relevant_set, MPI_COMM_WORLD);
 
-      ConstraintMatrix cm(relevant_set);
+      AffineConstraints<double> cm(relevant_set);
       DoFTools::make_hanging_node_constraints(dofh, cm);
       /*  std::vector<bool> velocity_mask (dim+1, true);
 
index 148f1c4775cf6b7cb9dba0719be2d3b835c76280..fe4afe5d02f45da7f685e03ac0e8ea3a7e491ce9 100644 (file)
@@ -69,7 +69,7 @@ test()
   // build constraint matrix
   IndexSet locally_relevant(dof.n_dofs());
   DoFTools::extract_locally_relevant_dofs(dof, locally_relevant);
-  ConstraintMatrix constraints(locally_relevant);
+  AffineConstraints<double> constraints(locally_relevant);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
index 013eb93ec23dcde86a96b78a8ac30e5dccb2ecea..9f118285659d6e0d7486b872e3f32d614b887ba6 100644 (file)
@@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index cedd38f0b3219bedae4b99c9b6c79bcd52a006cb..7ab286e997dcaa43fa4269c3bc996120908c01dc 100644 (file)
@@ -93,7 +93,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 937964710c62bdc4bd5f6e33bf0e0eb1180f3de6..82d87269eda6c380962b5cb836d4a2f3643fa829 100644 (file)
@@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index bc9ef338a95cd421c636a4add9fcf1d74baa668c..fced3da188e46ac67d17e77ed27da6c9a0e9bc20 100644 (file)
@@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 6b817fcf14f67ec6006254df15f377622d6c50ce..4a2150142ccd9f910dfe85abf117c06413973b61 100644 (file)
@@ -94,7 +94,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 8109bd28dd9eb1042bcc2a9477913526844a44d1..e2a254fd7a0d60b7fff24d2115bb84a5a2894f5e 100644 (file)
@@ -90,7 +90,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index ea7de819bfc438f094cee62a83374097f751c6d6..606e879c654bce3df9b8100f756ebd451436c7d3 100644 (file)
@@ -92,7 +92,7 @@ test(const unsigned int n_blocks = 5)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index b2d1fed16b0f934d100575f3bc114730841d3323..749cc527b235a1595abf492b743b88ff0f43706f 100644 (file)
@@ -92,7 +92,7 @@ test(const unsigned int n = 5, const unsigned int m = 3)
   IndexSet relevant_set;
   DoFTools::extract_locally_relevant_dofs(dof, relevant_set);
 
-  ConstraintMatrix constraints(relevant_set);
+  AffineConstraints<double> constraints(relevant_set);
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index abbab48427868c127146ab7d673e9c6840a1ba10..0c1e6904538dfd60dcd2a13d3a8edf50cf685a5c 100644 (file)
@@ -56,7 +56,7 @@ test()
   DoFHandler<dim> dof1(tria), dof2(tria);
   dof1.distribute_dofs(fe1);
   dof2.distribute_dofs(fe2);
-  ConstraintMatrix c1, c2;
+  AffineConstraints<double> c1, c2;
   DoFTools::make_hanging_node_constraints(dof1, c1);
   c1.close();
   DoFTools::make_hanging_node_constraints(dof2, c2);
index 187a3f52add39b8f1a5798cc1959dbf0aa0f63de..81aa942ad4b18d1c16c4e0903572cbf4dbb3ee62 100644 (file)
@@ -105,7 +105,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
index b6270ebb0b407175715da673d44dbbcf9f124f9e..312f5a4235aef603e3574cba4009f013a98dc3bc 100644 (file)
@@ -90,9 +90,9 @@ namespace Step22
     FESystem<dim>                             fe;
     DoFHandler<dim>                           dof_handler;
 
-    ConstraintMatrix      constraints;
-    std::vector<IndexSet> owned_partitioning;
-    std::vector<IndexSet> relevant_partitioning;
+    AffineConstraints<double> constraints;
+    std::vector<IndexSet>     owned_partitioning;
+    std::vector<IndexSet>     relevant_partitioning;
 
     TrilinosWrappers::BlockSparsityPattern sparsity_pattern;
     TrilinosWrappers::BlockSparseMatrix    system_matrix;
index 8e5da49f56c056179a079045fbca70edb7ad23c7..7c23d70d34dd296982ebb09e1e36d06e2880ede1 100644 (file)
@@ -91,9 +91,9 @@ namespace Step22
     FESystem<dim>                             fe;
     DoFHandler<dim>                           dof_handler;
 
-    ConstraintMatrix      constraints;
-    std::vector<IndexSet> owned_partitioning;
-    std::vector<IndexSet> relevant_partitioning;
+    AffineConstraints<double> constraints;
+    std::vector<IndexSet>     owned_partitioning;
+    std::vector<IndexSet>     relevant_partitioning;
 
     TrilinosWrappers::BlockSparseMatrix system_matrix;
 
index 0fd97a1c9c6172f27f3f68a95aa3f74c3dffeafc..10b825e12fef0dae5c7b977c01d7f2210cbdb841 100644 (file)
@@ -182,7 +182,7 @@ check(const unsigned int orientation, bool reverse)
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   IndexSet locally_owned_dofs = dof_handler.locally_owned_dofs();
   IndexSet locally_relevant_dofs;
index cef78ce3e98550dfd061fa84eab870f93eadadb6..5d790792b9720b4bf7520aee3d3bc3109594e784 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a petsc vector
+// check AffineConstraints<double>.distribute() for a petsc vector
 //
 // we do this by creating a vector where each processor has 100
 // elements but no ghost elements. then we add constraints on each
@@ -62,7 +62,7 @@ test()
   }
 
 
-  // create a ConstraintMatrix with a range that exceeds the locally
+  // create a AffineConstraints<double> with a range that exceeds the locally
   // owned range by 50 on each side
   IndexSet locally_relevant_range(vec.size());
   locally_relevant_range.add_range(
index 4386a264981e6cbb2a47795eb13cede3750cdcc0..cb6010a4cd9d97eb3bcec6e7be07602f24660344 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a petsc vector
+// check AffineConstraints<double>.distribute() for a petsc vector
 //
 // like _01, but for a block vector. this has the additional complication that
 // (at a global level) the set of indices owned by this processor is not
@@ -75,7 +75,7 @@ test()
   }
 
 
-  // create a ConstraintMatrix with a range that exceeds the locally
+  // create a AffineConstraints<double> with a range that exceeds the locally
   // owned range by 50 on each side
   IndexSet locally_relevant_range(vec.size());
   locally_relevant_range.add_range(
index 0e1598b72a5a4a537ea10b866a77a71c13f97681..ae8349d2eaf2bc9d5e8c1c732b7608d8a0ac3f3a 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a petsc vector
+// check AffineConstraints<double>.distribute() for a petsc vector
 //
 // like _01, but with an inhomogeneity
 
@@ -54,7 +54,7 @@ test()
   }
 
 
-  // create a ConstraintMatrix with a range that exceeds the locally
+  // create a AffineConstraints<double> with a range that exceeds the locally
   // owned range by 50 on each side
   IndexSet locally_relevant_range(vec.size());
   locally_relevant_range.add_range(
index b8b9701a515e37e372f63e509ad1c4c1e40f3677..26a3f78dd0a7c7fe3dc72f76641348b5c69e3621 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a petsc vector
+// check AffineConstraints<double>.distribute() for a petsc vector
 //
 // like _01, but for a block vector. this has the additional complication that
 // (at a global level) the set of indices owned by this processor is not
index a2b8b20762c53fed1708b6644e13a4bd7925a2c1..031569f6a9284e2286c08be2a1c3e175ba4aba8e 100644 (file)
@@ -83,7 +83,7 @@ test()
   TrilinosWrappers::MPI::Vector vector;
   vector.reinit(dofh.locally_owned_dofs(), MPI_COMM_WORLD);
   {
-    ConstraintMatrix cm;
+    AffineConstraints<double> cm;
     cm.close();
     QGauss<dim>                          quadrature_formula(2);
     FEValues<dim>                        fe_values(fe,
index a544241b1475ef8d7feacdf472ed95aaf849fe9b..286a9f6ea4c39f864973b595dc53726d8d5ddf2c 100644 (file)
@@ -84,7 +84,7 @@ test()
   TrilinosWrappers::MPI::Vector vector;
   vector.reinit(dofh.locally_owned_dofs(), MPI_COMM_WORLD);
   {
-    ConstraintMatrix cm;
+    AffineConstraints<double> cm;
     cm.close();
     QGauss<dim>                          quadrature_formula(2);
     FEValues<dim>                        fe_values(fe,
index b4419174297ad1e5e8a06246909386a0abdc18c8..fbbc6261062d1c482db4dac4c364dcc15f293cda 100644 (file)
@@ -104,13 +104,13 @@ namespace Step37
     std::shared_ptr<
       MappingFEField<dim, dim, LinearAlgebra::distributed::Vector<double>>>
                                                mapping;
-    ConstraintMatrix                           constraints_euler;
+    AffineConstraints<double>                  constraints_euler;
     LinearAlgebra::distributed::Vector<double> euler_positions;
 
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
-    ConstraintMatrix non_homogeneous_constraints;
+    AffineConstraints<double> constraints;
+    AffineConstraints<double> non_homogeneous_constraints;
     typedef MatrixFreeOperators::LaplaceOperator<
       dim,
       degree_finite_element,
@@ -258,7 +258,7 @@ namespace Step37
         DoFTools::extract_locally_relevant_level_dofs(dof_handler,
                                                       level,
                                                       relevant_dofs);
-        ConstraintMatrix level_constraints;
+        AffineConstraints<double> level_constraints;
         level_constraints.reinit(relevant_dofs);
         level_constraints.add_lines(
           mg_constrained_dofs.get_boundary_indices(level));
@@ -321,7 +321,7 @@ namespace Step37
 
     non_homogeneous_constraints.clear();
     {
-      ConstraintMatrix hanging_nodes_laplace_constraints;
+      AffineConstraints<double> hanging_nodes_laplace_constraints;
       hanging_nodes_laplace_constraints.reinit(locally_relevant_dofs);
       non_homogeneous_constraints.reinit(locally_relevant_dofs);
       DoFTools::make_hanging_node_constraints(
@@ -340,7 +340,7 @@ namespace Step37
       // make sure hanging nodes override Dirichlet
       non_homogeneous_constraints.merge(
         hanging_nodes_laplace_constraints,
-        ConstraintMatrix::MergeConflictBehavior::right_object_wins);
+        AffineConstraints<double>::MergeConflictBehavior::right_object_wins);
       non_homogeneous_constraints.close();
     }
 
index a2424b3fb7e9eb3ccd8c5699c1b2a97faf568090..e4486a4258f977dd4af128dc834b2665da40f93a 100644 (file)
@@ -91,7 +91,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
index f13724b975cb42463bd78494497462f610f50eb5..763c8501e80d1285ad8ae0edc430d190431c5d0d 100644 (file)
@@ -96,7 +96,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
index bf6449ad0e4539c390ada098b1a73383a43a245f..3f7be85e074ad27923c4ff7c2edd2bc05a010a94 100644 (file)
@@ -97,7 +97,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
index e3ce2b2b0d91f3ddad61fc7f393932e12dc35e7e..f2f410902799a8f1f2fae8a9fee15c9c887eb5fa 100644 (file)
@@ -91,7 +91,7 @@ namespace Step40
     IndexSet locally_owned_dofs;
     IndexSet locally_relevant_dofs;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     PETScWrappers::MPI::SparseMatrix system_matrix;
     PETScWrappers::MPI::Vector       locally_relevant_solution;
index e7a32581835e18e702ca5eda21ae07a72b2cc167..4cc60f98aae7ee74209c159fc90fad2a5a506236 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a trilinos vector
+// check AffineConstraints<double>.distribute() for a trilinos vector
 //
 // we do this by creating a vector where each processor has 100
 // elements but no ghost elements. then we add constraints on each
@@ -67,14 +67,14 @@ test()
   }
 
 
-  // create a ConstraintMatrix with a range that exceeds the locally
+  // create a AffineConstraints<double> with a range that exceeds the locally
   // owned range by 50 on each side
   IndexSet locally_relevant_range(vec.size());
   locally_relevant_range.add_range(
     std::max<int>(100 * myid - 50, 0),
     std::min(static_cast<types::global_dof_index>(100 * myid + 150),
              vec.size()));
-  ConstraintMatrix cm(locally_relevant_range);
+  AffineConstraints<double> cm(locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the
   // local range of each processor against an element outside, both in
index c1daf2fb370a0a48d546f5295ee616c9ea8df5e7..1c4ec4f1952068843c09fd8d90bdd168837e506a 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a trilinos vector
+// check AffineConstraints<double>.distribute() for a trilinos vector
 //
 // like _01, but for a block vector. this has the additional complication that
 // (at a global level) the set of indices owned by this processor is not
@@ -76,7 +76,7 @@ test()
   }
 
 
-  // create a ConstraintMatrix with a range that exceeds the locally
+  // create a AffineConstraints<double> with a range that exceeds the locally
   // owned range by 50 on each side
   IndexSet locally_relevant_range(vec.size());
   locally_relevant_range.add_range(
@@ -88,7 +88,7 @@ test()
     vec.block(0).size() +
       std::min(static_cast<types::global_dof_index>(100 * myid + 150),
                vec.block(0).size()));
-  ConstraintMatrix cm(locally_relevant_range);
+  AffineConstraints<double> cm(locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the
   // local range of each processor against an element outside, both in
index ff2c0ca45e00c1828b8f50bb8e1b63e67c136147..b0f3d562caf95a7e9f05a913a0ce1872d34d407a 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// check ConstraintMatrix.distribute() for a trilinos vector
+// check AffineConstraints<double>.distribute() for a trilinos vector
 //
 // like _01, but with an inhomogeneity
 
@@ -59,14 +59,14 @@ test()
   }
 
 
-  // create a ConstraintMatrix with a range that exceeds the locally
+  // create a AffineConstraints<double> with a range that exceeds the locally
   // owned range by 50 on each side
   IndexSet locally_relevant_range(vec.size());
   locally_relevant_range.add_range(
     std::max<int>(100 * myid - 50, 0),
     std::min(static_cast<types::global_dof_index>(100 * myid + 150),
              vec.size()));
-  ConstraintMatrix cm(locally_relevant_range);
+  AffineConstraints<double> cm(locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the
   // local range of each processor against an element outside, both in
index afad2caa26199c5ce1ebd9149cfe1a9f9cf611f3..4c557e09f16a5aff65dd9d7ed84527fe05048c80 100644 (file)
@@ -15,7 +15,7 @@
 
 
 
-// document bug in the new ConstraintMatrix::distribute() from r29593
+// document bug in the new AffineConstraints<double>::distribute() from r29593
 // if one vector owns all DoFs, then distribute() hangs.
 
 #include <deal.II/lac/affine_constraints.h>
@@ -47,7 +47,7 @@ test()
     vec(i) = i;
   vec.compress(VectorOperation::insert);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   cm.distribute(vec);
index afe3458606265eeb9bef94f50053039df5adbe65..2bdd80f76d8f5267065f1ed506d84f9be002bbb5 100644 (file)
 
 
 
-// document bug in the new ConstraintMatrix::distribute():
+// document bug in the new AffineConstraints<double>::distribute():
 /*
 --------------------------------------------------------
 An error occurred in line <1028> of file
 </scratch/deal-trunk/deal.II/include/deal.II/lac/constraint_matrix.templates.h>
-in function void dealii::ConstraintMatrix::distribute(VectorType&) const [with
-VectorType = dealii::TrilinosWrappers::MPI::Vector] The violated condition was:
-    vec(it->line) == it->entries.size()
-The name and call sequence of the exception was:
-    ExcIncorrectConstraint(it->line, it->entries.size())
+in function void dealii::AffineConstraints<double>::distribute(VectorType&)
+const [with VectorType = dealii::TrilinosWrappers::MPI::Vector] The violated
+condition was: vec(it->line) == it->entries.size() The name and call sequence of
+the exception was: ExcIncorrectConstraint(it->line, it->entries.size())
 Additional Information:
 While distributing the constraint for DoF 41, it turns out that one of the
 processors who own the 2 degrees of freedom that x_41 is constrained against
 does not know about the constraint on x_41. Did you not initialize the
-ConstraintMatrix with the appropriate locally_relevant set so that every
-processor who owns a DoF that constrains another DoF also knows about this
+AffineConstraints<double> with the appropriate locally_relevant set so that
+every processor who owns a DoF that constrains another DoF also knows about this
 constraint?
 --------------------------------------------------------
 
@@ -94,7 +93,7 @@ test()
   IndexSet locally_relevant_set;
   DoFTools::extract_locally_relevant_dofs(dofh, locally_relevant_set);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.reinit(locally_relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, cm);
 
index bed5868575636f81198cfef35a8c72898c10c23b..4cfa2d97c5443e857a31d4e060d9e9bc0af1a01a 100644 (file)
@@ -113,7 +113,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -276,9 +276,9 @@ namespace Step50
 
     std::vector<types::global_dof_index> local_dof_indices(dofs_per_cell);
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index 80a8370fda9de2a7fb79931bce10ef6f5a7833de..de940fa6655bc7ad1a509f1bc816029d27a90d09 100644 (file)
@@ -81,11 +81,11 @@ test()
       }
   tria.execute_coarsening_and_refinement();
 
-  FE_Q<dim>         fe(2);
-  DoFHandler<dim>   mg_dof_handler(tria);
-  IndexSet          locally_relevant_set;
-  ConstraintMatrix  constraints;
-  MGConstrainedDoFs mg_constrained_dofs;
+  FE_Q<dim>                 fe(2);
+  DoFHandler<dim>           mg_dof_handler(tria);
+  IndexSet                  locally_relevant_set;
+  AffineConstraints<double> constraints;
+  MGConstrainedDoFs         mg_constrained_dofs;
 
   mg_dof_handler.distribute_dofs(fe);
   mg_dof_handler.distribute_mg_dofs();
index 35b32d83095e521e30250e58420451e6e9c1ae2f..fb0ec4225794fa47baf5421d0b51bab81a361414 100644 (file)
@@ -113,7 +113,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -343,9 +343,9 @@ namespace Step50
     const Coefficient<dim> coefficient(K);
     std::vector<double>    coefficient_values(n_q_points);
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index a4f6b0cb02a0ee88eb4501d02929882d5be9e778..46fe69d95c0cc198708c7b82586b5375bf6726f6 100644 (file)
@@ -157,7 +157,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
@@ -406,9 +406,9 @@ LaplaceProblem<dim>::assemble_multigrid(const bool &use_mw)
       const Coefficient<dim> coefficient;
       std::vector<double>    coefficient_values(n_q_points);
 
-      std::vector<ConstraintMatrix> boundary_constraints(
+      std::vector<AffineConstraints<double>> boundary_constraints(
         triangulation.n_levels());
-      std::vector<ConstraintMatrix> boundary_interface_constraints(
+      std::vector<AffineConstraints<double>> boundary_interface_constraints(
         triangulation.n_levels());
       for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
         {
index 4c21457ad68a59f869a541a5db59693abe5e2484..b0fadd8968be32d292fdbee4b16bda9aa50eb012 100644 (file)
@@ -83,7 +83,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
@@ -287,8 +287,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = min_level; level < triangulation.n_levels();
        ++level)
     {
index 63ed99b98d81f18061f2f87bc11d18b633f392ea..39ddbad30c9737d8419a812b992f085be132c79f 100644 (file)
@@ -85,7 +85,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   LinearAlgebra::distributed::Vector<double> solution;
   LinearAlgebra::distributed::Vector<double> system_rhs;
@@ -296,8 +296,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = min_level; level < triangulation.n_levels();
        ++level)
     {
index af527d98d4970283a4857b4c588383df67d603de..dd7057ae91d382a99e581c2fd2c388833f72b520 100644 (file)
@@ -81,8 +81,8 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix hanging_node_constraints;
-  ConstraintMatrix constraints;
+  AffineConstraints<double> hanging_node_constraints;
+  AffineConstraints<double> constraints;
 
   LinearAlgebra::distributed::Vector<double> solution;
   LinearAlgebra::distributed::Vector<double> system_rhs;
@@ -297,8 +297,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = min_level; level < triangulation.n_levels();
        ++level)
     {
index e36142e4f406e9deaa5081f42945f036a9abee3e..aa46cd7dba8eef4c09660a28f162b07e75f35788 100644 (file)
@@ -81,8 +81,8 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix hanging_node_constraints;
-  ConstraintMatrix constraints;
+  AffineConstraints<double> hanging_node_constraints;
+  AffineConstraints<double> constraints;
 
   LinearAlgebra::distributed::Vector<double> solution;
   LinearAlgebra::distributed::Vector<double> system_rhs;
@@ -297,8 +297,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = min_level; level < triangulation.n_levels();
        ++level)
     {
index 8935f12bcf5ff09b8371c0a55d4f333f8587baa6..f6b1aadb5a2ce70ce2d1d1075f5773a1ff9157d7 100644 (file)
@@ -85,7 +85,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
@@ -293,8 +293,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
     {
       boundary_constraints[level].add_lines(
index a00a595465b3d856ba1fa4bf891ea6a92cdb542c..e235d990f5f1bda32126db8dc8ced6cd6aa99dfe 100644 (file)
@@ -114,7 +114,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -344,9 +344,9 @@ namespace Step50
 
 
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index 8a18dd1f9b58beb3ebb99df6f6b30c6986a6d987..680801bb64b5a6deeb892dd55f93e40f82940678 100644 (file)
@@ -114,7 +114,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -344,9 +344,9 @@ namespace Step50
 
 
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index 4500ad5737407312b66c8f2a5b03869a1d1e595f..7529a613495a66f0551788c410be03082bffd54d 100644 (file)
@@ -114,7 +114,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -344,9 +344,9 @@ namespace Step50
 
 
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index c42258a1d35db2b4ca7b135cf28c2b31cbfdf955..736b86d15a9376e0dd46a0cba8b6d69c649fd7bc 100644 (file)
@@ -88,7 +88,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
@@ -291,8 +291,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
     {
       boundary_constraints[level].add_lines(
index 8434de54e14e0db1f62fb3da80c071ff2c719705..a7f567beb1a763516fe7a41f8b775741f88e970a 100644 (file)
@@ -158,7 +158,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
@@ -412,9 +412,9 @@ LaplaceProblem<dim>::assemble_multigrid(bool use_mw)
       const Coefficient<dim> coefficient;
       std::vector<double>    coefficient_values(n_q_points);
 
-      std::vector<ConstraintMatrix> boundary_constraints(
+      std::vector<AffineConstraints<double>> boundary_constraints(
         triangulation.n_levels());
-      ConstraintMatrix empty_constraints;
+      AffineConstraints<double> empty_constraints;
 
       for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
         {
index 820e5f290147d3fabcc002d7423170ac4b9758a1..3b4dfe4cd33eb7f7dcd143ad046719b006f27309 100644 (file)
@@ -85,7 +85,7 @@ private:
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> system_matrix;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
@@ -293,8 +293,9 @@ LaplaceProblem<dim>::assemble_multigrid()
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values(n_q_points);
 
-  std::vector<ConstraintMatrix> boundary_constraints(triangulation.n_levels());
-  ConstraintMatrix              empty_constraints;
+  std::vector<AffineConstraints<double>> boundary_constraints(
+    triangulation.n_levels());
+  AffineConstraints<double> empty_constraints;
   for (unsigned int level = 0; level < triangulation.n_levels(); ++level)
     {
       boundary_constraints[level].add_lines(
index 8081d98e230573395314af43fc53d69a389d0512..6d0144f7809951c56b6f8d4c90abdf3784654b20 100644 (file)
@@ -110,7 +110,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -340,9 +340,9 @@ namespace Step50
     const Coefficient<dim> coefficient(K);
     std::vector<double>    coefficient_values(n_q_points);
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index 3b64ba792b14e955fdcd780959daf777592913ef..58e1c3b951ce3147d1c79bdc10f469f57b123c2d 100644 (file)
@@ -114,7 +114,7 @@ namespace Step50
 
     IndexSet locally_relevant_set;
 
-    ConstraintMatrix constraints;
+    AffineConstraints<double> constraints;
 
     vector_t solution;
     vector_t system_rhs;
@@ -353,9 +353,9 @@ namespace Step50
 
 
 
-    std::vector<ConstraintMatrix> boundary_constraints(
+    std::vector<AffineConstraints<double>> boundary_constraints(
       triangulation.n_global_levels());
-    ConstraintMatrix empty_constraints;
+    AffineConstraints<double> empty_constraints;
     for (unsigned int level = 0; level < triangulation.n_global_levels();
          ++level)
       {
index 764e7382c63f96031bdc71ce4d07f06b8f8146fd..a2ffd2d42ff5c22fe7080b8000ee1b4124eae7a9 100644 (file)
@@ -128,8 +128,8 @@ check_fe(FiniteElement<dim> &fe)
   MGConstrainedDoFs mg_constrained_dofs;
   mg_constrained_dofs.initialize(dofh);
 
-  ConstraintMatrix hanging_node_constraints;
-  IndexSet         locally_relevant_set;
+  AffineConstraints<double> hanging_node_constraints;
+  IndexSet                  locally_relevant_set;
   DoFTools::extract_locally_relevant_dofs(dofh, locally_relevant_set);
   hanging_node_constraints.reinit(locally_relevant_set);
   DoFTools::make_hanging_node_constraints(dofh, hanging_node_constraints);
index 0f660bdc44c30db2a8b5ac4179cb9d26a4743a05..d2fcec5e04617d01b30a7a1b86f35fb922410144 100644 (file)
@@ -75,7 +75,7 @@ test()
 
   QGauss<dim> quad(3); // Quadrature for coupling
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern sparsity;
   {
index 7cf0c4c58f1950ba0ce7b75a391669aa944b261c..43ded37a97f2c33cf23f768bcf153e0e9d171794 100644 (file)
@@ -79,7 +79,7 @@ test()
 
   QGauss<dim> quad(3); // Quadrature for coupling
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern sparsity;
   {
index 8850fa634c2068b2fc2320b7de6c6dc9df3e5594..bb0dbd783670f48d2f5e21ad5d93ed75995a19b3 100644 (file)
@@ -83,7 +83,7 @@ test()
   }
   SparseMatrix<double> coupling(sparsity);
   NonMatching::create_coupling_mass_matrix(
-    space_dh, dh, quad, coupling, ConstraintMatrix());
+    space_dh, dh, quad, coupling, AffineConstraints<double>());
 
   SparsityPattern mass_sparsity;
   {
index d74584925fda3091b19c98c342190d48ed9a7371..1942d04a66f2c7de49c0713255c4df75271142dd 100644 (file)
@@ -114,8 +114,8 @@ test()
     QGauss<dim>             quad(4);
     FEValues<dim, spacedim> fev(fe, quad, update_values | update_JxW_values);
     std::vector<types::global_dof_index> dofs(fe.dofs_per_cell);
-    FullMatrix<double> cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell);
-    ConstraintMatrix   constraints;
+    FullMatrix<double>        cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell);
+    AffineConstraints<double> constraints;
 
     for (auto cell : dh.active_cell_iterators())
       if (cell->is_locally_owned())
index 3074f846d4119d57c14df13e7ac547263f47cb06..fc2397a47cbfc2fb508e55d16ab574777981f037 100644 (file)
@@ -117,8 +117,8 @@ test()
     QGauss<dim>             quad(4);
     FEValues<dim, spacedim> fev(fe, quad, update_values | update_JxW_values);
     std::vector<types::global_dof_index> dofs(fe.dofs_per_cell);
-    FullMatrix<double> cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell);
-    ConstraintMatrix   constraints;
+    FullMatrix<double>        cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell);
+    AffineConstraints<double> constraints;
 
     for (auto cell : dh.active_cell_iterators())
       if (cell->is_locally_owned())
index d0d01ab74e8dbf4bce2e3ffff4dfb496657c0e8c..13bd685dab5e1fb1b128a06d3779ff77ad6db442 100644 (file)
@@ -69,7 +69,7 @@ test()
   dh.distribute_dofs(fe);
   space_dh.distribute_dofs(space_fe);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(space_dh, constraints);
 
   constraints.close();
index 07bb6bb9fb01c427d78eb3e2a3423f5b444607ff..5cc8557e5e275929d68c7bf08798d7330f079a64 100644 (file)
@@ -16,8 +16,8 @@
 
 
 // this function tests that assembly of matrices in parallel works properly,
-// in particular the cache used in ConstraintMatrix that stores some scratch
-// data and is accessed by several threads at the same time.
+// in particular the cache used in AffineConstraints<double> that stores some
+// scratch data and is accessed by several threads at the same time.
 
 #include <deal.II/base/function.h>
 #include <deal.II/base/graph_coloring.h>
@@ -140,7 +140,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> reference_matrix;
index cd8a08e0cc44b0f145d24aaf9145103f21a1f468..c0d2a1f730399bb1e3621cd98ee9bb844871b92d 100644 (file)
@@ -155,7 +155,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> reference_matrix;
index 49409b2f600a91252ad65c78d1b6b789dfe452f8..2668ec70e5ad367a24249bd482641e4e92ace64b 100644 (file)
@@ -140,7 +140,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   BlockSparsityPattern      sparsity_pattern;
   BlockSparseMatrix<double> reference_matrix;
index d5ca959e3ff20a9eb7dd2d5ae054ce257a432f29..d222498fa77764e4bcaa293f233320dca279a800 100644 (file)
@@ -154,7 +154,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   SparsityPattern      sparsity_pattern;
   SparseMatrix<double> reference_matrix;
index 0c779f6ad832f235376ec8e5bb9bd36afa74e04e..a1c3a0b8d7b5e7588f0320028753b6b4149e12f9 100644 (file)
@@ -89,7 +89,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index eb6d06e8a3eca750e862278cdf5f57084c6813f5..f67bb154b49acc53bb1d59b6c85bb0ef59aff716 100644 (file)
@@ -90,7 +90,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index da4c9361ff3638d475f4fc8dc8a55156281ce4bd..6232122df73d6451853746bc7ba0712c8604f5d3 100644 (file)
@@ -92,7 +92,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 25d3814ac097812de2ae303c1fb2ea38c983ab16..054896aff437f1c4e5d15106999ca09ebf19dfe6 100644 (file)
@@ -93,7 +93,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 6172e7ad0cd79387b0106ec36bdc6fbe59993c07..eb8a3930adc9815a57221a6e83dadc70fcd1c59f 100644 (file)
@@ -89,7 +89,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 5a58918abc8625056c2dd53c31a43700e1751a44..57e304e0314a6640d0c4dcb6a98d2eac4b0b1e45 100644 (file)
@@ -90,7 +90,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index e696bc84f2b4147d787bbd9019fd4a4e137fceea..3c4c0d906be6063e1688a1cfc1117bf0100e9b45 100644 (file)
@@ -92,7 +92,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 51a94c892b9723d60a1a028cad58a01e20eb8e34..abea1c74d056cb058c99e0f6a5fd029b1c91d8a0 100644 (file)
@@ -93,7 +93,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 6c34a6873598b750a4e095872f2320aec7531f04..df338fbaff30e3268fc7f957578800a6a088304a 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1, 1.), constraints);
index 4382630876a0e983893895c91c031f2936407b0d..d777025fbc848c3fbd14575cd008d19ac6a7fc78 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index 01d23523d0084918cb9195576092679cc8fd2733..72e7ce590ab96135e77ffdd8435e3f61633117db 100644 (file)
@@ -76,7 +76,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index 4a2a1037b37c8fb1955d8f0705486fbe0e76e4ea..0238325ee769d9c075a60b7324d0f1c34db97c13 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1, 1.), constraints);
index 8f3d5f6bcfc7130717202971acd74ec767e296f1..6099d8ac100b517a1065af0de8b7cd1aba645054 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index 01591fe64f58f97c58d65b7f1fe464e998b8585f..519bc47abc691c93fd18dc700845e7c75a89a170 100644 (file)
@@ -89,7 +89,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 8106957d57ff959a6f4fbd3131a7c9ffebf6a21c..ebc328449f84bcbe0863d053026130b06f70a8c9 100644 (file)
@@ -90,7 +90,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 906cd88b9a41ddfa008f475424360c5786a1a912..1d7351238113b116f44e8a46db0d9a93af45cd21 100644 (file)
@@ -92,7 +92,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 2d7539ea2db37b3d0a6c0ceb7aed5dd6825e9cb4..f88273291f9ff5ea5d931248c92a2a316ca1878d 100644 (file)
@@ -93,7 +93,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index a535cd8e8e5e6fdfcec665b90a2e7f865045e435..738aeddd4f1fbffa7f56cbc518db6f617acbf18b 100644 (file)
@@ -89,7 +89,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index e424cf024db061013dd80eb9475a4d80e5a5e22a..b95743d6e6980e475a5860e452626b44434b1691 100644 (file)
@@ -90,7 +90,7 @@ check()
   // not couple, so use pattern
   SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs());
   DoFTools::make_sparsity_pattern(dof, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 5d5350e36effac4d0a149ff5df7b04c2e1417168..ebed5492b1ca13b9dca4fff8427f25b4bf2a1261 100644 (file)
@@ -92,7 +92,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index e4d4dba5911f763c32347f7019d9d51529dc4f18..8801d14b61e6606dc4581631ad99fad03564243d 100644 (file)
@@ -93,7 +93,7 @@ check()
   mask(0, 0) = mask(1, 1) = DoFTools::always;
   mask(0, 1) = mask(1, 0) = DoFTools::none;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index 4a977da330d2120b0939c72d6aa9315dce82c5c4..4a790563723b80519295a6cffac5b3ebc2927c42 100644 (file)
@@ -92,7 +92,7 @@ check()
     for (unsigned int j = 0; j < dim; ++j)
       mask[dim + i][dim + j] = DoFTools::always;
   DoFTools::make_sparsity_pattern(dof, mask, sparsity);
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
   constraints.condense(sparsity);
index dc1e9506b34d9e67ac5dea3f0adbb6b689463c8f..2f489e1ed6667371d8e12213a4df62a3d10774fd 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1, 1.), constraints);
index b90927048099ddec54ceeaf1174b5fae22b5588d..81e2508636187d468efa5e7bfc31459f2a9d524e 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index dd29f58e68f28d39cc529d7bee90fa1f01f5cece..2f11606e0b81973fab2da9b7aad5d4f1ef083673 100644 (file)
@@ -76,7 +76,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(dof,
                                            0,
index c79b2c6af482ebd707e0ccfa45eea766aa81f0c4..d5e0311513cdd720468ad79590262dad17d5a5b8 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1, 1.), constraints);
index 2f6f27275330181bfdd9b4e4017c3db08b18bb46..ab4f662f4ca300e8e289c0af0f42c8202e808e35 100644 (file)
@@ -75,7 +75,7 @@ check()
   MappingQ<dim> mapping(3);
   QGauss<dim>   quadrature(6);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof, constraints);
   VectorTools::interpolate_boundary_values(
     dof, 0, Functions::ConstantFunction<dim>(1., 2), constraints);
index e9b668c2521825c2801b9f5940422b6d24a9e9c4..20ebcef9dcb34ccbe3b6846b883153bdcf9ca81f 100644 (file)
@@ -263,12 +263,12 @@ test_neumann(const NeumanBC<dim> &func)
 {
   deallog << "NeumanBC case:" << std::endl;
   deallog << "--------------" << std::endl;
-  Triangulation<dim>       triangulation;
-  hp::DoFHandler<dim>      dof_handler(triangulation);
-  hp::FECollection<dim>    fe_collection;
-  hp::QCollection<dim>     quadrature_formula;
-  hp::QCollection<dim - 1> face_quadrature_formula;
-  ConstraintMatrix         constraints;
+  Triangulation<dim>        triangulation;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  hp::FECollection<dim>     fe_collection;
+  hp::QCollection<dim>      quadrature_formula;
+  hp::QCollection<dim - 1>  face_quadrature_formula;
+  AffineConstraints<double> constraints;
 
   const unsigned int p = 3;
 
@@ -348,12 +348,12 @@ test_regular(const MyFunction<dim> &func)
   deallog << std::endl;
   deallog << "Regular face:" << std::endl;
   deallog << "-------------" << std::endl;
-  Triangulation<dim>       triangulation;
-  hp::DoFHandler<dim>      dof_handler(triangulation);
-  hp::FECollection<dim>    fe_collection;
-  hp::QCollection<dim>     quadrature_formula;
-  hp::QCollection<dim - 1> face_quadrature_formula;
-  ConstraintMatrix         constraints;
+  Triangulation<dim>        triangulation;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  hp::FECollection<dim>     fe_collection;
+  hp::QCollection<dim>      quadrature_formula;
+  hp::QCollection<dim - 1>  face_quadrature_formula;
+  AffineConstraints<double> constraints;
 
   const unsigned int        p1 = 1;
   const unsigned int        p2 = 2;
@@ -462,12 +462,12 @@ test_irregular(const MyFunction<dim> &func)
   deallog << std::endl;
   deallog << "Irregular face:" << std::endl;
   deallog << "---------------" << std::endl;
-  Triangulation<dim>       triangulation;
-  hp::DoFHandler<dim>      dof_handler(triangulation);
-  hp::FECollection<dim>    fe_collection;
-  hp::QCollection<dim>     quadrature_formula;
-  hp::QCollection<dim - 1> face_quadrature_formula;
-  ConstraintMatrix         constraints;
+  Triangulation<dim>        triangulation;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  hp::FECollection<dim>     fe_collection;
+  hp::QCollection<dim>      quadrature_formula;
+  hp::QCollection<dim - 1>  face_quadrature_formula;
+  AffineConstraints<double> constraints;
 
   const unsigned int        p1 = 1;
   const unsigned int        p2 = 2;
@@ -643,12 +643,12 @@ test(const MySecondFunction<dim> &func)
   deallog << "More complicated mesh:" << std::endl;
   deallog << "----------------------" << std::endl;
 
-  dealii::Triangulation<dim>       triangulation;
-  dealii::hp::DoFHandler<dim>      dof_handler(triangulation);
-  dealii::hp::FECollection<dim>    fe_collection;
-  dealii::hp::QCollection<dim>     quadrature_formula;
-  dealii::hp::QCollection<dim - 1> face_quadrature_formula;
-  dealii::ConstraintMatrix         constraints;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::hp::DoFHandler<dim>       dof_handler(triangulation);
+  dealii::hp::FECollection<dim>     fe_collection;
+  dealii::hp::QCollection<dim>      quadrature_formula;
+  dealii::hp::QCollection<dim - 1>  face_quadrature_formula;
+  dealii::AffineConstraints<double> constraints;
   for (unsigned int p = 1; p <= 3; p++)
     {
       fe_collection.push_back(dealii::FE_Q<dim>(QIterated<1>(QTrapez<1>(), p)));
index 9d9215ad572446775aef94737250d1064ce7b19a..bc5096b7b3bc82dfd6c45003d4fabcf8ba61df4b 100644 (file)
@@ -208,12 +208,12 @@ test_neumann(const NeumanBC<dim> &func)
 {
   deallog << "NeumanBC case:" << std::endl;
   deallog << "--------------" << std::endl;
-  Triangulation<dim>       triangulation;
-  hp::DoFHandler<dim>      dof_handler(triangulation);
-  hp::FECollection<dim>    fe_collection;
-  hp::QCollection<dim>     quadrature_formula;
-  hp::QCollection<dim - 1> face_quadrature_formula;
-  ConstraintMatrix         constraints;
+  Triangulation<dim>        triangulation;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  hp::FECollection<dim>     fe_collection;
+  hp::QCollection<dim>      quadrature_formula;
+  hp::QCollection<dim - 1>  face_quadrature_formula;
+  AffineConstraints<double> constraints;
 
   const unsigned int p = 3;
 
@@ -293,12 +293,12 @@ test_regular(const MyFunction<dim> &func)
   deallog << std::endl;
   deallog << "Regular face:" << std::endl;
   deallog << "-------------" << std::endl;
-  Triangulation<dim>       triangulation;
-  hp::DoFHandler<dim>      dof_handler(triangulation);
-  hp::FECollection<dim>    fe_collection;
-  hp::QCollection<dim>     quadrature_formula;
-  hp::QCollection<dim - 1> face_quadrature_formula;
-  ConstraintMatrix         constraints;
+  Triangulation<dim>        triangulation;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  hp::FECollection<dim>     fe_collection;
+  hp::QCollection<dim>      quadrature_formula;
+  hp::QCollection<dim - 1>  face_quadrature_formula;
+  AffineConstraints<double> constraints;
 
   const unsigned int        p1 = 1;
   const unsigned int        p2 = 2;
@@ -407,12 +407,12 @@ test_irregular(const MyFunction<dim> &func)
   deallog << std::endl;
   deallog << "Irregular face:" << std::endl;
   deallog << "---------------" << std::endl;
-  Triangulation<dim>       triangulation;
-  hp::DoFHandler<dim>      dof_handler(triangulation);
-  hp::FECollection<dim>    fe_collection;
-  hp::QCollection<dim>     quadrature_formula;
-  hp::QCollection<dim - 1> face_quadrature_formula;
-  ConstraintMatrix         constraints;
+  Triangulation<dim>        triangulation;
+  hp::DoFHandler<dim>       dof_handler(triangulation);
+  hp::FECollection<dim>     fe_collection;
+  hp::QCollection<dim>      quadrature_formula;
+  hp::QCollection<dim - 1>  face_quadrature_formula;
+  AffineConstraints<double> constraints;
 
   const unsigned int        p1 = 1;
   const unsigned int        p2 = 2;
@@ -590,12 +590,12 @@ test(const MySecondFunction<dim> &func)
   deallog << "More complicated mesh:" << std::endl;
   deallog << "----------------------" << std::endl;
 
-  dealii::Triangulation<dim>       triangulation;
-  dealii::hp::DoFHandler<dim>      dof_handler(triangulation);
-  dealii::hp::FECollection<dim>    fe_collection;
-  dealii::hp::QCollection<dim>     quadrature_formula;
-  dealii::hp::QCollection<dim - 1> face_quadrature_formula;
-  dealii::ConstraintMatrix         constraints;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::hp::DoFHandler<dim>       dof_handler(triangulation);
+  dealii::hp::FECollection<dim>     fe_collection;
+  dealii::hp::QCollection<dim>      quadrature_formula;
+  dealii::hp::QCollection<dim - 1>  face_quadrature_formula;
+  dealii::AffineConstraints<double> constraints;
   for (unsigned int p = 1; p <= 3; p++)
     {
       fe_collection.push_back(dealii::FE_Q<dim>(QIterated<1>(QTrapez<1>(), p)));
index 09f4a93e7845af00ce6fbdae906cb8b3a770bf22..4d9b459c0affef2683bf1680bf7c0687cb4cce13 100644 (file)
@@ -54,7 +54,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index aa5d6a38ae4f4211c298d35525a62f6222c87e5b..db71bc4a6f0ffa11a338ee2555c3b796ceed3f43 100644 (file)
@@ -55,7 +55,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_no_normal_flux_constraints(dof, 1, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index e7b9d6345b1f3976c7c231eb6f07935e04a2c694..a54bdaa2386fa40b461782da13835f0132e6149f 100644 (file)
@@ -54,7 +54,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
   std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
   cm.print(deallog.get_file_stream());
index ccc0ebf26c6e282ce5e6578f9415eb58315de422..b6e220a20a1abeae472580adcf0bc36c8d96b543 100644 (file)
@@ -89,7 +89,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
   std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
   cm.close();
 
index 619ad1e3b702ad991e2ee9db1ce123341ba298e8..610635d31dc92d60de6465c5c9784f4c7f699172 100644 (file)
@@ -65,7 +65,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index 2488a42c2ce381c47dc1e3f2a650617b8c1ccbc2..06cccd7a2f0d53457c1450c313fc5e8f9a9c95cf 100644 (file)
@@ -58,8 +58,8 @@ test_hyper_cube()
   boundary_ids.insert(1);
   boundary_ids.insert(3);
 
-  ConstraintMatrix    cm;
-  const MappingQ<dim> mapping(4);
+  AffineConstraints<double> cm;
+  const MappingQ<dim>       mapping(4);
   VectorTools::compute_no_normal_flux_constraints(
     dof, 0, boundary_ids, cm, mapping);
   cm.close();
index 00a4c5a421661b9e79a46b44ba6a9f7f83bee563..f20d40cd45ea0d9428cf77b9b3289668ef6ed150 100644 (file)
@@ -57,7 +57,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
   std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
   cm.print(deallog.get_file_stream());
index 8d485e5b3ecb9fe493d798310a2906ef1860c8be..b025d6e2b34c8b708966a151a85d2c1b20582c39 100644 (file)
@@ -22,7 +22,7 @@
 // in function
 //     static void dealii::VectorTools::compute_no_normal_flux_constraints(const
 //     DoFHandlerType<dim, spacedim>&, unsigned int, const
-//     std::set<types::boundary_id>&, dealii::ConstraintMatrix&, const
+//     std::set<types::boundary_id>&, dealii::AffineConstraints<double>&, const
 //     dealii::Mapping<dim, spacedim>&) [with int dim = 3, DoFHandlerType =
 //     dealii::DoFHandler, int spacedim = 3]
 // The violated condition was:
@@ -58,8 +58,8 @@ check()
   GridGenerator::half_hyper_shell(tr, Point<dim>(), 0.5, 1, 0);
   tr.reset_manifold(0);
 
-  ConstraintMatrix cm;
-  MappingQ<dim>    mapping(1);
+  AffineConstraints<double> cm;
+  MappingQ<dim>             mapping(1);
 
   FESystem<dim>   fe(FE_Q<dim>(1), dim);
   DoFHandler<dim> dofh(tr);
index 429fe46af003614bdf43548c05022c08fe511936..b1f0214939d93a4d6a54ff046520374a5c4e6814 100644 (file)
@@ -55,8 +55,8 @@ check()
   GridGenerator::quarter_hyper_shell(tr, Point<dim>(), 0.5, 1.0, 3, true);
   tr.reset_manifold(0);
 
-  ConstraintMatrix cm;
-  MappingQ<dim>    mapping(1);
+  AffineConstraints<double> cm;
+  MappingQ<dim>             mapping(1);
 
   FESystem<dim>   fe(FE_Q<dim>(1), dim);
   DoFHandler<dim> dofh(tr);
index e2364c0216a08c1543877e0a2797866ad15e2aa3..75e0c53f6c2004307e34c7a94e99c7adea323a50 100644 (file)
@@ -19,7 +19,7 @@
 // --------------------------------------------------------
 // An error occurred in line <304> of file <.../constraint_matrix.cc> in
 // function
-//     void dealii::ConstraintMatrix::close()
+//     void dealii::AffineConstraints<double>::close()
 // The violated condition was:
 //     dof_index != line->line
 // The name and call sequence of the exception was:
@@ -196,10 +196,10 @@ template <int dim>
 void
 run()
 {
-  Triangulation<dim> triangulation;
-  FESystem<dim>      fe(FE_Q<dim>(1), dim);
-  DoFHandler<dim>    dof_handler(triangulation);
-  ConstraintMatrix   constraints;
+  Triangulation<dim>        triangulation;
+  FESystem<dim>             fe(FE_Q<dim>(1), dim);
+  DoFHandler<dim>           dof_handler(triangulation);
+  AffineConstraints<double> constraints;
 
   sixty_deg_hyper_shell(triangulation, Point<dim>(), 0.5, 1.0);
   GridTools::copy_boundary_to_manifold_id(triangulation);
index 22af454ec428149b2f5afeded1676c8b71f96b26..f6820eb3e7294bc7482f655d442fa7695eac817d 100644 (file)
@@ -140,7 +140,7 @@ run()
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix             constraints;
+  AffineConstraints<double>    constraints;
   std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert(6);
   VectorTools::compute_no_normal_flux_constraints(dof_handler,
index a2ef7a575fb819b149fe9fbbd5e7cea3ec99c298..21eb7e42369eb843ffb8714dbbaa953df2fc67a8 100644 (file)
@@ -25,7 +25,7 @@
 in function 5:     void
 dealii::VectorTools::compute_no_normal_flux_constraints(const
 DoFHandlerType<dim, spacedim>&, unsigned int, const
-std::set<types::boundary_id>&, dealii::ConstraintMatrix&, const
+std::set<types::boundary_id>&, dealii::AffineConstraints<double>&, const
 dealii::Mapping<dim, spacedim>&) [with int dim = 3; DoFHandlerType =
 dealii::DoFHandler; int spacedim = 3] 5: The violated condition was: 5:
 contribution->second.size() == dim-1 5: The name and call sequence of the
@@ -95,7 +95,7 @@ run()
   DoFHandler<dim> dof_handler(tria);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix             constraints;
+  AffineConstraints<double>    constraints;
   std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert(0); // x=0
   no_normal_flux_boundaries.insert(5); // z=1
index b3fd3f103e975ef3c61a304969f4dd723dce478d..44e07229e7029d0a7c81fcd1696ca77f0747cfb0 100644 (file)
@@ -47,7 +47,7 @@ test()
   DoFHandler<dim> dof_handler(triangulation);
   dof_handler.distribute_dofs(fe);
 
-  ConstraintMatrix             constraints;
+  AffineConstraints<double>    constraints;
   std::set<types::boundary_id> no_normal_flux_boundaries;
   no_normal_flux_boundaries.insert(1);
   deal_II_exceptions::disable_abort_on_exception();
index 4d949f92a95465ad79014b7c8aa5f841249c0259..471135b760b75fa95d50af1a38743d860756fde4 100644 (file)
@@ -44,8 +44,8 @@ check()
   GridGenerator::quarter_hyper_shell(tr, Point<dim>(), 0.5, 1.0, 3, true);
   tr.reset_manifold(0);
 
-  ConstraintMatrix cm;
-  MappingQ<dim>    mapping(1);
+  AffineConstraints<double> cm;
+  MappingQ<dim>             mapping(1);
 
   FESystem<dim>   fe(FE_Q<dim>(3), dim);
   DoFHandler<dim> dofh(tr);
index e62069b62a3a9fa40e60662bdc7356a789f17cdb..cc4395304bc7ac55ff0e66057b0e41a051119613 100644 (file)
@@ -47,8 +47,8 @@ check()
   tria.set_all_manifold_ids(0);
   tria.set_manifold(0, spherical);
 
-  ConstraintMatrix cm;
-  MappingQ<dim>    mapping(4);
+  AffineConstraints<double> cm;
+  MappingQ<dim>             mapping(4);
 
   FESystem<dim>   fe(FE_Q<dim>(2), dim);
   DoFHandler<dim> dofh(tria);
index 9f6226c47c441b14ff15d4972f3cdbdb1520ab77..968a5ef3da1435e5f5fb861714688fdf7d6d67ca 100644 (file)
@@ -50,7 +50,7 @@ test(const Triangulation<dim> &tr, const hp::FECollection<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index 677f5054332d820c282cdebad2465dc7c27bf918..9629c9c66570640c4ec49cf53fa16be74cc14879 100644 (file)
@@ -51,7 +51,7 @@ test(const Triangulation<dim> &tr, const hp::FECollection<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_no_normal_flux_constraints(dof, 1, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index 83a025c306e89c37fc70354c5ffe34747852fb89..55ff250f146545f9dc55b66eead77819f6a10c18 100644 (file)
@@ -48,7 +48,7 @@ test(const Triangulation<dim> &tr, const hp::FECollection<dim> &fe)
   std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
   cm.print(deallog.get_file_stream());
index 0929da6427606faf23ab1d73f0310a5f148744ff..af05e24c0c1ddd029782542954cc2ed7d2e85815 100644 (file)
@@ -82,7 +82,7 @@ test(const Triangulation<dim> &tr, const hp::FECollection<dim> &fe)
   std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
   cm.close();
 
index c85025899478ce9b7b92a74a0d312dbcac49c7d6..50228d3a8db6eea3e364e51024b69dba4a8395f7 100644 (file)
@@ -57,7 +57,7 @@ test(const Triangulation<dim> &tr, const hp::FECollection<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index a53c95ed1f54986342ac6e808a8a4ce5816709b9..7de6e3bb087daf87bea12a726f01b983e9af9374 100644 (file)
@@ -54,7 +54,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index 79bebd1a16e579b57b29701d8154ecdb76f47c3c..c3052ebfb651c05002bb50a8fed338048fe776d9 100644 (file)
@@ -55,7 +55,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_normal_flux_constraints(dof, 1, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index a6a2f4d6761c2cc4583be55eca501298b584ba60..63052c6f0b71ac3da3cb4c62bb8a49e5e8180e4e 100644 (file)
@@ -49,7 +49,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
   std::set<types::boundary_id> boundary_ids;
   boundary_ids.insert(0);
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::compute_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
   cm.print(deallog.get_file_stream());
index 34bc0e9ea255c2e6724ab271bb3be7bf6d3a8672..1b1b8e2efa1dbadb53d10a1312c3e1dec597c84d 100644 (file)
@@ -55,7 +55,7 @@ test(const Triangulation<dim> &tr, const hp::FECollection<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_normal_flux_constraints(dof, 0, boundary_ids, cm);
 
       cm.print(deallog.get_file_stream());
index 6570c2066d4b305a625b505e7f5249f92084669d..c212a55206099f634d16a955688e8cbdf271675c 100644 (file)
@@ -60,7 +60,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_nonzero_normal_flux_constraints(
         dof, 0, boundary_ids, function_map, cm);
 
index dbf2292f0667faa91ee43d001b928f79d3ea623d..ec3510d761ba33ebe6035d20d866bfe2e6368a97 100644 (file)
@@ -75,7 +75,7 @@ test()
 
   Vector<double> v(dh.n_dofs());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::project(dh, cm, QGauss<dim>(3), F<dim>(), v);
 
index ab3204a407a1533c963b3f79c68f046072e87b1b..6707a71642abd74b07ba08631171e1eeb7d5d77c 100644 (file)
@@ -87,7 +87,7 @@ test()
 
   Vector<double> v(dh.n_dofs());
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
 
   // use the implicit Q1 mapping. this will yield a zero solution
index 50498db5bf7cd533e0a864f25d0ee4a2f558af6b..8441db9af84d25f4a7fc0a1f3183f2a8540f37a8 100644 (file)
@@ -78,7 +78,7 @@ test()
   v.block(1).reinit(dh.n_dofs() - dh.n_dofs() / 2);
   v.collect_sizes();
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   cm.close();
   VectorTools::project(dh, cm, QGauss<dim>(3), F<dim>(), v);
 
index bceaac3061a7fe05e8085ea3edb45c6002e9b34c..3645729394209dc11d48df7cfc2e3092f9001689 100644 (file)
@@ -80,7 +80,7 @@ test()
 
   const F<dim> approximated_function;
 
-  ConstraintMatrix cm;
+  AffineConstraints<double> cm;
   VectorTools::interpolate_boundary_values(dh, 0, approximated_function, cm);
   cm.close();
 
index 7060af49fb42a11eabe2a1659efbbe64bdae2bbf..8821a532ab9780fa80f1e9abace4d0d0dee0a92e 100644 (file)
@@ -65,8 +65,8 @@ test_boundary_values(const FiniteElement<dim> &fe)
 
   dof_handler.distribute_dofs(fe);
 
-  BoundaryFunction<dim> boundary_function;
-  ConstraintMatrix      constraints;
+  BoundaryFunction<dim>     boundary_function;
+  AffineConstraints<double> constraints;
 
   constraints.clear();
   VectorTools::project_boundary_values_curl_conforming(
index 456d3ce09fa54bc2c50cb8238be0f5d9a7b5ac2a..846e088fee1fe72318e9bef8f4d304a695ed0ef4 100644 (file)
@@ -61,8 +61,8 @@ BoundaryFunction<dim>::vector_value(const Point<dim> &,
 
 template <int dim>
 void
-test_boundary_values(const FiniteElement<dim> &fe,
-                     ConstraintMatrix &        constraints)
+test_boundary_values(const FiniteElement<dim> & fe,
+                     AffineConstraints<double> &constraints)
 {
   Triangulation<dim> triangulation;
   GridGenerator::subdivided_hyper_cube(triangulation, 2);
@@ -81,7 +81,7 @@ test(unsigned order)
 {
   deallog << "dim:" << dim << " order:" << order << "\t";
 
-  ConstraintMatrix constraints_fe, constraints_fes;
+  AffineConstraints<double> constraints_fe, constraints_fes;
 
   {
     FE_Nedelec<3> fe(order);
index 9615745fb862059a8117de42bd1162b981695abc..2414ddd178fa46cfb10db5b378be67c672a36b22 100644 (file)
@@ -65,8 +65,8 @@ test_boundary_values(const FiniteElement<dim> &fe)
 
   dof_handler.distribute_dofs(fe);
 
-  BoundaryFunction<dim> boundary_function;
-  ConstraintMatrix      constraints;
+  BoundaryFunction<dim>     boundary_function;
+  AffineConstraints<double> constraints;
 
   constraints.clear();
   VectorTools::project_boundary_values_div_conforming(
index 44b47c25c4e64e55f2c8efe6e11eb003836a2e83..2d8fc0cbc20922c43dbe3ccec6c06bb76cc880aa 100644 (file)
@@ -109,7 +109,7 @@ do_project(const Triangulation<dim> &triangulation,
 
   deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
 
index ffaadd5ac832a08eef4c2a1b0c367eb7d9152eca..c6757ea88a0aa209a25946807af7c76263387279 100644 (file)
@@ -117,7 +117,7 @@ do_project(const parallel::distributed::Triangulation<dim> &triangulation,
   IndexSet        locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 6a98dba68f914b051bb81c3261b7e5c2d5790ee3..580a18d547dc58b563aa44698d75ad6b84ad51d4 100644 (file)
@@ -114,7 +114,7 @@ do_project(const parallel::distributed::Triangulation<dim> &triangulation,
   IndexSet locally_relevant_dofs;
   DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs);
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index 676b11a7b879e3d7151352b0d2d0dd4cc6630e77..357a4926a253cab7500480e47f3d7d6d32f06e3f 100644 (file)
@@ -113,11 +113,11 @@ do_project(const parallel::distributed::Triangulation<dim> &triangulation,
   deallog << "n_cells=" << triangulation.n_global_active_cells() << std::endl;
 
   std::vector<std::shared_ptr<DoFHandler<dim>>> dof_handlers(fes.size());
-  std::vector<IndexSet>         locally_relevant_dofs(fes.size());
-  std::vector<ConstraintMatrix> constraints(fes.size());
+  std::vector<IndexSet>                  locally_relevant_dofs(fes.size());
+  std::vector<AffineConstraints<double>> constraints(fes.size());
 
-  std::vector<const DoFHandler<dim> *>  dof_handlers_mf(fes.size());
-  std::vector<const ConstraintMatrix *> constraints_mf(fes.size());
+  std::vector<const DoFHandler<dim> *>           dof_handlers_mf(fes.size());
+  std::vector<const AffineConstraints<double> *> constraints_mf(fes.size());
   for (unsigned int i = 0; i < fes.size(); ++i)
     {
       dof_handlers[i] = std::make_shared<DoFHandler<dim>>(triangulation);
index 8897f713d0d3a497716ed979f07455e397db201b..ac93fe48b456727b076592e3f779c8638c10b609 100644 (file)
@@ -61,7 +61,7 @@ test(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
       for (unsigned int j = 0; j <= i; ++j)
         boundary_ids.insert(j);
 
-      ConstraintMatrix cm;
+      AffineConstraints<double> cm;
       VectorTools::compute_nonzero_tangential_flux_constraints(
         dof, 0, boundary_ids, function_map, cm);
 
index 683f6589b6d57d0455e77d4d541c3390728ae738..ed017c0141ddf6fc55cc2613ed04199553bc763d 100644 (file)
@@ -15,8 +15,8 @@
 
 
 // Check that all the functionality needed for calling
-// ConstraintMatrix::distribute_local_to_global on mutiple combinations of
-// PETScWrappers objects is correctly instantiated and works.
+// AffineConstraints<double>::distribute_local_to_global on mutiple combinations
+// of PETScWrappers objects is correctly instantiated and works.
 
 #include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/full_matrix.h>
index a38af57246e3327ea2d6d0d129b0997c4d6f5fc6..a85328170a2b0999cb5eb626124b2e2edf383a3c 100644 (file)
@@ -105,7 +105,7 @@ test()
 
   const types::global_dof_index n_local_dofs = locally_owned_dofs.n_elements();
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
   constraints.reinit(locally_relevant_dofs);
   DoFTools::make_hanging_node_constraints(dof_handler, constraints);
   constraints.close();
index fcc1cff3bf91dbd65f95743b6fe0e0b709d52528..e4d458b0f963de7e2438be5a9c02a60d772a6eb3 100644 (file)
@@ -176,7 +176,7 @@ namespace Step18
     parallel::shared::Triangulation<dim> triangulation;
     FESystem<dim>                        fe;
     DoFHandler<dim>                      dof_handler;
-    ConstraintMatrix                     hanging_node_constraints;
+    AffineConstraints<double>            hanging_node_constraints;
     const QGauss<dim>                    quadrature_formula;
     std::vector<PointHistory<dim>>       quadrature_point_history;
     PETScWrappers::MPI::SparseMatrix     system_matrix;
index 32f2c99900809493777590474cfb1200328d08da..91fa6fd4434cc274d65907dc37458c2a70b0e540 100644 (file)
@@ -192,7 +192,7 @@ namespace Step18
     parallel::shared::Triangulation<dim> triangulation;
     FESystem<dim>                        fe;
     DoFHandler<dim>                      dof_handler;
-    ConstraintMatrix                     hanging_node_constraints;
+    AffineConstraints<double>            hanging_node_constraints;
     const QGauss<dim>                    quadrature_formula;
     std::vector<PointHistory<dim>>       quadrature_point_history;
     PETScWrappers::MPI::SparseMatrix     system_matrix;
index 7c223b73fe09060e3e4b50d510eda743d6b8eb31..d85406177f913f79393cc91cdadc11c3411ddd05 100644 (file)
@@ -904,7 +904,7 @@ namespace Step44
     const QGauss<dim - 1>                qf_face;
     const unsigned int                   n_q_points;
     const unsigned int                   n_q_points_f;
-    ConstraintMatrix                     constraints;
+    AffineConstraints<double>            constraints;
     BlockSparsityPattern                 sparsity_pattern;
     BlockSparseMatrix<double>            tangent_matrix;
     BlockVector<double>                  system_rhs;
@@ -998,7 +998,7 @@ namespace Step44
     make_grid();
     system_setup();
     {
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       constraints.close();
       const ComponentSelectFunction<dim> J_mask(J_component, n_components);
       VectorTools::project(dof_handler_ref,
index 237a0f5e15d96a320b28f5354deda362ca6a8c36..b5dd3777b44ee381914d01da7e7a3989b0c37948 100644 (file)
@@ -704,7 +704,7 @@ namespace Step44
     const QGauss<dim - 1>                qf_face;
     const unsigned int                   n_q_points;
     const unsigned int                   n_q_points_f;
-    ConstraintMatrix                     constraints;
+    AffineConstraints<double>            constraints;
     BlockSparsityPattern                 sparsity_pattern;
     BlockSparseMatrix<double>            tangent_matrix;
     BlockVector<double>                  system_rhs;
@@ -798,7 +798,7 @@ namespace Step44
     make_grid();
     system_setup();
     {
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       constraints.close();
       const ComponentSelectFunction<dim> J_mask(J_component, n_components);
       VectorTools::project(dof_handler_ref,
index 813ac98329449020cca4ebb4c038ef8d2a0c8062..4be51ee71d465ce71cff4669db59b27f00816854 100644 (file)
@@ -717,7 +717,7 @@ namespace Step44
     const QGauss<dim - 1>                qf_face;
     const unsigned int                   n_q_points;
     const unsigned int                   n_q_points_f;
-    ConstraintMatrix                     constraints;
+    AffineConstraints<double>            constraints;
     BlockSparsityPattern                 sparsity_pattern;
     BlockSparseMatrix<double>            tangent_matrix;
     BlockVector<double>                  system_rhs;
@@ -811,7 +811,7 @@ namespace Step44
     make_grid();
     system_setup();
     {
-      ConstraintMatrix constraints;
+      AffineConstraints<double> constraints;
       constraints.close();
       const ComponentSelectFunction<dim> J_mask(J_component, n_components);
       VectorTools::project(dof_handler_ref,
index 3394e2d969787190d6f750c17e3e66d618ccfb54..b620e8b967bb5d841630b1ed3a250fdc6d802ff7 100644 (file)
@@ -68,7 +68,7 @@ private:
 
   PETScWrappers::SparseMatrix A;
   PETScWrappers::MPI::Vector  b, x;
-  ConstraintMatrix            constraints;
+  AffineConstraints<double>   constraints;
 
   TableHandler output_table;
 };
index 88ebf33a4ac144fabd07f8b632fc319c73e926ff..7150d84e5fd86f5bec1fef1af4dda55c7e200651 100644 (file)
@@ -68,7 +68,7 @@ private:
   PETScWrappers::SparseMatrix             A, B;
   std::vector<PETScWrappers::MPI::Vector> x;
   std::vector<double>                     lambda;
-  ConstraintMatrix                        constraints;
+  AffineConstraints<double>               constraints;
 
   TableHandler output_table;
 };
index 812485f6c00fe340bd117f5d6a43991888619e9d..35937678abf96f4bde7682933998bb8257be2120 100644 (file)
@@ -69,7 +69,7 @@ private:
 
   TrilinosWrappers::SparseMatrix A;
   TrilinosWrappers::MPI::Vector  b, x;
-  ConstraintMatrix               constraints;
+  AffineConstraints<double>      constraints;
 
   TableHandler output_table;
 };
index 7a7af85c5f08ba34d7e90f555eb05e1cb561d9f3..b2366e6b742b0a4a4f691e2ad9790be8162b1f35 100644 (file)
@@ -72,9 +72,9 @@ private:
   DoFHandler<dim>    dof_handler;
   MappingQ<dim>      mapping;
 
-  SparsityPattern      sparsity_pattern;
-  SparseMatrix<double> system_matrix;
-  ConstraintMatrix     mean_value_constraints;
+  SparsityPattern           sparsity_pattern;
+  SparseMatrix<double>      system_matrix;
+  AffineConstraints<double> mean_value_constraints;
 
   Vector<double> solution;
   Vector<double> system_rhs;
index 9bcc1fb3b70634ddad63aa3d008b7911abf87da7..d23651c339cb4d384a89876c15301dc62f31be9c 100644 (file)
@@ -64,12 +64,12 @@ test(std::string solver_name, std::string preconditioner_name)
     dealii::Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  dealii::Triangulation<dim> triangulation;
-  dealii::DoFHandler<dim>    dof_handler(triangulation);
-  dealii::FE_Q<dim>          fe(1);
-  dealii::ConstraintMatrix   constraints;
-  dealii::IndexSet           locally_owned_dofs;
-  dealii::IndexSet           locally_relevant_dofs;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::DoFHandler<dim>           dof_handler(triangulation);
+  dealii::FE_Q<dim>                 fe(1);
+  dealii::AffineConstraints<double> constraints;
+  dealii::IndexSet                  locally_owned_dofs;
+  dealii::IndexSet                  locally_relevant_dofs;
 
   std::vector<dealii::PETScWrappers::MPI::Vector> eigenfunctions;
   std::vector<PetscScalar>                        eigenvalues;
index be7c7b629df5e154632122cfa6aca5a69e5fd5ec..ea58c35b165bff2b8f30cd8b998a535dd21e480f 100644 (file)
@@ -64,12 +64,12 @@ test(std::string solver_name, std::string preconditioner_name)
     dealii::Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  dealii::Triangulation<dim> triangulation;
-  dealii::DoFHandler<dim>    dof_handler(triangulation);
-  dealii::FE_Q<dim>          fe(1);
-  dealii::ConstraintMatrix   constraints;
-  dealii::IndexSet           locally_owned_dofs;
-  dealii::IndexSet           locally_relevant_dofs;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::DoFHandler<dim>           dof_handler(triangulation);
+  dealii::FE_Q<dim>                 fe(1);
+  dealii::AffineConstraints<double> constraints;
+  dealii::IndexSet                  locally_owned_dofs;
+  dealii::IndexSet                  locally_relevant_dofs;
 
   std::vector<dealii::PETScWrappers::MPI::Vector> eigenfunctions;
   std::vector<PetscScalar>                        eigenvalues;
index fbe6b5f79178f472c7a091fa13c0c5285b166194..394a66acdc13bfe6fb8b8d790fedb2968c9e0d47 100644 (file)
@@ -64,12 +64,12 @@ test(std::string solver_name, std::string preconditioner_name)
     dealii::Utilities::MPI::this_mpi_process(mpi_communicator);
 
 
-  dealii::Triangulation<dim> triangulation;
-  dealii::DoFHandler<dim>    dof_handler(triangulation);
-  dealii::FE_Q<dim>          fe(1);
-  dealii::ConstraintMatrix   constraints;
-  dealii::IndexSet           locally_owned_dofs;
-  dealii::IndexSet           locally_relevant_dofs;
+  dealii::Triangulation<dim>        triangulation;
+  dealii::DoFHandler<dim>           dof_handler(triangulation);
+  dealii::FE_Q<dim>                 fe(1);
+  dealii::AffineConstraints<double> constraints;
+  dealii::IndexSet                  locally_owned_dofs;
+  dealii::IndexSet                  locally_relevant_dofs;
 
   std::vector<dealii::PETScWrappers::MPI::Vector> eigenfunctions;
   std::vector<PetscScalar>                        eigenvalues;
index 56161176e256960967e93d2210ab4ce68c21b522..0050976025630f6a85d9d585683f3f8a7dfbed02 100644 (file)
@@ -138,7 +138,7 @@ private:
   hp::QCollection<dim>     quadrature_collection;
   hp::QCollection<dim - 1> face_quadrature_collection;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix reference_matrix;
   TrilinosWrappers::SparseMatrix test_matrix;
index a9a315d8d1622f8af6facbd6371d41a470c0711a..e544abce8743d92baa3db908fee8d2bcd92d701f 100644 (file)
@@ -146,7 +146,7 @@ private:
   FE_Q<dim>       fe;
   QGauss<dim>     quadrature;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix reference_matrix;
   TrilinosWrappers::SparseMatrix test_matrix;
index 2ffb7f2254fa025f077f767fd69716fe07fdb177..2e6bc792ee8d4f4a6f37f9da50b73f36def7e25f 100644 (file)
@@ -147,7 +147,7 @@ private:
   FE_Q<dim>       fe;
   QGauss<dim>     quadrature;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix reference_matrix;
   TrilinosWrappers::SparseMatrix test_matrix;
index 199566745887eeaa68e22edaff45d3eeba8bfdff..1df7d380ee3f404353256a30aae95fd516eaac1e 100644 (file)
@@ -148,7 +148,7 @@ private:
   FESystem<dim>   fe;
   QGauss<dim>     quadrature;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::BlockSparseMatrix reference_matrix;
   TrilinosWrappers::BlockSparseMatrix test_matrix;
index b7246888a646e535822da441c2d2b678794fa835..5fc2b6c22d5d932ff043ddfab52e354182ef9a2b 100644 (file)
@@ -148,7 +148,7 @@ private:
   FE_Q<dim>       fe;
   QGauss<dim>     quadrature;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix reference_matrix;
   TrilinosWrappers::SparseMatrix test_matrix;
index a6fb1020e839abe3a5f7876f27eedd378dc77d02..01704cb0985ec76611a8f30d22b228afd8094968 100644 (file)
@@ -150,7 +150,7 @@ private:
   FESystem<dim>   fe;
   QGauss<dim>     quadrature;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::BlockSparseMatrix reference_matrix;
   TrilinosWrappers::BlockSparseMatrix test_matrix;
index cec8da9cf71d709ae820e946caf9acb87825ca0a..31411f1ab86818ae8a64ce08cac85649384263d2 100644 (file)
@@ -147,7 +147,7 @@ private:
   FE_Q<dim>       fe;
   QGauss<dim>     quadrature;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix reference_matrix;
   TrilinosWrappers::SparseMatrix test_matrix;
index 8597f2fa3f3b2c40dda7d2ffe20c268b2d7c8e69..0253126c1f5157b381f57f764f139bfa11ebf2d2 100644 (file)
@@ -64,7 +64,7 @@ private:
   FE_Q<dim>          fe;
   DoFHandler<dim>    dof_handler;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index 7efee49f9b42ac884b89b39cd2abda8f44737084..07207e423e553271488a3759110fca671ab6d016 100644 (file)
@@ -70,8 +70,8 @@ private:
   FE_Q<dim>                                 fe;
   DoFHandler<dim>                           dof_handler;
 
-  ConstraintMatrix constraints;
-  SparsityPattern  sparsity_pattern;
+  AffineConstraints<double> constraints;
+  SparsityPattern           sparsity_pattern;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index 1357a0ce3878e521f3e30f6672920f550f3e28e4..784c0f6eb992d9ae69a72d5e63ef7c90892dbde9 100644 (file)
@@ -72,8 +72,8 @@ private:
   FE_Q<dim>                                 fe;
   DoFHandler<dim>                           dof_handler;
 
-  ConstraintMatrix constraints;
-  SparsityPattern  sparsity_pattern;
+  AffineConstraints<double> constraints;
+  SparsityPattern           sparsity_pattern;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index 884c8b46e44a03ea73abc8d1f7d6d043d79ce991..aa649dfa1ad61bbe16ad19c4e52b5de156ad3d1e 100644 (file)
@@ -50,7 +50,7 @@ test()
   DoFTools::make_sparsity_pattern(dof_handler,
                                   coupling,
                                   sparsity,
-                                  ConstraintMatrix(),
+                                  AffineConstraints<double>(),
                                   false,
                                   Utilities::MPI::this_mpi_process(
                                     MPI_COMM_WORLD));
index 998579172e48e8c826d94a0bbb59de19d6c1a9ad..b7ee1737ecce8cd356665e2561de1cd40058240e 100644 (file)
@@ -61,7 +61,7 @@ test()
   DoFTools::make_sparsity_pattern(dof_handler,
                                   coupling,
                                   sparsity,
-                                  ConstraintMatrix(),
+                                  AffineConstraints<double>(),
                                   false,
                                   Utilities::MPI::this_mpi_process(
                                     MPI_COMM_WORLD));
index 5ed41277b043e81ae9ed64e796b3b324b7a62230..1e0f576787b0c11bda077ce8e8768c715381e49b 100644 (file)
@@ -65,7 +65,7 @@ private:
   FE_Q<dim>          fe;
   DoFHandler<dim>    dof_handler;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index e261e0a1cd7d1e0e70f126386cf083c767aca242..62101399b38fbff41078afc327912dbef5f07dc2 100644 (file)
@@ -64,7 +64,7 @@ private:
   FE_Q<dim>          fe;
   DoFHandler<dim>    dof_handler;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index 10109d020a055695feafc6880d9a6f3ef37f306f..31b860e145d26d82e5bccd84fff27fb38788bc13 100644 (file)
@@ -70,7 +70,7 @@ private:
   FE_Q_iso_Q1<dim> fe_precondition;
   DoFHandler<dim>  dof_handler_precondition;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
   TrilinosWrappers::SparseMatrix preconditioner_matrix;
index ca417086d896172567ede36c549d1ad7eb7660f8..09d2c6eadf4ee23085df8f259b26e8e368fcfc41 100644 (file)
@@ -64,7 +64,7 @@ private:
   FE_Q<dim>          fe;
   DoFHandler<dim>    dof_handler;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
 
index a3f39619607602de91770100fb1fe964627f70c3..898a744487ededdbc8568e50f621efc9dbf0ca44 100644 (file)
@@ -70,7 +70,7 @@ private:
   FE_Q_iso_Q1<dim> fe_precondition;
   DoFHandler<dim>  dof_handler_precondition;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   TrilinosWrappers::SparseMatrix system_matrix;
   TrilinosWrappers::SparseMatrix preconditioner_matrix;
index 356f9fbd1a8a6d98c470e5fd47b9d8960a80bd6a..8675ca411d0c7099480bf33d97b602640e83f86f 100644 (file)
@@ -62,7 +62,7 @@ private:
 
   FE_Q<2> fe;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   IndexSet locally_owned_dofs;
   IndexSet locally_relevant_dofs;
index 5544bbda23af4bfb9f5bffe450c46957b1c4e530..09ae45f96015b6daa715b689f39bff0d76d25446 100644 (file)
@@ -109,7 +109,7 @@ private:
   IndexSet locally_owned_dofs;
   IndexSet locally_relevant_dofs;
 
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   LA::MPI::SparseMatrix system_matrix;
   LA::MPI::Vector       locally_relevant_solution;
index cd2c3a861c5731f5d3bd472828a2f2429e7bbbae..58e0df4ef0a159c0b966cec86a039ba1eb3db740 100644 (file)
@@ -59,9 +59,9 @@ namespace Step22
     FESystem<dim>                             fe;
     DoFHandler<dim>                           dof_handler;
 
-    ConstraintMatrix      constraints;
-    std::vector<IndexSet> owned_partitioning;
-    std::vector<IndexSet> relevant_partitioning;
+    AffineConstraints<double> constraints;
+    std::vector<IndexSet>     owned_partitioning;
+    std::vector<IndexSet>     relevant_partitioning;
   };
 
 
@@ -111,7 +111,7 @@ namespace Step22
         locally_relevant_dofs.get_view(n_u, n_u + n_p));
     }
 
-    ConstraintMatrix new_constraints;
+    AffineConstraints<double> new_constraints;
     new_constraints.close();
     {
       TrilinosWrappers::BlockSparsityPattern bsp(owned_partitioning,
index 1fc7088dacc17470ab7356c5cbac88d501524d50..c80705b6be8a497b266be31e6b49dae4784c9018 100644 (file)
@@ -50,7 +50,7 @@ test()
   DoFTools::extract_locally_relevant_dofs(dh, relevant_partitioning);
 
   // generate empty constraints
-  ConstraintMatrix constraints;
+  AffineConstraints<double> constraints;
 
   // generate sparsity pattern
   TrilinosWrappers::SparsityPattern sp(dh.locally_owned_dofs(),

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.