]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from upstream.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 13:24:11 +0000 (13:24 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 13:24:11 +0000 (13:24 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26723 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/include/deal.II/base/table_handler.h
deal.II/include/deal.II/numerics/vector_tools.templates.h
deal.II/source/dofs/dof_tools.cc
deal.II/source/fe/CMakeLists.txt
deal.II/source/fe/fe_values.cc
deal.II/source/numerics/error_estimator.cc

index f30397f94b90aee665b6932d104943bc72d56c75,aa7adf8d71a3addae44ab653e0d856abd4d9680d..bb871c90babb5f0f36fca0fe45f2a6656593a6da
@@@ -1950,8 -1940,9 +1929,8 @@@ namespace VectorTool
                                 const types::boundary_id            boundary_component,
                                 const Function<DH::space_dimension>           &boundary_function,
                                 std::map<unsigned int,double> &boundary_values,
-                                const std::vector<bool>       &component_mask)
+                                const ComponentMask       &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);
    interpolate_boundary_values (const DH                 &dof,
                                 const typename FunctionMap<DH::space_dimension>::type &function_map,
                                 std::map<unsigned int,double> &boundary_values,
-                                const std::vector<bool>       &component_mask)
+                                const ComponentMask       &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);
     const types::boundary_id                  boundary_component,
     const Function<DH::space_dimension> &boundary_function,
     ConstraintMatrix                    &constraints,
-    const std::vector<bool>             &component_mask)
+    const ComponentMask             &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);
    (const DH                                              &dof,
     const typename FunctionMap<DH::space_dimension>::type &function_map,
     ConstraintMatrix                                      &constraints,
-    const std::vector<bool>                               &component_mask)
+    const ComponentMask                               &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);
Simple merge
index 6546ec8722727e5fb0c4008413f19a10865326bf,0000000000000000000000000000000000000000..e1653eed47cdf954f7e273fd84570301952c66c4
mode 100644,000000..100644
--- /dev/null
@@@ -1,68 -1,0 +1,70 @@@
 +SET(src
++  block_mask.cc
++  component_mask.cc
 +  fe_abf.cc
 +  fe_bdm.cc
 +  fe.cc
 +  fe_data.cc
 +  fe_dgp.cc
 +  fe_dgp_monomial.cc
 +  fe_dgp_nonparametric.cc
 +  fe_dgq.cc
 +  fe_dg_vector.cc
 +  fe_face.cc
 +  fe_nedelec.cc
 +  fe_nothing.cc
 +  fe_poly.cc
 +  fe_poly_tensor.cc
 +  fe_q.cc
 +  fe_q_hierarchical.cc
 +  fe_raviart_thomas.cc
 +  fe_raviart_thomas_nodal.cc
 +  fe_system.cc
 +  fe_tools.cc
 +  fe_values.cc
 +  mapping_c1.cc
 +  mapping_cartesian.cc
 +  mapping.cc
 +  mapping_q1.cc
 +  mapping_q1_eulerian.cc
 +  mapping_q.cc
 +  mapping_q_eulerian.cc
 +  )
 +
 +SET(inst_in_files
 +  fe_abf.inst.in
 +  fe_bdm.inst.in
 +  fe_dgp.inst.in
 +  fe_dgp_monomial.inst.in
 +  fe_dgp_nonparametric.inst.in
 +  fe_dgq.inst.in
 +  fe_dg_vector.inst.in
 +  fe_face.inst.in
 +  fe.inst.in
 +  fe_nedelec.inst.in
 +  fe_nothing.inst.in
 +  fe_poly.inst.in
 +  fe_poly_tensor.inst.in
 +  fe_q_hierarchical.inst.in
 +  fe_q.inst.in
 +  fe_raviart_thomas.inst.in
 +  fe_raviart_thomas_nodal.inst.in
 +  fe_system.inst.in
 +  fe_tools.inst.in
 +  fe_values.decl.1.inst.in
 +  fe_values.decl.2.inst.in
 +  fe_values.impl.1.inst.in
 +  fe_values.impl.2.inst.in
 +  fe_values.inst.in
 +  mapping_c1.inst.in
 +  mapping_cartesian.inst.in
 +  mapping.inst.in
 +  mapping_q1_eulerian.inst.in
 +  mapping_q1.inst.in
 +  mapping_q_eulerian.inst.in
 +  mapping_q.inst.in
 +  )
 +
 +DEAL_II_ADD_LIBRARY(obj_fe OBJECT ${src})
 +EXPAND_INSTANTIATIONS(obj_fe "${inst_in_files}")
 +DEAL_II_ADD_DEPENDENCIES(obj_fe deal_ii_target_dependencies)
Simple merge

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.