]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Rename flags.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 2 Apr 1998 12:05:12 +0000 (12:05 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 2 Apr 1998 12:05:12 +0000 (12:05 +0000)
git-svn-id: https://svn.dealii.org/trunk@116 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/Attic/examples/poisson/poisson.cc
deal.II/deal.II/include/fe/fe.h
deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/numerics/base.cc
tests/big-tests/poisson/poisson.cc

index 9755ae893f0fa34e973986aa3cb43bd6b875a58a..7f65197b9174363029b278183214335f00953ee2 100644 (file)
@@ -123,27 +123,26 @@ int main () {
   QGauss4<2>         quadrature;
 
                                   
-//  HyperBallBoundary<2> boundary(Point<2>(2,3), 4);
-
   cout << "Making grid..." << endl;
   
   tria.create_hypercube ();
+//  HyperBallBoundary<2> boundary(Point<2>(2,3), 4);
 //  tria.create_hyper_ball(Point<2>(2,3),4);
 //  tria.set_boundary (&boundary);
   
-  tria.refine_global (1);
-  (--tria.last_active())->set_refine_flag();
-  tria.execute_refinement ();
+//  tria.refine_global (1);
+//  (--tria.last_active())->set_refine_flag();
+//  tria.execute_refinement ();
 //  tria.begin_active(2)->set_refine_flag();
 //  tria.execute_refinement ();
-  tria.refine_global (2);
+  tria.refine_global (3);
 
 /*
   const unsigned int dim=2;
   tria.refine_global (1);
        
   Triangulation<dim>::active_cell_iterator cell, endc;
-  for (int i=0; i<12; ++i) 
+  for (int i=0; i<8; ++i) 
     {
       int n_levels = tria.n_levels();
       cell = tria.begin_active();
@@ -171,12 +170,12 @@ int main () {
 
   cout << "Assembling matrices..." << endl;
   FEValues<2>::UpdateStruct update_flags;
-  update_flags.update_q_points = true;
-  update_flags.update_gradients = true;
-  update_flags.update_jacobians = true;
-  update_flags.update_JxW_values = true;
-  ProblemBase<2>::DirichletBC d;
-  problem.assemble (equation, quadrature, fe, update_flags, d);
+  update_flags.q_points = true;
+  update_flags.gradients = true;
+  update_flags.jacobians = true;
+  update_flags.JxW_values = true;
+  ProblemBase<2>::DirichletBC dirichlet_bc;
+  problem.assemble (equation, quadrature, fe, update_flags, dirichlet_bc);
 
   cout << "Solving..." << endl;
   problem.solve ();
index 6978d7734d6c343155f021e26cabf128e0053c0f..592dbc5ba3185baa3e085db67e31ac0ff00ac436 100644 (file)
@@ -77,30 +77,30 @@ class FEValues {
                                          * Compute quadrature points in real
                                          * space (not on unit cell).
                                          */
-       bool update_q_points;
+       bool q_points;
                                         /**
                                          * Transform gradients on unit cell to
                                          * gradients on real cell.
                                          */
-       bool update_gradients;
+       bool gradients;
                                         /**
                                          * Compute jacobian matrices of the
                                          * transform between unit and real cell
                                          * in the evaluation points.
                                          */
-       bool update_jacobians;
+       bool jacobians;
                                         /**
                                          * Compute the JxW values (Jacobian
                                          * determinant at the quadrature point
                                          * times the weight of this point).
                                          */
-       bool update_JxW_values;
+       bool JxW_values;
                                         /**
                                          * Compute the points on the real cell
                                          * on which the ansatz functions are
                                          * located.
                                          */
-       bool update_ansatz_points;
+       bool ansatz_points;
     };
 
     
@@ -828,7 +828,7 @@ template <int dim>
 inline
 const vector<vector<Point<dim> > > &
 FEValues<dim>::get_shape_grads () const {
-  Assert (update_flags.update_gradients, ExcAccessToUninitializedField());
+  Assert (update_flags.gradients, ExcAccessToUninitializedField());
   return shape_gradients;
 };
 
@@ -838,7 +838,7 @@ template <int dim>
 inline
 const vector<Point<dim> > &
 FEValues<dim>::get_quadrature_points () const {
-  Assert (update_flags.update_q_points, ExcAccessToUninitializedField());
+  Assert (update_flags.q_points, ExcAccessToUninitializedField());
   return quadrature_points;
 };
 
@@ -848,7 +848,7 @@ template <int dim>
 inline
 const vector<Point<dim> > &
 FEValues<dim>::get_ansatz_points () const {
-  Assert (update_flags.update_ansatz_points, ExcAccessToUninitializedField());
+  Assert (update_flags.ansatz_points, ExcAccessToUninitializedField());
   return ansatz_points;
 };
 
@@ -858,7 +858,7 @@ template <int dim>
 inline
 const vector<double> &
 FEValues<dim>::get_JxW_values () const {
-  Assert (update_flags.update_JxW_values, ExcAccessToUninitializedField());
+  Assert (update_flags.JxW_values, ExcAccessToUninitializedField());
   return JxW_values;
 };
 
index 3a12c2a61cf1a6dacca4bbfd98044892ccc5ce1c..8543071a75e970d89f6885ade9bde79fda887fc5 100644 (file)
@@ -9,11 +9,11 @@
 
 template <int dim>
 FEValues<dim>::UpdateStruct::UpdateStruct () :
-               update_q_points(false),
-               update_gradients(false),
-               update_jacobians(false),
-               update_JxW_values(false),
-               update_ansatz_points(false) {};
+               q_points(false),
+               gradients(false),
+               jacobians(false),
+               JxW_values(false),
+               ansatz_points(false) {};
                
 
 
@@ -75,7 +75,7 @@ FEValues<dim>::shape_grad (const unsigned int i,
                           const unsigned int j) const {
   Assert (i<(unsigned int)shape_values.m(), ExcInvalidIndex (i, shape_values.m()));
   Assert (j<(unsigned int)shape_values.n(), ExcInvalidIndex (j, shape_values.n()));
-  Assert (update_flags.update_gradients, ExcAccessToUninitializedField());
+  Assert (update_flags.gradients, ExcAccessToUninitializedField());
 
   return shape_gradients[i][j];
 };
@@ -85,7 +85,7 @@ FEValues<dim>::shape_grad (const unsigned int i,
 template <int dim>
 const Point<dim> & FEValues<dim>::quadrature_point (const unsigned int i) const {
   Assert (i<n_quadrature_points, ExcInvalidIndex(i, n_quadrature_points));
-  Assert (update_flags.update_q_points, ExcAccessToUninitializedField());
+  Assert (update_flags.q_points, ExcAccessToUninitializedField());
   
   return quadrature_points[i];
 };
@@ -95,7 +95,7 @@ const Point<dim> & FEValues<dim>::quadrature_point (const unsigned int i) const
 template <int dim>
 const Point<dim> & FEValues<dim>::ansatz_point (const unsigned int i) const {
   Assert (i<ansatz_points.size(), ExcInvalidIndex(i, ansatz_points.size()));
-  Assert (update_flags.update_ansatz_points, ExcAccessToUninitializedField());
+  Assert (update_flags.ansatz_points, ExcAccessToUninitializedField());
   
   return ansatz_points[i];
 };
@@ -105,7 +105,7 @@ const Point<dim> & FEValues<dim>::ansatz_point (const unsigned int i) const {
 template <int dim>
 double FEValues<dim>::JxW (const unsigned int i) const {
   Assert (i<n_quadrature_points, ExcInvalidIndex(i, n_quadrature_points));
-  Assert (update_flags.update_JxW_values, ExcAccessToUninitializedField());
+  Assert (update_flags.JxW_values, ExcAccessToUninitializedField());
   
   return JxW_values[i];
 };
@@ -117,21 +117,21 @@ void FEValues<dim>::reinit (const typename Triangulation<dim>::cell_iterator &ce
                            const FiniteElement<dim>                         &fe) {
                                   // fill jacobi matrices and real
                                   // quadrature points
-  if (update_flags.update_jacobians || update_flags.update_q_points)
+  if (update_flags.jacobians || update_flags.q_points)
     fe.fill_fe_values (cell,
                       unit_quadrature_points,
                       jacobi_matrices,
-                      update_flags.update_jacobians,
+                      update_flags.jacobians,
                       ansatz_points,
-                      update_flags.update_ansatz_points,
+                      update_flags.ansatz_points,
                       quadrature_points,
-                      update_flags.update_q_points);
+                      update_flags.q_points);
 
                                   // compute gradients on real element if
                                   // requested
-  if (update_flags.update_gradients) 
+  if (update_flags.gradients) 
     {
-      Assert (update_flags.update_jacobians, ExcCannotInitializeField());
+      Assert (update_flags.jacobians, ExcCannotInitializeField());
       
       for (unsigned int i=0; i<fe.total_dofs; ++i)
        for (unsigned int j=0; j<n_quadrature_points; ++j)
@@ -155,9 +155,9 @@ void FEValues<dim>::reinit (const typename Triangulation<dim>::cell_iterator &ce
                                   // refer to the general doc for
                                   // why we take the inverse of the
                                   // determinant
-  if (update_flags.update_JxW_values) 
+  if (update_flags.JxW_values) 
     {
-      Assert (update_flags.update_jacobians,
+      Assert (update_flags.jacobians,
              ExcCannotInitializeField());
       for (unsigned int i=0; i<n_quadrature_points; ++i)
        JxW_values[i] = weights[i] / jacobi_matrices[i].determinant();
index 1627c1d3566bce78978966d237c58b42539b1a63..87a79eb0ef671ba649a1471fa81e5c4919d1732c 100644 (file)
@@ -130,8 +130,8 @@ void ProblemBase<dim>::integrate_difference (const Function<dim>      &exact_sol
   difference.reserve (tria->n_cells());
 
   FEValues<dim>::UpdateStruct update_flags;
-  update_flags.update_q_points   = true;
-  update_flags.update_JxW_values = true;
+  update_flags.q_points   = true;
+  update_flags.JxW_values = true;
   FEValues<dim> fe_values(fe, q, update_flags);
   
                                   // loop over all cells
index 9755ae893f0fa34e973986aa3cb43bd6b875a58a..7f65197b9174363029b278183214335f00953ee2 100644 (file)
@@ -123,27 +123,26 @@ int main () {
   QGauss4<2>         quadrature;
 
                                   
-//  HyperBallBoundary<2> boundary(Point<2>(2,3), 4);
-
   cout << "Making grid..." << endl;
   
   tria.create_hypercube ();
+//  HyperBallBoundary<2> boundary(Point<2>(2,3), 4);
 //  tria.create_hyper_ball(Point<2>(2,3),4);
 //  tria.set_boundary (&boundary);
   
-  tria.refine_global (1);
-  (--tria.last_active())->set_refine_flag();
-  tria.execute_refinement ();
+//  tria.refine_global (1);
+//  (--tria.last_active())->set_refine_flag();
+//  tria.execute_refinement ();
 //  tria.begin_active(2)->set_refine_flag();
 //  tria.execute_refinement ();
-  tria.refine_global (2);
+  tria.refine_global (3);
 
 /*
   const unsigned int dim=2;
   tria.refine_global (1);
        
   Triangulation<dim>::active_cell_iterator cell, endc;
-  for (int i=0; i<12; ++i) 
+  for (int i=0; i<8; ++i) 
     {
       int n_levels = tria.n_levels();
       cell = tria.begin_active();
@@ -171,12 +170,12 @@ int main () {
 
   cout << "Assembling matrices..." << endl;
   FEValues<2>::UpdateStruct update_flags;
-  update_flags.update_q_points = true;
-  update_flags.update_gradients = true;
-  update_flags.update_jacobians = true;
-  update_flags.update_JxW_values = true;
-  ProblemBase<2>::DirichletBC d;
-  problem.assemble (equation, quadrature, fe, update_flags, d);
+  update_flags.q_points = true;
+  update_flags.gradients = true;
+  update_flags.jacobians = true;
+  update_flags.JxW_values = true;
+  ProblemBase<2>::DirichletBC dirichlet_bc;
+  problem.assemble (equation, quadrature, fe, update_flags, dirichlet_bc);
 
   cout << "Solving..." << endl;
   problem.solve ();

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.