From 89e981e98830fe6d7c4b414b75a067273d52b160 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Fri, 3 Jul 2026 16:39:56 -0600
Subject: [PATCH 1/2] Avoid some deprecated things.

---
 .../src/PlasticityLabProg.cpp                  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp b/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
index 91749fb3..63929d4c 100644
--- a/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
+++ b/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
@@ -14,7 +14,7 @@
 #include <deal.II/lac/trilinos_precondition.h>
 #include <deal.II/lac/trilinos_solver.h>
 
-#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/lac/affine_constraints.h>
 
 #include "TimeRateUpdateFlags.h"
 #include "TimeRateRequest.h"
@@ -1000,8 +1000,9 @@ namespace PlasticityLab {
       // solve the thermal projection system
       TrilinosWrappers::PreconditionAMG preconditioner;
 
-      std::vector<std::vector<bool> > constant_modes;
-      DoFTools::extract_constant_modes(thermal_dof_system.dof_handler, ComponentMask(), constant_modes);
+      const std::vector<std::vector<bool> > constant_modes
+        = DoFTools::extract_constant_modes(thermal_dof_system.dof_handler,
+                                           ComponentMask());
 
       TrilinosWrappers::PreconditionAMG::AdditionalData additional_data;
       additional_data.constant_modes = constant_modes;
@@ -1487,8 +1488,9 @@ namespace PlasticityLab {
     // solve the projection system
     TrilinosWrappers::PreconditionAMG preconditioner;
 
-    std::vector<std::vector<bool> > constant_modes;
-    DoFTools::extract_constant_modes(mechanical_dof_system.dof_handler, ComponentMask(), constant_modes);
+    const std::vector<std::vector<bool> > constant_modes
+      = DoFTools::extract_constant_modes(mechanical_dof_system.dof_handler,
+                                         ComponentMask());
 
     TrilinosWrappers::PreconditionAMG::AdditionalData additional_data;
     additional_data.constant_modes = constant_modes;
@@ -3273,9 +3275,9 @@ namespace PlasticityLab {
     const bool reset_solution) {
     TrilinosWrappers::PreconditionAMG preconditioner;
 
-    std::vector<std::vector<bool> > constant_modes;
-    DoFTools::extract_constant_modes(dof_system.dof_handler, ComponentMask(),
-                                     constant_modes);
+    const std::vector<std::vector<bool> > constant_modes
+      = DoFTools::extract_constant_modes(dof_system.dof_handler,
+                                         ComponentMask());
 
     TrilinosWrappers::PreconditionAMG::AdditionalData additional_data;
     additional_data.constant_modes = constant_modes;

From 1532e822852d1ac0db18d1b8c20ced2c95cda0c7 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Mon, 6 Jul 2026 10:41:45 -0600
Subject: [PATCH 2/2] Make things work with deal.II 9.6 as well.

---
 .../src/PlasticityLabProg.cpp                  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp b/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
index 63929d4c..d81cf174 100644
--- a/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
+++ b/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
@@ -1000,9 +1000,14 @@ namespace PlasticityLab {
       // solve the thermal projection system
       TrilinosWrappers::PreconditionAMG preconditioner;
 
+#if DEAL_II_VERSION_GTE(9,7,0)
       const std::vector<std::vector<bool> > constant_modes
         = DoFTools::extract_constant_modes(thermal_dof_system.dof_handler,
                                            ComponentMask());
+#else
+      std::vector<std::vector<bool> > constant_modes;
+      DoFTools::extract_constant_modes(thermal_dof_system.dof_handler, ComponentMask(), constant_modes);
+#endif
 
       TrilinosWrappers::PreconditionAMG::AdditionalData additional_data;
       additional_data.constant_modes = constant_modes;
@@ -1488,9 +1493,14 @@ namespace PlasticityLab {
     // solve the projection system
     TrilinosWrappers::PreconditionAMG preconditioner;
 
+#if DEAL_II_VERSION_GTE(9,7,0)
     const std::vector<std::vector<bool> > constant_modes
       = DoFTools::extract_constant_modes(mechanical_dof_system.dof_handler,
                                          ComponentMask());
+#else
+    std::vector<std::vector<bool> > constant_modes;
+    DoFTools::extract_constant_modes(mechanical_dof_system.dof_handler, ComponentMask(), constant_modes);
+#endif    
 
     TrilinosWrappers::PreconditionAMG::AdditionalData additional_data;
     additional_data.constant_modes = constant_modes;
@@ -3275,10 +3285,16 @@ namespace PlasticityLab {
     const bool reset_solution) {
     TrilinosWrappers::PreconditionAMG preconditioner;
 
+#if DEAL_II_VERSION_GTE(9,7,0)
     const std::vector<std::vector<bool> > constant_modes
       = DoFTools::extract_constant_modes(dof_system.dof_handler,
                                          ComponentMask());
-
+#else
+    std::vector<std::vector<bool> > constant_modes;
+    DoFTools::extract_constant_modes(dof_system.dof_handler, ComponentMask(),
+                                     constant_modes);
+#endif
+    
     TrilinosWrappers::PreconditionAMG::AdditionalData additional_data;
     additional_data.constant_modes = constant_modes;
     additional_data.elliptic = true;