From ff14a17e2e202c9351efe7978e109a7134e27c26 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 21 Feb 2018 16:54:15 +0100
Subject: [PATCH] [material] Move all components to namespace Components

---
 dumux/material/components/air.hh                | 14 +++++++++++---
 dumux/material/components/benzene.hh            | 13 ++++++++++---
 dumux/material/components/brine.hh              | 14 +++++++++++---
 dumux/material/components/cao.hh                | 14 +++++++++++---
 dumux/material/components/cao2h2.hh             | 14 +++++++++++---
 dumux/material/components/ch4.hh                | 13 ++++++++++---
 dumux/material/components/co2.hh                | 14 +++++++++++---
 dumux/material/components/constant.hh           |  3 ---
 dumux/material/components/dnapl.hh              | 13 ++++++++++---
 dumux/material/components/h2.hh                 | 13 ++++++++++---
 dumux/material/components/h2o.hh                | 15 ++++++++++++---
 dumux/material/components/heavyoil.hh           | 14 +++++++++++---
 dumux/material/components/lnapl.hh              | 14 +++++++++++---
 dumux/material/components/mesitylene.hh         | 14 +++++++++++---
 dumux/material/components/n2.hh                 | 13 ++++++++++---
 dumux/material/components/nacl.hh               | 14 ++++++++++----
 dumux/material/components/o2.hh                 | 13 ++++++++++---
 dumux/material/components/simpleco2.hh          | 14 +++++++++++---
 dumux/material/components/simpleh2o.hh          | 14 +++++++++++---
 dumux/material/components/tabulatedcomponent.hh | 12 +++++++++---
 dumux/material/components/xylene.hh             | 13 ++++++++++---
 21 files changed, 211 insertions(+), 64 deletions(-)

diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index a22328a918..6b49313dc1 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -28,8 +28,11 @@
 #include <dumux/material/components/component.hh>
 #include <dumux/material/idealgas.hh>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A class for the air fluid properties
@@ -331,6 +334,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using Air DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::Air<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/benzene.hh b/dumux/material/components/benzene.hh
index 4aa834036b..1bc38eda5d 100644
--- a/dumux/material/components/benzene.hh
+++ b/dumux/material/components/benzene.hh
@@ -27,9 +27,11 @@
 #include <dumux/material/idealgas.hh>
 #include "component.hh"
 
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
-namespace Dumux
-{
 /*!
  * \ingroup Components
  * \brief A simple benzene component (LNAPL).
@@ -170,6 +172,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using Benzene DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::Benzene<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index 73c9926423..eeb89a1727 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -32,8 +32,11 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A class for the brine fluid properties.
@@ -42,7 +45,7 @@ namespace Dumux
  * \tparam H2O Static polymorphism: the Brine class can access all properties of the H2O class
  */
 template <class Scalar,
-class H2O_Tabulated = TabulatedComponent<Scalar, H2O<Scalar>>>
+          class H2O_Tabulated = TabulatedComponent<Scalar, H2O<Scalar>>>
 class Brine : public Component<Scalar, Brine<Scalar, H2O_Tabulated> >
 {
 public:
@@ -391,6 +394,11 @@ public:
 template <class Scalar, class H2O>
 Scalar Brine<Scalar, H2O>::constantSalinity = 0.1;
 
+} // end namespace Components
+
+template <class Scalar, class H2O>
+using Brine DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::Brine<Scalar, H2O>;
+
 } // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/cao.hh b/dumux/material/components/cao.hh
index ae05818289..11aa1c0069 100644
--- a/dumux/material/components/cao.hh
+++ b/dumux/material/components/cao.hh
@@ -31,8 +31,11 @@
 #include <cmath>
 #include <iostream>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A class for the CaO properties
