Merge pull request #6219 from gassmoeller/improve_dealii_namespace_in…

…clusion

Improve dealii namespace inclusion

benchmarks/advection_in_annulus/advection_in_annulus.cc

@@ -45,8 +45,6 @@ namespace aspect
    */
   namespace AdvectionInAnnulus
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       const double A=2.0, B=-3.0/std::log(2.0), C=-1;
@@ -109,8 +107,6 @@ namespace aspect
 {
   namespace PrescribedStokesSolution
   {
-    using namespace dealii;
-
     /**
      * A class that implements the flow field of the annulus benchmark.
      *

benchmarks/annulus/plugin/annulus.cc

@@ -53,7 +53,6 @@ namespace aspect
    */
   namespace AnnulusBenchmark
   {
-    using namespace dealii;
     using namespace aspect::Utilities::Coordinates;
 
     /**

benchmarks/burstedde/burstedde.cc

@@ -51,8 +51,6 @@ namespace aspect
    */
   namespace BursteddeBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       Tensor<1,3>

benchmarks/davies_et_al/case-2.3-plugin/VoT.cc

@@ -27,9 +27,6 @@
 #include <cmath>
 
 
-using namespace dealii;
-
-
 namespace aspect
 {
   namespace MaterialModel

benchmarks/doneahuerta/doneahuerta.cc

@@ -36,8 +36,6 @@ namespace aspect
 {
   namespace DoneaHuertaBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
 

benchmarks/hollow_sphere/hollow_sphere.cc

@@ -43,8 +43,6 @@ namespace aspect
    */
   namespace HollowSphereBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       const double gammma = 1.0;

benchmarks/inclusion/compositional_fields/inclusion_compositional_fields.h

@@ -9,8 +9,6 @@ namespace aspect
 {
   namespace InclusionBenchmark
   {
-    using namespace dealii;
-
     template <int dim>
     class InclusionCompositionalMaterial : public InclusionMaterial<dim>
     {

benchmarks/inclusion/inclusion.h

@@ -36,8 +36,6 @@ namespace aspect
    */
   namespace InclusionBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       // based on http://geodynamics.org/hg/cs/AMR/Discontinuous_Stokes with permission

benchmarks/infill_density/infill_ascii_data.cc

@@ -29,8 +29,6 @@ namespace aspect
 {
   namespace BoundaryTraction
   {
-    using namespace dealii;
-
     /**
      * A class that implements prescribed traction boundary conditions determined
      * from pressures given in an AsciiData input file.

benchmarks/king2dcompressible/plugin/code.cc

@@ -27,8 +27,6 @@
 
 namespace aspect
 {
-  using namespace dealii;
-
   /**
    * This benchmark is from the article
    * @code

benchmarks/layeredflow/layeredflow.cc

@@ -36,8 +36,6 @@ namespace aspect
 {
   namespace LayeredFlowBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
 

benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/simple_nonlinear.cc

@@ -31,8 +31,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     /**
      * A material model based on a simple power law rheology and
      * implementing the derivatives needed for the Newton method.
@@ -110,8 +108,6 @@ namespace aspect
 
 
 
-using namespace dealii;
-
 namespace aspect
 {
 

benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/drucker_prager_compositions.cc

@@ -37,8 +37,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     /**
      * The same material model as Drucker Prager, but this one supports multiple
      * compositions. Designed to run the Spiegelman et al. 2016 benchmark.
@@ -171,8 +169,6 @@ namespace aspect
 #include <aspect/utilities.h>
 #include <aspect/parameters.h>
 
-using namespace dealii;
-
 namespace aspect
 {
   namespace

benchmarks/nsinker/nsinker.cc

@@ -39,8 +39,6 @@ namespace aspect
    */
   namespace NSinkerBenchmark
   {
-    using namespace dealii;
-
     /**
      * @note This benchmark only talks about the flow field, not about a
      * temperature field. All quantities related to the temperature are

benchmarks/nsinker_spherical_shell/nsinker.cc

@@ -32,8 +32,6 @@ namespace aspect
    */
   namespace NSinkerBenchmark
   {
-    using namespace dealii;
-
     /**
      * @note This benchmark only talks about the flow field, not about a
      * temperature field. All quantities related to the temperature are

benchmarks/operator_splitting/advection_reaction/advection_reaction.cc

@@ -33,8 +33,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     template <int dim>
     class ExponentialDecay : public MaterialModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
     {
@@ -64,8 +62,6 @@ namespace aspect
 
   namespace HeatingModel
   {
-    using namespace dealii;
-
     template <int dim>
     class ExponentialDecayHeating : public HeatingModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
     {

benchmarks/operator_splitting/exponential_decay/exponential_decay.cc

@@ -31,8 +31,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     template <int dim>
     class ExponentialDecay : public MaterialModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
     {
@@ -64,8 +62,6 @@ namespace aspect
 
   namespace HeatingModel
   {
-    using namespace dealii;
-
     template <int dim>
     class ExponentialDecayHeating : public HeatingModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
     {

benchmarks/rayleigh_taylor_instability/rayleigh_taylor_instability.cc

@@ -36,8 +36,6 @@ namespace aspect
 {
   namespace RTinstabilityBenchmark
   {
-    using namespace dealii;
-
     /**
      * @note This benchmark only talks about the flow field, not about a
      * temperature field. All quantities related to the temperature are

benchmarks/rigid_shear/plugin/rigid_shear.cc

@@ -39,8 +39,6 @@
 
 namespace aspect
 {
-  using namespace dealii;
-
   namespace RigidShearBenchmark
   {
     /**

benchmarks/shear_bands/shear_bands.cc

@@ -59,9 +59,6 @@ namespace aspect
    */
   namespace ShearBands
   {
-    using namespace dealii;
-
-
     /**
      * @note This benchmark only talks about the flow field, not about a
      * temperature field. All quantities related to the temperature are

benchmarks/sinking_block/sinking_block.cc

@@ -35,8 +35,6 @@ namespace aspect
 {
   namespace SinkingBlockBenchmark
   {
-    using namespace dealii;
-
     /**
      * @note This benchmark only talks about the flow field, not about a
      * temperature field. All quantities related to the temperature are

benchmarks/solcx/compositional_fields/solcx_compositional_fields.h

@@ -9,8 +9,6 @@ namespace aspect
 {
   namespace InclusionBenchmark
   {
-    using namespace dealii;
-
     template <int dim>
     class SolCxCompositionalMaterial : public SolCxMaterial<dim>
     {

benchmarks/solcx/solcx.h

@@ -36,8 +36,6 @@ namespace aspect
    */
   namespace InclusionBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       // based on http://geodynamics.org/hg/cs/AMR/Discontinuous_Stokes with permission

benchmarks/solitary_wave/solitary_wave.cc

@@ -117,8 +117,6 @@ namespace aspect
    */
   namespace SolitaryWaveBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       // vectors to store the porosity field and the corresponding coordinate in

benchmarks/solkz/compositional_fields/solkz_compositional_fields.h

@@ -10,8 +10,6 @@ namespace aspect
 {
   namespace InclusionBenchmark
   {
-    using namespace dealii;
-
     template <int dim>
     class SolKzCompositionalMaterial : public SolKzMaterial<dim>
     {

benchmarks/solkz/solkz.h

@@ -36,8 +36,6 @@ namespace aspect
    */
   namespace InclusionBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
       // based on http://geodynamics.org/hg/cs/AMR/Discontinuous_Stokes with permission

benchmarks/solubility/plugin/solubility.cc

@@ -32,8 +32,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     /**
      * Volatiles material model.
      * @ingroup MaterialModels

benchmarks/tangurnis/code/tangurnis.cc

@@ -39,10 +39,6 @@
 
 namespace aspect
 {
-  using namespace dealii;
-
-
-
   /**
    * This benchmark is from the article
    * @code

benchmarks/time_dependent_annulus/plugin/time_dependent_annulus.h

@@ -112,8 +112,6 @@ namespace aspect
 
   namespace MaterialModel
   {
-    using namespace dealii;
-
     template <int dim>
     class TimeDependentAnnulus : public MaterialModel::Interface<dim>
     {

benchmarks/tosi_et_al_2015_gcubed/tosi.cc

@@ -60,9 +60,6 @@ namespace aspect
    */
   namespace TosiBenchmark
   {
-    using namespace dealii;
-
-
     /**
      * @ingroup MaterialModels
      */

benchmarks/viscosity_grooves/viscosity_grooves.cc

@@ -37,8 +37,6 @@ namespace aspect
 {
   namespace ViscosityGroovesBenchmark
   {
-    using namespace dealii;
-
     namespace AnalyticSolutions
     {
 

benchmarks/yamauchi_takei_2016_anelasticity/anelasticity_temperature.h

@@ -33,8 +33,6 @@ namespace aspect
 {
   namespace InitialTemperature
   {
-    using namespace dealii;
-
     /**
      * A class that describes an initial temperature field for a 2D or 3D shear wave velocity (Vs) model.
      * Vs values are converted to temperature using the anelasticity parameterization of Yamauchi & Takei (2016).

cookbooks/anisotropic_viscosity/av_material.cc

@@ -63,8 +63,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     /**
      * Additional output fields for anisotropic viscosities to be added to
      * the MaterialModel::MaterialModelOutputs structure and filled in the

cookbooks/finite_strain/finite_strain.cc

@@ -28,8 +28,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     template <int dim>
     class FiniteStrain : public MaterialModel::Simple<dim>
     {

cookbooks/free_surface_with_crust/plugin/simpler_with_crust.cc

@@ -30,8 +30,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     /**
      * A material model similar to the "simpler" material model, but where the
      * viscosity has two different values dependent on whether we are above or

cookbooks/inner_core_convection/inner_core_convection.cc

@@ -27,8 +27,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     template <int dim>
     class InnerCore : public MaterialModel::Simple<dim>
     {
@@ -357,8 +355,6 @@ namespace aspect
 {
   namespace HeatingModel
   {
-    using namespace dealii;
-
     /**
      * A class that implements a constant radiogenic heating rate.
      *

cookbooks/kinematically_driven_subduction_2d/subduction_plate_cooling.h

@@ -29,8 +29,6 @@ namespace aspect
 {
   namespace InitialTemperature
   {
-    using namespace dealii;
-
     /**
      * A class that prescribes the initial temperature field according to the plate cooling model
      * and plate geometries implemented in Quinquis (2014).

cookbooks/magnetic_stripes/magnetic_stripes.cc

@@ -27,8 +27,6 @@ namespace aspect
 {
   namespace MaterialModel
   {
-    using namespace dealii;
-
     template <int dim>
     class MagneticStripes : public MaterialModel::CompositionReaction<dim>
     {