Created Legacy namespaces with copies of ...

... SolutionTransfer, FEFieldFunction, DataOut, DataOut_DoFData, DataOutFaces, DataOutRotation.

diff --git a/doc/news/changes/incompatibilities/20201120Fehling b/doc/news/changes/incompatibilities/20201120Fehling
new file mode 100644 (file)
index 0000000..fc665cf
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20201120Fehling
@@ -0,0 +1,28 @@
+Deprecation announcement: The template arguments of the following
+classes will change in a future release:
+<ul>
+  <li>SolutionTransfer
+  <li>parallel::distributed::SolutionTransfer
+  <li>Functions::FEFieldFunction
+  <li>DataOut
+  <li>DataOut_DoFData
+  <li>DataOutFaces
+  <li>DataOutRotation
+</ul>
+If for some reason, you need a code that is compatible with deal.II
+9.3 and the subsequent release, a Legacy namespace has been introduced
+with aliases of these classes with their original interface. You can
+make the following substitutions to your code for each of the affected
+classes:
+<ul>
+  <li>X &rarr; Legacy::X
+</ul>
+To perform this substitution automatically, you may use a *search and
+replace* script like the following made for the *bash* shell:
+@code{.sh}
+classes=(SolutionTransfer parallel::distributed::SolutionTransfer Functions::FEFieldFunction DataOut DataOut_DoFData DataOutFaces DataOutRotation)
+for c in \${classes[@]}; do
+  find /path/to/your/code -type f -exec sed -i -E "/(\w\${c}|\${c}[^<]|Particles::\${c}|distributed::\${c}|^\s*(\/\/|\*))/! s/\${c}/Legacy::\${c}/g" {} \;
+done
+@endcode
+(Marc Fehling, 2020/11/20)

diff --git a/include/deal.II/distributed/solution_transfer.h b/include/deal.II/distributed/solution_transfer.h
index ab2061a1806ec4de5aba508078fc3399fc98844d..f0d11ac987915d695595cd3c3fedc59d62c51954 100644 (file)
--- a/include/deal.II/distributed/solution_transfer.h
+++ b/include/deal.II/distributed/solution_transfer.h
@@ -372,11 +372,29 @@ namespace parallel
       void
       register_data_attach();
     };
-
-
   } // namespace distributed
 } // namespace parallel
 
+namespace Legacy
+{
+  namespace parallel
+  {
+    namespace distributed
+    {
+      /**
+       * The template arguments of the original
+       * dealii::parallel::distributed::SolutionTransfer class will change in a
+       * future release. If for some reason, you need a code that is compatible
+       * with deal.II 9.3 and the subsequent release, use this alias instead.
+       */
+      template <int dim,
+                typename VectorType,
+                typename DoFHandlerType = DoFHandler<dim>>
+      using SolutionTransfer = dealii::parallel::distributed::
+        SolutionTransfer<dim, VectorType, DoFHandlerType>;
+    } // namespace distributed
+  }   // namespace parallel
+} // namespace Legacy
 
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/include/deal.II/numerics/data_out.h b/include/deal.II/numerics/data_out.h
index aa6a3ffaf9448b5d7214608e6e13c723524b7da0..5a3278274c964e39de4667f4321c3be4bd4302a9 100644 (file)
--- a/include/deal.II/numerics/data_out.h
+++ b/include/deal.II/numerics/data_out.h
@@ -516,6 +516,17 @@ private:
                   const CurvedCellRegion              curved_cell_region);
 };
 
+namespace Legacy
+{
+  /**
+   * The template arguments of the original dealii::DataOut class will
+   * change in a future release. If for some reason, you need a code that is
+   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * instead.
+   */
+  template <int dim, typename DoFHandlerType = DoFHandler<dim>>
+  using DataOut = dealii::DataOut<dim, DoFHandlerType>;
+} // namespace Legacy
 
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/include/deal.II/numerics/data_out_dof_data.h b/include/deal.II/numerics/data_out_dof_data.h
index 86fe1fcea07583fdd7f04a572b76385a6153ec30..c1c09f3f99ac6814c8eef78ab6bd101c20764f51 100644 (file)
--- a/include/deal.II/numerics/data_out_dof_data.h
+++ b/include/deal.II/numerics/data_out_dof_data.h
@@ -1243,6 +1243,21 @@ DataOut_DoFData<DoFHandlerType, patch_dim, patch_space_dim>::merge_patches(
         patches[i].neighbors[n] += old_n_patches;
 }
 
+namespace Legacy
+{
+  /**
+   * The template arguments of the original dealii::DataOut_DoFData class will
+   * change in a future release. If for some reason, you need a code that is
+   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * instead.
+   */
+  template <typename DoFHandlerType,
+            int patch_dim,
+            int patch_space_dim = patch_dim>
+  using DataOut_DoFData =
+    dealii::DataOut_DoFData<DoFHandlerType, patch_dim, patch_space_dim>;
+} // namespace Legacy
+
 
 DEAL_II_NAMESPACE_CLOSE
 

diff --git a/include/deal.II/numerics/data_out_faces.h b/include/deal.II/numerics/data_out_faces.h
index 533f340b2c0c4db4744441891260fa9299400fda..1e20dd41e7112b270f9dba94e7d2b60849e16674 100644 (file)
--- a/include/deal.II/numerics/data_out_faces.h
+++ b/include/deal.II/numerics/data_out_faces.h
@@ -250,6 +250,18 @@ private:
     DataOutBase::Patch<dimension - 1, space_dimension> &patch);
 };
 
