From ff07f8ade895a3e6df638b7b584076eafdbe6dd7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 27 Apr 1998 18:06:58 +0000 Subject: [PATCH] Name change. git-svn-id: https://svn.dealii.org/trunk@209 0785d39b-7218-0410-832d-ea1e28bc413d --- .../Attic/examples/convergence/convergence.cc | 2 +- .../error-estimation/error-estimation.cc | 2 +- .../deal.II/Attic/examples/poisson/problem.cc | 2 +- deal.II/deal.II/include/numerics/base.h | 32 +++++++++---------- tests/big-tests/convergence/convergence.cc | 2 +- .../error-estimation/error-estimation.cc | 2 +- tests/big-tests/poisson/problem.cc | 2 +- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index daeaafbf60..2a95fa67aa 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -254,7 +254,7 @@ void PoissonProblem::run (const unsigned int level) { UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | update_jacobians | update_JxW_values); - ProblemBase::DirichletBC dirichlet_bc; + ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, update_flags, dirichlet_bc); diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 1d43aeb913..3767cdd2a5 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -255,7 +255,7 @@ void PoissonProblem::run (const unsigned int level) { UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | update_jacobians | update_JxW_values); - ProblemBase::DirichletBC dirichlet_bc; + ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, update_flags, dirichlet_bc); diff --git a/deal.II/deal.II/Attic/examples/poisson/problem.cc b/deal.II/deal.II/Attic/examples/poisson/problem.cc index ed039acba3..48dad443c8 100644 --- a/deal.II/deal.II/Attic/examples/poisson/problem.cc +++ b/deal.II/deal.II/Attic/examples/poisson/problem.cc @@ -448,7 +448,7 @@ void PoissonProblem::run (ParameterHandler &prm) { cout << dof->n_dofs() << " degrees of freedom." << endl; cout << " Assembling matrices..." << endl; - ProblemBase::DirichletBC dirichlet_bc; + ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, UpdateFlags(update_gradients | update_JxW_values | diff --git a/deal.II/deal.II/include/numerics/base.h b/deal.II/deal.II/include/numerics/base.h index 68ed8df444..88e650243b 100644 --- a/deal.II/deal.II/include/numerics/base.h +++ b/deal.II/deal.II/include/numerics/base.h @@ -18,12 +18,11 @@ template class DoFHandler; template class FiniteElement; template class Quadrature; template class DataOut; -template class Function; template class Equation; template class Assembler; template class Boundary; template class StraightBoundary; - +template class Function; /** @@ -238,19 +237,18 @@ template class ProblemBase { public: /** - * Declare a data type which denotes a - * mapping between a boundary indicator - * and the function denoting the boundary - * values on this part of the boundary. - * Only one boundary function may be given - * for each boundary indicator, which is - * guaranteed by the #map# data type. - * - * See the general documentation of this - * class for more detail. + * Declare a data type which denotes a + * mapping between a boundary indicator + * and the function denoting the boundary + * values on this part of the boundary. + * Only one boundary function may be given + * for each boundary indicator, which is + * guaranteed by the #map# data type. + * + * See the general documentation of this + * class for more detail. */ - typedef map* > DirichletBC; - + typedef map*> FunctionMap; /** * Typdedef an iterator which assembles * matrices and vectors. @@ -309,7 +307,7 @@ class ProblemBase { const Quadrature &q, const FiniteElement &fe, const UpdateFlags update_flags, - const DirichletBC &dirichlet_bc = DirichletBC(), + const FunctionMap &dirichlet_bc = FunctionMap(), const Boundary &boundary = StraightBoundary()); /** @@ -373,7 +371,7 @@ class ProblemBase { * See the general doc for more * information. */ - virtual void make_boundary_value_list (const DirichletBC &dirichlet_bc, + virtual void make_boundary_value_list (const FunctionMap &dirichlet_bc, const FiniteElement &fe, const Boundary &boundary, map &boundary_values) const; @@ -450,7 +448,7 @@ class ProblemBase { void apply_dirichlet_bc (dSMatrix &matrix, dVector &solution, dVector &right_hand_side, - const DirichletBC &dirichlet_bc, + const FunctionMap &dirichlet_bc, const FiniteElement &fe, const Boundary &boundary); diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index daeaafbf60..2a95fa67aa 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -254,7 +254,7 @@ void PoissonProblem::run (const unsigned int level) { UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | update_jacobians | update_JxW_values); - ProblemBase::DirichletBC dirichlet_bc; + ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, update_flags, dirichlet_bc); diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 1d43aeb913..3767cdd2a5 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -255,7 +255,7 @@ void PoissonProblem::run (const unsigned int level) { UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | update_jacobians | update_JxW_values); - ProblemBase::DirichletBC dirichlet_bc; + ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, update_flags, dirichlet_bc); diff --git a/tests/big-tests/poisson/problem.cc b/tests/big-tests/poisson/problem.cc index ed039acba3..48dad443c8 100644 --- a/tests/big-tests/poisson/problem.cc +++ b/tests/big-tests/poisson/problem.cc @@ -448,7 +448,7 @@ void PoissonProblem::run (ParameterHandler &prm) { cout << dof->n_dofs() << " degrees of freedom." << endl; cout << " Assembling matrices..." << endl; - ProblemBase::DirichletBC dirichlet_bc; + ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, UpdateFlags(update_gradients | update_JxW_values | -- 2.39.5