Rename an internal variable from 'import' to 'importer'.

diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h
index d41b8c264c4141a9920dcf2511627708e256b77d..20a08ff3a8d8cad98166bce4ba0ce913edfb9194 100644 (file)
--- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h
+++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h
@@ -36,13 +36,14 @@ namespace LinearAlgebra
   namespace EpetraWrappers
   {
     /**
-     * This class implements a wrapper to Trilinos Import.
+     * This class implements a wrapper to a Trilinos Epetra_Import object,
+     * for use in places where a CommunicationPatternBase object is required.
      */
     class CommunicationPattern : public CommunicationPatternBase
     {
     public:
       /**
-       * Reinitialize the communication pattern. The first argument @p
+       * Initialize the communication pattern. The first argument @p
        * vector_space_vector_index_set is the index set associated to a
        * VectorSpaceVector object. The second argument @p
        * read_write_vector_index_set is the index set associated to a
@@ -81,7 +82,7 @@ namespace LinearAlgebra
       /**
        * Shared pointer to the Epetra_Import object used.
        */
-      std::unique_ptr<Epetra_Import> import;
+      std::unique_ptr<Epetra_Import> importer;
     };
   } // end of namespace EpetraWrappers
 } // end of namespace LinearAlgebra

diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc
index 28928d48e278d7875ad887aac21a762744d3d51d..0fb34a92de2cd1091901f32cc5bc763cd7117122 100644 (file)
--- a/source/lac/trilinos_epetra_communication_pattern.cc
+++ b/source/lac/trilinos_epetra_communication_pattern.cc
@@ -61,8 +61,8 @@ namespace LinearAlgebra
       // Target map is read_write_vector_map
       // Source map is vector_space_vector_map. This map must have uniquely
       // owned GID.
-      import = std::make_unique<Epetra_Import>(read_write_vector_map,
-                                               vector_space_vector_map);
+      importer = std::make_unique<Epetra_Import>(read_write_vector_map,
+                                                 vector_space_vector_map);
     }
 
 
@@ -78,7 +78,7 @@ namespace LinearAlgebra
     const Epetra_Import &
     CommunicationPattern::get_epetra_import() const
     {
-      return *import;
+      return *importer;
     }
   } // namespace EpetraWrappers
 } // namespace LinearAlgebra