Merge pull request #199 from marcfehling/fix-zlib

Make programs compile again.
dealii · Aug 20, 2024 · 99a7c1b · 99a7c1b
2 parents 1afe182 + 873573d
commit 99a7c1b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         build_type: ["Debug"]
-        dealii_version: ["master", "v9.5.0"]
+        dealii_version: ["master", "v9.6.0", "v9.5.0"]
         ubuntu_version: ["jammy"]
 
     container:

diff --git a/Crystal_Growth_Phase_Field_Model/output_results.cpp b/Crystal_Growth_Phase_Field_Model/output_results.cpp
@@ -28,7 +28,7 @@ void PhaseFieldSolver::output_results(const unsigned int timestep_number) const
                 "solution-" + Utilities::int_to_string(timestep_number, 3) + ".vtk";
         DataOutBase::VtkFlags vtk_flags;
         vtk_flags.compression_level =
-                DataOutBase::VtkFlags::ZlibCompressionLevel::best_speed;
+                DataOutBase::CompressionLevel::best_speed;
         data_out.set_flags(vtk_flags);
         std::ofstream output(filename);
 

diff --git a/ElastoplasticTorsion/ElastoplasticTorsion.cc b/ElastoplasticTorsion/ElastoplasticTorsion.cc
@@ -778,9 +778,13 @@ namespace nsp
     solution_transfer.prepare_for_coarsening_and_refinement(present_solution);
     triangulation.execute_coarsening_and_refinement();
     dof_handler.distribute_dofs(fe);
+#  if DEAL_II_VERSION_GTE(9, 7, 0)
+    solution_transfer.interpolate(present_solution);
+#  else
     Vector<double> tmp(dof_handler.n_dofs());
     solution_transfer.interpolate(present_solution, tmp);
     present_solution = tmp;
+#  endif
     set_boundary_values ();
     hanging_node_constraints.clear();
 

diff --git a/TravelingWaves/TravelingWaveSolver.cc b/TravelingWaves/TravelingWaveSolver.cc
@@ -636,9 +636,13 @@ namespace TravelingWave
 
     setup_system(/*initial_step=*/ false);
 
+#  if DEAL_II_VERSION_GTE(9, 7, 0)
+    solution_transfer.interpolate(current_solution);
+#  else
     Vector<double> tmp(dof_handler.n_dofs());
     solution_transfer.interpolate(current_solution, tmp);
     current_solution = std::move(tmp);
+#  endif
 
     set_boundary_and_centering_values();
 

diff --git a/cdr/common/include/deal.II-cdr/write_pvtu_output.templates.h b/cdr/common/include/deal.II-cdr/write_pvtu_output.templates.h
@@ -55,8 +55,7 @@ namespace CDR
     flags.time = current_time;
     // While the default flag is for the best compression level, using
     // <code>best_speed</code> makes this function much faster.
-    flags.compression_level =
-      DataOutBase::VtkFlags::ZlibCompressionLevel::best_speed;
+    flags.compression_level = DataOutBase::CompressionLevel::best_speed;
     data_out.set_flags(flags);
 
     unsigned int subdomain_n;

diff --git a/goal_oriented_elastoplasticity/elastoplastic.cc b/goal_oriented_elastoplasticity/elastoplastic.cc
@@ -5605,6 +5605,30 @@ namespace ElastoPlastic
 
     // ---------------------------------------------------
     history_dof_handler.distribute_dofs (history_fe);
+
+#  if DEAL_II_VERSION_GTE(9, 7, 0)
+    // stress
+    history_stress_field_transfer0.interpolate(history_stress_field[0]);
+    if ( dim > 1)
+      {
+        history_stress_field_transfer1.interpolate(history_stress_field[1]);
+      }
+    if ( dim == 3)
+      {
+        history_stress_field_transfer2.interpolate(history_stress_field[2]);
+      }
+
+    // strain
+    history_strain_field_transfer0.interpolate(history_strain_field[0]);
+    if ( dim > 1)
+      {
+        history_strain_field_transfer1.interpolate(history_strain_field[1]);
+      }
+    if ( dim == 3)
+      {
+        history_strain_field_transfer2.interpolate(history_strain_field[2]);
+      }
+#  else
     // stress
     std::vector< std::vector< Vector<double> > >
     distributed_history_stress_field (dim, std::vector< Vector<double> >(dim));
@@ -5646,6 +5670,7 @@ namespace ElastoPlastic
       }
 
     history_strain_field = distributed_history_strain_field;
+#  endif
 
     // ---------------------------------------------------------------
     // Transfer the history data to the quadrature points of the new mesh