From: guido Date: Wed, 3 Jul 2002 12:16:02 +0000 (+0000) Subject: make last changes ISO conforming X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1839f6392995f7261d6578fce71c3c0dbcbcf7f3;p=dealii-svn.git make last changes ISO conforming git-svn-id: https://svn.dealii.org/trunk@6214 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/mapping.h b/deal.II/deal.II/include/fe/mapping.h index ec3f2f3c20..ec981877d4 100644 --- a/deal.II/deal.II/include/fe/mapping.h +++ b/deal.II/deal.II/include/fe/mapping.h @@ -201,9 +201,9 @@ class Mapping : public Subscriptor */ virtual void - transform_covariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_covariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const InternalDataBase& internal) const = 0; /** @@ -221,9 +221,9 @@ class Mapping : public Subscriptor */ virtual void - transform_contravariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_contravariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const InternalDataBase& internal) const = 0; /** diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index af5c50ec00..558a3cb6a1 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -105,9 +105,9 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - transform_covariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_covariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const; /** @@ -115,9 +115,9 @@ class MappingCartesian : public Mapping * @ref{Mapping}. */ virtual void - transform_contravariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_contravariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const; /** diff --git a/deal.II/deal.II/include/fe/mapping_q.h b/deal.II/deal.II/include/fe/mapping_q.h index 82ba320cbd..c1d9f86f12 100644 --- a/deal.II/deal.II/include/fe/mapping_q.h +++ b/deal.II/deal.II/include/fe/mapping_q.h @@ -83,9 +83,9 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - transform_covariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_covariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const; /** @@ -93,9 +93,9 @@ class MappingQ : public MappingQ1 * @ref{Mapping}. */ virtual void - transform_contravariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_contravariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const; /** diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h index a3c4d92aac..2ceba94765 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -72,9 +72,9 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - transform_covariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_covariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const; /** @@ -82,9 +82,9 @@ class MappingQ1 : public Mapping * @ref{Mapping}. */ virtual void - transform_contravariant (Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + transform_contravariant (typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const; /** diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 02f3981b3d..b74c9c74ce 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -466,7 +466,7 @@ compute_2nd (const Mapping &mapping, for (unsigned int d=0; d::fill_fe_face_values (const Mapping &mapping, if (flags & update_gradients) mapping.transform_covariant(data.shape_gradients[k].begin(), data.shape_gradients[k].end(), - &fe_data.shape_gradients[k][offset], + fe_data.shape_gradients[k].begin()+offset, mapping_data); } @@ -383,7 +383,7 @@ FE_DGP::fill_fe_subface_values (const Mapping &mappi if (flags & update_gradients) mapping.transform_covariant(data.shape_gradients[k].begin(), data.shape_gradients[k].end(), - &fe_data.shape_gradients[k][offset], + fe_data.shape_gradients[k].begin()+offset, mapping_data); } diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 633e75f2a9..3d894db154 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -537,7 +537,7 @@ FE_DGQ::fill_fe_face_values (const Mapping &mapping, if (flags & update_gradients) mapping.transform_covariant(data.shape_gradients[k].begin(), data.shape_gradients[k].end(), - &fe_data.shape_gradients[k][offset], + fe_data.shape_gradients[k].begin()+offset, mapping_data); } @@ -583,7 +583,7 @@ FE_DGQ::fill_fe_subface_values (const Mapping &mappi if (flags & update_gradients) mapping.transform_covariant(data.shape_gradients[k].begin(), data.shape_gradients[k].end(), - &fe_data.shape_gradients[k][offset], + fe_data.shape_gradients[k].begin()+offset, mapping_data); } diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index a63cb08ad8..097849cb68 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -1229,7 +1229,7 @@ FE_Q::fill_fe_face_values (const Mapping &mapping, if (flags & update_gradients) mapping.transform_covariant(data.shape_gradients[k].begin(), data.shape_gradients[k].end(), - &fe_data.shape_gradients[k][offset], + fe_data.shape_gradients[k].begin()+offset, mapping_data); } @@ -1275,7 +1275,7 @@ FE_Q::fill_fe_subface_values (const Mapping &mapping if (flags & update_gradients) mapping.transform_covariant(data.shape_gradients[k].begin(), data.shape_gradients[k].end(), - &fe_data.shape_gradients[k][offset], + fe_data.shape_gradients[k].begin()+offset, mapping_data); } diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index 1a56f051f0..a8609cc495 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -439,9 +439,9 @@ MappingCartesian<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterator template void MappingCartesian::transform_covariant ( - Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const { const InternalData &data = dynamic_cast (mapping_data); @@ -464,9 +464,9 @@ MappingCartesian::transform_covariant ( template void MappingCartesian::transform_contravariant ( - Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const { // convert data object to internal diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index 98e5a36e23..b88510a027 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -1069,9 +1069,9 @@ MappingQ::fill_quad_support_points_simple (const typename Triangulation void MappingQ::transform_covariant ( - Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const { const typename MappingQ1::InternalData *q1_data = @@ -1102,9 +1102,9 @@ MappingQ::transform_covariant ( template void MappingQ::transform_contravariant ( - Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const { const typename MappingQ1::InternalData *q1_data = diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index 54973f58a2..b397bed5e4 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -780,9 +780,9 @@ MappingQ1<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterator &, template void MappingQ1::transform_covariant ( - Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const { const InternalData *data_ptr = dynamic_cast (&mapping_data); @@ -808,9 +808,9 @@ MappingQ1::transform_covariant ( template void MappingQ1::transform_contravariant ( - Tensor<1,dim>* begin, - const Tensor<1,dim>* end, - const Tensor<1,dim>* src, + typename std::vector >::iterator begin, + typename std::vector >::const_iterator end, + typename std::vector >::const_iterator src, const typename Mapping::InternalDataBase &mapping_data) const { const InternalData* data_ptr = dynamic_cast (&mapping_data);