]> https://gitweb.dealii.org/ - code-gallery.git/commitdiff
Remove #includes of headers removed in 9.2.
authorDavid Wells <wellsd2@rpi.edu>
Mon, 18 May 2020 17:02:29 +0000 (13:02 -0400)
committerDavid Wells <drwells@email.unc.edu>
Mon, 18 May 2020 17:23:19 +0000 (13:23 -0400)
CeresFE/support_code/ellipsoid_fit.h
Linear_Elastic_Active_Skeletal_Muscle_Model/Linear_active_muscle_model.cc
Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc
Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc
goal_oriented_elastoplasticity/elastoplastic.cc
two_phase_flow/LevelSetSolver.cc
two_phase_flow/MultiPhase.cc
two_phase_flow/NavierStokesSolver.cc

index bb41268535daf63e7d11f535713e2a156c63c65f..f935a23eddb30448bcdaba92f9f6b84a8b61491b 100644 (file)
@@ -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>
 
index 496db3e787b0beb58eb296f7a3bacad9ee351c1c..0f84353e76b4861da433f8647775af8229b3eb83 100644 (file)
@@ -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>
index 40528d0bb6a6574c9882c59cacaf7529b88c4081..7a40efe22ab2584b45de877eb329f78fa131bdad 100644 (file)
@@ -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>
index 384a5e5ff6245b1adf3a2a4f3384d32c3de83896..5df82b91168a0b168d7e2caefc3021569f019b34 100644 (file)
@@ -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>
index 0eabcef08cab68b6aafe47460c367fd4def88cd1..1d0b2eff9e3bbb8719effafe0ff4017e038c4fe3 100644 (file)
@@ -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>
 
index 883b5cab19204654dd2bda88876a42fcb326b106..af18d86f2739b5d7caa76cdd57a4010ebc4236ed 100644 (file)
 #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)
 {
index 3000496069a9fde6202bdbeeb8ce5b81fb8164b4..00dbf55439c0aaab07fa9443b0a7323a949ff9e7 100644 (file)
@@ -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>
index 2df261bd35f4b340e0f872dcd49decf04437a9d9..7acd19a42377cade449570fb19a7431f4aca0225 100644 (file)
 #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)
 {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.