Merge pull request #50 from peterrum/dealii-9-3

Make deal.II 9.3 compatible
kronbichler · Jun 4, 2021 · 7102081 · 7102081
2 parents c8b6989 + 0607647
commit 7102081
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/include/adaflo/sharp_interface.h b/include/adaflo/sharp_interface.h
@@ -588,14 +588,23 @@ class FrontTrackingSolver : public SharpInterfaceSolver
     {
       DataOutBase::VtkFlags flags;
 
+#if (DEAL_II_VERSION_MAJOR <= 9) && (DEAL_II_VERSION_MINOR <= 3)
+      DataOut<dim - 1, DoFHandler<dim - 1, dim>> data_out;
+#else
       DataOut<dim - 1, dim> data_out;
+#endif
       data_out.set_flags(flags);
       data_out.add_data_vector(surface_dofhandler, curvature_vector, "curvature");
       data_out.add_data_vector(surface_dofhandler_dim, normal_vector, "normal");
 
       data_out.build_patches(*euler_mapping,
                              surface_dofhandler_dim.get_fe().degree + 1,
-                             DataOut<dim - 1, dim>::CurvedCellRegion::curved_inner_cells);
+#if (DEAL_II_VERSION_MAJOR <= 9) && (DEAL_II_VERSION_MINOR <= 3)
+                             DataOut<dim - 1, DoFHandler<dim - 1, dim>>
+#else
+                             DataOut<dim - 1, dim>
+#endif
+                             ::CurvedCellRegion::curved_inner_cells);
 
       std::filesystem::path path(output_filename + "_surface");
 
@@ -893,14 +902,22 @@ class MixedLevelSetSolver : public SharpInterfaceSolver
       {
         DataOutBase::VtkFlags flags;
 
+#if (DEAL_II_VERSION_MAJOR <= 9) && (DEAL_II_VERSION_MINOR <= 3)
+        DataOut<dim - 1, DoFHandler<dim - 1, dim>> data_out;
+#else
         DataOut<dim - 1, dim> data_out;
+#endif
         data_out.set_flags(flags);
         data_out.attach_dof_handler(euler_dofhandler);
 
-        data_out.build_patches(
-          *euler_mapping,
-          euler_dofhandler.get_fe().degree + 1,
-          DataOut<dim - 1, dim>::CurvedCellRegion::curved_inner_cells);
+        data_out.build_patches(*euler_mapping,
+                               euler_dofhandler.get_fe().degree + 1,
+#if (DEAL_II_VERSION_MAJOR <= 9) && (DEAL_II_VERSION_MINOR <= 3)
+                               DataOut<dim - 1, DoFHandler<dim - 1, dim>>
+#else
+                               DataOut<dim - 1, dim>
+#endif
+                               ::CurvedCellRegion::curved_inner_cells);
 
         std::filesystem::path path(output_filename + "_surface");