Skip to content
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.

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

Improve dealii namespace inclusion #6219

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions benchmarks/advection_in_annulus/advection_in_annulus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -109,8 +107,6 @@ namespace aspect
{
namespace PrescribedStokesSolution
{
using namespace dealii;

/**
* A class that implements the flow field of the annulus benchmark.
*
Expand Down
1 change: 0 additions & 1 deletion benchmarks/annulus/plugin/annulus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ namespace aspect
*/
namespace AnnulusBenchmark
{
using namespace dealii;
using namespace aspect::Utilities::Coordinates;

/**
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/burstedde/burstedde.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ namespace aspect
*/
namespace BursteddeBenchmark
{
using namespace dealii;

namespace AnalyticSolutions
{
Tensor<1,3>
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/davies_et_al/case-2.3-plugin/VoT.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
#include <cmath>


using namespace dealii;


namespace aspect
{
namespace MaterialModel
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/doneahuerta/doneahuerta.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ namespace aspect
{
namespace DoneaHuertaBenchmark
{
using namespace dealii;

namespace AnalyticSolutions
{

Expand Down
2 changes: 0 additions & 2 deletions benchmarks/hollow_sphere/hollow_sphere.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ namespace aspect
*/
namespace HollowSphereBenchmark
{
using namespace dealii;

namespace AnalyticSolutions
{
const double gammma = 1.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ namespace aspect
{
namespace InclusionBenchmark
{
using namespace dealii;

template <int dim>
class InclusionCompositionalMaterial : public InclusionMaterial<dim>
{
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/inclusion/inclusion.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/infill_density/infill_ascii_data.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/king2dcompressible/plugin/code.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

namespace aspect
{
using namespace dealii;

/**
* This benchmark is from the article
* @code
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/layeredflow/layeredflow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ namespace aspect
{
namespace LayeredFlowBenchmark
{
using namespace dealii;

namespace AnalyticSolutions
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -110,8 +108,6 @@ namespace aspect



using namespace dealii;

namespace aspect
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -171,8 +169,6 @@ namespace aspect
#include <aspect/utilities.h>
#include <aspect/parameters.h>

using namespace dealii;

namespace aspect
{
namespace
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/nsinker/nsinker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/nsinker_spherical_shell/nsinker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ namespace aspect
{
namespace MaterialModel
{
using namespace dealii;

template <int dim>
class ExponentialDecay : public MaterialModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
{
Expand Down Expand Up @@ -64,8 +62,6 @@ namespace aspect

namespace HeatingModel
{
using namespace dealii;

template <int dim>
class ExponentialDecayHeating : public HeatingModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ namespace aspect
{
namespace MaterialModel
{
using namespace dealii;

template <int dim>
class ExponentialDecay : public MaterialModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
{
Expand Down Expand Up @@ -64,8 +62,6 @@ namespace aspect

namespace HeatingModel
{
using namespace dealii;

template <int dim>
class ExponentialDecayHeating : public HeatingModel::Interface<dim>, public ::aspect::SimulatorAccess<dim>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/rigid_shear/plugin/rigid_shear.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@

namespace aspect
{
using namespace dealii;

namespace RigidShearBenchmark
{
/**
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/shear_bands/shear_bands.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/sinking_block/sinking_block.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ namespace aspect
{
namespace InclusionBenchmark
{
using namespace dealii;

template <int dim>
class SolCxCompositionalMaterial : public SolCxMaterial<dim>
{
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/solcx/solcx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/solitary_wave/solitary_wave.cc
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ namespace aspect
*/
namespace SolitaryWaveBenchmark
{
using namespace dealii;

namespace AnalyticSolutions
{
// vectors to store the porosity field and the corresponding coordinate in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ namespace aspect
{
namespace InclusionBenchmark
{
using namespace dealii;

template <int dim>
class SolKzCompositionalMaterial : public SolKzMaterial<dim>
{
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/solkz/solkz.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/solubility/plugin/solubility.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ namespace aspect
{
namespace MaterialModel
{
using namespace dealii;

/**
* Volatiles material model.
* @ingroup MaterialModels
Expand Down
4 changes: 0 additions & 4 deletions benchmarks/tangurnis/code/tangurnis.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@

namespace aspect
{
using namespace dealii;



/**
* This benchmark is from the article
* @code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ namespace aspect

namespace MaterialModel
{
using namespace dealii;

template <int dim>
class TimeDependentAnnulus : public MaterialModel::Interface<dim>
{
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/tosi_et_al_2015_gcubed/tosi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ namespace aspect
*/
namespace TosiBenchmark
{
using namespace dealii;


/**
* @ingroup MaterialModels
*/
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/viscosity_grooves/viscosity_grooves.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ namespace aspect
{
namespace ViscosityGroovesBenchmark
{
using namespace dealii;

namespace AnalyticSolutions
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 0 additions & 2 deletions cookbooks/anisotropic_viscosity/av_material.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions cookbooks/finite_strain/finite_strain.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ namespace aspect
{
namespace MaterialModel
{
using namespace dealii;

template <int dim>
class FiniteStrain : public MaterialModel::Simple<dim>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions cookbooks/inner_core_convection/inner_core_convection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ namespace aspect
{
namespace MaterialModel
{
using namespace dealii;

template <int dim>
class InnerCore : public MaterialModel::Simple<dim>
{
Expand Down Expand Up @@ -357,8 +355,6 @@ namespace aspect
{
namespace HeatingModel
{
using namespace dealii;

/**
* A class that implements a constant radiogenic heating rate.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 0 additions & 2 deletions cookbooks/magnetic_stripes/magnetic_stripes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ namespace aspect
{
namespace MaterialModel
{
using namespace dealii;

template <int dim>
class MagneticStripes : public MaterialModel::CompositionReaction<dim>
{
Expand Down
Loading