Skip to content

Avoid some deprecated things. #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masterleinad merged 2 commits into from
Jul 6, 2026
Merged

Avoid some deprecated things. #253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e981e
Avoid some deprecated things.
bangerth Jul 3, 2026
1532e82
Make things work with deal.II 9.6 as well.
bangerth Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions ALE_Finite_Strain_Plasticity/src/PlasticityLabProg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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<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;
Expand Down Expand Up @@ -1487,8 +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;
Expand Down Expand Up @@ -3273,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;
Expand Down