]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
add target for creation of plain files and rename cg to solver to make changes easier
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 12 Oct 2010 21:53:08 +0000 (21:53 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 12 Oct 2010 21:53:08 +0000 (21:53 +0000)
git-svn-id: https://svn.dealii.org/trunk@22321 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/Makefile
deal.II/examples/step-3/step-3.cc
deal.II/examples/step-4/step-4.cc
deal.II/examples/step-5/step-5.cc
deal.II/examples/step-6/step-6.cc

index 9dbca34e0c02884f7da829e607a704cf1f1c0c80..14655af6594ac041c8b4e544446def3582a71672 100644 (file)
@@ -22,6 +22,9 @@ clean:
        $(addsuffix $(EXEEXT),$(basename $(shell echo step-*/step-*.cc))) \
        doxygen/*.o doxygen/*.exe */Makefile.dep
 
+# Create plain.cc in each subdirectory
+plain: $(steps)
+       for step in $(steps) ; do cd $$step; perl $D/doc/doxygen/tutorial/program2plain $$step.cc > plain.cc ; cd .. ; done
 
 # for each build/run/clean target: strip the build- prefix of the
 # target and build in that directory
index de0da46ba679e58d0a342267f3d824e747a62fa6..bfc890ae36e4c6ed839551d91be60c190ba5ee5a 100644 (file)
@@ -769,7 +769,7 @@ void LaplaceProblem::solve ()
                                   // the default arguments (which are
                                   // <code>SparseMatrix@<double@></code> and
                                   // <code>Vector@<double@></code>):
-  SolverCG<>              cg (solver_control);
+  SolverCG<>              solver (solver_control);
 
                                   // Now solve the system of equations. The
                                   // CG solver takes a preconditioner as its
@@ -777,7 +777,7 @@ void LaplaceProblem::solve ()
                                   // delve into this yet, so we tell it to
                                   // use the identity operation as
                                   // preconditioner:
-  cg.solve (system_matrix, solution, system_rhs,
+  solver.solve (system_matrix, solution, system_rhs,
            PreconditionIdentity());
                                   // Now that the solver has done its
                                   // job, the solution variable
index 8c49529ef25c7dfb0d1f52edf47a2967056c38e3..ab57c37cf9845bfba4dc73c3d662a5780502f3e1 100644 (file)
@@ -572,9 +572,9 @@ template <int dim>
 void LaplaceProblem<dim>::solve () 
 {
   SolverControl           solver_control (1000, 1e-12);
-  SolverCG<>              cg (solver_control);
-  cg.solve (system_matrix, solution, system_rhs,
-           PreconditionIdentity());
+  SolverCG<>              solver (solver_control);
+  solver.solve (system_matrix, solution, system_rhs,
+               PreconditionIdentity());
 
                                   // We have made one addition,
                                   // though: since we suppress output
index d140d0a654a3b23155d54285f1e8403cc481361c..fd6d95adbfa7cd813227cc8b352375d4d8977301 100644 (file)
@@ -636,13 +636,13 @@ template <int dim>
 void LaplaceProblem<dim>::solve ()
 {
   SolverControl           solver_control (1000, 1e-12);
-  SolverCG<>              cg (solver_control);
+  SolverCG<>              solver (solver_control);
 
   PreconditionSSOR<> preconditioner;
   preconditioner.initialize(system_matrix, 1.2);
 
-  cg.solve (system_matrix, solution, system_rhs,
-           preconditioner);
+  solver.solve (system_matrix, solution, system_rhs,
+               preconditioner);
 
   std::cout << "   " << solver_control.last_step()
            << " CG iterations needed to obtain convergence."
index 3d149a23297c33bc63d38e03f07eecc13180bf19..3a81e2f4de72d77d9daca3c518a49a26d676c136 100644 (file)
@@ -696,13 +696,13 @@ template <int dim>
 void LaplaceProblem<dim>::solve ()
 {
   SolverControl           solver_control (1000, 1e-12);
-  SolverCG<>              cg (solver_control);
+  SolverCG<>              solver (solver_control);
 
   PreconditionSSOR<> preconditioner;
   preconditioner.initialize(system_matrix, 1.2);
 
-  cg.solve (system_matrix, solution, system_rhs,
-           preconditioner);
+  solver.solve (system_matrix, solution, system_rhs,
+               preconditioner);
 
   hanging_node_constraints.distribute (solution);
 }

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.