]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove DEAL_II_COMPAT_MAPPING as suggested by Wolfgang Bangerth
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 17 Sep 2012 21:01:49 +0000 (21:01 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 17 Sep 2012 21:01:49 +0000 (21:01 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26453 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/include/deal.II/base/config.h.in
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/fe/fe_values.cc
deal.II/source/numerics/derivative_approximation.cc
deal.II/source/numerics/error_estimator.cc
deal.II/source/numerics/matrix_tools.cc

index fbc43305c43e267cdb3bb174c13b84acd8815103..cd7ed19fc701b94874614e486dce4d42720049b9 100644 (file)
@@ -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)
-
-
 
 
 ###########################################################################
index 292363135dbbbd3b6b176eda505bc40a5e42a08c..a81b8b611e355cea66355ea275ae7a0b045d06d8 100644 (file)
 
 
 
-/* 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: *
 #cmakedefine HAVE_STRTRS_
 
 
-
 /****************************************
  * Configured in configure_metis.cmake: *
  ****************************************/
index d30b1c824fa45f5397528dfab745e8c279ac0558..9e549115fea615cdbb4d984308cd71ceac03530a 100644 (file)
@@ -268,7 +268,6 @@ namespace VectorTools
                     const Function<DH::space_dimension>   &function,
                     VECTOR                &vec)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     interpolate(StaticMappingQ1<DH::dimension, DH::space_dimension>::mapping,
                 dof, function, vec);
   }
@@ -644,7 +643,6 @@ namespace VectorTools
                 const Quadrature<dim-1>  &q_boundary,
                 const bool                project_to_boundary_first)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     project(StaticMappingQ1<dim,spacedim>::mapping, dof, constraints, quadrature, function, vec,
             enforce_zero_boundary, q_boundary, project_to_boundary_first);
   }
@@ -769,7 +767,6 @@ namespace VectorTools
                                const Function<spacedim>      &rhs_function,
                                Vector<double>           &rhs_vector)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_right_hand_side(StaticMappingQ1<dim,spacedim>::mapping, dof_handler, quadrature,
                            rhs_function, rhs_vector);
   }
@@ -908,7 +905,6 @@ namespace VectorTools
                                const Function<spacedim>      &rhs_function,
                                Vector<double>           &rhs_vector)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_right_hand_side(hp::StaticMappingQ1<dim,spacedim>::mapping_collection,
                            dof_handler, quadrature,
                            rhs_function, rhs_vector);
@@ -956,7 +952,6 @@ namespace VectorTools
                                    const Point<spacedim>         &p,
                                    Vector<double>           &rhs_vector)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_point_source_vector(StaticMappingQ1<dim,spacedim>::mapping, dof_handler,
                                p, rhs_vector);
   }
@@ -1001,7 +996,6 @@ namespace VectorTools
                                    const Point<spacedim>         &p,
                                    Vector<double>           &rhs_vector)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_point_source_vector(hp::StaticMappingQ1<dim>::mapping_collection,
                                dof_handler,
                                p, rhs_vector);
@@ -1052,7 +1046,6 @@ namespace VectorTools
                                    const Point<dim>                  &orientation,
                                    Vector<double>                    &rhs_vector)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_point_source_vector(StaticMappingQ1<dim,spacedim>::mapping, dof_handler,
                                p, orientation, rhs_vector);
   }
@@ -1100,7 +1093,6 @@ namespace VectorTools
                                    const Point<dim>                     &orientation,
                                    Vector<double>                       &rhs_vector)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_point_source_vector(hp::StaticMappingQ1<dim>::mapping_collection,
                                dof_handler,
                                p, orientation, rhs_vector);
@@ -1269,8 +1261,6 @@ namespace VectorTools
                                    Vector<double>          &rhs_vector,
                                    const std::set<types::boundary_id> &boundary_indicators)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-
     create_boundary_right_hand_side(StaticMappingQ1<dim>::mapping, dof_handler,
                                     quadrature,
                                     rhs_function, rhs_vector,
@@ -1452,7 +1442,6 @@ namespace VectorTools
                                    Vector<double>                &rhs_vector,
                                    const std::set<types::boundary_id> &boundary_indicators)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_boundary_right_hand_side(hp::StaticMappingQ1<dim>::mapping_collection,
                                     dof_handler, quadrature,
                                     rhs_function, rhs_vector,
@@ -1963,7 +1952,6 @@ namespace VectorTools
                                std::map<unsigned int,double> &boundary_values,
                                const std::vector<bool>       &component_mask)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     interpolate_boundary_values(StaticMappingQ1<DH::dimension,DH::space_dimension>::mapping,
                                 dof, boundary_component,
                                 boundary_function, boundary_values, component_mask);
