]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
make last changes ISO conforming
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Jul 2002 12:16:02 +0000 (12:16 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Jul 2002 12:16:02 +0000 (12:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@6214 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/mapping.h
deal.II/deal.II/include/fe/mapping_cartesian.h
deal.II/deal.II/include/fe/mapping_q.h
deal.II/deal.II/include/fe/mapping_q1.h
deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/fe/fe_dgp.cc
deal.II/deal.II/source/fe/fe_dgq.cc
deal.II/deal.II/source/fe/fe_q.cc
deal.II/deal.II/source/fe/mapping_cartesian.cc
deal.II/deal.II/source/fe/mapping_q.cc
deal.II/deal.II/source/fe/mapping_q1.cc

index ec3f2f3c2002a4df3ea29b49ff9c0733b09033f6..ec981877d436fbe385c0f856994a274663581a61 100644 (file)
@@ -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<Tensor<1,dim> >::iterator begin,
+                        typename std::vector<Tensor<1,dim> >::const_iterator end,
+                        typename std::vector<Tensor<1,dim> >::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<Tensor<1,dim> >::iterator begin,
+                            typename std::vector<Tensor<1,dim> >::const_iterator end,
+                            typename std::vector<Tensor<1,dim> >::const_iterator src,
                             const InternalDataBase& internal) const = 0;
 
                                     /**
index af5c50ec0000419c15f155994e6f0725585a96a2..558a3cb6a19cebcd7ac8533cb25ba3c05aac3caf 100644 (file)
@@ -105,9 +105,9 @@ class MappingCartesian : public Mapping<dim>
                                      * @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<Tensor<1,dim> >::iterator begin,
+                        typename std::vector<Tensor<1,dim> >::const_iterator end,
+                        typename std::vector<Tensor<1,dim> >::const_iterator src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data) const;
     
                                     /**
@@ -115,9 +115,9 @@ class MappingCartesian : public Mapping<dim>
                                      * @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<Tensor<1,dim> >::iterator begin,
+                        typename std::vector<Tensor<1,dim> >::const_iterator end,
+                        typename std::vector<Tensor<1,dim> >::const_iterator src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data) const;
 
                                     /**
index 82ba320cbdc98ab3e4a1bd5fb8f04226e36b6f4c..c1d9f86f12b56541c3268fd033d6089e7fc23717 100644 (file)
@@ -83,9 +83,9 @@ class MappingQ : public MappingQ1<dim>
                                      * @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<Tensor<1,dim> >::iterator begin,
+                        typename std::vector<Tensor<1,dim> >::const_iterator end,
+                        typename std::vector<Tensor<1,dim> >::const_iterator src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data) const;
     
                                     /**
@@ -93,9 +93,9 @@ class MappingQ : public MappingQ1<dim>
                                      * @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<Tensor<1,dim> >::iterator begin,
+                        typename std::vector<Tensor<1,dim> >::const_iterator end,
+                        typename std::vector<Tensor<1,dim> >::const_iterator src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data) const;    
 
                                     /**
index a3c4d92aac23291d8a2074342f28b8ad0e37f5a4..2ceba94765f170a700c8e7dfdcf5b8a7b761c899 100644 (file)
@@ -72,9 +72,9 @@ class MappingQ1 : public Mapping<dim>
                                      * @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<Tensor<1,dim> >::iterator begin,
+                        typename std::vector<Tensor<1,dim> >::const_iterator end,
+                        typename std::vector<Tensor<1,dim> >::const_iterator src,
                         const typename Mapping<dim>::InternalDataBase &mapping_data) const;
     
                                     /**
@@ -82,9 +82,9 @@ class MappingQ1 : public Mapping<dim>
                                      * @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<Tensor<1,dim> >::iterator begin,
+                            typename std::vector<Tensor<1,dim> >::const_iterator end,
+                            typename std::vector<Tensor<1,dim> >::const_iterator src,
                             const typename Mapping<dim>::InternalDataBase &mapping_data) const;
     
                                     /**
index 02f3981b3db6bbbb81b168a1071082228e8985a2..b74c9c74cef87785a6eca25a23b2072a8ae222c5 100644 (file)
@@ -466,7 +466,7 @@ compute_2nd (const Mapping<dim>                   &mapping,
       for (unsigned int d=0; d<dim; ++d)
        {
          mapping.transform_covariant (diff_quot2.begin(), diff_quot2.end(),
-                                      &diff_quot[d][offset],
+                                      diff_quot[d].begin()+offset,
                                       mapping_internal);
 
          for (unsigned int q=0; q<n_q_points; ++q)
index d3fe59b8054c5c8e014fe05d09479aa5f1cc8988..203b6658ff1d4e07fedf801dc58a077ff159b6d6 100644 (file)
@@ -337,7 +337,7 @@ FE_DGP<dim>::fill_fe_face_values (const Mapping<dim>                   &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<dim>::fill_fe_subface_values (const Mapping<dim>                   &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);
     }
   
index 633e75f2a97d16b7e218cfb396fb5b9debf1c036..3d894db1548052b72ebd9644a2f9d52ead6046bb 100644 (file)
@@ -537,7 +537,7 @@ FE_DGQ<dim>::fill_fe_face_values (const Mapping<dim>                   &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<dim>::fill_fe_subface_values (const Mapping<dim>                   &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);
     }
   
index a63cb08ad82ed70f132b1c5405e0be38e737b804..097849cb6844c468005cb390c6a77c78ac5a27a4 100644 (file)
@@ -1229,7 +1229,7 @@ FE_Q<dim>::fill_fe_face_values (const Mapping<dim>                   &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<dim>::fill_fe_subface_values (const Mapping<dim>                   &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);
     }
   
index 1a56f051f0c68872e809a6962046554592daa08d..a8609cc495ada394f57bca4dbe139e9838c2e275 100644 (file)
@@ -439,9 +439,9 @@ MappingCartesian<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterator
 template <int dim>
 void
 MappingCartesian<dim>::transform_covariant (
-  Tensor<1,dim>* begin,
-  const Tensor<1,dim>* end,
-  const Tensor<1,dim>* src,
+  typename std::vector<Tensor<1,dim> >::iterator begin,
+  typename std::vector<Tensor<1,dim> >::const_iterator end,
+  typename std::vector<Tensor<1,dim> >::const_iterator src,
   const typename Mapping<dim>::InternalDataBase &mapping_data) const
 {
   const InternalData &data = dynamic_cast<const InternalData&> (mapping_data);
@@ -464,9 +464,9 @@ MappingCartesian<dim>::transform_covariant (
 template <int dim>
 void
 MappingCartesian<dim>::transform_contravariant (
-  Tensor<1,dim>* begin,
-  const Tensor<1,dim>* end,
-  const Tensor<1,dim>* src,
+  typename std::vector<Tensor<1,dim> >::iterator begin,
+  typename std::vector<Tensor<1,dim> >::const_iterator end,
+  typename std::vector<Tensor<1,dim> >::const_iterator src,
   const typename Mapping<dim>::InternalDataBase &mapping_data) const
 {
                                   // convert data object to internal
index 98e5a36e23570b6c3adef1d598712549bc254b5d..b88510a0273af9afb7bc2b656be0700f6d82748c 100644 (file)
@@ -1069,9 +1069,9 @@ MappingQ<dim>::fill_quad_support_points_simple (const typename Triangulation<dim
 template <int dim>
 void
 MappingQ<dim>::transform_covariant (
-  Tensor<1,dim>* begin,
-  const Tensor<1,dim>* end,
-  const Tensor<1,dim>* src,
+  typename std::vector<Tensor<1,dim> >::iterator begin,
+  typename std::vector<Tensor<1,dim> >::const_iterator end,
+  typename std::vector<Tensor<1,dim> >::const_iterator src,
   const typename Mapping<dim>::InternalDataBase &mapping_data) const
 {
   const typename MappingQ1<dim>::InternalData *q1_data =
@@ -1102,9 +1102,9 @@ MappingQ<dim>::transform_covariant (
 template <int dim>
 void
 MappingQ<dim>::transform_contravariant (
-  Tensor<1,dim>* begin,
-  const Tensor<1,dim>* end,
-  const Tensor<1,dim>* src,
+  typename std::vector<Tensor<1,dim> >::iterator begin,
+  typename std::vector<Tensor<1,dim> >::const_iterator end,
+  typename std::vector<Tensor<1,dim> >::const_iterator src,
   const typename Mapping<dim>::InternalDataBase &mapping_data) const
 {
   const typename MappingQ1<dim>::InternalData *q1_data =
index 54973f58a2e054b8b2789b7a2d267ef79c430457..b397bed5e419bbdaada0747be2deface97f8a761 100644 (file)
@@ -780,9 +780,9 @@ MappingQ1<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterator &,
 template <int dim>
 void
 MappingQ1<dim>::transform_covariant (
-  Tensor<1,dim>* begin,
-  const Tensor<1,dim>* end,
-  const Tensor<1,dim>* src,
+  typename std::vector<Tensor<1,dim> >::iterator begin,
+  typename std::vector<Tensor<1,dim> >::const_iterator end,
+  typename std::vector<Tensor<1,dim> >::const_iterator src,
   const typename Mapping<dim>::InternalDataBase &mapping_data) const
 {
   const InternalData *data_ptr = dynamic_cast<const InternalData *> (&mapping_data);
@@ -808,9 +808,9 @@ MappingQ1<dim>::transform_covariant (
 template <int dim>
 void
 MappingQ1<dim>::transform_contravariant (
-  Tensor<1,dim>* begin,
-  const Tensor<1,dim>* end,
-  const Tensor<1,dim>* src,
+  typename std::vector<Tensor<1,dim> >::iterator begin,
+  typename std::vector<Tensor<1,dim> >::const_iterator end,
+  typename std::vector<Tensor<1,dim> >::const_iterator src,
   const typename Mapping<dim>::InternalDataBase &mapping_data) const
 {
   const InternalData* data_ptr = dynamic_cast<const InternalData *> (&mapping_data);

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.