From: David Wells <wellsd2@rpi.edu>
Date: Mon, 18 May 2020 17:02:29 +0000 (-0400)
Subject: Remove #includes of headers removed in 9.2.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e68a0a512c054031cb637d0a81b6a3fc6f6119;p=code-gallery.git

Remove #includes of headers removed in 9.2.
---

diff --git a/CeresFE/support_code/ellipsoid_fit.h b/CeresFE/support_code/ellipsoid_fit.h
index bb41268..f935a23 100644
--- a/CeresFE/support_code/ellipsoid_fit.h
+++ b/CeresFE/support_code/ellipsoid_fit.h
@@ -26,7 +26,6 @@
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/grid_out.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/base/point.h>
 #include <deal.II/grid/grid_generator.h>
 
diff --git a/Linear_Elastic_Active_Skeletal_Muscle_Model/Linear_active_muscle_model.cc b/Linear_Elastic_Active_Skeletal_Muscle_Model/Linear_active_muscle_model.cc
index 496db3e..0f84353 100644
--- a/Linear_Elastic_Active_Skeletal_Muscle_Model/Linear_active_muscle_model.cc
+++ b/Linear_Elastic_Active_Skeletal_Muscle_Model/Linear_active_muscle_model.cc
@@ -43,7 +43,6 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_tools.h>
diff --git a/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc b/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc
index 40528d0..7a40efe 100644
--- a/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc
+++ b/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc
@@ -41,7 +41,6 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 
 #include <deal.II/fe/fe_dgp_monomial.h>
 #include <deal.II/fe/fe_q.h>
diff --git a/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc b/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc
index 384a5e5..5df82b9 100644
--- a/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc
+++ b/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc
@@ -36,7 +36,6 @@
 #include <deal.II/grid/grid_in.h>
 #include <deal.II/grid/manifold_lib.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/fe/fe_dgp_monomial.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
diff --git a/goal_oriented_elastoplasticity/elastoplastic.cc b/goal_oriented_elastoplasticity/elastoplastic.cc
index 0eabcef..1d0b2ef 100644
--- a/goal_oriented_elastoplasticity/elastoplastic.cc
+++ b/goal_oriented_elastoplasticity/elastoplastic.cc
@@ -56,7 +56,6 @@
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/grid/grid_out.h>
 #include <deal.II/grid/manifold_lib.h>
 
diff --git a/two_phase_flow/LevelSetSolver.cc b/two_phase_flow/LevelSetSolver.cc
index 883b5ca..af18d86 100644
--- a/two_phase_flow/LevelSetSolver.cc
+++ b/two_phase_flow/LevelSetSolver.cc
@@ -29,14 +29,16 @@
 #include <deal.II/lac/vector.h>
 #include <deal.II/base/convergence_table.h>
 #include <deal.II/base/timer.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/base/parameter_handler.h>
-#include <fstream>
-#include <iostream>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/fe/mapping_q.h>
+
 #include <mpi.h>
 
+#include <fstream>
+#include <iostream>
+#include <memory>
+
 using namespace dealii;
 
 // FLAGS
@@ -160,7 +162,7 @@ private:
   void get_map_from_Q1_to_Q2();
   void solve(const ConstraintMatrix &constraints,
              PETScWrappers::MPI::SparseMatrix &Matrix,
-             std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
+             std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
              PETScWrappers::MPI::Vector &completely_distributed_solution,
              const PETScWrappers::MPI::Vector &rhs);
   void save_old_solution();
@@ -199,7 +201,7 @@ private:
 
   // MASS MATRIX
   PETScWrappers::MPI::SparseMatrix MC_matrix;
-  std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> MC_preconditioner;
+  std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> MC_preconditioner;
 
   // BOUNDARIES
   std::vector<types::global_dof_index> boundary_values_id_u;