+namespace Legacy
+{
+  /**
+   * The template arguments of the original dealii::DataOutFaces class will
+   * change in a future release. If for some reason, you need a code that is
+   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * instead.
+   */
+  template <int dim, typename DoFHandlerType = DoFHandler<dim>>
+  using DataOutFaces = dealii::DataOutFaces<dim, DoFHandlerType>;
+} // namespace Legacy
+
 
 DEAL_II_NAMESPACE_CLOSE
 

diff --git a/include/deal.II/numerics/data_out_rotation.h b/include/deal.II/numerics/data_out_rotation.h
index c999c08a7f31d08161936a50d5168e562e046b67..ff7f20f0d1c0616916e24bed2b0cdf4f4213defc 100644 (file)
--- a/include/deal.II/numerics/data_out_rotation.h
+++ b/include/deal.II/numerics/data_out_rotation.h
@@ -215,6 +215,18 @@ private:
       &my_patches);
 };
 
+namespace Legacy
+{
+  /**
+   * The template arguments of the original dealii::DataOutRotation class will
+   * change in a future release. If for some reason, you need a code that is
+   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * instead.
+   */
+  template <int dim, typename DoFHandlerType = DoFHandler<dim>>
+  using DataOutRotation = dealii::DataOutRotation<dim, DoFHandlerType>;
+} // namespace Legacy
+
 
 DEAL_II_NAMESPACE_CLOSE
 

diff --git a/include/deal.II/numerics/fe_field_function.h b/include/deal.II/numerics/fe_field_function.h
index 87797dde7e9a7e43c69a357c6ecb1465d17c55d5..c3efd768d2c954cbb3d98cf48325407058ec8273 100644 (file)
--- a/include/deal.II/numerics/fe_field_function.h
+++ b/include/deal.II/numerics/fe_field_function.h
@@ -489,6 +489,25 @@ namespace Functions
   };
 } // namespace Functions
 
+namespace Legacy
+{
+  namespace Functions
+  {
+    /**
+     * The template arguments of the original dealii::Functions::FEFieldFunction
+     * class will change in a future release. If for some reason, you need a
+     * code that is compatible with deal.II 9.3 and the subsequent release, use
+     * this alias instead.
+     */
+    template <int dim,
+              typename DoFHandlerType = DoFHandler<dim>,
+              typename VectorType     = Vector<double>>
+    using FEFieldFunction =
+      dealii::Functions::FEFieldFunction<dim, DoFHandlerType, VectorType>;
+  } // namespace Functions
+} // namespace Legacy
+
+
 DEAL_II_NAMESPACE_CLOSE
 
 #endif

diff --git a/include/deal.II/numerics/solution_transfer.h b/include/deal.II/numerics/solution_transfer.h
index 058d212654642c0803ad1303374655fdde626a0c..ddaa04566e16f6c88637b5d904e7ba891b29deb8 100644 (file)
--- a/include/deal.II/numerics/solution_transfer.h
+++ b/include/deal.II/numerics/solution_transfer.h
@@ -574,6 +574,21 @@ private:
     dof_values_on_cell;
 };
 
+namespace Legacy
+{
+  /**
+   * The template arguments of the original dealii::SolutionTransfer class will
+   * change in a future release. If for some reason, you need a code that is
+   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * instead.
+   */
+  template <int dim,
+            typename VectorType     = Vector<double>,
+            typename DoFHandlerType = DoFHandler<dim>>
+  using SolutionTransfer =
+    dealii::SolutionTransfer<dim, VectorType, DoFHandlerType>;
+} // namespace Legacy
+
 
 DEAL_II_NAMESPACE_CLOSE
 

diff --git a/source/numerics/fe_field_function.cc b/source/numerics/fe_field_function.cc
index 7ad838c7c1248c7c322be12a99b96fbd796c2866..06975283173c5c197c648c86c4d6c7374416f326 100644 (file)
--- a/source/numerics/fe_field_function.cc
+++ b/source/numerics/fe_field_function.cc
@@ -33,9 +33,8 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-namespace Functions
-{
+
 #include "fe_field_function.inst"
-}
+
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/source/numerics/fe_field_function.inst.in b/source/numerics/fe_field_function.inst.in
index a994eb8b32cbfa1cd4bb507cd44412dd9c6c74d3..ec114ca80288e69593d72d64def03726b9bcdb16 100644 (file)
--- a/source/numerics/fe_field_function.inst.in
+++ b/source/numerics/fe_field_function.inst.in
@@ -18,7 +18,10 @@
 for (DoFHandler : DOFHANDLER_TEMPLATES; VECTOR : VECTOR_TYPES;
      deal_II_dimension : DIMENSIONS)
   {
-    template class FEFieldFunction<deal_II_dimension,
-                                   DoFHandler<deal_II_dimension>,
-                                   VECTOR>;
+    namespace Functions
+    \{
+      template class FEFieldFunction<deal_II_dimension,
+                                     DoFHandler<deal_II_dimension>,
+                                     VECTOR>;
+    \}
   }