From 8e7b2f8e2968909d580d54daef4865b971264e4f Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 20 Mar 2002 12:49:44 +0000 Subject: [PATCH] Undo erroneous check-in. git-svn-id: https://svn.dealii.org/trunk@5600 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-1/Makefile | 2 +- deal.II/examples/step-7/Makefile | 2 +- deal.II/examples/step-7/step-7.cc | 30 +++++------------------------- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile index 5d76059226..9761232d00 100644 --- 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 da9acbbdb7..6360bcca20 100644 --- 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 bc06127426..a27f10c6bd 100644 --- a/deal.II/examples/step-7/step-7.cc +++ b/deal.II/examples/step-7/step-7.cc @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -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::assemble_system () // cell (rather than on the unit // cell) to evaluate the right hand // side function. - MappingQ mapping(3); - FEValues fe_values (mapping, *fe, quadrature_formula, + FEValues fe_values (*fe, quadrature_formula, UpdateFlags(update_values | update_gradients | update_q_points | @@ -1061,21 +1051,15 @@ void LaplaceProblem::assemble_system () template void LaplaceProblem::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::process_solution (const unsigned int cycle) template void LaplaceProblem::run () { - const unsigned int n_cycles = (refinement_mode == global_refinement ? - (dim == 2 ? 7 : 3) - : - (dim == 2 ? 12 : 7)); - for (unsigned int cycle=0; cycle