]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Since DataOutBase is a private base class of DataOutInterface, which itself is a...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Jun 2002 13:11:10 +0000 (13:11 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Jun 2002 13:11:10 +0000 (13:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@6078 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/numerics/data_out.h
deal.II/deal.II/include/numerics/data_out_stack.h
deal.II/deal.II/source/numerics/data_out.cc
deal.II/deal.II/source/numerics/data_out_faces.cc
deal.II/deal.II/source/numerics/data_out_rotation.cc
deal.II/deal.II/source/numerics/data_out_stack.cc

index 901d3d5905ebd26d270ebe4d71aaa63553e8fc94..0cc2ad93f95e52962a31997f5fdc9faa63adfc08 100644 (file)
@@ -464,7 +464,7 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                      * Abbreviate the somewhat lengthy
                                      * name for the @p{Patch} class.
                                      */
-    typedef typename DataOutBase::Patch<patch_dim,patch_space_dim> Patch;
+    typedef ::DataOutBase::Patch<patch_dim,patch_space_dim> Patch;
 
                                     /**
                                      * Pointer to the dof handler object.
@@ -645,7 +645,7 @@ class DataOut : public DataOut_DoFData<dim,dim>
                                      * for finding neighbors.
                                      */
     typedef std::map<typename DoFHandler<dim>::cell_iterator,
-      typename std::vector<typename DataOutBase::Patch<dim> >::iterator>
+      typename std::vector<::DataOutBase::Patch<dim> >::iterator>
       PatchMap;
     
                                     /**
index 9cbed626424e5a30db7e004de97f4780ecd6306d..71bfa844c799f217095979b53226887fd69e4d10 100644 (file)
@@ -367,7 +367,7 @@ class DataOutStack : public DataOutInterface<dim+1>
                                      * List of patches of all past and
                                      * present parameter value data sets.
                                      */
-    typename std::vector<DataOutBase::Patch<dim+1> >   patches;
+    typename std::vector<::DataOutBase::Patch<dim+1> >   patches;
 
                                     /**
                                      * Structure holding data vectors
@@ -413,7 +413,7 @@ class DataOutStack : public DataOutInterface<dim+1>
                                      * the base class @ref{DataOutBase}) to
                                      * the actual output function.
                                      */
-    virtual const typename std::vector<typename DataOutBase::Patch<dim+1> > & get_patches () const;
+    virtual const typename std::vector<::DataOutBase::Patch<dim+1> > & get_patches () const;
 
 
                                     /**
index e821f1f03960c8e5ba1da2ffeda3e7a1ff09967d..321440ee078530804c6b86f3a826a53a0a44d45f 100644 (file)
@@ -309,7 +309,7 @@ DataOut_DoFData<dof_handler_dim,patch_dim,patch_space_dim>::get_dataset_names ()
 
 
 template <int dof_handler_dim, int patch_dim, int patch_space_dim>
-const typename std::vector<typename DataOutBase::Patch<patch_dim, patch_space_dim> > &
+const typename std::vector<::DataOutBase::Patch<patch_dim, patch_space_dim> > &
 DataOut_DoFData<dof_handler_dim,patch_dim,patch_space_dim>::get_patches () const
 {
   return patches;
@@ -352,7 +352,7 @@ void DataOut<dim>::build_some_patches (Data data)
   const unsigned int n_q_points = patch_points.n_quadrature_points;
   
   unsigned int cell_number = 0;
-  typename std::vector<typename DataOutBase::Patch<dim> >::iterator patch = this->patches.begin();
+  typename std::vector<::DataOutBase::Patch<dim> >::iterator patch = this->patches.begin();
   typename DoFHandler<dim>::cell_iterator cell=first_cell();
 
                                   // get first cell in this thread
@@ -478,7 +478,7 @@ void DataOut<dim>::build_patches (const unsigned int n_subdivisions,
                                   // clear the patches array
   if (true)
     {
-      typename std::vector<DataOutBase::Patch<dim> > dummy;
+      typename std::vector<::DataOutBase::Patch<dim> > dummy;
       this->patches.swap (dummy);
     };
   
@@ -519,7 +519,7 @@ void DataOut<dim>::build_patches (const unsigned int n_subdivisions,
                                   // or similar operations are used
                                   // which would regularly overflow
                                   // the allocated amount of memory
-  DataOutBase::Patch<dim>  default_patch;
+  ::DataOutBase::Patch<dim>  default_patch;
   default_patch.n_subdivisions = n_subdivisions;
   default_patch.data.reinit (n_datasets, n_q_points);
   this->patches.insert (patches.end(), n_patches, default_patch);
@@ -542,7 +542,7 @@ void DataOut<dim>::build_patches (const unsigned int n_subdivisions,
                                   // First, number patches
                                   // consecutively.
   unsigned int patch_no = 0;
-  for (typename std::vector<typename DataOutBase::Patch<dim> >::iterator
+  for (typename std::vector<::DataOutBase::Patch<dim> >::iterator
         patch = patches.begin(); patch != patches.end(); ++patch)
     patch->me = patch_no++;
 
@@ -556,7 +556,7 @@ void DataOut<dim>::build_patches (const unsigned int n_subdivisions,
     {
       const typename DoFHandler<dim>::cell_iterator
        cell = map_entry->first;
-      const typename std::vector<typename DataOutBase::Patch<dim> >::iterator
+      const typename std::vector<::DataOutBase::Patch<dim> >::iterator
        patch = map_entry->second;
 
                                       // loop over all faces and see
@@ -580,7 +580,7 @@ void DataOut<dim>::build_patches (const unsigned int n_subdivisions,
                                           // if there is a neighbor,
                                           // get its patch...
          const typename
-           std::vector<typename DataOutBase::Patch<dim> >::iterator
+           std::vector<::DataOutBase::Patch<dim> >::iterator
            neighbor_patch = patch_map.find(cell->neighbor(i))->second;
                                           // ...and set its neighbor
                                           // pointer set
index def79752d2b5129868b5ca0d9edcde3b628869f5..f23c6fe3f2ea0b46d9e467450153dbc6fa31d0fd 100644 (file)
@@ -49,7 +49,7 @@ void DataOutFaces<dim>::build_some_patches (Data data)
   const unsigned int n_q_points = patch_points.n_quadrature_points;
   
   unsigned int face_number = 0;
-  typename std::vector<DataOutBase::Patch<dim-1,dim> >::iterator patch = this->patches.begin();
+  typename std::vector<::DataOutBase::Patch<dim-1,dim> >::iterator patch = this->patches.begin();
   FaceDescriptor face=first_face();
 
                                   // get first face in this thread
@@ -173,7 +173,7 @@ void DataOutFaces<dim>::build_patches (const unsigned int n_subdivisions,
                                   // clear the patches array
   if (true)
     {
-      std::vector<DataOutBase::Patch<dim-1,dim> > dummy;
+      std::vector<::DataOutBase::Patch<dim-1,dim> > dummy;
       this->patches.swap (dummy);
     };
   
@@ -207,7 +207,7 @@ void DataOutFaces<dim>::build_patches (const unsigned int n_subdivisions,
                                   // values. note that the evaluation
                                   // points on the face have to be
                                   // repeated in angular direction
-  DataOutBase::Patch<dim-1,dim>  default_patch;
+  ::DataOutBase::Patch<dim-1,dim>  default_patch;
   default_patch.n_subdivisions = n_subdivisions;
   default_patch.data.reinit (n_datasets, n_q_points);
   this->patches.insert (patches.end(), n_patches, default_patch);
index af25b60100801bd524374a8ede2847304ccb64cb..3d318788f10cb60f99e806c262f58bd153fe0231 100644 (file)
@@ -78,7 +78,7 @@ void DataOutRotation<dim>::build_some_patches (Data data)
   
   
   unsigned int cell_number = 0;
-  typename std::vector<DataOutBase::Patch<dim+1> >::iterator patch = this->patches.begin();
+  typename std::vector<::DataOutBase::Patch<dim+1> >::iterator patch = this->patches.begin();
   typename DoFHandler<dim>::cell_iterator cell=first_cell();
 
                                   // get first cell in this thread
@@ -351,7 +351,7 @@ void DataOutRotation<dim>::build_patches (const unsigned int n_patches_per_circl
                                   // clear the patches array
   if (true)
     {
-      std::vector<DataOutBase::Patch<dim+1> > dummy;
+      std::vector<::DataOutBase::Patch<dim+1> > dummy;
       this->patches.swap (dummy);
     };
   
@@ -392,7 +392,7 @@ void DataOutRotation<dim>::build_patches (const unsigned int n_patches_per_circl
                                   // values. note that the evaluation
                                   // points on the cell have to be
                                   // repeated in angular direction
-  DataOutBase::Patch<dim+1>  default_patch;
+  ::DataOutBase::Patch<dim+1>  default_patch;
   default_patch.n_subdivisions = n_subdivisions;
   default_patch.data.reinit (n_datasets,
                             n_q_points * (n_subdivisions+1));
index ba1b5f0a0b52b19750e2a6d0908baf4ed2b41997..816bbb131b409a2d9cfa439d7c167f41516cf8e5 100644 (file)
@@ -240,14 +240,14 @@ void DataOutStack<dim>::build_patches (const unsigned int n_subdivisions)
                                                    Vector<double>(n_components));
 
                                   // add the required number of patches
-  DataOutBase::Patch<dim+1>  default_patch;
+  ::DataOutBase::Patch<dim+1>  default_patch;
   default_patch.n_subdivisions = n_subdivisions;
   default_patch.data.reinit (n_datasets, n_q_points*(n_subdivisions+1));
   patches.insert (patches.end(), n_patches, default_patch);
 
                                   // now loop over all cells and
                                   // actually create the patches
-  typename std::vector<DataOutBase::Patch<dim+1> >::iterator
+  typename std::vector<::DataOutBase::Patch<dim+1> >::iterator
     patch = patches.begin() + (patches.size()-n_patches);
   unsigned int cell_number = 0;
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof_handler->begin_active();
@@ -355,7 +355,7 @@ DataOutStack<dim>::memory_consumption () const
 
 
 template <int dim>
-const typename std::vector<typename DataOutBase::Patch<dim+1> > &
+const typename std::vector<::DataOutBase::Patch<dim+1> > &
 DataOutStack<dim>::get_patches () const
 {
   return patches;

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.