From: guido Date: Thu, 8 Apr 1999 12:02:46 +0000 (+0000) Subject: Argument to get_function_values changed back X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d632a2733e3c961d2b3fdfa5bc40bff3da5c7f6;p=dealii-svn.git Argument to get_function_values changed back git-svn-id: https://svn.dealii.org/trunk@1094 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 4bee616711..f8e43c1b3e 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -307,7 +307,7 @@ class FEValuesBase { * elements. */ void get_function_values (const Vector &fe_function, - vector > &values) const; + vector > &values) const; /** * Return the gradient of the #i#th shape diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 7dc5311a6c..131a7166a9 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -93,7 +93,7 @@ void FEValuesBase::get_function_values (const Vector &fe_function, template void FEValuesBase::get_function_values (const Vector &fe_function, - vector< vector > &values) const + vector< Vector > &values) const { Assert (n_quadrature_points == values.size(), ExcWrongNoOfComponents()); @@ -116,7 +116,7 @@ void FEValuesBase::get_function_values (const Vector &fe_functi // functions for (unsigned int point=0; pointsystem_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)); }; diff --git a/deal.II/deal.II/source/numerics/data_io.cc b/deal.II/deal.II/source/numerics/data_io.cc index 1d71bb6a07..1681a3f49d 100644 --- a/deal.II/deal.II/source/numerics/data_io.cc +++ b/deal.II/deal.II/source/numerics/data_io.cc @@ -596,10 +596,10 @@ void DataOut::write_gnuplot (ostream &out, unsigned int accuracy) const FEValues fe(dofs->get_fe(), points, UpdateFlags(update_q_points), dofs->get_tria().get_boundary()); - vector< vector > > + vector< vector > > values (dof_data.size(), - vector< vector >(points.n_quadrature_points, - vector(dofs->get_fe().n_components + vector< Vector >(points.n_quadrature_points, + Vector(dofs->get_fe().n_components ))); unsigned int cell_index=0; @@ -624,7 +624,7 @@ void DataOut::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::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::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::integrate_difference (const DoFHandler &dof, // fe_function if (true) { - vector< vector > function_values (n_q_points, - vector(fe.n_components)); + vector< Vector > function_values (n_q_points, + Vector(fe.n_components)); fe_values.get_function_values (fe_function, function_values); /* transform (psi.begin(), psi.end(),