]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Do not use deprecated p::d::SolutionTransfer in examples and tests. 18618/head
authorMarc Fehling <mafehling.git@gmail.com>
Thu, 3 Jul 2025 09:02:15 +0000 (11:02 +0200)
committerMarc Fehling <mafehling.git@gmail.com>
Thu, 3 Jul 2025 09:20:58 +0000 (11:20 +0200)
Follow-up to #15706.

23 files changed:
examples/step-32/step-32.cc
examples/step-42/step-42.cc
examples/step-48/step-48.cc
examples/step-70/step-70.cc
examples/step-86/step-86.cc
tests/distributed_grids/checkpointing_02.cc
tests/distributed_grids/checkpointing_03.cc
tests/distributed_grids/solution_transfer_01.cc
tests/distributed_grids/solution_transfer_02.cc
tests/distributed_grids/solution_transfer_03.cc
tests/distributed_grids/solution_transfer_04.cc
tests/fullydistributed_grids/solution_transfer_01.cc
tests/mpi/p4est_2d_constraintmatrix_04.cc
tests/mpi/p4est_3d_constraintmatrix_03.cc
tests/mpi/p4est_save_02.cc
tests/mpi/p4est_save_03.cc
tests/mpi/p4est_save_04.cc
tests/mpi/p4est_save_06.cc
tests/mpi/solution_transfer_01.cc
tests/mpi/solution_transfer_04.cc
tests/mpi/solution_transfer_06.cc
tests/non_matching/step-70.cc
tests/petsc/step-77-snes.cc

index 878b80983f63491fbf65bd3b7b9ac119bed9a599..e22b9b32873287896b3ac4054315fb63b9a4d2d2 100644 (file)
 #include <locale>
 #include <string>
 
-// This is the only include file that is new: It introduces the
-// parallel::distributed::SolutionTransfer equivalent of the
-// SolutionTransfer class to take a solution from on mesh to the next
-// one upon mesh refinement, but in the case of parallel distributed
-// triangulations:
-#include <deal.II/distributed/solution_transfer.h>
-
 // The following classes are used in parallel distributed computations and
 // have all already been introduced in step-40:
 #include <deal.II/base/index_set.h>
