]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
replace rank_ by rank
authorhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 3 May 1999 16:41:25 +0000 (16:41 +0000)
committerhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 3 May 1999 16:41:25 +0000 (16:41 +0000)
git-svn-id: https://svn.dealii.org/trunk@1254 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/tensor_function.h
deal.II/base/source/tensor_function.cc

index 36ef35f69db7e7e998f880b2540cf96e8323cc0e..3185530fa10d9d08c90afb3ae545dc3b7de06893 100644 (file)
@@ -18,7 +18,7 @@
 
 template <typename number> class Vector;
 template <int dim> class VectorFunction;
-template <int rank_, int dim> class TensorFunction;
+template <int rank, int dim> class TensorFunction;
 
 /**
  * Base class for multi-valued functions.
@@ -177,8 +177,8 @@ class VectorFunction //<dim>
  *
  *  @author Guido Kanschat, 1999
  */
-template <int rank_, int dim>
-class TensorFunction //<rank_ , dim>
+template <int rank, int dim>
+class TensorFunction //<rank , dim>
   :
   public VectorFunction<dim>
 {
@@ -200,7 +200,7 @@ class TensorFunction //<rank_ , dim>
                                      * Return the value of the function
                                      * at the given point.
                                      */
-    virtual Tensor<rank_, dim> operator () (const Point<dim> &p) const;
+    virtual Tensor<rank, dim> operator () (const Point<dim> &p) const;
 
                                     /**
                                      * Set #values# to the point values
@@ -211,19 +211,19 @@ class TensorFunction //<rank_ , dim>
                                      * array.
                                      */
     virtual void value_list (const vector<Point<dim> > &points,
-                            vector<Tensor<rank_,dim> > &values) const;
+                            vector<Tensor<rank,dim> > &values) const;
 
 //                                /**
 //                                 * Return one component of the value.
 //                                 */
-//  virtual double operator() (TensorIndex<rank_> i, const Point<dim>& p) const;
+//  virtual double operator() (TensorIndex<rank> i, const Point<dim>& p) const;
   
 
                                     /**
                                      * Return the gradient of the function
                                      * at the given point.
                                      */
-    virtual Tensor<rank_+1,dim> gradient (const Point<dim> &p) const;
+    virtual Tensor<rank+1,dim> gradient (const Point<dim> &p) const;
 
                                     /**
                                      * Set #gradients# to the gradients of
@@ -233,7 +233,7 @@ class TensorFunction //<rank_ , dim>
                                      * the same size as the #points# array.
                                      */
     virtual void gradient_list (const vector<Point<dim> > &points,
-                               vector<Tensor<rank_+1,dim> > &gradients) const;
+                               vector<Tensor<rank+1,dim> > &gradients) const;
 
                                     /**
                                      * See #VectorFunction#.
index c51dcd5439c54cea2f149fdbc754ad8b56b4f0ec..260a2a63e2a2654bb05605b926b1fe01ebf136e7 100644 (file)
@@ -109,23 +109,23 @@ VectorFunction<dim>::Extractor::gradient_list (const vector<Point<dim> > &points
 // TensorFunction
 //////////////////////////////////////////////////////////////////////
 
-template <int rank_, int dim>
-TensorFunction<rank_, dim>::TensorFunction (const double initial_time)
+template <int rank, int dim>
+TensorFunction<rank, dim>::TensorFunction (const double initial_time)
                :
-               VectorFunction<dim>(pow(dim,rank_), initial_time)
+               VectorFunction<dim>(pow(dim,rank), initial_time)
 {};
 
 
 
-template <int rank_, int dim>
-TensorFunction<rank_, dim>::~TensorFunction ()
+template <int rank, int dim>
+TensorFunction<rank, dim>::~TensorFunction ()
 {};
 
 
 
-// template <int rank_, int dim>
+// template <int rank, int dim>
 // double
-// TensorFunction<rank_, dim>::operator () (TensorIndex<rank_> i,
+// TensorFunction<rank, dim>::operator () (TensorIndex<rank> i,
 //                                      const Point<dim> &) const
 // {
 //   int k=i(0);
@@ -136,19 +136,19 @@ TensorFunction<rank_, dim>::~TensorFunction ()
 // };
 
 
-template <int rank_, int dim>
-Tensor<rank_,dim>
-TensorFunction<rank_, dim>::operator() (const Point<dim> &) const
+template <int rank, int dim>
+Tensor<rank,dim>
+TensorFunction<rank, dim>::operator() (const Point<dim> &) const
 {
   Assert (false, ExcPureFunctionCalled());
-  return Tensor<rank_,dim>();
+  return Tensor<rank,dim>();
 };
 
 
-template <int rank_, int dim>
+template <int rank, int dim>
 void
-TensorFunction<rank_, dim>::value_list (const vector<Point<dim> > &points,
-                                vector<Tensor<rank_,dim> > &values) const
+TensorFunction<rank, dim>::value_list (const vector<Point<dim> > &points,
+                                vector<Tensor<rank,dim> > &values) const
 {
   Assert (values.size() == points.size(),
          ExcVectorHasWrongSize(values.size(), points.size()));
@@ -158,20 +158,20 @@ TensorFunction<rank_, dim>::value_list (const vector<Point<dim> > &points,
 };
 
 
-template <int rank_, int dim>
-Tensor<rank_+1,dim>
-TensorFunction<rank_, dim>::gradient (const Point<dim> &) const
+template <int rank, int dim>
+Tensor<rank+1,dim>
+TensorFunction<rank, dim>::gradient (const Point<dim> &) const
 {
   Assert (false, ExcPureFunctionCalled());
-  return Tensor<rank_+1,dim>();
+  return Tensor<rank+1,dim>();
 };
 
 
 
-template <int rank_, int dim>
+template <int rank, int dim>
 void
-TensorFunction<rank_, dim>::gradient_list (const vector<Point<dim> > &points,
-                                   vector<Tensor<rank_+1,dim> > &gradients) const
+TensorFunction<rank, dim>::gradient_list (const vector<Point<dim> > &points,
+                                   vector<Tensor<rank+1,dim> > &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcVectorHasWrongSize(gradients.size(), points.size()));
@@ -181,17 +181,17 @@ TensorFunction<rank_, dim>::gradient_list (const vector<Point<dim> > &points,
 };
 
 
-template <int rank_, int dim> void
-TensorFunction<rank_, dim>::value (const Point<dim>  &p,
+template <int rank, int dim> void
+TensorFunction<rank, dim>::value (const Point<dim>  &p,
                                   Vector<double> &erg) const
 {
-  Tensor<rank_,dim> h = operator()(p);
+  Tensor<rank,dim> h = operator()(p);
   h.unroll(erg);
 }
 
 
-template <int rank_, int dim> void
-TensorFunction<rank_, dim>::value_list (const vector<Point<dim> > & points,
+template <int rank, int dim> void
+TensorFunction<rank, dim>::value_list (const vector<Point<dim> > & points,
                                 vector<Vector<double> > & values) const
 {
   Assert (values.size() == points.size(),
@@ -203,8 +203,8 @@ TensorFunction<rank_, dim>::value_list (const vector<Point<dim> > & points,
 }
 
 
-template <int rank_, int dim> void
-TensorFunction<rank_, dim>::gradient_list (const vector<Point<dim> > &,
+template <int rank, int dim> void
+TensorFunction<rank, dim>::gradient_list (const vector<Point<dim> > &,
                                    vector<vector<Tensor<1,dim> > > &) const
 {
   Assert (false, ExcPureFunctionCalled());

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.