From e6bd26fa7fe423c98d7c51755b066092e4eed998 Mon Sep 17 00:00:00 2001
From: Philipp Nuske <philipp.nuske@mailbox.org>
Date: Mon, 19 Sep 2011 15:49:01 +0000
Subject: [PATCH] - added a pc-version with different signature: pC(const
Params ¶ms, Scalar Sw, const Scalar temperature) i.e.: temperature
dependent capillary pressure. - Not final but subject of discussion
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6633 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../fluidmatrixinteractions/2p/efftoabslaw.hh | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index ee8fb6d215..34f078d811 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -84,6 +84,33 @@ public:
return EffLaw::pC(params, SwToSwe(params, Sw));
}
+ /*!
+ * \brief The temperature dependent capillary pressure-saturation curve.
+ *
+ *
+ * \param Sw Absolute saturation of the wetting phase \f$\overline{S}_w\f$. It is converted to effective saturation
+ * and then handed over to the material law actually used for calculation.
+ * \param temperature Absolute temperature (of the wetting phase?).
+ * \param params A container object that is populated with the appropriate coefficients for the respective law.
+ * Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
+ * is constructed accordingly. Afterwards the values are set there, too.
+ * \return Capillary pressure calculated by specific constitutive relation (EffLaw e.g. Brooks & Corey, van Genuchten, linear...)
+ *
+ */
+ static Scalar pC(const Params ¶ms, Scalar Sw, const Scalar temperature)
+ DUNE_DEPRECATED
+ /*
+ * We have to decide which kind of signature to use for pc.
+ * One possibility would look like:
+ * pC(const Params ¶ms, Scalar Sw, const Scalar temperature = NAN)
+ * This would cause some noise if the function is called without the parameter being set.
+ *
+ * One implementation of pc(Sw, T) can be found in dumux-devel/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
+ */
+ {
+ return EffLaw::pC(params, SwToSwe(params, Sw), temperature);
+ }
+
/*!
* \brief The saturation-capillary pressure curve.
*
--
GitLab