Merged from trunk r32444 through r32780.

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id_intermediate@32781 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/scripts/run_testsuite.cmake b/deal.II/cmake/scripts/run_testsuite.cmake
index bcc9e12fdbf54f0adad26406efe06e2587cb750e..34d6e9fb99791bbe1b707c85e4c63900843cc9ae 100644 (file)
--- a/deal.II/cmake/scripts/run_testsuite.cmake
+++ b/deal.II/cmake/scripts/run_testsuite.cmake
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2013 by the deal.II authors
+## Copyright (C) 2013, 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -69,7 +69,7 @@
 #       "Nightly"          - Reserved for nightly regression tests for
 #                            build bots on various architectures
 #
-#       "Regression Tests" - Reserved for the regression tester
+#       "Regression Tests" - Reserved for the "official" regression tester
 #
 #   CONFIG_FILE
 #     - A configuration file (see ../deal.II/docs/development/Config.sample)
@@ -245,7 +245,7 @@ ENDIF()
 MESSAGE("-- CTEST_SITE:             ${CTEST_SITE}")
 
 IF( "${TRACK}" STREQUAL "Regression Tests"
-    AND NOT CTEST_SITE MATCHES "c0541" )
+    AND NOT CTEST_SITE MATCHES "tester" )
   MESSAGE(FATAL_ERROR "
 I'm sorry ${CTEST_SITE}, I'm afraid I can't do that.
 The TRACK \"Regression Tests\" is not for you.

diff --git a/deal.II/contrib/utilities/wrapcomments.py b/deal.II/contrib/utilities/wrapcomments.py
index 93b7d403d12d8b916a804dcf769410f79ddc6afc..8ee0ec6b73c0d50243b767884c1a4d711ea165dd 100755 (executable)
--- a/deal.II/contrib/utilities/wrapcomments.py
+++ b/deal.II/contrib/utilities/wrapcomments.py
@@ -94,7 +94,7 @@ def format_block(lines, infostr=""):
 
     ops_startline = ["<li>", "@param", "@returns", "@warning", "@ingroup", "@author", "@date", "@related", "@deprecated"]
 
-    ops_separate_line = ["<ul>", "</ul>", "@{", "@}"]
+    ops_separate_line = ["<ol>", "</ol>", "<ul>", "</ul>", "@{", "@}", "<br>"]
 
     while idx<endidx:
         if one_in(ops_separate_line, lines[idx]):

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 5c2f730fe7506acae6721b2e5edcf4fef84a490a..899dd3ce74e21d2a483e582ed4813f688e356b1d 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -148,6 +148,13 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
+  <li> Fixed: GridTools::find_active_cell_around_point() could get into an infinite
+  loop if the point we are looking for is in fact not within the domain. This is now
+  fixed.
+  <br>
+  (Giorgos Kourakos, Timo Heister, Wolfgang Bangerth, 2014/04/14)
+  </li>
+
   <li> Changed: TableBase<N,T> now uses AlignedVector for storing data
   instead of std::vector, which allows its use for VectorizedArray<Number>
   data fields which require more alignment.

diff --git a/deal.II/include/deal.II/base/aligned_vector.h b/deal.II/include/deal.II/base/aligned_vector.h
index 07f1a24ecbf76f34982eda8651a71378aed557e8..0acf98798b43448dcefcd1e84968450bc55c6b3b 100644 (file)
--- a/deal.II/include/deal.II/base/aligned_vector.h
+++ b/deal.II/include/deal.II/base/aligned_vector.h
@@ -546,8 +546,8 @@ AlignedVector<T>::reserve (const size_type size_alloc)
       _end_allocated = _data + new_size;
       if (_end_data != _data)
         {
-          internal::AlignedVectorMove<T>(new_data, new_data + old_size,
-                                         _data);
+          dealii::internal::AlignedVectorMove<T>(new_data, new_data + old_size,
+                                                _data);
 #if DEAL_II_COMPILER_VECTORIZATION_LEVEL > 0
           _mm_free(new_data);
 #else

diff --git a/deal.II/source/grid/grid_generator.cc b/deal.II/source/grid/grid_generator.cc
index 2a466932c88e30338c4326bbeda93283ba470e0d..06a3b147e7a956ae61ef29a0741240fb34626054 100644 (file)
--- a/deal.II/source/grid/grid_generator.cc
+++ b/deal.II/source/grid/grid_generator.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -3428,8 +3428,6 @@ namespace GridGenerator
     GridTools::delete_duplicated_vertices (vertices, cells,
                                           subcell_data,
                                           considered_vertices);
-    GridReordering<dim,spacedim>::reorder_cells (cells);
-
     result.clear ();
     result.create_triangulation (vertices, cells, subcell_data);
   }

diff --git a/deal.II/source/grid/grid_tools.cc b/deal.II/source/grid/grid_tools.cc
index 34888a24bb1f950477f8e2f7f68da06efa085609..39c240319438f21386d5597760fe9068782bce07 100644 (file)
--- a/deal.II/source/grid/grid_tools.cc
+++ b/deal.II/source/grid/grid_tools.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2001 - 2013 by the deal.II authors
+// Copyright (C) 2001 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -890,7 +890,7 @@ next_cell:
                                  const Container<dim,spacedim> &container,
                                  const Point<spacedim>     &p)
   {
-    typedef typename Container<dim,spacedim>::active_cell_iterator cell_iterator;
+    typedef typename Container<dim,spacedim>::active_cell_iterator active_cell_iterator;
 
     // The best distance is set to the
     // maximum allowable distance from
@@ -898,22 +898,22 @@ next_cell:
     // max. deviation of 1e-10
     double best_distance = 1e-10;
     int    best_level = -1;
-    std::pair<cell_iterator, Point<dim> > best_cell;
+    std::pair<active_cell_iterator, Point<dim> > best_cell;
 
     // Find closest vertex and determine
     // all adjacent cells
-    unsigned int vertex = find_closest_vertex(container, p);
-
-    std::vector<cell_iterator> adjacent_cells_tmp =
-      find_cells_adjacent_to_vertex(container, vertex);
+    std::vector<active_cell_iterator> adjacent_cells_tmp
+    = find_cells_adjacent_to_vertex(container,
+                                    find_closest_vertex(container, p));
 
     // Make sure that we have found
     // at least one cell adjacent to vertex.
     Assert(adjacent_cells_tmp.size()>0, ExcInternalError());
 
     // Copy all the cells into a std::set
-    std::set<cell_iterator> adjacent_cells(adjacent_cells_tmp.begin(), adjacent_cells_tmp.end());
-    std::set<cell_iterator> searched_cells;
+    std::set<active_cell_iterator> adjacent_cells (adjacent_cells_tmp.begin(),
+                                                   adjacent_cells_tmp.end());
+    std::set<active_cell_iterator> searched_cells;
 
     // Determine the maximal number of cells
     // in the grid.
@@ -921,12 +921,12 @@ next_cell:
     // the cell and have not searched
     // every cell in the triangulation,
     // we keep on looking.
-    const unsigned int n_cells =get_tria(container).n_cells();
+    const unsigned int n_active_cells = get_tria(container).n_active_cells();
     bool found = false;
     unsigned int cells_searched = 0;
-    while (!found && cells_searched < n_cells)
+    while (!found && cells_searched < n_active_cells)
       {
-        typename std::set<cell_iterator>::const_iterator
+        typename std::set<active_cell_iterator>::const_iterator
         cell = adjacent_cells.begin(),
         endc = adjacent_cells.end();
         for (; cell != endc; ++cell)
@@ -943,10 +943,13 @@ next_cell:
                 // unit cell (or at least not too far
                 // outside). If it is, it is also checked
                 // that the cell has a more refined state
-                if (dist < best_distance ||
-                    (dist == best_distance && (*cell)->level() > best_level))
+                if ((dist < best_distance)
+                    ||
+                    ((dist == best_distance)
+                     &&
+                     ((*cell)->level() > best_level)))
                   {
-                    found       = true;
+                    found         = true;
                     best_distance = dist;
                     best_level    = (*cell)->level();
                     best_cell     = std::make_pair(*cell, p_cell);
@@ -967,16 +970,18 @@ next_cell:
                 // to the next
               }
           }
-        //udpate the number of cells searched
+
+        // update the number of cells searched
         cells_searched += adjacent_cells.size();
+
         // if we have not found the cell in
         // question and have not yet searched every
         // cell, we expand our search to
         // all the not already searched neighbors of
         // the cells in adjacent_cells. This is
-        // what find_active_cell_around_poin_internal
+        // what find_active_cell_around_point_internal
         // is for.
-        if (!found && cells_searched < n_cells)
+        if (!found && cells_searched < n_active_cells)
           {
             find_active_cell_around_point_internal<dim,Container,spacedim>
             (container, searched_cells, adjacent_cells);

diff --git a/tests/fe/injection_q.output b/tests/fe/injection_q.output
index cd936b8bfc953ef3f34b7fca379169b806cdb2bf..5f9e874d0d67d18c0fdc1546577779389547a0d1 100644 (file)
--- a/tests/fe/injection_q.output
+++ b/tests/fe/injection_q.output
@@ -898,7 +898,7 @@ DEAL::8 6 -0.08789
 DEAL::8 7 0.6152
 DEAL::8 8 0.4102
 DEAL::0 0 0.1406
-DEAL::0 1 -0.04688
+DEAL::0 1 -0.04687
 DEAL::0 2 -0.04687
 DEAL::0 3 0.01562
 DEAL::0 4 0.2812
@@ -1070,7 +1070,7 @@ DEAL::2 7 -0.1250
 DEAL::2 8 0.7500
 DEAL::3 0 -0.04688
 DEAL::3 1 0.1406
-DEAL::3 2 0.01562
+DEAL::3 2 0.01563
 DEAL::3 3 -0.04687
 DEAL::3 4 -0.09375
 DEAL::3 5 0.2812
@@ -1204,7 +1204,7 @@ DEAL::1 6 0
 DEAL::1 7 0
 DEAL::1 8 1.000
 DEAL::2 0 -0.04688
-DEAL::2 1 0.01562
+DEAL::2 1 0.01563
 DEAL::2 2 0.1406
 DEAL::2 3 -0.04687
 DEAL::2 4 0.2813
@@ -4742,8 +4742,8 @@ DEAL::0 1 0.1406
 DEAL::0 2 0.1406
 DEAL::0 3 0.04688
 DEAL::0 4 0.1406
-DEAL::0 5 0.04687
-DEAL::0 6 0.04687
+DEAL::0 5 0.04688
+DEAL::0 6 0.04688
 DEAL::0 7 0.01562
 DEAL::1 0 0.2813
 DEAL::1 1 0.2812
@@ -4812,7 +4812,7 @@ DEAL::8 7 0.02083
 DEAL::9 0 0.3281
 DEAL::9 1 0.1094
 DEAL::9 2 0.2344
-DEAL::9 3 0.07812
+DEAL::9 3 0.07813
 DEAL::9 4 0.1094
 DEAL::9 5 0.03646
 DEAL::9 6 0.07812
@@ -4942,7 +4942,7 @@ DEAL::25 1 0.1094
 DEAL::25 2 0.1094
 DEAL::25 3 0.03646
 DEAL::25 4 0.2344
-DEAL::25 5 0.07813
+DEAL::25 5 0.07812
 DEAL::25 6 0.07812
 DEAL::25 7 0.02604
 DEAL::26 0 0.2500
@@ -4958,7 +4958,7 @@ DEAL::27 1 0.2188
 DEAL::27 2 0.07292
 DEAL::27 3 0.07292
 DEAL::27 4 0.1563
-DEAL::27 5 0.1563
+DEAL::27 5 0.1562
 DEAL::27 6 0.05208
 DEAL::27 7 0.05208
 DEAL::28 0 0.2500
@@ -5406,7 +5406,7 @@ DEAL::19 1 0.4688
 DEAL::19 2 0.03125
 DEAL::19 3 0.09375
 DEAL::19 4 0.05208
-DEAL::19 5 0.1562
+DEAL::19 5 0.1563
 DEAL::19 6 0.01042
 DEAL::19 7 0.03125
 DEAL::20 0 0.3125
@@ -5820,7 +5820,7 @@ DEAL::6 7 0.04688
 DEAL::7 0 0.09375
 DEAL::7 1 0.09375
 DEAL::7 2 0.2813
-DEAL::7 3 0.2812
+DEAL::7 3 0.2813
 DEAL::7 4 0.03125
 DEAL::7 5 0.03125
 DEAL::7 6 0.09375
@@ -6308,7 +6308,7 @@ DEAL::3 7 0
 DEAL::4 0 0.09375
 DEAL::4 1 0.09375
 DEAL::4 2 0.2813
-DEAL::4 3 0.2812
+DEAL::4 3 0.2813
 DEAL::4 4 0.03125
 DEAL::4 5 0.03125
 DEAL::4 6 0.09375
@@ -6830,7 +6830,7 @@ DEAL::5 1 0.09375
 DEAL::5 2 0.03125
 DEAL::5 3 0.03125
 DEAL::5 4 0.2813
-DEAL::5 5 0.2812
+DEAL::5 5 0.2813
 DEAL::5 6 0.09375
 DEAL::5 7 0.09375
 DEAL::6 0 0.09375
@@ -6928,7 +6928,7 @@ DEAL::17 3 0.02604
 DEAL::17 4 0.3281
 DEAL::17 5 0.1094
 DEAL::17 6 0.2344
-DEAL::17 7 0.07813
+DEAL::17 7 0.07812
 DEAL::18 0 0.08333
 DEAL::18 1 0.08333
 DEAL::18 2 0.04167
@@ -6944,7 +6944,7 @@ DEAL::19 3 0.05208
 DEAL::19 4 0.2188
 DEAL::19 5 0.2188
 DEAL::19 6 0.1563
-DEAL::19 7 0.1562
+DEAL::19 7 0.1563
 DEAL::20 0 0.1250
 DEAL::20 1 0.06250
 DEAL::20 2 0.04167
@@ -6974,7 +6974,7 @@ DEAL::23 1 0.05208
 DEAL::23 2 0.07292
 DEAL::23 3 0.05208
 DEAL::23 4 0.2188
-DEAL::23 5 0.1562
+DEAL::23 5 0.1563
 DEAL::23 6 0.2188
 DEAL::23 7 0.1563
 DEAL::24 0 0.2344
@@ -6998,7 +6998,7 @@ DEAL::26 1 0.1562
 DEAL::26 2 0.05208
 DEAL::26 3 0.05208
 DEAL::26 4 0.2188
-DEAL::26 5 0.2188
+DEAL::26 5 0.2187
 DEAL::26 6 0.07292
 DEAL::26 7 0.07292
 DEAL::27 0 0.1250
@@ -7920,7 +7920,7 @@ DEAL::13 3 0.05208
 DEAL::13 4 0.2188
 DEAL::13 5 0.1562
 DEAL::13 6 0.2188
-DEAL::13 7 0.1563
+DEAL::13 7 0.1562
 DEAL::14 0 0.04167
 DEAL::14 1 0.02083
 DEAL::14 2 0.1250
@@ -16476,7 +16476,7 @@ DEAL::2 25 0
 DEAL::2 26 0
 DEAL::3 0 -0.04688
 DEAL::3 1 0.1406
-DEAL::3 2 0.01562
+DEAL::3 2 0.01563
 DEAL::3 3 -0.04687
 DEAL::3 4 0
 DEAL::3 5 0
@@ -16532,7 +16532,7 @@ DEAL::5 0 -0.04688
 DEAL::5 1 0.1406
 DEAL::5 2 0
 DEAL::5 3 0
-DEAL::5 4 0.01562
+DEAL::5 4 0.01563
 DEAL::5 5 -0.04687
 DEAL::5 6 0
 DEAL::5 7 0
@@ -18176,7 +18176,7 @@ DEAL::1 24 1.000
 DEAL::1 25 0
 DEAL::1 26 0
 DEAL::2 0 -0.04688
-DEAL::2 1 0.01562
+DEAL::2 1 0.01563
 DEAL::2 2 0.1406
 DEAL::2 3 -0.04687
 DEAL::2 4 0
@@ -20044,7 +20044,7 @@ DEAL::7 2 -0.04688
 DEAL::7 3 0.1406
 DEAL::7 4 0
 DEAL::7 5 0
-DEAL::7 6 0.01562
+DEAL::7 6 0.01563
 DEAL::7 7 -0.04687
 DEAL::7 8 0
 DEAL::7 9 0
@@ -20587,9 +20587,9 @@ DEAL::27 5 0.005208
 DEAL::27 6 0.005208
 DEAL::27 7 -0.01562
 DEAL::27 8 -0.05208
-DEAL::27 9 0.1563
+DEAL::27 9 0.1562
 DEAL::27 10 -0.05208
-DEAL::27 11 0.1563
+DEAL::27 11 0.1562
 DEAL::27 12 0.01042
 DEAL::27 13 -0.03125
 DEAL::27 14 0.01042
@@ -23500,7 +23500,7 @@ DEAL::7 2 0
 DEAL::7 3 0
 DEAL::7 4 -0.04688
 DEAL::7 5 0.1406
-DEAL::7 6 0.01562
+DEAL::7 6 0.01563
 DEAL::7 7 -0.04687
 DEAL::7 8 0
 DEAL::7 9 0
@@ -23616,18 +23616,18 @@ DEAL::11 10 -0.05208
 DEAL::11 11 0.01042
 DEAL::11 12 -0.02604
 DEAL::11 13 0.07812
-DEAL::11 14 0.1562
+DEAL::11 14 0.1563
 DEAL::11 15 -0.03125
 DEAL::11 16 -0.05208
 DEAL::11 17 0.1563
 DEAL::11 18 0.01042
 DEAL::11 19 -0.03125
 DEAL::11 20 -0.05208
-DEAL::11 21 0.1562
+DEAL::11 21 0.1563
 DEAL::11 22 0.3125
 DEAL::11 23 -0.06250
 DEAL::11 24 -0.05208
-DEAL::11 25 0.1562
+DEAL::11 25 0.1563
 DEAL::11 26 0.3125
 DEAL::12 0 0.008681
 DEAL::12 1 -0.01215
@@ -25137,9 +25137,9 @@ DEAL::3 19 0
 DEAL::3 20 0
 DEAL::3 21 0
 DEAL::3 22 -0.09375
-DEAL::3 23 0.2812
+DEAL::3 23 0.2813
 DEAL::3 24 -0.09375
-DEAL::3 25 0.2812
+DEAL::3 25 0.2813
 DEAL::3 26 0.5625
 DEAL::4 0 0
 DEAL::4 1 0
@@ -25200,7 +25200,7 @@ DEAL::6 1 0
 DEAL::6 2 0
 DEAL::6 3 0
 DEAL::6 4 -0.04688
-DEAL::6 5 0.01562
+DEAL::6 5 0.01563
 DEAL::6 6 0.1406
 DEAL::6 7 -0.04687
 DEAL::6 8 0
@@ -26784,7 +26784,7 @@ DEAL::0 19 0
 DEAL::0 20 0
 DEAL::0 21 0
 DEAL::0 22 -0.09375
-DEAL::0 23 0.2812
+DEAL::0 23 0.2813
 DEAL::0 24 -0.09375
 DEAL::0 25 0.2812
 DEAL::0 26 0.5625
@@ -27044,7 +27044,7 @@ DEAL::10 9 -0.02604
 DEAL::10 10 0.01042
 DEAL::10 11 -0.05208
 DEAL::10 12 -0.02604
-DEAL::10 13 0.07812
+DEAL::10 13 0.07813
 DEAL::10 14 -0.03125
 DEAL::10 15 0.1562
 DEAL::10 16 0.01042

diff --git a/tests/fe/injection_q_dg0.output b/tests/fe/injection_q_dg0.output
index 698fcc105dbdafab08761665c67afe82927f1ee8..d383b14aa8cdfb9ba66193e07e14d68a4f477a62 100644 (file)
--- a/tests/fe/injection_q_dg0.output
+++ b/tests/fe/injection_q_dg0.output
@@ -16705,9 +16705,9 @@ DEAL::inj 2 3:
 DEAL::0 0 0.0527344
 DEAL::0 1 -0.0175781
 DEAL::0 2 -0.0175781
-DEAL::0 3 0.00585938
+DEAL::0 3 0.00585937
 DEAL::0 4 -0.0175781
-DEAL::0 5 0.00585938
+DEAL::0 5 0.00585937
 DEAL::0 6 0.00585938
 DEAL::0 7 -0.00195312
 DEAL::0 8 0.105469
@@ -16715,13 +16715,13 @@ DEAL::0 9 -0.0351562
 DEAL::0 10 0.105469
 DEAL::0 11 -0.0351562
 DEAL::0 12 -0.0351562
-DEAL::0 13 0.0117187
+DEAL::0 13 0.0117188
 DEAL::0 14 -0.0351562
 DEAL::0 15 0.0117188
 DEAL::0 16 0.105469
 DEAL::0 17 -0.0351562
 DEAL::0 18 -0.0351562
-DEAL::0 19 0.0117188
+DEAL::0 19 0.0117187
 DEAL::0 20 0.210938
 DEAL::0 21 -0.0703125
 DEAL::0 22 0.210938
@@ -18724,7 +18724,7 @@ DEAL::7 2 0.00585938
 DEAL::7 3 -0.0175781
 DEAL::7 4 0.00585938
 DEAL::7 5 -0.0175781
-DEAL::7 6 -0.00195313
+DEAL::7 6 -0.00195312
 DEAL::7 7 0.00585937
 DEAL::7 8 -0.0351563
 DEAL::7 9 0.105469
@@ -19155,12 +19155,12 @@ DEAL::22 13 -0.00911458
 DEAL::22 14 -0.0455729
 DEAL::22 15 0.0151910
 DEAL::22 16 -0.0195313
-DEAL::22 17 0.0273438
+DEAL::22 17 0.0273437
 DEAL::22 18 0.00651042
 DEAL::22 19 -0.00911458
 DEAL::22 20 -0.0390625
 DEAL::22 21 0.0546875
-DEAL::22 22 0.273437
+DEAL::22 22 0.273438
 DEAL::22 23 -0.0911458
 DEAL::22 24 0.273437
 DEAL::22 25 -0.0911458
@@ -20810,7 +20810,7 @@ DEAL::16 16 -0.0195313
 DEAL::16 17 0.00651042
 DEAL::16 18 0.0273438
 DEAL::16 19 -0.00911458
-DEAL::16 20 0.273437
+DEAL::16 20 0.273438
 DEAL::16 21 -0.0911458
 DEAL::16 22 -0.0390625
 DEAL::16 23 0.0546875
@@ -22695,7 +22695,7 @@ DEAL::18 25 -0.0520833
 DEAL::18 26 0.312500
 DEAL::18 27 0
 DEAL::19 0 0.00325521
-DEAL::19 1 -0.00976562
+DEAL::19 1 -0.00976563
 DEAL::19 2 -0.0358073
 DEAL::19 3 0.107422
 DEAL::19 4 -0.00108507
@@ -24668,15 +24668,15 @@ DEAL::24 10 -0.0195313
 DEAL::24 11 0.00651042
 DEAL::24 12 0.0273437
 DEAL::24 13 -0.00911458
-DEAL::24 14 0.0273437
+DEAL::24 14 0.0273438
 DEAL::24 15 -0.00911458
 DEAL::24 16 0.136719
 DEAL::24 17 -0.0455729
 DEAL::24 18 -0.0455729
 DEAL::24 19 0.0151910
-DEAL::24 20 0.273437
+DEAL::24 20 0.273438
 DEAL::24 21 -0.0911458
-DEAL::24 22 0.273437
+DEAL::24 22 0.273438
 DEAL::24 23 -0.0911458
 DEAL::24 24 -0.0390625
 DEAL::24 25 0.0546875
@@ -25905,7 +25905,7 @@ DEAL::3 15 -0.0351562
 DEAL::3 16 -0.0351563
 DEAL::3 17 0.105469
 DEAL::3 18 0.0117188
-DEAL::3 19 -0.0351563
+DEAL::3 19 -0.0351562
 DEAL::3 20 -0.0703125
 DEAL::3 21 0.210938
 DEAL::3 22 0.210938
@@ -26101,7 +26101,7 @@ DEAL::10 15 -0.0195312
 DEAL::10 16 -0.0716146
 DEAL::10 17 0.214844
 DEAL::10 18 0.00651042
-DEAL::10 19 -0.0195313
+DEAL::10 19 -0.0195312
 DEAL::10 20 -0.0286458
 DEAL::10 21 0.0859375
 DEAL::10 22 0.429688
@@ -27861,7 +27861,7 @@ DEAL::8 11 -0.00911458
 DEAL::8 12 0.136719
 DEAL::8 13 -0.0455729
 DEAL::8 14 -0.0195313
-DEAL::8 15 0.0273438
+DEAL::8 15 0.0273437
 DEAL::8 16 -0.0195313
 DEAL::8 17 0.00651042
 DEAL::8 18 0.0273438
@@ -29755,7 +29755,7 @@ DEAL::11 1 0.00325521
 DEAL::11 2 0.0119358
 DEAL::11 3 -0.0358073
 DEAL::11 4 0.00325521
-DEAL::11 5 -0.00976563
+DEAL::11 5 -0.00976562
 DEAL::11 6 -0.0358073
 DEAL::11 7 0.107422
 DEAL::11 8 0.00477431
@@ -29803,7 +29803,7 @@ DEAL::12 21 0.0546875
 DEAL::12 22 -0.0911458
 DEAL::12 23 0.273438
 DEAL::12 24 -0.0911458
-DEAL::12 25 0.273437
+DEAL::12 25 0.273438
 DEAL::12 26 0.546875
 DEAL::12 27 0
 DEAL::13 0 -0.00173611

diff --git a/tests/lapack/full_matrix_03.cc b/tests/lapack/full_matrix_03.cc
index 35b55bedad95f2d1b8115ffcd683419d7c24c0d8..f8a0cd6270d4ec02eb9011bfa1eb322c517a1511 100644 (file)
--- a/tests/lapack/full_matrix_03.cc
+++ b/tests/lapack/full_matrix_03.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2005 - 2013 by the deal.II authors
+// Copyright (C) 2005 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -96,7 +96,7 @@ void test_rect(unsigned int m, unsigned int n, const double *values)
   LA.Tvmult(u, v2);
   u *= -1;
   A.Tvmult_add(u, v2);
-  if (u.l2_norm() < 1.e-12)
+  if (u.l2_norm() < 1.e-11)
     deallog << "Tvmult ok" << std::endl;
   else
     deallog << "Tvmult error " << u.l2_norm() << std::endl;
@@ -104,7 +104,7 @@ void test_rect(unsigned int m, unsigned int n, const double *values)
   A.Tvmult(u, v2);
   u *= -1;
   LA.Tvmult_add(u, v2);
-  if (u.l2_norm() < 1.e-12)
+  if (u.l2_norm() < 1.e-11)
     deallog << "Tvmult_add ok" << std::endl;
   else
     deallog << "Tvmult_add error " << u.l2_norm() << std::endl;

diff --git a/tests/mpi/codim_01.cc b/tests/mpi/codim_01.cc
index 3c77850ef22dd510445a522e37a303e076cd431c..00d26b39393d3a4768e806a23ca9323874ee82ee 100644 (file)
--- a/tests/mpi/codim_01.cc
+++ b/tests/mpi/codim_01.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id: 2d_refinement_01.cc 31349 2013-10-20 19:07:06Z maier $
 //
-// Copyright (C) 2008 - 2013 by the deal.II authors
+// Copyright (C) 2008 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <deal.II/fe/fe_q.h>
 
-template <int dim, int spacedim=dim>
+template <int dim, int spacedim>
 void write_vtk (const parallel::distributed::Triangulation<dim,spacedim> &tria,
                 const char                                *filename)
 {
@@ -73,7 +73,7 @@ void test(std::ostream & /*out*/)
 
   GridGenerator::torus(tr, 1, 0.2);
   tr.refine_global();
-  
+
   tr.begin_active()->set_refine_flag();
   (++(tr.begin_active()))->set_refine_flag();
 
@@ -112,6 +112,6 @@ int main(int argc, char *argv[])
   MPILogInitAll init;
 
   deallog.push("2-3");
-  test<2,3>(deallog.get_file_stream());  
+  test<2,3>(deallog.get_file_stream());
   deallog.pop();
 }

diff --git a/tests/petsc/deal_solver_02.output b/tests/petsc/deal_solver_02.output
index cd4f267710b1a31ab1f47c39867ccd9bf6905d8b..80d5f05c42c35d66013ee42fccc83da50a5adac7 100644 (file)
--- a/tests/petsc/deal_solver_02.output
+++ b/tests/petsc/deal_solver_02.output
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii14SolverBicgstabINS_13PETScWrappers6VectorEEE
 DEAL:Bicgstab::Starting value 31.00
-DEAL:Bicgstab::Convergence step 50 value 0
-DEAL::Solver stopped after 50 iterations
+DEAL:Bicgstab::Convergence step 49 value 0
+DEAL::Solver stopped after 49 iterations

diff --git a/tests/petsc/solver_11.output b/tests/petsc/solver_11.output
index b5aa43b0774d17dd9ea0b0d764061bebf44b400c..114296722a69a088732650a8cedf1f47ce3bca4a 100644 (file)
--- a/tests/petsc/solver_11.output
+++ b/tests/petsc/solver_11.output
@@ -2,6 +2,6 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii13PETScWrappers10SolverLSQRE
 DEAL::Starting value 31.00
-DEAL::Failure step 100 value 24.02
+DEAL::Failure step 100 value 24.01
 DEAL::Catched exception dealii::SolverControl::NoConvergence
 DEAL::Solver stopped after 100 iterations

diff --git a/tests/trilinos/deal_solver_02.output b/tests/trilinos/deal_solver_02.output
index a60db791fbc5fb5b5358b2d269c65a0a35a0d2b3..c30333642b85414306f0e4b7588dbeb01d8faad5 100644 (file)
--- a/tests/trilinos/deal_solver_02.output
+++ b/tests/trilinos/deal_solver_02.output
@@ -2,5 +2,5 @@
 DEAL::Size 32 Unknowns 961
 DEAL::Solver type: N6dealii14SolverBicgstabINS_16TrilinosWrappers6VectorEEE
 DEAL:Bicgstab::Starting value 31.00
-DEAL:Bicgstab::Convergence step 50 value 0
-DEAL::Solver stopped after 50 iterations
+DEAL:Bicgstab::Convergence step 51 value 0
+DEAL::Solver stopped after 51 iterations