From: Wolfgang Bangerth Date: Thu, 2 Apr 1998 12:05:12 +0000 (+0000) Subject: Rename flags. X-Git-Tag: v8.0.0~23138 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ba2d403d557639ec539557bcfd9e974a6ea33e1;p=dealii.git Rename flags. git-svn-id: https://svn.dealii.org/trunk@116 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/poisson/poisson.cc b/deal.II/deal.II/Attic/examples/poisson/poisson.cc index 9755ae893f..7f65197b91 100644 --- a/deal.II/deal.II/Attic/examples/poisson/poisson.cc +++ b/deal.II/deal.II/Attic/examples/poisson/poisson.cc @@ -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::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 (); diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index 6978d7734d..592dbc5ba3 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -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 inline const vector > > & FEValues::get_shape_grads () const { - Assert (update_flags.update_gradients, ExcAccessToUninitializedField()); + Assert (update_flags.gradients, ExcAccessToUninitializedField()); return shape_gradients; }; @@ -838,7 +838,7 @@ template inline const vector > & FEValues::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 inline const vector > & FEValues::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 inline const vector & FEValues::get_JxW_values () const { - Assert (update_flags.update_JxW_values, ExcAccessToUninitializedField()); + Assert (update_flags.JxW_values, ExcAccessToUninitializedField()); return JxW_values; }; diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 3a12c2a61c..8543071a75 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -9,11 +9,11 @@ template FEValues::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::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::shape_grad (const unsigned int i, template const Point & FEValues::quadrature_point (const unsigned int i) const { Assert (i & FEValues::quadrature_point (const unsigned int i) const template const Point & FEValues::ansatz_point (const unsigned int i) const { Assert (i & FEValues::ansatz_point (const unsigned int i) const { template double FEValues::JxW (const unsigned int i) const { Assert (i::reinit (const typename Triangulation::cell_iterator &ce const FiniteElement &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::reinit (const typename Triangulation::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::integrate_difference (const Function &exact_sol difference.reserve (tria->n_cells()); FEValues::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 fe_values(fe, q, update_flags); // loop over all cells diff --git a/tests/big-tests/poisson/poisson.cc b/tests/big-tests/poisson/poisson.cc index 9755ae893f..7f65197b91 100644 --- a/tests/big-tests/poisson/poisson.cc +++ b/tests/big-tests/poisson/poisson.cc @@ -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::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 ();