From: Reza Rastak Date: Tue, 28 Apr 2020 05:59:19 +0000 (-0700) Subject: Repeated include statements removed X-Git-Tag: v9.2.0-rc1~171^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9977%2Fhead;p=dealii.git Repeated include statements removed --- diff --git a/examples/step-47/step-47.cc b/examples/step-47/step-47.cc index 63c3714a35..7bf7c8ff08 100644 --- a/examples/step-47/step-47.cc +++ b/examples/step-47/step-47.cc @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/examples/step-57/step-57.cc b/examples/step-57/step-57.cc index 928cc94b3b..a9ba43c837 100644 --- a/examples/step-57/step-57.cc +++ b/examples/step-57/step-57.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/examples/step-61/step-61.cc b/examples/step-61/step-61.cc index 7f8f027c37..eaf59d541f 100644 --- a/examples/step-61/step-61.cc +++ b/examples/step-61/step-61.cc @@ -54,7 +54,6 @@ #include #include #include -#include #include #include diff --git a/include/deal.II/base/work_stream.h b/include/deal.II/base/work_stream.h index 228b2b4f0a..98bd062da3 100644 --- a/include/deal.II/base/work_stream.h +++ b/include/deal.II/base/work_stream.h @@ -28,8 +28,6 @@ # include # ifdef DEAL_II_WITH_THREADS -# include - # include # endif diff --git a/include/deal.II/differentiation/ad/adolc_number_types.h b/include/deal.II/differentiation/ad/adolc_number_types.h index 8c45ee24c9..ae76d2f9c5 100644 --- a/include/deal.II/differentiation/ad/adolc_number_types.h +++ b/include/deal.II/differentiation/ad/adolc_number_types.h @@ -82,7 +82,6 @@ DEAL_II_NAMESPACE_CLOSE # include // Taped double math functions # include -# include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/differentiation/ad/sacado_number_types.h b/include/deal.II/differentiation/ad/sacado_number_types.h index 907e830e1f..53f14b9e4d 100644 --- a/include/deal.II/differentiation/ad/sacado_number_types.h +++ b/include/deal.II/differentiation/ad/sacado_number_types.h @@ -91,7 +91,6 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include -# include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/generic_linear_algebra.h b/include/deal.II/lac/generic_linear_algebra.h index 23b18392d7..9b70289826 100644 --- a/include/deal.II/lac/generic_linear_algebra.h +++ b/include/deal.II/lac/generic_linear_algebra.h @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -68,7 +69,6 @@ DEAL_II_NAMESPACE_CLOSE #ifdef DEAL_II_WITH_PETSC -# include # include # include # include @@ -162,7 +162,6 @@ DEAL_II_NAMESPACE_CLOSE #ifdef DEAL_II_WITH_TRILINOS -# include # include # include # include diff --git a/include/deal.II/numerics/matrix_creator.templates.h b/include/deal.II/numerics/matrix_creator.templates.h index aeb070944b..047b3334af 100644 --- a/include/deal.II/numerics/matrix_creator.templates.h +++ b/include/deal.II/numerics/matrix_creator.templates.h @@ -58,8 +58,6 @@ #endif -#include - #include #include #include diff --git a/include/deal.II/sundials/arkode.h b/include/deal.II/sundials/arkode.h index bcbd9b2f92..6d5971f779 100644 --- a/include/deal.II/sundials/arkode.h +++ b/include/deal.II/sundials/arkode.h @@ -25,7 +25,6 @@ # include # include # include -# include # include # ifdef DEAL_II_WITH_PETSC # include diff --git a/include/deal.II/sundials/ida.h b/include/deal.II/sundials/ida.h index 37dbea0200..24a9339c1c 100644 --- a/include/deal.II/sundials/ida.h +++ b/include/deal.II/sundials/ida.h @@ -24,7 +24,6 @@ # include # include # include -# include # include # ifdef DEAL_II_WITH_PETSC # include diff --git a/source/base/mpi.cc b/source/base/mpi.cc index f8cddf8b7f..2871323703 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -36,7 +36,6 @@ # ifdef DEAL_II_WITH_MPI # include # include -# include # include # endif diff --git a/source/lac/trilinos_precondition_ml.cc b/source/lac/trilinos_precondition_ml.cc index 2a5ea5305e..2411604796 100644 --- a/source/lac/trilinos_precondition_ml.cc +++ b/source/lac/trilinos_precondition_ml.cc @@ -19,7 +19,6 @@ #ifdef DEAL_II_WITH_TRILINOS # include -# include # include # include diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index 274ac25f59..16a392ed9c 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -25,7 +25,6 @@ # include # include # include -# include # include # include diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc index 08c9e3e6eb..bc2adefaae 100644 --- a/source/lac/trilinos_sparsity_pattern.cc +++ b/source/lac/trilinos_sparsity_pattern.cc @@ -23,7 +23,6 @@ # include # include -# include # include diff --git a/source/sundials/arkode.cc b/source/sundials/arkode.cc index 098319be6c..bc0378ca7b 100644 --- a/source/sundials/arkode.cc +++ b/source/sundials/arkode.cc @@ -31,7 +31,6 @@ # include # include # endif -# include # include diff --git a/source/sundials/ida.cc b/source/sundials/ida.cc index 3e1aec39c0..a44f732658 100644 --- a/source/sundials/ida.cc +++ b/source/sundials/ida.cc @@ -31,7 +31,6 @@ # include # include # endif -# include # include diff --git a/source/sundials/kinsol.cc b/source/sundials/kinsol.cc index e0bb952b04..a3d9f56123 100644 --- a/source/sundials/kinsol.cc +++ b/source/sundials/kinsol.cc @@ -31,7 +31,6 @@ # include # include # endif -# include # include diff --git a/tests/bits/static_condensation.cc b/tests/bits/static_condensation.cc index 236c743045..6fe15a6442 100644 --- a/tests/bits/static_condensation.cc +++ b/tests/bits/static_condensation.cc @@ -17,11 +17,6 @@ // a un-hp-ified version of hp/step-7 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include #include @@ -61,7 +56,6 @@ std::ofstream logfile("output"); #include "../tests.h" - template class SolutionBase { @@ -674,6 +668,7 @@ HelmholtzProblem::run() int main() { + std::ofstream logfile("output"); deallog << std::setprecision(2); logfile << std::setprecision(2); diff --git a/tests/bits/step-11.cc b/tests/bits/step-11.cc index 7f78c529d7..d07d599672 100644 --- a/tests/bits/step-11.cc +++ b/tests/bits/step-11.cc @@ -17,10 +17,6 @@ // a un-hp-ified version of hp/step-11 - -#include "../tests.h" -std::ofstream logfile("output"); - #include #include #include @@ -224,6 +220,7 @@ LaplaceProblem::run() int main() { + std::ofstream logfile("output"); try { deallog << std::setprecision(2); diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc index 5a3d523aed..0d29a7aae4 100644 --- a/tests/bits/step-13.cc +++ b/tests/bits/step-13.cc @@ -17,11 +17,6 @@ // a un-hp-ified version of hp/step-13 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include #include @@ -800,6 +795,7 @@ solve_problem(const std::string &solver_name) int main() { + std::ofstream logfile("output"); try { deallog << std::setprecision(2); diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index f5c785426f..564c37bdb6 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -17,11 +17,6 @@ // a un-hp-ified version of hp/step-14 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include #include @@ -2060,6 +2055,7 @@ Framework::run(const ProblemDescription &descriptor) int main() { + std::ofstream logfile("output"); try { deallog << std::setprecision(2); diff --git a/tests/bits/step-16.cc b/tests/bits/step-16.cc index 6318ebb57e..a36fc041ae 100644 --- a/tests/bits/step-16.cc +++ b/tests/bits/step-16.cc @@ -17,10 +17,6 @@ // a un-hp-ified version of hp/step-16 - -#include "../tests.h" -std::ofstream logfile("output"); - #include #include @@ -341,6 +337,7 @@ LaplaceProblem::run() int main() { + std::ofstream logfile("output"); deallog << std::setprecision(2); logfile << std::setprecision(2); diff --git a/tests/bits/step-4.cc b/tests/bits/step-4.cc index 4a86536087..d2d6150ad3 100644 --- a/tests/bits/step-4.cc +++ b/tests/bits/step-4.cc @@ -17,11 +17,6 @@ // a un-hp-ified version of hp/step-4 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include @@ -293,6 +288,7 @@ LaplaceProblem::run() int main() { + std::ofstream logfile("output"); deallog << std::setprecision(2); logfile << std::setprecision(2); diff --git a/tests/bits/step-6-racoptimize-2.cc b/tests/bits/step-6-racoptimize-2.cc index 73730a40ea..41269b697d 100644 --- a/tests/bits/step-6-racoptimize-2.cc +++ b/tests/bits/step-6-racoptimize-2.cc @@ -18,11 +18,6 @@ // like the step-6-racoptimize test but calling // GridRefinement::refine_and_coarsen_optimize with argument order=5 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include diff --git a/tests/bits/step-6-racoptimize.cc b/tests/bits/step-6-racoptimize.cc index a4d14aec1b..7f0a10d551 100644 --- a/tests/bits/step-6-racoptimize.cc +++ b/tests/bits/step-6-racoptimize.cc @@ -18,11 +18,6 @@ // like the step-6 test but calling // GridRefinement::refine_and_coarsen_optimize - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index 84c26eb9cc..fb66be308f 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -17,11 +17,6 @@ // a un-hp-ified version of hp/step-7 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include #include @@ -664,6 +659,7 @@ HelmholtzProblem::run() int main() { + std::ofstream logfile("output"); deallog << std::setprecision(2); logfile << std::setprecision(2); diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc index f64bc4efc2..ceacace6bb 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -17,11 +17,6 @@ // a un-hp-ified version of hp/step-8 - -#include "../tests.h" -std::ofstream logfile("output"); - - #include #include @@ -428,6 +423,7 @@ ElasticProblem::run() int main() { + std::ofstream logfile("output"); deallog << std::setprecision(2); logfile << std::setprecision(2); diff --git a/tests/fail/step-15.cc b/tests/fail/step-15.cc index 6c148a0d69..ebd78de383 100644 --- a/tests/fail/step-15.cc +++ b/tests/fail/step-15.cc @@ -17,10 +17,6 @@ // a un-hp-ified version of hp/step-15 - -#include "../tests.h" -std::ofstream logfile("output"); - #include #include @@ -581,6 +577,7 @@ MinimizationProblem::run() int main() { + std::ofstream logfile("output"); try { deallog << std::setprecision(2); diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 814221b465..764f5ae108 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include