From db47ce975a07b4913c2d6db1cb929592e1c9c893 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 14 Feb 2012 10:03:14 +0000
Subject: [PATCH] fix havoc created by r7733
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7746 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh | 2 +-
dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh | 6 +++---
dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh | 4 ++--
dumux/boxmodels/mpnc/mpncindices.hh | 2 +-
dumux/boxmodels/mpnc/mpncnewtoncontroller.hh | 10 +++++-----
dumux/boxmodels/mpnc/mpncproperties.hh | 2 +-
dumux/boxmodels/mpnc/mpncpropertydefaults.hh | 6 +++---
dumux/boxmodels/mpnc/mpncvtkwritercommon.hh | 4 ++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh b/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
index 7dcc6eb9bb..34534ec3b1 100644
--- a/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
+++ b/dumux/boxmodels/mpnc/energy/mpncfluxvariablesenergy.hh
@@ -25,7 +25,7 @@
* \file
*
* \brief Contains the quantities to calculate the energy flux in the
- * mpnc box model.
+ * MpNc box model.
*/
#ifndef DUMUX_MPNC_ENERGY_FLUX_VARIABLES_HH
#define DUMUX_MPNC_ENERGY_FLUX_VARIABLES_HH
diff --git a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
index 4e9cc47784..40cf403313 100644
--- a/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
+++ b/dumux/boxmodels/mpnc/energy/mpncvtkwriterenergy.hh
@@ -23,7 +23,7 @@
* \file
*
* \brief VTK writer module for the energy related quantities of the
- * mpnc model.
+ * MpNc model.
*/
#ifndef DUMUX_MPNC_VTK_WRITER_ENERGY_HH
#define DUMUX_MPNC_VTK_WRITER_ENERGY_HH
@@ -36,7 +36,7 @@ namespace Dumux
* \ingroup MPNCModel
*
* \brief VTK writer module for the energy related quantities of the
- * mpnc model.
+ * MpNc model.
*
* This is the specialization for the case without energy.
*/
@@ -123,7 +123,7 @@ private:
* \ingroup MPNCModel
*
* \brief VTK writer module for the energy related quantities of the
- * mpnc model.
+ * MpNc model.
*
* This is the specialization for the case with an energy equation but
* local thermal equilibrium. (i.e. no kinetic energy transfer)
diff --git a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
index 7e5f513140..1c4bb2cbb9 100644
--- a/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
+++ b/dumux/boxmodels/mpnc/mass/mpncvtkwritermass.hh
@@ -23,7 +23,7 @@
* \file
*
* \brief VTK writer module for the mass related quantities of the
- * mpnc model.
+ * MpNc model.
*/
#ifndef DUMUX_MPNC_VTK_WRITER_MASS_HH
#define DUMUX_MPNC_VTK_WRITER_MASS_HH
@@ -36,7 +36,7 @@ namespace Dumux
* \ingroup MPNCModel
*
* \brief VTK writer module for the mass related quantities of the
- * mpnc model.
+ * MpNc model.
*
* This is the specialization for the case _without_ kinetic mass
* transfer between phases.
diff --git a/dumux/boxmodels/mpnc/mpncindices.hh b/dumux/boxmodels/mpnc/mpncindices.hh
index 4d815a4b18..0508a45de4 100644
--- a/dumux/boxmodels/mpnc/mpncindices.hh
+++ b/dumux/boxmodels/mpnc/mpncindices.hh
@@ -32,7 +32,7 @@ namespace Dumux
/*!
* \ingroup MPNCModel
* \ingroup BoxIndices
- * \brief The primary variable and equation indices for the mpnc
+ * \brief The primary variable and equation indices for the MpNc
* model.
*/
template <class TypeTag, int BasePVOffset = 0>
diff --git a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
index 69e937c008..255dd09a31 100644
--- a/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
+++ b/dumux/boxmodels/mpnc/mpncnewtoncontroller.hh
@@ -22,7 +22,7 @@
*****************************************************************************/
/*!
* \file
- * \brief A mpnc specific controller for the newton solver.
+ * \brief A MpNc specific controller for the newton solver.
*
* This controller 'knows' what a 'physically meaningful' solution is
* which allows the newton method to abort quicker if the solution is
@@ -39,7 +39,7 @@
namespace Dumux {
template <class TypeTag, bool enableKinetic /* = false */>
-class mpncNewtonChop
+class MpNcNewtonChop
{
typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -90,7 +90,7 @@ private:
};
template <class TypeTag>
-class mpncNewtonChop<TypeTag, /*enableKinetic=*/true>
+class MpNcNewtonChop<TypeTag, /*enableKinetic=*/true>
{
typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -153,7 +153,7 @@ private:
/*!
* \ingroup Newton
- * \brief A mpnc specific controller for the newton solver.
+ * \brief A MpNc specific controller for the newton solver.
*
* This controller 'knows' what a 'physically meaningful' solution is
* which allows the newton method to abort quicker if the solution is
@@ -180,7 +180,7 @@ class MPNCNewtonController : public NewtonController<TypeTag>
S0Idx = Indices::S0Idx
};
- typedef mpncNewtonChop<TypeTag, enableKinetic> NewtonChop;
+ typedef MpNcNewtonChop<TypeTag, enableKinetic> NewtonChop;
public:
MPNCNewtonController(const Problem &problem)
diff --git a/dumux/boxmodels/mpnc/mpncproperties.hh b/dumux/boxmodels/mpnc/mpncproperties.hh
index 198d35a29b..0e59947c24 100644
--- a/dumux/boxmodels/mpnc/mpncproperties.hh
+++ b/dumux/boxmodels/mpnc/mpncproperties.hh
@@ -27,7 +27,7 @@
/*!
* \ingroup Properties
* \ingroup BoxProperties
- * \ingroup BoxmpncModel
+ * \ingroup BoxMpNcModel
* \file
* \brief Defines the properties required for the Mp-Nc box model.
*/
diff --git a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
index 0e41434bf6..26f5abfbe9 100644
--- a/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
+++ b/dumux/boxmodels/mpnc/mpncpropertydefaults.hh
@@ -45,7 +45,7 @@
/*!
* \ingroup Properties
* \ingroup BoxProperties
- * \ingroup BoxmpncModel
+ * \ingroup BoxMpNcModel
* \file
* \brief Default properties for the Mp-Nc box model.
*/
@@ -125,12 +125,12 @@ public:
typedef Dumux::CompositionFromFugacities<Scalar, FluidSystem> type;
};
-//! Use the mpnc local jacobian operator for the mpnc model
+//! Use the MpNc local jacobian operator for the MpNc model
SET_TYPE_PROP(BoxMPNC,
LocalResidual,
MPNCLocalResidual<TypeTag>);
-//! Use the mpnc specific newton controller for the mpnc model
+//! Use the MpNc specific newton controller for the MpNc model
SET_PROP(BoxMPNC, NewtonController)
{public:
typedef MPNCNewtonController<TypeTag> type;
diff --git a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
index aa06c34700..4e5bff6324 100644
--- a/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
+++ b/dumux/boxmodels/mpnc/mpncvtkwritercommon.hh
@@ -22,7 +22,7 @@
/*!
* \file
*
- * \brief VTK writer module for the common quantities of the mpnc
+ * \brief VTK writer module for the common quantities of the MpNc
* model.
*/
#ifndef DUMUX_MPNC_VTK_WRITER_COMMON_HH
@@ -36,7 +36,7 @@ namespace Dumux
/*!
* \ingroup MPNCModel
*
- * \brief VTK writer module for the common quantities of the mpnc
+ * \brief VTK writer module for the common quantities of the MpNc
* model.
*/
template<class TypeTag>
--
GitLab