]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Argument to get_function_values changed back
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 8 Apr 1999 12:02:46 +0000 (12:02 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 8 Apr 1999 12:02:46 +0000 (12:02 +0000)
git-svn-id: https://svn.dealii.org/trunk@1094 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/source/fe/fe_values.cc
deal.II/deal.II/source/numerics/data_io.cc
deal.II/deal.II/source/numerics/vectors.cc

index 4bee6167115bff9bd7d9bd01e85faa53f023bccd..f8e43c1b3e3374174e2ef20c390feb7ee7be4d2d 100644 (file)
@@ -307,7 +307,7 @@ class FEValuesBase {
                                      * elements.
                                      */
     void get_function_values (const Vector<double>    &fe_function,
-                             vector<vector<double> > &values) const;
+                             vector<Vector<double> > &values) const;
 
                                     /**
                                      * Return the gradient of the #i#th shape
index 7dc5311a6c7deddfcfa6e1eec613178a00bce96a..131a7166a9f2b450138682be03513574a4234aff 100644 (file)
@@ -93,7 +93,7 @@ void FEValuesBase<dim>::get_function_values (const Vector<double> &fe_function,
 
 template <int dim>
 void FEValuesBase<dim>::get_function_values (const Vector<double>     &fe_function,
-                                            vector< vector<double> > &values) const
+                                            vector< Vector<double> > &values) const
 {
   Assert (n_quadrature_points == values.size(),
          ExcWrongNoOfComponents());
@@ -116,7 +116,7 @@ void FEValuesBase<dim>::get_function_values (const Vector<double>     &fe_functi
                                   // functions
   for (unsigned int point=0; point<n_quadrature_points; ++point)
     for (unsigned int shape_func=0; shape_func<total_dofs; ++shape_func)
-      values[point][fe->system_to_component_index(shape_func).first]
+      values[point](fe->system_to_component_index(shape_func).first)
        += (dof_values(shape_func) * shape_values[selected_dataset](shape_func, point));
 };
 
index 1d71bb6a07ad45b097f2e43344bfa8791918902b..1681a3f49dd4defb68cee9c84538249d34bde903 100644 (file)
@@ -596,10 +596,10 @@ void DataOut<dim>::write_gnuplot (ostream &out, unsigned int accuracy) const
   
   FEValues<dim> fe(dofs->get_fe(), points, UpdateFlags(update_q_points),
                   dofs->get_tria().get_boundary());
-  vector< vector <vector<double> > >
+  vector< vector <Vector<double> > >
     values (dof_data.size(),
-           vector< vector<double> >(points.n_quadrature_points,
-                                    vector<double>(dofs->get_fe().n_components
+           vector< Vector<double> >(points.n_quadrature_points,
+                                    Vector<double>(dofs->get_fe().n_components
                                     )));
 
   unsigned int cell_index=0;
@@ -624,7 +624,7 @@ void DataOut<dim>::write_gnuplot (ostream &out, unsigned int accuracy) const
                    out << pt << "  ";
                    for (unsigned int i=0; i!=dof_data.size(); ++i)
                      for (unsigned int j=0; j < dofs->get_fe().n_components; ++j)
-                       out << values[i][supp_pt][j]
+                       out << values[i][supp_pt](j)
                            << ' ';
                    for (unsigned int i=0; i<cell_data.size(); ++i)
                      out << (*cell_data[i].data)(cell_index)
@@ -650,7 +650,7 @@ void DataOut<dim>::write_gnuplot (ostream &out, unsigned int accuracy) const
                    
                    for (unsigned int i=0; i!=dof_data.size(); ++i)
                      for (unsigned int j=0; j < dofs->get_fe().n_components; ++j)
-                       out << values[i][supp_pt][j]
+                       out << values[i][supp_pt](j)
                            << ' ';
                    for (unsigned int i=0; i<cell_data.size(); ++i)
                      out << (*cell_data[i].data)(cell_index)
@@ -686,7 +686,7 @@ void DataOut<dim>::write_gnuplot (ostream &out, unsigned int accuracy) const
                            
                            for (unsigned int i=0; i!=dof_data.size(); ++i)
                              for (unsigned int j=0; j < dofs->get_fe().n_components; ++j)
-                               out << values[i][supp_pt][j]
+                               out << values[i][supp_pt](j)
                                    << ' ';
                            for (unsigned int i=0; i<cell_data.size(); ++i)
                              out << (*cell_data[i].data)(cell_index)
index 55b79029047c06d24fac084732d82c3601687084..8c6852a7d4d0a4f597fbee8ff2ead104a25e6739 100644 (file)
@@ -671,8 +671,8 @@ VectorTools<dim>::integrate_difference (const DoFHandler<dim>    &dof,
                                             // fe_function
            if (true) 
              {
-               vector< vector<double> > function_values (n_q_points,
-                                                         vector<double>(fe.n_components));
+               vector< Vector<double> > function_values (n_q_points,
+                                                         Vector<double>(fe.n_components));
                fe_values.get_function_values (fe_function, function_values);
 
 /*             transform (psi.begin(), psi.end(),

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.