From f584f230d0db57e7240ef3f5b4d2aa2d438ee3f2 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 17 Sep 2012 21:01:49 +0000 Subject: [PATCH] Remove DEAL_II_COMPAT_MAPPING as suggested by Wolfgang Bangerth git-svn-id: https://svn.dealii.org/branches/branch_cmake@26453 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 11 ---------- deal.II/include/deal.II/base/config.h.in | 9 --------- .../deal.II/numerics/vector_tools.templates.h | 20 ------------------- deal.II/source/fe/fe_values.cc | 3 --- .../numerics/derivative_approximation.cc | 3 --- deal.II/source/numerics/error_estimator.cc | 8 -------- deal.II/source/numerics/matrix_tools.cc | 10 ---------- 7 files changed, 64 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index fbc43305c4..cd7ed19fc7 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -154,17 +154,6 @@ OPTION(DEAL_II_FORCE_CONTRIB_BOOST OFF) -# -# Compatibility support: -# - -OPTION(DEAL_II_COMPAT_MAPPING - "Backward compatibility support for functions and classes that do not - take an explicit mapping variable, but rather use a default Q1 mapping - instead." - ON) - - ########################################################################### diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 292363135d..a81b8b611e 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -51,14 +51,6 @@ -/* Backward compatibility support for functions and classes that do not - * take an explicit mapping variable, but rather use a default Q1 mapping - * instead - */ -#cmakedefine DEAL_II_COMPAT_MAPPING - - - /*************************************** * Configured in configure_blas.cmake: * @@ -186,7 +178,6 @@ #cmakedefine HAVE_STRTRS_ - /**************************************** * Configured in configure_metis.cmake: * ****************************************/ diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h index d30b1c824f..9e549115fe 100644 --- a/deal.II/include/deal.II/numerics/vector_tools.templates.h +++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h @@ -268,7 +268,6 @@ namespace VectorTools const Function &function, VECTOR &vec) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); interpolate(StaticMappingQ1::mapping, dof, function, vec); } @@ -644,7 +643,6 @@ namespace VectorTools const Quadrature &q_boundary, const bool project_to_boundary_first) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); project(StaticMappingQ1::mapping, dof, constraints, quadrature, function, vec, enforce_zero_boundary, q_boundary, project_to_boundary_first); } @@ -769,7 +767,6 @@ namespace VectorTools const Function &rhs_function, Vector &rhs_vector) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_right_hand_side(StaticMappingQ1::mapping, dof_handler, quadrature, rhs_function, rhs_vector); } @@ -908,7 +905,6 @@ namespace VectorTools const Function &rhs_function, Vector &rhs_vector) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_right_hand_side(hp::StaticMappingQ1::mapping_collection, dof_handler, quadrature, rhs_function, rhs_vector); @@ -956,7 +952,6 @@ namespace VectorTools const Point &p, Vector &rhs_vector) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_point_source_vector(StaticMappingQ1::mapping, dof_handler, p, rhs_vector); } @@ -1001,7 +996,6 @@ namespace VectorTools const Point &p, Vector &rhs_vector) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_point_source_vector(hp::StaticMappingQ1::mapping_collection, dof_handler, p, rhs_vector); @@ -1052,7 +1046,6 @@ namespace VectorTools const Point &orientation, Vector &rhs_vector) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_point_source_vector(StaticMappingQ1::mapping, dof_handler, p, orientation, rhs_vector); } @@ -1100,7 +1093,6 @@ namespace VectorTools const Point &orientation, Vector &rhs_vector) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_point_source_vector(hp::StaticMappingQ1::mapping_collection, dof_handler, p, orientation, rhs_vector); @@ -1269,8 +1261,6 @@ namespace VectorTools Vector &rhs_vector, const std::set &boundary_indicators) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - create_boundary_right_hand_side(StaticMappingQ1::mapping, dof_handler, quadrature, rhs_function, rhs_vector, @@ -1452,7 +1442,6 @@ namespace VectorTools Vector &rhs_vector, const std::set &boundary_indicators) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_boundary_right_hand_side(hp::StaticMappingQ1::mapping_collection, dof_handler, quadrature, rhs_function, rhs_vector, @@ -1963,7 +1952,6 @@ namespace VectorTools std::map &boundary_values, const std::vector &component_mask) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); interpolate_boundary_values(StaticMappingQ1::mapping, dof, boundary_component, boundary_function, boundary_values, component_mask); @@ -1978,7 +1966,6 @@ namespace VectorTools std::map &boundary_values, const std::vector &component_mask) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); interpolate_boundary_values(StaticMappingQ1::mapping, dof, function_map, boundary_values, component_mask); @@ -2047,7 +2034,6 @@ namespace VectorTools ConstraintMatrix &constraints, const std::vector &component_mask) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); interpolate_boundary_values(StaticMappingQ1::mapping, dof, boundary_component, boundary_function, constraints, component_mask); @@ -2063,7 +2049,6 @@ namespace VectorTools ConstraintMatrix &constraints, const std::vector &component_mask) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); interpolate_boundary_values(StaticMappingQ1::mapping, dof, function_map, constraints, component_mask); @@ -2287,7 +2272,6 @@ namespace VectorTools std::map &boundary_values, std::vector component_mapping) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); project_boundary_values(StaticMappingQ1::mapping, dof, boundary_functions, q, boundary_values, component_mapping); } @@ -2333,7 +2317,6 @@ namespace VectorTools ConstraintMatrix &constraints, std::vector component_mapping) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); project_boundary_values(StaticMappingQ1::mapping, dof, boundary_functions, q, constraints, component_mapping); } @@ -5311,7 +5294,6 @@ namespace VectorTools const Function *weight, const double exponent) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); internal ::do_integrate_difference(hp::StaticMappingQ1::mapping_collection, dof, fe_function, exact_solution, @@ -5352,7 +5334,6 @@ namespace VectorTools const Function *weight, const double exponent) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); internal ::do_integrate_difference(hp::StaticMappingQ1::mapping_collection, dof, fe_function, exact_solution, @@ -5692,7 +5673,6 @@ namespace VectorTools const InVector &v, const unsigned int component) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); return compute_mean_value(StaticMappingQ1::mapping, dof, quadrature, v, component); } } diff --git a/deal.II/source/fe/fe_values.cc b/deal.II/source/fe/fe_values.cc index 36e7552579..077d686ca4 100644 --- a/deal.II/source/fe/fe_values.cc +++ b/deal.II/source/fe/fe_values.cc @@ -3500,7 +3500,6 @@ FEValues::FEValues (const FiniteElement &fe, fe), quadrature (q) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); initialize (update_flags); } @@ -3787,7 +3786,6 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, StaticMappingQ1::mapping, fe, quadrature) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); initialize (update_flags); } @@ -4018,7 +4016,6 @@ FESubfaceValues::FESubfaceValues (const FiniteElement::mapping, fe, quadrature) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); initialize (update_flags); } diff --git a/deal.II/source/numerics/derivative_approximation.cc b/deal.II/source/numerics/derivative_approximation.cc index 6ada44114c..123b949a39 100644 --- a/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/source/numerics/derivative_approximation.cc @@ -522,7 +522,6 @@ approximate_gradient (const DH &dof_handler, Vector &derivative_norm, const unsigned int component) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); approximate_derivative,dim> (StaticMappingQ1::mapping, dof_handler, solution, @@ -556,7 +555,6 @@ approximate_second_derivative (const DH &dof_handler, Vector &derivative_norm, const unsigned int component) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); approximate_derivative,dim> (StaticMappingQ1::mapping, dof_handler, solution, @@ -597,7 +595,6 @@ approximate_derivative_tensor (const DH { // just call the respective function with Q1 // mapping - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); approximate_derivative_tensor (StaticMappingQ1::mapping, dof, solution, diff --git a/deal.II/source/numerics/error_estimator.cc b/deal.II/source/numerics/error_estimator.cc index 95517074b6..16f6e3693f 100644 --- a/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/source/numerics/error_estimator.cc @@ -1043,7 +1043,6 @@ estimate (const DH &dof_handler, const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -1065,7 +1064,6 @@ estimate (const DH &dof_handler, const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -1111,7 +1109,6 @@ estimate (const DH &dof_handler, const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -1133,7 +1130,6 @@ estimate (const DH &dof_handler, const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -1469,7 +1465,6 @@ estimate (const DH &dof_handler, const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, subdomain_id, material_id); @@ -1515,7 +1510,6 @@ estimate (const DH &dof_handler, const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, subdomain_id, material_id); @@ -1739,7 +1733,6 @@ void KellyErrorEstimator::estimate (const DH const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); @@ -1760,7 +1753,6 @@ void KellyErrorEstimator::estimate (const DH const types::subdomain_id subdomain_id, const types::material_id material_id) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); diff --git a/deal.II/source/numerics/matrix_tools.cc b/deal.II/source/numerics/matrix_tools.cc index 84bf26e84e..94a3a8f7b3 100644 --- a/deal.II/source/numerics/matrix_tools.cc +++ b/deal.II/source/numerics/matrix_tools.cc @@ -651,7 +651,6 @@ namespace MatrixCreator SparseMatrix &matrix, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_mass_matrix(StaticMappingQ1::mapping, dof, q, matrix, coefficient); } @@ -707,7 +706,6 @@ namespace MatrixCreator Vector &rhs_vector, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_mass_matrix(StaticMappingQ1::mapping, dof, q, matrix, rhs, rhs_vector, coefficient); } @@ -756,7 +754,6 @@ namespace MatrixCreator SparseMatrix &matrix, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_mass_matrix(hp::StaticMappingQ1::mapping_collection, dof, q, matrix, coefficient); } @@ -808,7 +805,6 @@ namespace MatrixCreator Vector &rhs_vector, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_mass_matrix(hp::StaticMappingQ1::mapping_collection, dof, q, matrix, rhs, rhs_vector, coefficient); } @@ -1595,7 +1591,6 @@ namespace MatrixCreator const Function * const a, std::vector component_mapping) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_boundary_mass_matrix(StaticMappingQ1::mapping, dof, q, matrix,rhs, rhs_vector, dof_to_boundary_mapping, a, component_mapping); } @@ -1701,7 +1696,6 @@ namespace MatrixCreator const Function * const a, std::vector component_mapping) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_boundary_mass_matrix(hp::StaticMappingQ1::mapping_collection, dof, q, matrix,rhs, rhs_vector, dof_to_boundary_mapping, a, component_mapping); } @@ -1758,7 +1752,6 @@ namespace MatrixCreator SparseMatrix &matrix, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_laplace_matrix(StaticMappingQ1::mapping, dof, q, matrix, coefficient); } @@ -1818,7 +1811,6 @@ namespace MatrixCreator Vector &rhs_vector, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_laplace_matrix(StaticMappingQ1::mapping, dof, q, matrix, rhs, rhs_vector, coefficient); } @@ -1872,7 +1864,6 @@ namespace MatrixCreator SparseMatrix &matrix, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_laplace_matrix(hp::StaticMappingQ1::mapping_collection, dof, q, matrix, coefficient); } @@ -1929,7 +1920,6 @@ namespace MatrixCreator Vector &rhs_vector, const Function * const coefficient) { - Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); create_laplace_matrix(hp::StaticMappingQ1::mapping_collection, dof, q, matrix, rhs, rhs_vector, coefficient); } -- 2.39.5