@@ -3249,11 +3242,10 @@ namespace Step32
   void
   BoussinesqFlowProblem<dim>::refine_mesh(const unsigned int max_grid_level)
   {
-    parallel::distributed::SolutionTransfer<dim, TrilinosWrappers::MPI::Vector>
-      temperature_trans(temperature_dof_handler);
-    parallel::distributed::SolutionTransfer<dim,
-                                            TrilinosWrappers::MPI::BlockVector>
-      stokes_trans(stokes_dof_handler);
+    SolutionTransfer<dim, TrilinosWrappers::MPI::Vector> temperature_trans(
+      temperature_dof_handler);
+    SolutionTransfer<dim, TrilinosWrappers::MPI::BlockVector> stokes_trans(
+      stokes_dof_handler);
 
     {
       TimerOutput::Scope timer_section(computing_timer,
@@ -3283,9 +3275,8 @@ namespace Step32
           cell->clear_refine_flag();
 
       // With all flags marked as necessary, we can then tell the
-      // parallel::distributed::SolutionTransfer objects to get ready to
-      // transfer data from one mesh to the next, which they will do when
-      // notified by
+      // SolutionTransfer objects to get ready to transfer data from one mesh to
+      // the next, which they will do when notified by
       // Triangulation as part of the @p execute_coarsening_and_refinement() call.
       // The syntax is similar to the non-%parallel solution transfer (with the
       // exception that here a pointer to the vector entries is enough). The
index cf1598485896463e27bf148a78b57039650d014e..bb6aeade33a20c7c7c52164af7efbc3922b9e529 100644 (file)
@@ -50,7 +50,6 @@
 
 #include <deal.II/distributed/tria.h>
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_renumbering.h>
@@ -64,6 +63,7 @@
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/error_estimator.h>
 #include <deal.II/numerics/fe_field_function.h>
+#include <deal.II/numerics/solution_transfer.h>
 
 #include <fstream>
 #include <iostream>
@@ -1874,8 +1874,8 @@ namespace Step42
 
     triangulation.prepare_coarsening_and_refinement();
 
-    parallel::distributed::SolutionTransfer<dim, TrilinosWrappers::MPI::Vector>
-      solution_transfer(dof_handler);
+    SolutionTransfer<dim, TrilinosWrappers::MPI::Vector> solution_transfer(
+      dof_handler);
     if (transfer_solution)
       solution_transfer.prepare_for_coarsening_and_refinement(solution);
 
index 6f8393a38bfd075db86609a4d3e54b6ee4f2deaf..cb25bec5198c0c13013501e2a3ffaef6b76967df 100644 (file)
@@ -364,9 +364,8 @@ namespace Step48
   // cells whose center is within a radius of 11, and then refine once more
   // for a radius 6.  This simple ad hoc refinement could be done better by
   // adapting the mesh to the solution using error estimators during the time
-  // stepping as done in other example programs, and using
-  // parallel::distributed::SolutionTransfer to transfer the solution to the
-  // new mesh.
+  // stepping as done in other example programs, and using SolutionTransfer to
+  // transfer the solution to the new mesh.
   template <int dim>
   void SineGordonProblem<dim>::make_grid_and_dofs()
   {
index 80a4abb4873f24078fa2aec69baa1d5e44fafe17..df4717af1e86537672cea88e78a515a74f077b31 100644 (file)
@@ -52,7 +52,6 @@ namespace LA
 #include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -87,6 +86,7 @@ namespace LA
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/error_estimator.h>
 #include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/solution_transfer.h>
 
 // These are the only new include files with regard to step-60. In this
 // tutorial, the non-matching coupling between the solid and the fluid is
@@ -1664,8 +1664,7 @@ namespace Step70
           cell->clear_coarsen_flag();
       }
 
-    parallel::distributed::SolutionTransfer<spacedim, LA::MPI::BlockVector>
-      transfer(fluid_dh);
+    SolutionTransfer<spacedim, LA::MPI::BlockVector> transfer(fluid_dh);
 
     fluid_tria.prepare_coarsening_and_refinement();
     transfer.prepare_for_coarsening_and_refinement(locally_relevant_solution);
index 3c94ac0b4f72b994f3f703451a4ce0d10c3170e2..47de4175fd4122f424df82f45596ca55b5880cde 100644 (file)
@@ -41,7 +41,6 @@
 #include <deal.II/lac/sparsity_tools.h>
 #include <deal.II/distributed/tria.h>
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/grid_out.h>
 #include <deal.II/dofs/dof_handler.h>
@@ -864,8 +863,8 @@ namespace Step86
     const std::vector<PETScWrappers::MPI::Vector> &all_in,
     std::vector<PETScWrappers::MPI::Vector>       &all_out)
   {
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      solution_trans(dof_handler);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> solution_trans(
+      dof_handler);
 
     std::vector<PETScWrappers::MPI::Vector> all_in_ghosted(all_in.size());
     std::vector<const PETScWrappers::MPI::Vector *> all_in_ghosted_ptr(
index 1c76a1d1da00ac2dcd6d85fea9c74d77d8ddd46e..3595c39968e67190cb7239ed78e5766062deea3d 100644 (file)
@@ -30,7 +30,6 @@ const bool run_big = false;
 #include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_accessor.h>
@@ -51,6 +50,7 @@ const bool run_big = false;
 
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/error_estimator.h>
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include <fstream>
@@ -189,10 +189,8 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
 
         // To be sure, use two SolutionTransfer objects, because the second one
         // will get a large offset
-        parallel::distributed::SolutionTransfer<dim, VectorType> system_trans(
-          dof_handler);
-        parallel::distributed::SolutionTransfer<dim, VectorType> trans2(
-          dof_handler);
+        SolutionTransfer<dim, VectorType> system_trans(dof_handler);
+        SolutionTransfer<dim, VectorType> trans2(dof_handler);
 
         system_trans.prepare_for_serialization(x_system);
         trans2.prepare_for_serialization(y);
@@ -218,10 +216,8 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
         triangulation.coarsen_global(99);
         triangulation.load("restart.mesh");
 
-        parallel::distributed::SolutionTransfer<dim, VectorType> system_trans(
-          dof_handler);
-        parallel::distributed::SolutionTransfer<dim, VectorType> trans2(
-          dof_handler);
+        SolutionTransfer<dim, VectorType> system_trans(dof_handler);
+        SolutionTransfer<dim, VectorType> trans2(dof_handler);
         system_trans.deserialize(x_system);
         trans2.deserialize(y);
 
index b83099ee566a9a29db7a00f4ed1a4749970e0726..4a42c3a0307b1d97d74a5400b8704073bcf5d99f 100644 (file)
@@ -27,7 +27,6 @@ const bool run_big = false;
 #include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_accessor.h>
@@ -48,6 +47,7 @@ const bool run_big = false;
 
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/error_estimator.h>
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include <fstream>
@@ -188,10 +188,8 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
 
         // To be sure, use two SolutionTransfer objects, because the second one
         // will get a large offset
-        parallel::distributed::SolutionTransfer<dim, VectorType> system_trans(
-          dof_handler);
-        parallel::distributed::SolutionTransfer<dim, VectorType> trans2(
-          dof_handler);
+        SolutionTransfer<dim, VectorType> system_trans(dof_handler);
+        SolutionTransfer<dim, VectorType> trans2(dof_handler);
 
 
         dof_handler.prepare_for_serialization_of_active_fe_indices();
@@ -219,10 +217,8 @@ LaplaceProblem<dim>::run(unsigned int n_cycles_global,
         triangulation.coarsen_global(99);
         triangulation.load("restart.mesh");
 
-        parallel::distributed::SolutionTransfer<dim, VectorType> system_trans(
-          dof_handler);
-        parallel::distributed::SolutionTransfer<dim, VectorType> trans2(
-          dof_handler);
+        SolutionTransfer<dim, VectorType> system_trans(dof_handler);
+        SolutionTransfer<dim, VectorType> trans2(dof_handler);
 
         dof_handler.deserialize_active_fe_indices();
         system_trans.deserialize(x_system);
index b95867dc5ec08db6d2407fa95b50a36dbc397e68..4d062ce79767323ac34db71d252c08f58e69bb7e 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/fe/fe_q.h>
@@ -31,6 +30,8 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 
@@ -46,7 +47,7 @@ test(std::ostream & /*out*/)
   static const FE_Q<dim> fe(2);
   dofh.distribute_dofs(fe);
 
-  parallel::distributed::SolutionTransfer<dim, Vector<double>> soltrans(dofh);
+  SolutionTransfer<dim, Vector<double>> soltrans(dofh);
 
   for (typename Triangulation<dim>::active_cell_iterator cell =
          tr.begin_active();
index 19bbfa38fbddf7cb340b5801446b4bc144db52ae..2be41c3c174dd1c1b0c61307e8bc3653a8edfe15 100644 (file)
@@ -19,7 +19,6 @@
 #include <deal.II/base/function.h>
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/fe/fe_q.h>
@@ -33,6 +32,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include "../tests.h"
@@ -73,7 +73,7 @@ test(std::ostream & /*out*/)
   static const FE_Q<dim> fe(1);
   dofh.distribute_dofs(fe);
 
-  parallel::distributed::SolutionTransfer<dim, Vector<double>> soltrans(dofh);
+  SolutionTransfer<dim, Vector<double>> soltrans(dofh);
 
   for (typename Triangulation<dim>::active_cell_iterator cell =
          tr.begin_active();
index c5b83ec159b5a434b366650f7a9a2fea6c26c0a0..0cccef57c17cfb948662fd179a268ea07b96ea26 100644 (file)
@@ -19,7 +19,6 @@
 #include <deal.II/base/function.h>
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/fe/fe_q.h>
@@ -33,6 +32,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include "../tests.h"
@@ -72,7 +72,7 @@ test(std::ostream & /*out*/)
   static const FE_Q<dim> fe(1);
   dofh.distribute_dofs(fe);
 
-  parallel::distributed::SolutionTransfer<dim, Vector<double>> soltrans(dofh);
+  SolutionTransfer<dim, Vector<double>> soltrans(dofh);
 
   for (int i = 0; i < 4; ++i)
     {
index 83268e6e453a83f17b5d4831ecffcfbbc8714d9f..2b5788cf79d2da4f3cd8e7bad5bdfd3a6ac2ee72 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/fe/fe_q.h>
@@ -31,6 +30,8 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 #include "coarse_grid_common.h"
@@ -49,8 +50,8 @@ test(std::ostream & /*out*/)
   static const FE_Q<dim> fe(2);
   dofh.distribute_dofs(fe);
 
-  parallel::distributed::SolutionTransfer<dim, Vector<double>> soltrans(dofh);
-  parallel::distributed::SolutionTransfer<dim, Vector<double>> soltrans2(dofh);
+  SolutionTransfer<dim, Vector<double>> soltrans(dofh);
+  SolutionTransfer<dim, Vector<double>> soltrans2(dofh);
 
   for (typename Triangulation<dim>::active_cell_iterator cell =
          tr.begin_active();
index f9027add3484d3efce0a9cfe1563e5317d6d19fa..71351a4e01ac7cfb184e270e7d3936d8fc363a0c 100644 (file)
@@ -17,7 +17,6 @@
 // Test distributed solution transfer with fullydistributed triangulations.
 
 #include <deal.II/distributed/fully_distributed_tria.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -30,6 +29,7 @@
 
 #include <deal.II/lac/la_parallel_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include "../grid/tests.h"
@@ -77,8 +77,7 @@ test(TriangulationType &triangulation)
     "solution_transfer_" + std::to_string(dim) + "d_out";
 
   {
-    parallel::distributed::SolutionTransfer<dim, VectorType> solution_transfer(
-      dof_handler);
+    SolutionTransfer<dim, VectorType> solution_transfer(dof_handler);
     solution_transfer.prepare_for_serialization(vector);
 
     triangulation.save(filename);
@@ -90,8 +89,7 @@ test(TriangulationType &triangulation)
     triangulation.load(filename);
     dof_handler.distribute_dofs(FE_Q<dim>(2));
 
-    parallel::distributed::SolutionTransfer<dim, VectorType> solution_transfer(
-      dof_handler);
+    SolutionTransfer<dim, VectorType> solution_transfer(dof_handler);
     solution_transfer.deserialize(vector_loaded);
 
     vector_loaded.update_ghost_values();
index bcf1e064b1a80a01d8af478383638c16a57056ef..10cd178b85a116de75b43e4ae35d6e1f81a66f29 100644 (file)
@@ -21,7 +21,6 @@
 #include <deal.II/base/function.h>
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_accessor.h>
@@ -42,6 +41,7 @@
 #include <deal.II/lac/trilinos_vector.h>
 
 #include <deal.II/numerics/data_out.h>
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include "../tests.h"
@@ -182,9 +182,7 @@ test()
 
 
 
-      parallel::distributed::SolutionTransfer<dim,
-                                              TrilinosWrappers::MPI::Vector>
-        trans(dofh);
+      SolutionTransfer<dim, TrilinosWrappers::MPI::Vector> trans(dofh);
       tr.prepare_coarsening_and_refinement();
 
 
index 04a22c5f3bf59c3fbcd6c14430839981ed6f7812..828623a90d19d5cf45c02b4451ef513cc412f3b0 100644 (file)
@@ -21,7 +21,6 @@
 #include <deal.II/base/function.h>
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_accessor.h>
@@ -42,6 +41,7 @@
 #include <deal.II/lac/trilinos_parallel_block_vector.h>
 
 #include <deal.II/numerics/data_out.h>
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include "../tests.h"
@@ -181,9 +181,7 @@ test()
               }
         }
 
-      parallel::distributed::SolutionTransfer<dim,
-                                              TrilinosWrappers::MPI::Vector>
-        trans(dofh);
+      SolutionTransfer<dim, TrilinosWrappers::MPI::Vector> trans(dofh);
       tr.prepare_coarsening_and_refinement();
 
 
index ec9d55e70f2d76dae25a3cb669fbc8379931a292..0c21bee7c9e1998b77d2f0d23c88c312119a1d78 100644 (file)
@@ -19,7 +19,6 @@
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/utilities.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -35,6 +34,8 @@
 
 #include <deal.II/lac/petsc_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 
@@ -81,8 +82,7 @@ test()
                                         locally_relevant_dofs,
                                         MPI_COMM_WORLD);
 
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
 
     for (unsigned int i = 0; i < locally_owned_dofs.n_elements(); ++i)
       {
@@ -123,8 +123,7 @@ test()
       DoFTools::extract_locally_relevant_dofs(dh);
 
     PETScWrappers::MPI::Vector solution(locally_owned_dofs, MPI_COMM_WORLD);
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
     solution = 2;
     soltrans.deserialize(solution);
 
index 5326c5044e464de5f928a8034e1cf8bb96f37bd3..e8d41290bed6501904e9d5bd0df6fe7988565c09 100644 (file)
@@ -20,7 +20,6 @@
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/utilities.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -36,6 +35,8 @@
 
 #include <deal.II/lac/petsc_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 
@@ -86,10 +87,8 @@ test()
                                          locally_relevant_dofs,
                                          MPI_COMM_WORLD);
 
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans(dh);
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans2(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans2(dh);
 
     for (unsigned int i = 0; i < locally_owned_dofs.n_elements(); ++i)
       {
@@ -136,10 +135,8 @@ test()
 
     PETScWrappers::MPI::Vector solution(locally_owned_dofs, MPI_COMM_WORLD);
     PETScWrappers::MPI::Vector solution2(locally_owned_dofs, MPI_COMM_WORLD);
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans(dh);
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans2(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans2(dh);
     solution = 2;
     soltrans.deserialize(solution);
     soltrans2.deserialize(solution2);
index 91512b3e85a60e4f7daa6d6745b1c1bcd6837736..786851d43d488a8f6b0ab3e85c828e3bfb18c28c 100644 (file)
@@ -19,7 +19,6 @@
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/utilities.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -35,6 +34,8 @@
 
 #include <deal.II/lac/petsc_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 
@@ -84,8 +85,7 @@ test()
                                        locally_relevant_dofs,
                                        com_small);
 
-      parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-        soltrans(dh);
+      SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
 
       for (unsigned int i = 0; i < locally_owned_dofs.n_elements(); ++i)
         {
@@ -129,8 +129,7 @@ test()
     PETScWrappers::MPI::Vector solution(locally_owned_dofs, com_all);
     solution = PetscScalar();
 
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
     soltrans.deserialize(solution);
 
     for (unsigned int i = 0; i < locally_owned_dofs.n_elements(); ++i)
index f62c29cd061fe037ae907c42586c1be4186e55e0..47e54a339533e794aee5de57ecedcab0047a6c81 100644 (file)
@@ -20,7 +20,6 @@
 #include <deal.II/base/tensor.h>
 #include <deal.II/base/utilities.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -36,6 +35,8 @@
 
 #include <deal.II/lac/petsc_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 
@@ -91,8 +92,7 @@ test()
                                        locally_relevant_dofs,
                                        com_small);
 
-      parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-        soltrans(dh);
+      SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
 
       for (unsigned int i = 0; i < locally_owned_dofs.n_elements(); ++i)
         {
@@ -143,8 +143,7 @@ test()
     PETScWrappers::MPI::Vector solution(locally_owned_dofs, com_all);
     solution = PetscScalar();
 
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      soltrans(dh);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> soltrans(dh);
 
     soltrans.deserialize(solution);
 
index 9ca404ae280865d50a1d3c1a1767b5890618c823..a9af4ac748956f221cb487154c8dac3e6959b6ec 100644 (file)
@@ -20,7 +20,6 @@
 #include <deal.II/base/function.h>
 #include <deal.II/base/tensor.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_accessor.h>
@@ -41,6 +40,7 @@
 #include <deal.II/lac/petsc_vector.h>
 
 #include <deal.II/numerics/data_out.h>
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 #include "../tests.h"
@@ -70,8 +70,7 @@ test()
                                       locally_relevant_dofs,
                                       MPI_COMM_WORLD);
 
-  parallel::distributed::SolutionTransfer<2, PETScWrappers::MPI::Vector>
-    soltrans(dh);
+  SolutionTransfer<2, PETScWrappers::MPI::Vector> soltrans(dh);
 
   tria.set_all_refine_flags();
   tria.prepare_coarsening_and_refinement();
index a8b8fe4c73264f1ff5ff3b0461d5908f535c8c23..7a2723305bfe078daeaa81fb66b9ac74d1e0ee5b 100644 (file)
@@ -18,7 +18,6 @@
 // This tests is based on mpi/feindices_transfer.cc
 
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -30,6 +29,8 @@
 
 #include <deal.II/lac/trilinos_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include "../tests.h"
 
 
@@ -97,8 +98,7 @@ test()
 
 
   // ----- transfer -----
-  parallel::distributed::SolutionTransfer<dim, TrilinosWrappers::MPI::Vector>
-    soltrans(dh);
+  SolutionTransfer<dim, TrilinosWrappers::MPI::Vector> soltrans(dh);
 
   soltrans.prepare_for_coarsening_and_refinement(old_solution);
   tria.execute_coarsening_and_refinement();
index 9364d251e5cbac8ea97bbebfe7653dda5a157f26..d1574532a7752426d497cfae05c2d83145b0b1cf 100644 (file)
 
 
 
-// Test parallel::distributed::SolutionTransfer for FE_Nothing
+// Test parallel distributed SolutionTransfer for FE_Nothing
 // (see also https://github.com/dealii/dealii/issues/10570).
 
 #include <deal.II/base/function.h>
 
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_accessor.h>
@@ -37,6 +36,8 @@
 
 #include <deal.II/lac/la_parallel_vector.h>
 
+#include <deal.II/numerics/solution_transfer.h>
+
 #include <iostream>
 #include <vector>
 
@@ -76,9 +77,8 @@ transfer(const MPI_Comm comm)
   for (unsigned int i = 0; i < solution.size(); ++i)
     solution(i) = i;
 
-  parallel::distributed::
-    SolutionTransfer<dim, LinearAlgebra::distributed::Vector<double>>
-      soltrans(dof_handler);
+  SolutionTransfer<dim, LinearAlgebra::distributed::Vector<double>> soltrans(
+    dof_handler);
 
   for (const auto &cell : tria.active_cell_iterators())
     cell->set_refine_flag();
index 0a5726fcc395960e05bdbfebc1abed66c18ef0f1..de1d8bb5e72a3346d46fa5078eafd8ea1c567024 100644 (file)
@@ -55,7 +55,6 @@ namespace LA
 #include <deal.II/base/utilities.h>
 
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/dofs/dof_handler.h>
@@ -89,6 +88,7 @@ namespace LA
 
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/error_estimator.h>
+#include <deal.II/numerics/solution_transfer.h>
 #include <deal.II/numerics/vector_tools.h>
 
 // These are the only new include files with regard to step-60. In this
@@ -1659,8 +1659,7 @@ namespace Step70
           cell->clear_coarsen_flag();
       }
 
-    parallel::distributed::SolutionTransfer<spacedim, LA::MPI::BlockVector>
-      transfer(fluid_dh);
+    SolutionTransfer<spacedim, LA::MPI::BlockVector> transfer(fluid_dh);
 
     fluid_tria.prepare_coarsening_and_refinement();
     transfer.prepare_for_coarsening_and_refinement(locally_relevant_solution);
index 4617d1cb2a992c25c39c964ae39ebc909d7b87eb..c4f1bcd78525e462ecc378d56a8763a62e8b3d7d 100644 (file)
@@ -54,7 +54,6 @@
 #include <deal.II/base/conditional_ostream.h>
 
 #include <deal.II/distributed/grid_refinement.h>
-#include <deal.II/distributed/solution_transfer.h>
 #include <deal.II/distributed/tria.h>
 
 #include <deal.II/grid/grid_tools.h>
@@ -437,8 +436,8 @@ namespace Step77
 
     triangulation.prepare_coarsening_and_refinement();
 
-    parallel::distributed::SolutionTransfer<dim, PETScWrappers::MPI::Vector>
-      solution_transfer(dof_handler);
+    SolutionTransfer<dim, PETScWrappers::MPI::Vector> solution_transfer(
+      dof_handler);
 
     PETScWrappers::MPI::Vector current_solution_tmp(locally_relevant_solution);
     solution_transfer.prepare_for_coarsening_and_refinement(

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.