]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix grammar.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Jan 2007 18:28:44 +0000 (18:28 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 17 Jan 2007 18:28:44 +0000 (18:28 +0000)
git-svn-id: https://svn.dealii.org/trunk@14334 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe.h
deal.II/deal.II/include/fe/fe_q.h
deal.II/deal.II/include/fe/fe_system.h
deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/source/fe/fe_values.cc

index 60107d9021a08999b62c52a8719c48250ebf4bf0..76a768dbb36da634173cfe43a804e292c782fa47 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -1462,12 +1462,12 @@ class FiniteElement : public Subscriptor,
                                     /**
                                      * For faces with non-standard
                                      * face_orientation in 3D, the shape
-                                     * functions on faces have to be permutated
+                                     * functions on faces have to be permutat
                                      * in order to be combined with the correct
                                      * dofs. This function returns a vector of
                                      * integer values, that have to be added to
                                      * the index of a shape function in order
-                                     * to result in the permutated index. Prior
+                                     * to result in the permuted index. Prior
                                      * content of the vector @p shifts is
                                      * erased. In 3D a vector of length @p
                                      * dofs_per_quad is returned, in 2D and 1D
index 92d5ab0a1e86a8a7175e0425106e6c37e35b533a..cd57fcf2b6e63be58c1855a6d85779cc6e484042 100644 (file)
@@ -442,12 +442,12 @@ class FE_Q : public FE_Poly<TensorProductPolynomials<dim>,dim>
                                     /**
                                      * For faces with non-standard
                                      * face_orientation in 3D, the shape
-                                     * functions on faces have to be permutated
+                                     * functions on faces have to be permuted
                                      * in order to be combined with the correct
                                      * dofs. This function returns a vector of
                                      * integer values, that have to be added to
                                      * the index of a shape function in order
-                                     * to result in the permutated index. Prior
+                                     * to result in the permuted index. Prior
                                      * content of the vector @p shifts is
                                      * erased. In 3D a vector of length @p
                                      * dofs_per_quad is returned, in 2D and 1D
index d2d8ac1c653d1c55001de9736bdeeaea21c8cda7..ff0eb1d84bcc43231f6731c8d65ed11bdd7177cb 100644 (file)
@@ -543,12 +543,12 @@ class FESystem : public FiniteElement<dim>
                                     /**
                                      * For faces with non-standard
                                      * face_orientation in 3D, the shape
-                                     * functions on faces have to be permutated
+                                     * functions on faces have to be permuted
                                      * in order to be combined with the correct
                                      * dofs. This function returns a vector of
                                      * integer values, that have to be added to
                                      * the index of a shape function in order
-                                     * to result in the permutated index. Prior
+                                     * to result in the permuted index. Prior
                                      * content of the vector @p shifts is
                                      * erased. In 3D a vector of length @p
                                      * dofs_per_quad is returned, in 2D and 1D
index 560e0d2226face455f47d43a1577cae55266378c..a0fcde80468a2571587a099bd468441900139356 100644 (file)
@@ -284,11 +284,11 @@ class FEValuesData
                                      * faces are oriented according to the
                                      * standard, this is the identity mapping.
                                      */
-    std::vector<unsigned int> permutated_shape_functions;
+    std::vector<unsigned int> permuted_shape_functions;
 
                                     /**
                                      * Bool flag indicating the need to update
-                                     * the @p permutated_shape_functions vector
+                                     * the @p permuted_shape_functions vector
                                      * on each cell. This is only necessary in
                                      * 3d and if the finite element has
                                      * shape_functions on the face.
@@ -659,7 +659,7 @@ class FEValuesBase : protected FEValuesData<dim>,
     
                                     /**
                                      * If shape functions belong to a face in
-                                     * 3D, they have to be permutated, if the
+                                     * 3D, they have to be permuted, if the
                                      * face has non-standard face
                                      * orientation. This functuion takes an
                                      * index of a shape function (on a standard
@@ -2754,7 +2754,7 @@ unsigned int
 FEValuesBase<3>::shift_shape_function_index (const unsigned int i) const
 {
   Assert(i<fe->dofs_per_cell, ExcInternalError());
-  return this->permutated_shape_functions[i];
+  return this->permuted_shape_functions[i];
 }
 
 
index 879738a5470c3b2fc15c39480754f75d04f187d3..7d5e1eadb67118ec43666d087abc552f8a3b8a9e 100644 (file)
@@ -321,11 +321,11 @@ FEValuesData<dim>::initialize (const unsigned int        n_quadrature_points,
                                   // are needed
   if (dim==3)
     {
-      permutated_shape_functions.resize(fe.dofs_per_cell);
+      permuted_shape_functions.resize(fe.dofs_per_cell);
                                       // initialize cell permutation mapping
                                       // with identity
       for (unsigned int i=0; i<fe.dofs_per_cell; ++i)
-       this->permutated_shape_functions[i]=i;
+       this->permuted_shape_functions[i]=i;
 
       if (fe.dofs_per_quad>0 &&
          (flags & update_values ||
@@ -416,10 +416,10 @@ void FEValuesBase<3>::reinit ()
        {
          if (thiscell->face_orientation(face_no))
            for (unsigned int i=0; i<fe->dofs_per_quad; ++i)
-             this->permutated_shape_functions[offset+i]=offset+i;
+             this->permuted_shape_functions[offset+i]=offset+i;
          else
            for (unsigned int i=0; i<fe->dofs_per_quad; ++i)
-             this->permutated_shape_functions[offset+i]=offset+i+this->shift_in_face_shape_functions[i];
+             this->permuted_shape_functions[offset+i]=offset+i+this->shift_in_face_shape_functions[i];
 
          offset+=this->fe->dofs_per_quad;
        }
@@ -1076,7 +1076,7 @@ FEValuesBase<dim>::memory_consumption () const
   return (MemoryConsumption::memory_consumption (this->shape_values) +
          MemoryConsumption::memory_consumption (this->shape_gradients) +
          MemoryConsumption::memory_consumption (this->shape_2nd_derivatives) +
-         MemoryConsumption::memory_consumption (this->permutated_shape_functions) +
+         MemoryConsumption::memory_consumption (this->permuted_shape_functions) +
          MemoryConsumption::memory_consumption (this->shift_in_face_shape_functions) +
          MemoryConsumption::memory_consumption (this->JxW_values) +
          MemoryConsumption::memory_consumption (this->quadrature_points) +

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.