Rename FluidSystem::BaseFluidSystem to FluidSystem::Base.

dumux/material/fluidsystems/1padapter.hh

@@ -42,10 +42,10 @@ namespace FluidSystems {
  */
 template <class MPFluidSystem, int phase = 0>
 class OnePAdapter
-: public BaseFluidSystem<typename MPFluidSystem::Scalar, OnePAdapter<MPFluidSystem, phase>>
+: public Base<typename MPFluidSystem::Scalar, OnePAdapter<MPFluidSystem, phase>>
 {
     using ThisType = OnePAdapter<MPFluidSystem, phase>;
-    using Base = BaseFluidSystem<typename MPFluidSystem::Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<typename MPFluidSystem::Scalar, ThisType>;
 
     static_assert(phase < MPFluidSystem::numPhases, "Phase does not exist in multi-phase fluidsystem!");
 

dumux/material/fluidsystems/1pgas.hh

@@ -41,10 +41,10 @@ namespace FluidSystems {
  */
 template <class Scalar, class ComponentT>
 class OnePGas
-: public BaseFluidSystem<Scalar, OnePGas<Scalar, ComponentT> >
+: public Base<Scalar, OnePGas<Scalar, ComponentT> >
 {
     using ThisType = OnePGas<Scalar, ComponentT>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
     static_assert(ComponentTraits<ComponentT>::hasGasState, "The component does not implement a gas state!");
 

dumux/material/fluidsystems/1pliquid.hh

@@ -41,10 +41,10 @@ namespace FluidSystems {
  */
 template <class Scalar, class ComponentT>
 class OnePLiquid
-: public BaseFluidSystem<Scalar, OnePLiquid<Scalar, ComponentT> >
+: public Base<Scalar, OnePLiquid<Scalar, ComponentT> >
 {
     using ThisType = OnePLiquid<Scalar, ComponentT>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
     static_assert(ComponentTraits<ComponentT>::hasLiquidState, "The component does not implement a liquid state!");
 

dumux/material/fluidsystems/2p1c.hh

@@ -40,10 +40,10 @@ namespace FluidSystems {
  */
 template <class Scalar, class ComponentType>
 class TwoPOneC
-    : public BaseFluidSystem<Scalar, TwoPOneC<Scalar, ComponentType> >
+    : public Base<Scalar, TwoPOneC<Scalar, ComponentType> >
 {
     using ThisType = TwoPOneC<Scalar, ComponentType>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
     using Component = ComponentType;
 
 public:

dumux/material/fluidsystems/2pimmiscible.hh

@@ -53,7 +53,7 @@ namespace FluidSystems {
  */
 template <class Scalar, class Fluid0, class Fluid1>
 class TwoPImmiscible
-: public BaseFluidSystem<Scalar, TwoPImmiscible<Scalar, Fluid0, Fluid1> >
+: public Base<Scalar, TwoPImmiscible<Scalar, Fluid0, Fluid1> >
 {
     static_assert((Fluid0::numPhases == 1), "Fluid0 has more than one phase");
     static_assert((Fluid1::numPhases == 1), "Fluid1 has more than one phase");
@@ -63,7 +63,7 @@ class TwoPImmiscible
     static_assert(Fluid0::isLiquid() || Fluid1::isLiquid(), "One phase has to be a liquid!");
 
     using ThisType = TwoPImmiscible<Scalar, Fluid0, Fluid1>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
 public:
     static constexpr int numPhases = 2; //!< Number of phases in the fluid system

dumux/material/fluidsystems/3pimmiscible.hh

@@ -56,7 +56,7 @@ namespace FluidSystems {
  */
 template <class Scalar, class WettingFluid, class NonwettingFluid, class Gas>
 class ThreePImmiscible
-: public BaseFluidSystem<Scalar, ThreePImmiscible<Scalar, WettingFluid, NonwettingFluid, Gas> >
+: public Base<Scalar, ThreePImmiscible<Scalar, WettingFluid, NonwettingFluid, Gas> >
 {
     static_assert((WettingFluid::numPhases == 1), "WettingFluid has more than one phase");
     static_assert((NonwettingFluid::numPhases == 1), "NonwettingFluid has more than one phase");
@@ -66,7 +66,7 @@ class ThreePImmiscible
     static_assert((Gas::numComponents == 1), "Gas has more than one component");
 
     using ThisType = ThreePImmiscible<Scalar, WettingFluid, NonwettingFluid, Gas>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 public:
     /****************************************
      * Fluid phase related static parameters

dumux/material/fluidsystems/base.hh

@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Fluidsystems
- * \brief @copybrief Dumux::FluidSystems::BaseFluidSystem
+ * \brief @copybrief Dumux::FluidSystems::Base
  */
 #ifndef DUMUX_BASE_FLUID_SYSTEM_HH
 #define DUMUX_BASE_FLUID_SYSTEM_HH
@@ -39,7 +39,7 @@ namespace FluidSystems {
 *       that all basic functionality is available!
 */
 template <class ScalarType, class Implementation>
-class BaseFluidSystem
+class Base
 {
 public:
     //! export the scalar type

dumux/material/fluidsystems/brine.hh

@@ -41,10 +41,10 @@ namespace FluidSystems {
  *        two components, which are H2O and NaCl.
  */
 template< class Scalar, class H2OType = Components::TabulatedComponent<Dumux::Components::H2O<Scalar>> >
-class Brine : public BaseFluidSystem< Scalar, Brine<Scalar, H2OType>>
+class Brine : public Base< Scalar, Brine<Scalar, H2OType>>
 {
     using ThisType = Brine<Scalar, H2OType>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
 public:
     //! export the involved components

dumux/material/fluidsystems/brineair.hh

@@ -69,10 +69,10 @@ template <class Scalar,
           class H2Otype = Components::TabulatedComponent<Components::H2O<Scalar>>,
           class Policy = BrineAirDefaultPolicy<>>
 class BrineAir
-: public BaseFluidSystem<Scalar, BrineAir<Scalar, H2Otype, Policy>>
+: public Base<Scalar, BrineAir<Scalar, H2Otype, Policy>>
 {
     using ThisType = BrineAir<Scalar, H2Otype, Policy>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
     using IdealGas = Dumux::IdealGas<Scalar>;
 
 public:

dumux/material/fluidsystems/brineco2.hh

@@ -52,10 +52,10 @@ template<class Scalar,
          class BrineRawComponent = Components::Brine<Scalar, Components::H2O<Scalar> >,
          class Brinetype = Components::TabulatedComponent<BrineRawComponent> >
 class BrineCO2
-: public BaseFluidSystem<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> >
+: public Base<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> >
 {
     using ThisType = BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
 
     using Brine_CO2 = BinaryCoeff::Brine_CO2<Scalar, CO2Table>;
@@ -610,7 +610,7 @@ public:
 
     using Base::heatCapacity;
     /*!
-     * \copybrief BaseFluidSystem::heatCapacity
+     * \copybrief Base::heatCapacity
      *
      * \note We employ the heat capacity of the pure phases.
      *

dumux/material/fluidsystems/h2oair.hh

@@ -69,10 +69,10 @@ template <class Scalar,
           class Policy = H2OAirDefaultPolicy<>,
           bool useKelvinVaporPressure = false>
 class H2OAir
-: public BaseFluidSystem<Scalar, H2OAir<Scalar, H2Otype, Policy> >
+: public Base<Scalar, H2OAir<Scalar, H2Otype, Policy> >
 {
     using ThisType = H2OAir<Scalar,H2Otype, Policy>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
     using IdealGas = Dumux::IdealGas<Scalar>;
 
 public:

dumux/material/fluidsystems/h2oairmesitylene.hh

@@ -51,10 +51,10 @@ namespace FluidSystems {
 template <class Scalar,
           class H2OType = Components::TabulatedComponent<Components::H2O<Scalar> > >
 class H2OAirMesitylene
-    : public BaseFluidSystem<Scalar, H2OAirMesitylene<Scalar, H2OType> >
+    : public Base<Scalar, H2OAirMesitylene<Scalar, H2OType> >
 {
     using ThisType = H2OAirMesitylene<Scalar, H2OType>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
 public:
     using NAPL = Components::Mesitylene<Scalar>;

dumux/material/fluidsystems/h2oairxylene.hh

@@ -52,10 +52,10 @@ namespace FluidSystems
 template <class Scalar,
           class H2OType = Components::TabulatedComponent<Components::H2O<Scalar> > >
 class H2OAirXylene
-    : public BaseFluidSystem<Scalar, H2OAirXylene<Scalar, H2OType> >
+    : public Base<Scalar, H2OAirXylene<Scalar, H2OType> >
 {
     using ThisType = H2OAirXylene<Scalar, H2OType>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
 public:
     using H2O = H2OType;

dumux/material/fluidsystems/h2oheavyoil.hh

@@ -44,10 +44,10 @@ namespace FluidSystems {
 template <class Scalar,
           class H2OType = Dumux::Components::TabulatedComponent<Dumux::Components::H2O<Scalar> > >
 class H2OHeavyOil
-    : public BaseFluidSystem<Scalar, H2OHeavyOil<Scalar, H2OType> >
+    : public Base<Scalar, H2OHeavyOil<Scalar, H2OType> >
 {
     using ThisType = H2OHeavyOil<Scalar, H2OType>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
 public:
     using HeavyOil = Dumux::Components::HeavyOil<Scalar>;

dumux/material/fluidsystems/h2on2.hh

@@ -63,10 +63,10 @@ struct H2ON2DefaultPolicy
  */
 template <class Scalar, class Policy = H2ON2DefaultPolicy<>>
 class H2ON2
-    : public BaseFluidSystem<Scalar, H2ON2<Scalar, Policy> >
+    : public Base<Scalar, H2ON2<Scalar, Policy> >
 {
     using ThisType = H2ON2<Scalar, Policy>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
     // convenience using declarations
     using IdealGas = Dumux::IdealGas<Scalar>;

dumux/material/fluidsystems/h2on2o2.hh

@@ -72,10 +72,10 @@ struct H2ON2O2DefaultPolicy
  */
 template <class Scalar, class Policy = H2ON2O2DefaultPolicy<>>
 class H2ON2O2
-    : public BaseFluidSystem<Scalar, H2ON2O2<Scalar, Policy> >
+    : public Base<Scalar, H2ON2O2<Scalar, Policy> >
 {
     using ThisType = H2ON2O2<Scalar, Policy>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
     using IdealGas = Dumux::IdealGas<Scalar>;
     using Constants = Dumux::Constants<Scalar>;

dumux/material/fluidsystems/liquidphase2c.hh

@@ -41,10 +41,10 @@ namespace FluidSystems {
  */
 template <class Scalar, class MainComponent, class SecondComponent>
 class LiquidPhaseTwoC
-: public BaseFluidSystem<Scalar, LiquidPhaseTwoC<Scalar, MainComponent, SecondComponent> >
+: public Base<Scalar, LiquidPhaseTwoC<Scalar, MainComponent, SecondComponent> >
 {
     using ThisType = LiquidPhaseTwoC<Scalar, MainComponent, SecondComponent>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
     using BinaryCoefficients = BinaryCoeff::H2O_Component<Scalar, SecondComponent>;
 
 public:

test/freeflow/navierstokesnc/msfreeflowtestproblem.hh

@@ -75,12 +75,12 @@ SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, MolecularDiffusionType, MaxwellStefans
  */
 template<class TypeTag>
 class MaxwellStefanFluidSystem
-: public FluidSystems::BaseFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar), MaxwellStefanFluidSystem<TypeTag>>
+: public FluidSystems::Base<typename GET_PROP_TYPE(TypeTag, Scalar), MaxwellStefanFluidSystem<TypeTag>>
 
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using ThisType = MaxwellStefanFluidSystem<TypeTag>;
-    using Base = FluidSystems::BaseFluidSystem<Scalar, ThisType>;
+    using Base = FluidSystems::Base<Scalar, ThisType>;
 
 public:
     //! The number of phases

test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh

@@ -47,10 +47,10 @@ namespace FluidSystems {
  */
 template <class Scalar>
 class CombustionFluidsystem
-    : public BaseFluidSystem<Scalar, CombustionFluidsystem<Scalar> >
+    : public Base<Scalar, CombustionFluidsystem<Scalar> >
 {
     using ThisType = CombustionFluidsystem<Scalar>;
-    using Base = BaseFluidSystem<Scalar, ThisType>;
+    using Base = Dumux::FluidSystems::Base<Scalar, ThisType>;
 
     // convenience using declarations
     using IdealGas = Dumux::IdealGas<Scalar>;

test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh

@@ -67,7 +67,7 @@ SET_BOOL_PROP(TracerTestCCTypeTag, SolutionDependentMolecularDiffusion, false);
 
 //! A simple fluid system with one tracer component
 template<class TypeTag>
-class TracerFluidSystem : public FluidSystems::BaseFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar),
+class TracerFluidSystem : public FluidSystems::Base<typename GET_PROP_TYPE(TypeTag, Scalar),
                                                                TracerFluidSystem<TypeTag>>
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);