]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Simplify code.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 14 Dec 2011 17:15:57 +0000 (17:15 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 14 Dec 2011 17:15:57 +0000 (17:15 +0000)
git-svn-id: https://svn.dealii.org/trunk@24825 0785d39b-7218-0410-832d-ea1e28bc413d

tests/deal.II/data_out.cc

index 7cbaee77f3bf3cad825c36a69d2bcc12aa47943e..c7d8542053b08da5817cef62a50aecd20390ebcf 100644 (file)
@@ -1,8 +1,8 @@
 //----------------------------  data_out.cc  ---------------------------
 //    $Id$
-//    Version: $Name$ 
+//    Version: $Name$
 //
-//    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007, 2008 by the deal.II authors
+//    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2011 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/mapping_q1.h>
-#include <deal.II/dofs/dof_tools.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/base/quadrature_lib.h>
 #include <deal.II/base/function.h>
 #include <deal.II/numerics/vectors.h>
 #include <deal.II/numerics/matrices.h>
 #include <deal.II/lac/vector.h>
-#include <deal.II/lac/full_matrix.h>
-#include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/solver_cg.h>
-#include <deal.II/lac/vector_memory.h>
-#include <deal.II/lac/precondition.h>
 
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/data_out_rotation.h>
@@ -50,12 +43,12 @@ std::ofstream logfile("data_out/output");
 
 
 template <int dim>
-class LaplaceProblem 
+class LaplaceProblem
 {
   public:
     LaplaceProblem ();
     void run ();
-    
+
   private:
     void make_grid_and_dofs ();
     void solve ();
@@ -65,57 +58,10 @@ class LaplaceProblem
     FE_Q<dim>            fe;
     DoFHandler<dim>      dof_handler;
 
-    SparsityPattern      sparsity_pattern;
-    SparseMatrix<double> system_matrix;
-
     Vector<double>       solution;
-    Vector<double>       system_rhs;
-};
-
-
-template <int dim>
-class RightHandSide : public Function<dim> 
-{
-  public:
-    virtual double value (const Point<dim>   &p,
-                         const unsigned int  component = 0) const;
 };
 
 
-
-template <int dim>
-class BoundaryValues : public Function<dim> 
-{
-  public:
-    virtual double value (const Point<dim>   &p,
-                         const unsigned int  component = 0) const;
-};
-
-
-
-
-template <int dim>
-double RightHandSide<dim>::value (const Point<dim> &p,
-                                 const unsigned int) const 
-{
-  double return_value = 0;
-  for (unsigned int i=0; i<dim; ++i)
-    return_value += 4*pow(p(i), 4);
-
-  return return_value;
-}
-
-
-template <int dim>
-double BoundaryValues<dim>::value (const Point<dim> &p,
-                                  const unsigned int) const 
-{
-  return p.square();
-}
-
-
-
-
 template <int dim>
 LaplaceProblem<dim>::LaplaceProblem () :
   fe (1), dof_handler (triangulation)
@@ -133,8 +79,8 @@ void LaplaceProblem<dim>::make_grid_and_dofs ()
       triangulation.begin_active()->set_refine_flag ();
       triangulation.execute_coarsening_and_refinement ();
     };
-  
-  
+
+
   deallog << "   Number of active cells: "
          << triangulation.n_active_cells()
          << std::endl
@@ -148,23 +94,14 @@ void LaplaceProblem<dim>::make_grid_and_dofs ()
          << dof_handler.n_dofs()
          << std::endl;
 
-  sparsity_pattern.reinit (dof_handler.n_dofs(),
-                          dof_handler.n_dofs(),
-                          dof_handler.max_couplings_between_dofs());
-  DoFTools::make_sparsity_pattern (dof_handler, sparsity_pattern);
-  sparsity_pattern.compress();
-
-  system_matrix.reinit (sparsity_pattern);
-
   solution.reinit (dof_handler.n_dofs());
-  system_rhs.reinit (dof_handler.n_dofs());
 }
 
 
 
 
 template <int dim>
-void LaplaceProblem<dim>::solve () 
+void LaplaceProblem<dim>::solve ()
 {
                                   // dummy solve. just insert some
                                   // arbitrary values
@@ -251,26 +188,26 @@ void LaplaceProblem<3>::output_results () const
 
 
 template <int dim>
-void LaplaceProblem<dim>::run () 
+void LaplaceProblem<dim>::run ()
 {
   make_grid_and_dofs();
   solve ();
   output_results ();
 }
 
-    
 
-int main () 
+
+int main ()
 {
   deallog.depth_console (0);
   logfile << std::setprecision(2);
   deallog << std::setprecision(2);
-  
+
   LaplaceProblem<2> laplace_problem_2d;
   laplace_problem_2d.run ();
 
   LaplaceProblem<3> laplace_problem_3d;
   laplace_problem_3d.run ();
-  
+
   return 0;
 }

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.