From 0607647bb7dcc545d48fd3db0012df752797c757 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Thu, 3 Jun 2021 19:05:11 +0200 Subject: [PATCH] Make deal.II 9.3 compatible --- include/adaflo/sharp_interface.h | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/include/adaflo/sharp_interface.h b/include/adaflo/sharp_interface.h index 4d447a1..4479625 100644 --- 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> data_out; +#else DataOut 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::CurvedCellRegion::curved_inner_cells); +#if (DEAL_II_VERSION_MAJOR <= 9) && (DEAL_II_VERSION_MINOR <= 3) + DataOut> +#else + DataOut +#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> data_out; +#else DataOut 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::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> +#else + DataOut +#endif + ::CurvedCellRegion::curved_inner_cells); std::filesystem::path path(output_filename + "_surface");