From: wolf Date: Thu, 8 Mar 2001 10:41:04 +0000 (+0000) Subject: Bring up to date w.r.t. the mapping branch. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a86f9569428de2927398f909bf22c2bc78e7b27;p=dealii-svn.git Bring up to date w.r.t. the mapping branch. git-svn-id: https://svn.dealii.org/trunk@4171 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-8/step-8.cc b/deal.II/examples/step-8/step-8.cc index fb4dcbeeed..c7be77c74b 100644 --- a/deal.II/examples/step-8/step-8.cc +++ b/deal.II/examples/step-8/step-8.cc @@ -38,7 +38,7 @@ // finite elements from regular Q1 // elements which can be found here, // as usual: -#include +#include // This again is C++: #include @@ -70,7 +70,7 @@ class ElasticProblem // Instead of a concrete finite // element class such as - // ``FEQ1'', we now use a more + // ``FE_Q'', we now use a more // generic one, ``FESystem''. In // fact, it is not a finite // element itself, but rather a @@ -80,7 +80,7 @@ class ElasticProblem // vector-valued finite // element. In our case, we will // compose the vector-valued - // element of ``FEQ1'' objects, + // element of ``FE_Q(1)'' objects, // as shown below in the // constructor of this class. FESystem fe; @@ -304,7 +304,7 @@ ElasticProblem::ElasticProblem () : // vector-valued // finite element as // outer product of - // several scald + // several scalar // finite // elements. Of // course, the number @@ -330,11 +330,11 @@ ElasticProblem::ElasticProblem () : // the system of, and // how often it shall // be repeated: - fe (FEQ1(), dim) + fe (FE_Q(1), dim) // In fact, the ``FESystem'' class // has several more constructors // which can perform more complex - // operations that just stacking + // operations than just stacking // together several scalar finite // elements of the same type into // one; we will get to know these @@ -348,11 +348,8 @@ ElasticProblem::ElasticProblem () : // use an anonymous object created // in-place. The ``FESystem'' // constructor only needs the - // parameter to deduce the type of - // the finite element from this and - // then creates objects of the - // underlying finite element type - // itself. + // parameter to generate a copy of + // the finite element from this. {}; diff --git a/deal.II/examples/step-9/step-9.cc b/deal.II/examples/step-9/step-9.cc index 39d3f6a777..8066823ce3 100644 --- a/deal.II/examples/step-9/step-9.cc +++ b/deal.II/examples/step-9/step-9.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include // The following two files provide @@ -133,7 +133,7 @@ class AdvectionProblem Triangulation triangulation; DoFHandler dof_handler; - FEQ1 fe; + FE_Q fe; ConstraintMatrix hanging_node_constraints; @@ -626,7 +626,8 @@ class GradientEstimation // three function: template AdvectionProblem::AdvectionProblem () : - dof_handler (triangulation) + dof_handler (triangulation), + fe(1) {};