]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Let the cell iterators in the equation class functions be DoF iterators rather than...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 20 Feb 1999 14:57:32 +0000 (14:57 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 20 Feb 1999 14:57:32 +0000 (14:57 +0000)
git-svn-id: https://svn.dealii.org/trunk@863 0785d39b-7218-0410-832d-ea1e28bc413d

16 files changed:
deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc
deal.II/deal.II/Attic/examples/poisson/Makefile
deal.II/deal.II/Attic/examples/poisson/equation.cc
deal.II/deal.II/Attic/examples/poisson/poisson.cc
deal.II/deal.II/Attic/examples/poisson/poisson.h
deal.II/deal.II/Attic/examples/poisson/poisson.prm
deal.II/deal.II/include/numerics/assembler.h
deal.II/deal.II/include/numerics/matrices.h
deal.II/deal.II/source/numerics/assembler.cc
deal.II/deal.II/source/numerics/matrices.cc
tests/big-tests/error-estimation/error-estimation.cc
tests/big-tests/poisson/Makefile
tests/big-tests/poisson/equation.cc
tests/big-tests/poisson/poisson.cc
tests/big-tests/poisson/poisson.h
tests/big-tests/poisson/poisson.prm

index bf563621317576de5994d13328d98067ba8502d6..ea856cbbe119323cb5fbf9a5eb118a197b4002bc 100644 (file)
@@ -48,13 +48,13 @@ class PoissonEquation :  public Equation<dim> {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
   protected:
     const bool           use_coefficient;
     const Function<dim> &right_hand_side;
@@ -259,7 +259,7 @@ template <>
 void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
                                   dVector             &rhs,
                                   const FEValues<2>   &fe_values,
-                                  const Triangulation<2>::cell_iterator &) const {
+                                  const DoFHandler<2>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point) 
     {
       const double c = (use_coefficient ?
@@ -284,7 +284,7 @@ void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
 template <int dim>
 void PoissonEquation<dim>::assemble (dFMatrix            &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -293,7 +293,7 @@ void PoissonEquation<dim>::assemble (dFMatrix            &,
 template <int dim>
 void PoissonEquation<dim>::assemble (dVector             &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
index b355f178dfaf4db895d4443051a2de777d28ab51..f43777d1c6f3542a8e78b1bc524726442f11c245 100644 (file)
@@ -51,8 +51,8 @@ h-files     = $(wildcard *.h)
 lib-h-files = $(wildcard ../../include/*/*.h)
 
 # list of libraries needed to link with
-libs     = ./Obj.a     -ldeal_II_2d   -llac -lbase
-libs.g   = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g
+libs     = ./Obj.a   -ldeal_II_3d   -llac -lbase
+libs.g   = ./Obj.g.a -ldeal_II_3d.g -llac.g -lbase.g
 
 
 # check whether we use debug mode or not
index 915b92a52caa11491647b8b6bb1f2ad8394cbfad..ed7b4ebabe041cce83cba4525d3205f3f8ef9864 100644 (file)
@@ -13,7 +13,7 @@ template <>
 void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
                                   dVector             &rhs,
                                   const FEValues<1>   &fe_values,
-                                  const Triangulation<1>::cell_iterator &) const {
+                                  const DoFHandler<1>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
     for (unsigned int i=0; i<fe_values.total_dofs; ++i) 
       {
@@ -31,14 +31,14 @@ void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
 
 
 
-#if deal_II_dimension == 2
+//#if deal_II_dimension >= 2
 
-template <>
-void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
-                                  dVector             &rhs,
-                                  const FEValues<2>   &fe_values,
-                                  const Triangulation<2>::cell_iterator &) const {
-  const vector<vector<Tensor<1,2> > >&gradients = fe_values.get_shape_grads ();
+template <int dim>
+void PoissonEquation<dim>::assemble (dFMatrix            &cell_matrix,
+                                    dVector             &rhs,
+                                    const FEValues<dim> &fe_values,
+                                    const DoFHandler<dim>::cell_iterator &) const {
+  const vector<vector<Tensor<1,dim> > >&gradients = fe_values.get_shape_grads ();
   const dFMatrix       &values    = fe_values.get_shape_values ();
   vector<double>        rhs_values (fe_values.n_quadrature_points);
   const vector<double> &weights   = fe_values.get_JxW_values ();
@@ -58,14 +58,14 @@ void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
       };
 };
 
-#endif
+//#endif
 
 
 
 template <int dim>
 void PoissonEquation<dim>::assemble (dFMatrix            &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -74,7 +74,7 @@ void PoissonEquation<dim>::assemble (dFMatrix            &,
 template <int dim>
 void PoissonEquation<dim>::assemble (dVector             &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -83,4 +83,4 @@ void PoissonEquation<dim>::assemble (dVector             &,
 
 
 
-template class PoissonEquation<2>;
+template class PoissonEquation<3>;
index a84e555c613689f837bd56e0da545f11e214759f..b4017ea350464bb52df0123247cbc064eb54ca82 100644 (file)
@@ -15,7 +15,7 @@ int main (int argc, char **argv) {
       return 1;
     };
 
-  PoissonProblem<2> poisson;
+  PoissonProblem<3> poisson;
   MultipleParameterLoop input_data;
 
   poisson.declare_parameters(input_data);
index a26bd89b74f218702311a977c5db537dbc7ecba9..f85471ab30202d752ceab2a553cf1ee66ddf9cd7 100644 (file)
@@ -45,13 +45,13 @@ class PoissonEquation :  public Equation<dim> {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
   protected:
     const Function<dim> &right_hand_side;
 };
index 9d94d10703c7af3465d111b4c2196930a3d25bf0..165e2d9d0fdb8f722722376b78b6f81bfc2dafa0 100644 (file)
@@ -1,5 +1,5 @@
 set Test run          = { zoom in | ball | curved line | random | jump | L-region}
-set Global refinement = {{ 2 | 5 | 6 | 0 | 2 | 5 }}
+set Global refinement = {{ 1 | 3 | 3 | 0 | 3 | 3 }} #{{ 2 | 3 | 3 | 1 | 3 | 3 }}
 set Right hand side   = {{ zero | zero | trigpoly | constant | zero | zero }}
 set Boundary values   = {{ sine | sine | zero | zero | jump | sine }}
-set Output file       = gnuplot.{{ zoom_in | ball | curved_line | random | jump | L-region }}
+set Output file       = results/{{ zoom_in | ball | curved_line | random | jump | L-region }}.inp
index 9ab6b98b4c89820d42c9cb99f99ae8de1d36ce90..17c57229770f0b0fc3d68df4e6163d1873770c19 100644 (file)
@@ -59,7 +59,7 @@ class Equation {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
 
                                     /**
                                      * Virtual function which only assembles
@@ -76,7 +76,7 @@ class Equation {
                                      */
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
 
                                     /**
                                      * Virtual function which only assembles
@@ -93,7 +93,7 @@ class Equation {
                                      */
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
 
                                     /**
                                      * Return number of equations for this
index ad19460c3b57e9b5b261d643f11901c106a71ce1..89f4df8269531e66d009667bd3b4424b4b785ef2 100644 (file)
@@ -527,7 +527,7 @@ class MassMatrix :  public Equation<dim> {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const typename Triangulation<dim>::cell_iterator &) const;
+                          const typename DoFHandler<dim>::cell_iterator &) const;
 
                                     /**
                                      * Construct the cell matrix for this cell.
@@ -536,7 +536,7 @@ class MassMatrix :  public Equation<dim> {
                                      */
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const typename Triangulation<dim>::cell_iterator &) const;
+                          const typename DoFHandler<dim>::cell_iterator &) const;
 
                                     /**
                                      * Only construct the right hand side
@@ -547,7 +547,7 @@ class MassMatrix :  public Equation<dim> {
                                      */
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const typename Triangulation<dim>::cell_iterator &) const;
+                          const typename DoFHandler<dim>::cell_iterator &) const;
     
                                     /**
                                      * Exception
@@ -630,7 +630,7 @@ class LaplaceMatrix :  public Equation<dim> {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const typename Triangulation<dim>::cell_iterator &) const;
+                          const typename DoFHandler<dim>::cell_iterator &) const;
 
                                     /**
                                      * Construct the cell matrix for this cell.
@@ -639,7 +639,7 @@ class LaplaceMatrix :  public Equation<dim> {
                                      */
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const typename Triangulation<dim>::cell_iterator &) const;
+                          const typename DoFHandler<dim>::cell_iterator &) const;
 
                                     /**
                                      * Only construct the right hand side
@@ -650,7 +650,7 @@ class LaplaceMatrix :  public Equation<dim> {
                                      */
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const typename Triangulation<dim>::cell_iterator &) const;
+                          const typename DoFHandler<dim>::cell_iterator &) const;
 
                                     /**
                                      * Exception
index c286a070bf0d0e1b6434c04e53da208510b3ec49..fa493e400179d1fd1eea1bfdae649776a74d1119 100644 (file)
@@ -21,7 +21,7 @@ template <int dim>
 void Equation<dim>::assemble (dFMatrix          &,
                              dVector           &,
                              const FEValues<dim> &,
-                             const typename Triangulation<dim>::cell_iterator &) const {
+                             const typename DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -30,7 +30,7 @@ void Equation<dim>::assemble (dFMatrix          &,
 template <int dim>
 void Equation<dim>::assemble (dFMatrix          &,
                              const FEValues<dim> &,
-                             const typename Triangulation<dim>::cell_iterator &) const {
+                             const typename DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -39,7 +39,7 @@ void Equation<dim>::assemble (dFMatrix          &,
 template <int dim>
 void Equation<dim>::assemble (dVector           &,
                              const FEValues<dim> &,
-                             const typename Triangulation<dim>::cell_iterator &) const {
+                             const typename DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
index 9075fc1e9fe52efc1c0ce63bd5c3daa687645226..61ff2185f78cae4154d80124c7b6deee74785c3a 100644 (file)
@@ -543,7 +543,7 @@ MassMatrix<dim>::MassMatrix (const Function<dim> * const rhs,
 template <int dim>
 void MassMatrix<dim>::assemble (dFMatrix            &cell_matrix,
                                const FEValues<dim> &fe_values,
-                               const typename Triangulation<dim>::cell_iterator &) const {
+                               const typename DoFHandler<dim>::cell_iterator &) const {
   const unsigned int total_dofs = fe_values.total_dofs,
                     n_q_points = fe_values.n_quadrature_points;
 
@@ -585,7 +585,7 @@ template <int dim>
 void MassMatrix<dim>::assemble (dFMatrix            &cell_matrix,
                                dVector             &rhs,
                                const FEValues<dim> &fe_values,
-                               const Triangulation<dim>::cell_iterator &) const {
+                               const DoFHandler<dim>::cell_iterator &) const {
   Assert (right_hand_side != 0, ExcNoRHSSelected());
 
   const unsigned int total_dofs = fe_values.total_dofs,
@@ -642,7 +642,7 @@ void MassMatrix<dim>::assemble (dFMatrix            &cell_matrix,
 template <int dim>
 void MassMatrix<dim>::assemble (dVector             &rhs,
                                const FEValues<dim> &fe_values,
-                               const Triangulation<dim>::cell_iterator &) const {
+                               const DoFHandler<dim>::cell_iterator &) const {
   Assert (right_hand_side != 0, ExcNoRHSSelected());
 
   const unsigned int total_dofs = fe_values.total_dofs,
@@ -679,7 +679,7 @@ template <int dim>
 void LaplaceMatrix<dim>::assemble (dFMatrix            &cell_matrix,
                                   dVector             &rhs,
                                   const FEValues<dim> &fe_values,
-                                  const Triangulation<dim>::cell_iterator &) const {
+                                  const DoFHandler<dim>::cell_iterator &) const {
   Assert (right_hand_side != 0, ExcNoRHSSelected());
   
   const unsigned int total_dofs = fe_values.total_dofs,
@@ -738,7 +738,7 @@ void LaplaceMatrix<dim>::assemble (dFMatrix            &cell_matrix,
 template <int dim>
 void LaplaceMatrix<dim>::assemble (dFMatrix            &cell_matrix,
                                   const FEValues<dim> &fe_values,
-                                  const Triangulation<dim>::cell_iterator &) const {
+                                  const DoFHandler<dim>::cell_iterator &) const {
   const unsigned int total_dofs = fe_values.total_dofs,
                     n_q_points = fe_values.n_quadrature_points;
 
@@ -778,7 +778,7 @@ void LaplaceMatrix<dim>::assemble (dFMatrix            &cell_matrix,
 template <int dim>
 void LaplaceMatrix<dim>::assemble (dVector             &rhs,
                                   const FEValues<dim> &fe_values,
-                                  const Triangulation<dim>::cell_iterator &) const {
+                                  const DoFHandler<dim>::cell_iterator &) const {
   Assert (right_hand_side != 0, ExcNoRHSSelected());
 
   const unsigned int total_dofs = fe_values.total_dofs,
index bf563621317576de5994d13328d98067ba8502d6..ea856cbbe119323cb5fbf9a5eb118a197b4002bc 100644 (file)
@@ -48,13 +48,13 @@ class PoissonEquation :  public Equation<dim> {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
   protected:
     const bool           use_coefficient;
     const Function<dim> &right_hand_side;
@@ -259,7 +259,7 @@ template <>
 void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
                                   dVector             &rhs,
                                   const FEValues<2>   &fe_values,
-                                  const Triangulation<2>::cell_iterator &) const {
+                                  const DoFHandler<2>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point) 
     {
       const double c = (use_coefficient ?
@@ -284,7 +284,7 @@ void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
 template <int dim>
 void PoissonEquation<dim>::assemble (dFMatrix            &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -293,7 +293,7 @@ void PoissonEquation<dim>::assemble (dFMatrix            &,
 template <int dim>
 void PoissonEquation<dim>::assemble (dVector             &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
index b355f178dfaf4db895d4443051a2de777d28ab51..f43777d1c6f3542a8e78b1bc524726442f11c245 100644 (file)
@@ -51,8 +51,8 @@ h-files     = $(wildcard *.h)
 lib-h-files = $(wildcard ../../include/*/*.h)
 
 # list of libraries needed to link with