@@ -1532,7 +1534,7 @@ void LevelSetSolver<dim>::get_map_from_Q1_to_Q2()
 template <int dim>
 void LevelSetSolver<dim>::solve(const ConstraintMatrix &constraints,
                                 PETScWrappers::MPI::SparseMatrix &Matrix,
-                                std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
+                                std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
                                 PETScWrappers::MPI::Vector &completely_distributed_solution,
                                 const PETScWrappers::MPI::Vector &rhs)
 {
diff --git a/two_phase_flow/MultiPhase.cc b/two_phase_flow/MultiPhase.cc
index 3000496..00dbf55 100644
--- a/two_phase_flow/MultiPhase.cc
+++ b/two_phase_flow/MultiPhase.cc
@@ -27,7 +27,6 @@
 #include <deal.II/distributed/grid_refinement.h>
 #include <deal.II/base/convergence_table.h>
 #include <deal.II/base/timer.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/base/parameter_handler.h>
 #include <fstream>
 #include <iostream>
diff --git a/two_phase_flow/NavierStokesSolver.cc b/two_phase_flow/NavierStokesSolver.cc
index 2df261b..7acd19a 100644
--- a/two_phase_flow/NavierStokesSolver.cc
+++ b/two_phase_flow/NavierStokesSolver.cc
@@ -28,13 +28,13 @@
 #include <deal.II/lac/petsc_parallel_vector.h>
 #include <deal.II/base/convergence_table.h>
 #include <deal.II/base/timer.h>
-#include <deal.II/grid/tria_boundary_lib.h>
 #include <deal.II/base/parameter_handler.h>
-#include <fstream>
-#include <iostream>
 #include <deal.II/grid/grid_tools.h>
 #include <deal.II/fe/mapping_q.h>
-#include <deal.II/base/std_cxx1x/shared_ptr.h>
+
+#include <fstream>
+#include <iostream>
+#include <memory>
 
 using namespace dealii;
 
@@ -121,11 +121,11 @@ private:
   void assemble_system_dpsi_q();
   // SOLVERS //
   void solve_U(const ConstraintMatrix &constraints, PETScWrappers::MPI::SparseMatrix &Matrix,
-               std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
+               std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
                PETScWrappers::MPI::Vector &completely_distributed_solution,
                const PETScWrappers::MPI::Vector &rhs);
   void solve_P(const ConstraintMatrix &constraints, PETScWrappers::MPI::SparseMatrix &Matrix,
-               std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
+               std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
                PETScWrappers::MPI::Vector &completely_distributed_solution,
                const PETScWrappers::MPI::Vector &rhs);
   // GET DIFFERENT FIELDS //
@@ -196,13 +196,13 @@ private:
   PETScWrappers::MPI::SparseMatrix system_Matrix_v;
   PETScWrappers::MPI::SparseMatrix system_Matrix_w;
   bool rebuild_Matrix_U;
-  std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_Matrix_u;
-  std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_Matrix_v;
-  std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_Matrix_w;
+  std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_Matrix_u;
+  std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_Matrix_v;
+  std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_Matrix_w;
   PETScWrappers::MPI::SparseMatrix system_S;
-  std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_S;
+  std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_S;
   PETScWrappers::MPI::SparseMatrix system_M;
-  std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_M;
+  std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner_M;
   bool rebuild_S_M;
   bool rebuild_Matrix_U_preconditioners;
   bool rebuild_S_M_preconditioners;
@@ -986,7 +986,7 @@ void NavierStokesSolver<dim>::assemble_system_dpsi_q()
 template<int dim>
 void NavierStokesSolver<dim>::solve_U(const ConstraintMatrix &constraints,
                                       PETScWrappers::MPI::SparseMatrix &Matrix,
-                                      std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
+                                      std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
                                       PETScWrappers::MPI::Vector &completely_distributed_solution,
                                       const PETScWrappers::MPI::Vector &rhs)
 {
@@ -1007,7 +1007,7 @@ void NavierStokesSolver<dim>::solve_U(const ConstraintMatrix &constraints,
 template<int dim>
 void NavierStokesSolver<dim>::solve_P(const ConstraintMatrix &constraints,
                                       PETScWrappers::MPI::SparseMatrix &Matrix,
-                                      std_cxx1x::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
+                                      std::shared_ptr<PETScWrappers::PreconditionBoomerAMG> preconditioner,
                                       PETScWrappers::MPI::Vector &completely_distributed_solution,
                                       const PETScWrappers::MPI::Vector &rhs)
 {