From: Denis Davydov Date: Mon, 2 Feb 2015 08:28:11 +0000 (+0100) Subject: patch vector_selector X-Git-Tag: v8.3.0-rc1~184^2~24 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a562440b956f2afad3cd919aef0e415d84aceab;p=dealii.git patch vector_selector --- diff --git a/include/deal.II/meshworker/vector_selector.h b/include/deal.II/meshworker/vector_selector.h index c805e8af63..311e10768e 100644 --- a/include/deal.II/meshworker/vector_selector.h +++ b/include/deal.II/meshworker/vector_selector.h @@ -313,9 +313,9 @@ namespace MeshWorker void initialize(const VECTOR *, const std::string &name); virtual void fill( - std::vector > > &values, - std::vector > > > &gradients, - std::vector > > > &hessians, + std::vector > > &values, + std::vector > > > &gradients, + std::vector > > > &hessians, const FEValuesBase &fe, const std::vector &index, const unsigned int component, @@ -324,9 +324,9 @@ namespace MeshWorker const unsigned int size) const; virtual void mg_fill( - std::vector > > &values, - std::vector > > > &gradients, - std::vector > > > &hessians, + std::vector > > &values, + std::vector > > > &gradients, + std::vector > > > &hessians, const FEValuesBase &fe, const unsigned int level, const std::vector &index, diff --git a/include/deal.II/meshworker/vector_selector.templates.h b/include/deal.II/meshworker/vector_selector.templates.h index 6c45048a92..925012279d 100644 --- a/include/deal.II/meshworker/vector_selector.templates.h +++ b/include/deal.II/meshworker/vector_selector.templates.h @@ -119,9 +119,9 @@ namespace MeshWorker template void VectorData::fill( - std::vector > > &values, - std::vector > > > &gradients, - std::vector > > > &hessians, + std::vector > > &values, + std::vector > > > &gradients, + std::vector > > > &hessians, const FEValuesBase &fe, const std::vector &index, const unsigned int component, @@ -137,21 +137,21 @@ namespace MeshWorker for (unsigned int i=0; in_values(); ++i) { const VECTOR *src = data.read_ptr(this->value_index(i)); - VectorSlice > > dst(values[i], component, n_comp); + VectorSlice > > dst(values[i], component, n_comp); fe.get_function_values(*src, make_slice(index, start, size), dst, true); } for (unsigned int i=0; in_gradients(); ++i) { const VECTOR *src = data.read_ptr(this->gradient_index(i)); - VectorSlice > > > dst(gradients[i], component, n_comp); + VectorSlice > > > dst(gradients[i], component, n_comp); fe.get_function_gradients(*src, make_slice(index, start, size), dst, true); } for (unsigned int i=0; in_hessians(); ++i) { const VECTOR *src = data.read_ptr(this->hessian_index(i)); - VectorSlice > > > dst(hessians[i], component, n_comp); + VectorSlice > > > dst(hessians[i], component, n_comp); fe.get_function_hessians(*src, make_slice(index, start, size), dst, true); } } @@ -203,9 +203,9 @@ namespace MeshWorker template void VectorData::mg_fill( - std::vector > > &values, - std::vector > > > &gradients, - std::vector > > > &hessians, + std::vector > > &values, + std::vector > > > &gradients, + std::vector > > > &hessians, const FEValuesBase &fe, const unsigned int level, const std::vector &index, @@ -222,21 +222,21 @@ namespace MeshWorker for (unsigned int i=0; in_values(); ++i) { const MGLevelObject *src = data.read_ptr >(this->value_index(i)); - VectorSlice > > dst(values[i], component, n_comp); + VectorSlice > > dst(values[i], component, n_comp); fe.get_function_values((*src)[level], make_slice(index, start, size), dst, true); } for (unsigned int i=0; in_gradients(); ++i) { const MGLevelObject *src = data.read_ptr >(this->value_index(i)); - VectorSlice > > > dst(gradients[i], component, n_comp); + VectorSlice > > > dst(gradients[i], component, n_comp); fe.get_function_gradients((*src)[level], make_slice(index, start, size), dst, true); } for (unsigned int i=0; in_hessians(); ++i) { const MGLevelObject *src = data.read_ptr >(this->value_index(i)); - VectorSlice > > > dst(hessians[i], component, n_comp); + VectorSlice > > > dst(hessians[i], component, n_comp); fe.get_function_hessians((*src)[level], make_slice(index, start, size), dst, true); } }