@@ -1978,7 +1966,6 @@ namespace VectorTools
                                std::map<unsigned int,double> &boundary_values,
                                const std::vector<bool>       &component_mask)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     interpolate_boundary_values(StaticMappingQ1<DH::dimension,DH::space_dimension>::mapping,
                                 dof, function_map,
                                 boundary_values, component_mask);
@@ -2047,7 +2034,6 @@ namespace VectorTools
    ConstraintMatrix                    &constraints,
    const std::vector<bool>             &component_mask)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     interpolate_boundary_values(StaticMappingQ1<DH::dimension,DH::space_dimension>::mapping,
                                 dof, boundary_component,
                                 boundary_function, constraints, component_mask);
@@ -2063,7 +2049,6 @@ namespace VectorTools
    ConstraintMatrix                                      &constraints,
    const std::vector<bool>                               &component_mask)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     interpolate_boundary_values(StaticMappingQ1<DH::dimension,DH::space_dimension>::mapping,
                                 dof, function_map,
                                 constraints, component_mask);
@@ -2287,7 +2272,6 @@ namespace VectorTools
                            std::map<unsigned int,double> &boundary_values,
                            std::vector<unsigned int> component_mapping)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     project_boundary_values(StaticMappingQ1<dim,spacedim>::mapping, dof, boundary_functions, q,
                             boundary_values, component_mapping);
   }
@@ -2333,7 +2317,6 @@ namespace VectorTools
                            ConstraintMatrix &constraints,
                            std::vector<unsigned int> component_mapping)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     project_boundary_values(StaticMappingQ1<dim,spacedim>::mapping, dof, boundary_functions, q,
                             constraints, component_mapping);
   }
@@ -5311,7 +5294,6 @@ namespace VectorTools
                         const Function<spacedim>      *weight,
                         const double              exponent)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     internal
       ::do_integrate_difference(hp::StaticMappingQ1<dim,spacedim>::mapping_collection,
                                 dof, fe_function, exact_solution,
@@ -5352,7 +5334,6 @@ namespace VectorTools
                         const Function<spacedim>      *weight,
                         const double              exponent)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     internal
       ::do_integrate_difference(hp::StaticMappingQ1<dim>::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<dim,spacedim>::mapping, dof, quadrature, v, component);
   }
 }
index 36e75525795988b3d5f3fbff3a1bebc0c8cad16e..077d686ca489d3e7cd9658c22297e1439c053804 100644 (file)
@@ -3500,7 +3500,6 @@ FEValues<dim,spacedim>::FEValues (const FiniteElement<dim,spacedim> &fe,
                                             fe),
                 quadrature (q)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   initialize (update_flags);
 }
 
@@ -3787,7 +3786,6 @@ FEFaceValues<dim,spacedim>::FEFaceValues (const FiniteElement<dim,spacedim> &fe,
                                                 StaticMappingQ1<dim,spacedim>::mapping,
                                                 fe, quadrature)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   initialize (update_flags);
 }
 
@@ -4018,7 +4016,6 @@ FESubfaceValues<dim,spacedim>::FESubfaceValues (const FiniteElement<dim,spacedim
                                                 StaticMappingQ1<dim,spacedim>::mapping,
                                                 fe, quadrature)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   initialize (update_flags);
 }
 