-libs     = ./Obj.a     -ldeal_II_2d   -llac -lbase
-libs.g   = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g
+libs     = ./Obj.a   -ldeal_II_3d   -llac -lbase
+libs.g   = ./Obj.g.a -ldeal_II_3d.g -llac.g -lbase.g
 
 
 # check whether we use debug mode or not
index 915b92a52caa11491647b8b6bb1f2ad8394cbfad..ed7b4ebabe041cce83cba4525d3205f3f8ef9864 100644 (file)
@@ -13,7 +13,7 @@ template <>
 void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
                                   dVector             &rhs,
                                   const FEValues<1>   &fe_values,
-                                  const Triangulation<1>::cell_iterator &) const {
+                                  const DoFHandler<1>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
     for (unsigned int i=0; i<fe_values.total_dofs; ++i) 
       {
@@ -31,14 +31,14 @@ void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
 
 
 
-#if deal_II_dimension == 2
+//#if deal_II_dimension >= 2
 
-template <>
-void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
-                                  dVector             &rhs,
-                                  const FEValues<2>   &fe_values,
-                                  const Triangulation<2>::cell_iterator &) const {
-  const vector<vector<Tensor<1,2> > >&gradients = fe_values.get_shape_grads ();
+template <int dim>
+void PoissonEquation<dim>::assemble (dFMatrix            &cell_matrix,
+                                    dVector             &rhs,
+                                    const FEValues<dim> &fe_values,
+                                    const DoFHandler<dim>::cell_iterator &) const {
+  const vector<vector<Tensor<1,dim> > >&gradients = fe_values.get_shape_grads ();
   const dFMatrix       &values    = fe_values.get_shape_values ();
   vector<double>        rhs_values (fe_values.n_quadrature_points);
   const vector<double> &weights   = fe_values.get_JxW_values ();
@@ -58,14 +58,14 @@ void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
       };
 };
 
-#endif
+//#endif
 
 
 
 template <int dim>
 void PoissonEquation<dim>::assemble (dFMatrix            &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -74,7 +74,7 @@ void PoissonEquation<dim>::assemble (dFMatrix            &,
 template <int dim>
 void PoissonEquation<dim>::assemble (dVector             &,
                                     const FEValues<dim> &,
-                                    const Triangulation<dim>::cell_iterator &) const {
+                                    const DoFHandler<dim>::cell_iterator &) const {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
 
@@ -83,4 +83,4 @@ void PoissonEquation<dim>::assemble (dVector             &,
 
 
 
-template class PoissonEquation<2>;
+template class PoissonEquation<3>;
index a84e555c613689f837bd56e0da545f11e214759f..b4017ea350464bb52df0123247cbc064eb54ca82 100644 (file)
@@ -15,7 +15,7 @@ int main (int argc, char **argv) {
       return 1;
     };
 
-  PoissonProblem<2> poisson;
+  PoissonProblem<3> poisson;
   MultipleParameterLoop input_data;
 
   poisson.declare_parameters(input_data);
index a26bd89b74f218702311a977c5db537dbc7ecba9..f85471ab30202d752ceab2a553cf1ee66ddf9cd7 100644 (file)
@@ -45,13 +45,13 @@ class PoissonEquation :  public Equation<dim> {
     virtual void assemble (dFMatrix            &cell_matrix,
                           dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dFMatrix            &cell_matrix,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
     virtual void assemble (dVector             &rhs,
                           const FEValues<dim> &fe_values,
-                          const Triangulation<dim>::cell_iterator &cell) const;
+                          const DoFHandler<dim>::cell_iterator &cell) const;
   protected:
     const Function<dim> &right_hand_side;
 };
index 9d94d10703c7af3465d111b4c2196930a3d25bf0..165e2d9d0fdb8f722722376b78b6f81bfc2dafa0 100644 (file)
@@ -1,5 +1,5 @@
 set Test run          = { zoom in | ball | curved line | random | jump | L-region}
-set Global refinement = {{ 2 | 5 | 6 | 0 | 2 | 5 }}
+set Global refinement = {{ 1 | 3 | 3 | 0 | 3 | 3 }} #{{ 2 | 3 | 3 | 1 | 3 | 3 }}
 set Right hand side   = {{ zero | zero | trigpoly | constant | zero | zero }}
 set Boundary values   = {{ sine | sine | zero | zero | jump | sine }}
-set Output file       = gnuplot.{{ zoom_in | ball | curved_line | random | jump | L-region }}
+set Output file       = results/{{ zoom_in | ball | curved_line | random | jump | L-region }}.inp

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.