]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge from mainline.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 20 Sep 2013 23:27:40 +0000 (23:27 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 20 Sep 2013 23:27:40 +0000 (23:27 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30879 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
tests/base/data_out_reader_01.cc
tests/base/graph_coloring_01.cc
tests/base/graph_coloring_02.cc
tests/base/graph_coloring_03.cc
tests/bits/dof_tools_21_b.cc
tests/bits/dof_tools_21_b_x.cc
tests/bits/dof_tools_21_b_x_q3.cc
tests/bits/dof_tools_21_b_y.cc
tests/tests.h

Simple merge
Simple merge
Simple merge
index 61b600052956df8620a817cc54c77646ab4f96a2,9d0a0f9d8d8589c21fba7f09493fb9da938d93ae..2d7f56d8b2b781c8936a89b34b25bd30ea473e30
@@@ -59,7 -69,8 +69,8 @@@ void check(
  
    // Create the coloring
    std::vector<std::vector<typename hp::DoFHandler<dim>::active_cell_iterator> > coloring(
-       graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end()));
+       graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
 -        get_conflict_indices_cfem<dim>));      
++        get_conflict_indices_cfem<dim>));
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/tests.h
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.