From f953308df203747fb2b6030559540c0c2d76878b Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 12 Mar 2013 10:22:25 +0000
Subject: [PATCH] remove property CompositionFromFugacitiesSolver which has
been deprecated in 2.3. ConstraintSolver has to be used instead.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10391 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/mpnc/mpncproperties.hh | 1 -
dumux/implicit/mpnc/mpncpropertydefaults.hh | 18 +-----------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/dumux/implicit/mpnc/mpncproperties.hh b/dumux/implicit/mpnc/mpncproperties.hh
index b7b36d43d6..6fafbb9326 100644
--- a/dumux/implicit/mpnc/mpncproperties.hh
+++ b/dumux/implicit/mpnc/mpncproperties.hh
@@ -98,7 +98,6 @@ NEW_PROP_TAG(FluidSystem);
//! The thermodynamic constraint solver which calculates the
//! composition of any phase given all component fugacities.
-NEW_PROP_TAG(CompositionFromFugacitiesSolver);
NEW_PROP_TAG(ConstraintSolver);
//! Enable the energy equation?
diff --git a/dumux/implicit/mpnc/mpncpropertydefaults.hh b/dumux/implicit/mpnc/mpncpropertydefaults.hh
index 2248ab3a95..99ea10f836 100644
--- a/dumux/implicit/mpnc/mpncpropertydefaults.hh
+++ b/dumux/implicit/mpnc/mpncpropertydefaults.hh
@@ -103,22 +103,6 @@ public:
typedef typename MaterialLaw::Params type;
};
-/*!
- * \brief Set the thermodynamic constraint solver which calculates the
- * composition of any phase given all component fugacities.
- *
- * \deprecated version. Use "ConstraintSolver" instead of "CompositionFromFugacitiesSolver"
- */
-SET_PROP(MPNC, CompositionFromFugacitiesSolver) // DEPRECATED version. Use "ConstraintSolver" instead of "CompositionFromFugacitiesSolver"
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
-public:
- typedef Dumux::CompositionFromFugacities<Scalar, FluidSystem> type; // DEPRECATED version. Use "ConstraintSolver" instead of "CompositionFromFugacitiesSolver"
-};
-
/*!
* \brief Set the thermodynamic constraint solver which calculates the
* composition of any phase given all component fugacities.
@@ -130,7 +114,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef typename GET_PROP_TYPE(TypeTag, CompositionFromFugacitiesSolver) type;
+ typedef Dumux::CompositionFromFugacities<Scalar, FluidSystem> type;
};
--
GitLab