Undo erroneous check-in.

git-svn-id: https://svn.dealii.org/trunk@5600 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index 5d76059226ddd16963a73c90b337f777433256bd..9761232d00e38fa52a00183cec56a6573f39404c 100644 (file)
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -14,7 +14,7 @@ target = $(basename $(shell echo step-*.cc))
 # run-time checking of parameters and internal states is performed, so
 # you should set this value to `on' while you develop your program,
 # and to `off' when running production computations.
-debug-mode = off
+debug-mode = on
 
 
 # As third field, we need to give the path to the top-level deal.II

diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index da9acbbdb76972dc6f735b98d969865f886ef03e..6360bcca20162bd174d67d4692443f3fc47b97f3 100644 (file)
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -14,7 +14,7 @@ target = $(basename $(shell echo step-*.cc))
 # run-time checking of parameters and internal states is performed, so
 # you should set this value to `on' while you develop your program,
 # and to `off' when running production computations.
-debug-mode = off
+debug-mode = on
 
 
 # As third field, we need to give the path to the top-level deal.II

diff --git a/deal.II/examples/step-7/step-7.cc b/deal.II/examples/step-7/step-7.cc
index bc0612742681edea3a4791b6ccfe06f28fa9186f..a27f10c6bd59ead3da994e29985817a0db8cb5cb 100644 (file)
--- a/deal.II/examples/step-7/step-7.cc
+++ b/deal.II/examples/step-7/step-7.cc
@@ -35,7 +35,6 @@
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe_q.h>
-#include <fe/mapping_q.h>
 #include <numerics/matrices.h>
 #include <numerics/error_estimator.h>
 #include <numerics/data_out.h>
@@ -167,14 +166,6 @@ SolutionBase<2>::source_centers[SolutionBase<2>::n_source_centers]
     Point<2>(-0.5, -0.5), 
     Point<2>(+0.5, -0.5)   };
 
-                                // ...and finally for 3d:
-template <>
-const Point<3>
-SolutionBase<3>::source_centers[SolutionBase<3>::n_source_centers]
-= { Point<3>(-0.5, +0.5, -0.5), 
-    Point<3>(-0.5, -0.5, +0.5), 
-    Point<3>(+0.5, -0.5, 0.0)   };
-
                                 // There remains to assign a value to
                                 // the half-width of the
                                 // exponentials. We would like to use
@@ -789,8 +780,7 @@ void LaplaceProblem<dim>::assemble_system ()
                                   // cell (rather than on the unit
                                   // cell) to evaluate the right hand
                                   // side function.
-  MappingQ<dim> mapping(3);
-  FEValues<dim>  fe_values (mapping, *fe, quadrature_formula, 
+  FEValues<dim>  fe_values (*fe, quadrature_formula, 
                            UpdateFlags(update_values    |
                                        update_gradients |
                                        update_q_points  |
@@ -1061,21 +1051,15 @@ void LaplaceProblem<dim>::assemble_system ()
 template <int dim>
 void LaplaceProblem<dim>::solve () 
 {
-  SolverControl           solver_control (30, 1e-4);
+  SolverControl           solver_control (1000, 1e-12);
   PrimitiveVectorMemory<> vector_memory;
   SolverCG<>              cg (solver_control, vector_memory);
 
   PreconditionSSOR<> preconditioner;
   preconditioner.initialize(system_matrix, 1.2);
 
-  try
-    {
-      cg.solve (system_matrix, solution, system_rhs,
-               preconditioner);
-    }
-  catch (...)
-    {
-    };
+  cg.solve (system_matrix, solution, system_rhs,
+           preconditioner);
 
   hanging_node_constraints.distribute (solution);
 };
@@ -1338,11 +1322,7 @@ void LaplaceProblem<dim>::process_solution (const unsigned int cycle)
 template <int dim>
 void LaplaceProblem<dim>::run () 
 {
-  const unsigned int n_cycles = (refinement_mode == global_refinement ?
-                                (dim == 2 ? 7 : 3)
-                                :
-                                (dim == 2 ? 12 : 7));
-  for (unsigned int cycle=0; cycle<n_cycles; ++cycle)
+  for (unsigned int cycle=0; cycle<7; ++cycle)
     {
                                       // The first action in each
                                       // iteration of the outer loop