index 6ada44114c8bf6a29071074208254778f192ecb4..123b949a397e4dda66fb010a868773468d52ddcc 100644 (file)
@@ -522,7 +522,6 @@ approximate_gradient (const DH<dim,spacedim>         &dof_handler,
                       Vector<float>         &derivative_norm,
                       const unsigned int     component)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   approximate_derivative<Gradient<dim>,dim> (StaticMappingQ1<dim>::mapping,
                                              dof_handler,
                                              solution,
@@ -556,7 +555,6 @@ approximate_second_derivative (const DH<dim,spacedim>         &dof_handler,
                                Vector<float>         &derivative_norm,
                                const unsigned int     component)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   approximate_derivative<SecondDerivative<dim>,dim> (StaticMappingQ1<dim>::mapping,
                                                      dof_handler,
                                                      solution,
@@ -597,7 +595,6 @@ approximate_derivative_tensor (const DH<dim,spacedim>
 {
                                    // just call the respective function with Q1
                                    // mapping
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   approximate_derivative_tensor (StaticMappingQ1<dim>::mapping,
                                  dof,
                                  solution,
index 95517074b6d7edc12bfc6f7354678a4ffc554497..16f6e3693f7d7d307a58e12a602a7de2eaf4ca59 100644 (file)
@@ -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<dim,spacedim>::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<dim, spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution,
            error, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
@@ -1739,7 +1733,6 @@ void KellyErrorEstimator<dim, spacedim>::estimate (const DH
                                          const types::subdomain_id subdomain_id,
                                          const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<dim, spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
            errors, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
@@ -1760,7 +1753,6 @@ void KellyErrorEstimator<dim, spacedim>::estimate (const DH
                                          const types::subdomain_id subdomain_id,
                                          const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<dim, spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
            errors, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
index 84bf26e84e8e58c2d9cbb6d1bd71f1c28e4fe893..94a3a8f7b3cda3e20f96eba5d2f9ca3618e5ad0b 100644 (file)
@@ -651,7 +651,6 @@ namespace MatrixCreator
                            SparseMatrix<number>     &matrix,
                            const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_mass_matrix(StaticMappingQ1<dim,spacedim>::mapping, dof,
                        q, matrix, coefficient);
   }
@@ -707,7 +706,6 @@ namespace MatrixCreator
                            Vector<double>           &rhs_vector,
                            const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_mass_matrix(StaticMappingQ1<dim,spacedim>::mapping,
                        dof, q, matrix, rhs, rhs_vector, coefficient);
   }
@@ -756,7 +754,6 @@ namespace MatrixCreator
                            SparseMatrix<number>     &matrix,
                            const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_mass_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q, matrix, coefficient);
   }
 
@@ -808,7 +805,6 @@ namespace MatrixCreator
                            Vector<double>           &rhs_vector,
                            const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_mass_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q,
                        matrix, rhs, rhs_vector, coefficient);
   }
@@ -1595,7 +1591,6 @@ namespace MatrixCreator
                                     const Function<spacedim> * const a,
                                     std::vector<unsigned int> component_mapping)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_boundary_mass_matrix(StaticMappingQ1<dim,spacedim>::mapping, dof, q,
                                 matrix,rhs, rhs_vector, dof_to_boundary_mapping, a, component_mapping);
   }
@@ -1701,7 +1696,6 @@ namespace MatrixCreator
                                     const Function<spacedim> * const a,
                                     std::vector<unsigned int> component_mapping)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_boundary_mass_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q,
                                 matrix,rhs, rhs_vector, dof_to_boundary_mapping, a, component_mapping);
   }
@@ -1758,7 +1752,6 @@ namespace MatrixCreator
                               SparseMatrix<double>     &matrix,
                               const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_laplace_matrix(StaticMappingQ1<dim,spacedim>::mapping, dof, q, matrix, coefficient);
   }
 
@@ -1818,7 +1811,6 @@ namespace MatrixCreator
                               Vector<double>           &rhs_vector,
                               const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_laplace_matrix(StaticMappingQ1<dim,spacedim>::mapping, dof, q,
                           matrix, rhs, rhs_vector, coefficient);
   }
@@ -1872,7 +1864,6 @@ namespace MatrixCreator
                               SparseMatrix<double>     &matrix,
                               const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_laplace_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q, matrix, coefficient);
   }
 
@@ -1929,7 +1920,6 @@ namespace MatrixCreator
                               Vector<double>           &rhs_vector,
                               const Function<spacedim> * const coefficient)
   {
-    Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
     create_laplace_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q,
                           matrix, rhs, rhs_vector, coefficient);
   }

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.