@@ -74,6 +77,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using CaO DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::CaO<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/cao2h2.hh b/dumux/material/components/cao2h2.hh
index 62d754d123..ec8a036151 100644
--- a/dumux/material/components/cao2h2.hh
+++ b/dumux/material/components/cao2h2.hh
@@ -31,8 +31,11 @@
 #include <cmath>
 #include <iostream>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A class for the CaO2H2 properties
@@ -74,6 +77,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using CaO2H2 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::CaO2H2<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh
index 81b8e275d7..c4cd42578d 100644
--- a/dumux/material/components/ch4.hh
+++ b/dumux/material/components/ch4.hh
@@ -30,8 +30,10 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
 /*!
  * \ingroup Components
@@ -228,6 +230,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using CH4 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::CH4<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh
index dbd8a46cc2..c7a988caaf 100644
--- a/dumux/material/components/co2.hh
+++ b/dumux/material/components/co2.hh
@@ -32,8 +32,11 @@
 #include <cmath>
 #include <iostream>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A class for the CO2 fluid properties
@@ -387,6 +390,11 @@ const Scalar CO2<Scalar, CO2Tables>::R = Constants<Scalar>::R;
 template <class Scalar, class CO2Tables>
 bool CO2<Scalar, CO2Tables>::warningThrown = false;
 
-} // end namespace
+} // end namespace Components
+
+template <class Scalar, class CO2Tables>
+using CO2 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::CO2<Scalar, CO2Tables>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/constant.hh b/dumux/material/components/constant.hh
index 878255a52d..97d8ec64fb 100644
--- a/dumux/material/components/constant.hh
+++ b/dumux/material/components/constant.hh
@@ -156,9 +156,6 @@ public:
 
 } // end namespace Components
 
-template<class TypeTag, class Scalar>
-using Constant DUNE_DEPRECATED_MSG("Use Components::Constant<id, Scalar> instead") = Dumux::Components::Constant<1, Scalar>;
-
 } // end namespace Dumux
 
 #endif // DUMUX_COMPONENTS_CONSTANT_HH
diff --git a/dumux/material/components/dnapl.hh b/dumux/material/components/dnapl.hh
index 30ca653fb2..a5eec0d470 100644
--- a/dumux/material/components/dnapl.hh
+++ b/dumux/material/components/dnapl.hh
@@ -27,9 +27,11 @@
 #include <dumux/material/idealgas.hh>
 #include "component.hh"
 
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
-namespace Dumux
-{
 /*!
  * \ingroup Components
  * \brief A simple implementation of TCE as exemplary component for a dense NAPL.
@@ -152,6 +154,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using DNAPL DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::DNAPL<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index 5b705b67ed..ae4cc908ec 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -30,8 +30,10 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
 /*!
  * \ingroup Components
@@ -220,6 +222,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using H2 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::H2<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index c92a63868e..e0866cfa1d 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -38,8 +38,11 @@
 #include "iapws/region2.hh"
 #include "iapws/region4.hh"
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief Material properties of pure water \f$H_2O\f$.
@@ -888,6 +891,12 @@ private:
             Rs * temperature / pressure;
     }
 }; // end class
-} // end namespace
+
+} // end namespace Components
+
+template<class Scalar>
+using H2O DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::H2O<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/heavyoil.hh b/dumux/material/components/heavyoil.hh
index c866c8e653..a3db2f96a7 100644
--- a/dumux/material/components/heavyoil.hh
+++ b/dumux/material/components/heavyoil.hh
@@ -29,8 +29,11 @@
 #include <dumux/material/components/component.hh>
 #include <dumux/material/constants.hh>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief Properties of the component heavyoil
@@ -484,6 +487,11 @@ protected:
 
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using HeavyOil DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::HeavyOil<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/lnapl.hh b/dumux/material/components/lnapl.hh
index 67d1be4302..f050b781c5 100644
--- a/dumux/material/components/lnapl.hh
+++ b/dumux/material/components/lnapl.hh
@@ -27,8 +27,11 @@
 
 #include "component.hh"
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A simple implementation of a LNAPL, e.g. a kind of oil
@@ -76,6 +79,11 @@ public:
 
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using LNAPL DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::LNAPL<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index d0aa656f6f..61d55d2e31 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -29,8 +29,11 @@
 #include <dumux/material/components/component.hh>
 #include <dumux/material/constants.hh>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief mesitylene
@@ -368,6 +371,11 @@ protected:
 
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using Mesitylene DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::Mesitylene<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh
index c137c6f29b..8f674d8414 100644
--- a/dumux/material/components/n2.hh
+++ b/dumux/material/components/n2.hh
@@ -30,8 +30,10 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
 /*!
  * \ingroup Componentss
@@ -271,6 +273,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using N2 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::N2<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/nacl.hh b/dumux/material/components/nacl.hh
index 66d3c24163..c831fc8e32 100644
--- a/dumux/material/components/nacl.hh
+++ b/dumux/material/components/nacl.hh
@@ -30,9 +30,11 @@
 #include <cmath>
 #include <iostream>
 
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
-namespace Dumux
-{
 /*!
  * \ingroup Components
  * \brief A class for the NaCl properties
@@ -84,7 +86,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
 
-#endif
+template<class Scalar>
+using NaCl DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::NaCl<Scalar>;
 
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/material/components/o2.hh b/dumux/material/components/o2.hh
index 8d2d595597..90b64fc9db 100644
--- a/dumux/material/components/o2.hh
+++ b/dumux/material/components/o2.hh
@@ -30,8 +30,10 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
 /*!
  * \ingroup Components
@@ -247,6 +249,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using O2 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::O2<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh
index 90c533a7e9..5751d38169 100644
--- a/dumux/material/components/simpleco2.hh
+++ b/dumux/material/components/simpleco2.hh
@@ -30,8 +30,11 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A class for the \f$CO_2\f$ fluid properties
@@ -196,6 +199,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using SimpleCO2 DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::SimpleCO2<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index 00851dccda..f7ea57d880 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -31,8 +31,11 @@
 
 #include <cmath>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
+
 /*!
  * \ingroup Components
  * \brief A much simpler (and thus potentially less buggy) version of
@@ -325,6 +328,11 @@ public:
 template <class Scalar>
 const Scalar SimpleH2O<Scalar>::R = Constants<Scalar>::R / 18e-3;
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using SimpleH2O DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::SimpleH2O<Scalar>;
+
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index eaf559061b..c4347531b0 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -35,8 +35,10 @@
 
 #include <dumux/common/exceptions.hh>
 
-namespace Dumux
-{
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
 /*!
  * \ingroup Components
@@ -950,7 +952,11 @@ Scalar TabulatedComponent<Scalar, RawComponent, useVaporPressure>::densityMax_;
 template <class Scalar, class RawComponent, bool useVaporPressure>
 unsigned TabulatedComponent<Scalar, RawComponent, useVaporPressure>::nDensity_;
 
+} // end namespace Components
+
+template <class Scalar, class RawComponent, bool useVaporPressure=true>
+using TabulatedComponent DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::TabulatedComponent<Scalar, RawComponent, useVaporPressure>;
 
-} // end namespace
+} // end namespace Dumux
 
 #endif
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index d234602148..f144d23a62 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -29,9 +29,11 @@
 #include <dumux/material/components/component.hh>
 #include <dumux/material/constants.hh>
 
+#include <dune/common/deprecated.hh>
+
+namespace Dumux {
+namespace Components {
 
-namespace Dumux
-{
 /*!
  * \ingroup Components
  * \brief Properties of xylene.
@@ -383,6 +385,11 @@ public:
     }
 };
 
-} // end namespace
+} // end namespace Components
+
+template<class Scalar>
+using Xylene DUNE_DEPRECATED_MSG("Now in the namespace: Components") = Dumux::Components::Xylene<Scalar>;
+
+} // end namespace Dumux
 
 #endif
-- 
GitLab