diff --git a/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp b/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp index 91749fb3..d81cf174 100644 --- a/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp +++ b/ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include "TimeRateUpdateFlags.h" #include "TimeRateRequest.h" @@ -1000,8 +1000,14 @@ namespace PlasticityLab { // solve the thermal projection system TrilinosWrappers::PreconditionAMG preconditioner; +#if DEAL_II_VERSION_GTE(9,7,0) + const std::vector > constant_modes + = DoFTools::extract_constant_modes(thermal_dof_system.dof_handler, + ComponentMask()); +#else std::vector > 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; @@ -1487,8 +1493,14 @@ namespace PlasticityLab { // solve the projection system TrilinosWrappers::PreconditionAMG preconditioner; +#if DEAL_II_VERSION_GTE(9,7,0) + const std::vector > constant_modes + = DoFTools::extract_constant_modes(mechanical_dof_system.dof_handler, + ComponentMask()); +#else std::vector > 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; @@ -3273,10 +3285,16 @@ namespace PlasticityLab { const bool reset_solution) { TrilinosWrappers::PreconditionAMG preconditioner; +#if DEAL_II_VERSION_GTE(9,7,0) + const std::vector > constant_modes + = DoFTools::extract_constant_modes(dof_system.dof_handler, + ComponentMask()); +#else std::vector > 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;