From 20f06c3ae153a88ca6f4f7d958dd265d573f93e3 Mon Sep 17 00:00:00 2001
From: Klaus Mosthaf <klmos@env.dtu.dk>
Date: Thu, 9 Feb 2012 16:19:43 +0000
Subject: [PATCH] wrote model equations in a more homogeneous way
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7700 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/1p/1pmodel.hh | 9 ++++-----
dumux/boxmodels/1p2c/1p2cmodel.hh | 14 +++++++-------
dumux/boxmodels/2p/2pmodel.hh | 4 ++--
dumux/boxmodels/2p2c/2p2cmodel.hh | 2 +-
dumux/boxmodels/2p2cni/2p2cnimodel.hh | 2 +-
dumux/boxmodels/3p3c/3p3cmodel.hh | 8 ++++----
dumux/boxmodels/3p3cni/3p3cnimodel.hh | 8 ++++----
dumux/boxmodels/richards/richardsmodel.hh | 6 +++---
8 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/dumux/boxmodels/1p/1pmodel.hh b/dumux/boxmodels/1p/1pmodel.hh
index 3f6ddc90c4..7c15dfa9f0 100644
--- a/dumux/boxmodels/1p/1pmodel.hh
+++ b/dumux/boxmodels/1p/1pmodel.hh
@@ -40,14 +40,13 @@ namespace Dumux
{
/*!
* \ingroup OnePBoxModel
- * \brief Adaption of the BOX scheme to the single phase isothermal flow model.
+ * \brief Adaption of the BOX scheme to the single-phase isothermal flow model.
*
- * Single phase compressible isothermal flow model,
+ * Single-phase compressible isothermal flow model,
* \f{align*}
- * \phi \frac{\partial \varrho}{\partial t} + \vec{\nabla} \cdot (- \varrho \frac{\bar{\bar{K}}}{\mu} ( \nabla p -\varrho \vec{g})) = q,
+ * \phi \frac{\partial \varrho}{\partial t} + \text{div} (- \varrho \frac{\textbf K}{\mu} ( \text{grad}\, p -\varrho {\textbf g})) = q,
* \f}
- * discretized using a vertex
- * centered finite volume (box) scheme as spatial and
+ * discretized using a vertex-centered finite volume (box) scheme as spatial and
* the implicit Euler method as time discretization.
* Of course, the model can also be used for incompressible
* single phase flow modeling, if a fluid with constant density is chosen in the problem file.
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index bc56bf2c68..f18c9b73d7 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -49,26 +49,26 @@ namespace Dumux
* using a standard Darcy
* approach as the equation for the conservation of momentum:
\f[
- v_{D} = - \frac{K}{\mu}
- \left(\text{grad} p - \varrho g \right)
+ v_{D} = - \frac{\textbf K}{\mu}
+ \left(\text{grad} p - \varrho {\textbf g} \right)
\f]
*
* Gravity can be enabled or disabled via the property system.
* By inserting this into the continuity equation, one gets
\f[
\Phi \frac{\partial \varrho}{\partial t} - \text{div} \left\{
- \varrho \frac{K}{\mu} \left(\text{grad} p - \varrho g \right)
+ \varrho \frac{\textbf K}{\mu} \left(\text{grad}\, p - \varrho {\textbf g} \right)
\right\} = q \;,
\f]
*
* The transport of the components is described by the following equation:
\f[
- \Phi \frac{ \partial \varrho}{\partial t} - \text{div} \left( \varrho \frac{K x}{\mu} \left( \text{grad} p -
- \varrho g \right) + \varrho \tau \Phi D \text{grad} x \right) = q.
+ \Phi \frac{ \partial \varrho x}{\partial t} - \text{div} \left( \varrho \frac{{\textbf K} x}{\mu} \left( \text{grad}\, p -
+ \varrho {\textbf g} \right) + \varrho \tau \Phi D \text{grad} x \right) = q.
\f]
*
- * All equations are discretized using a fully-coupled vertex
- * centered finite volume (box) scheme as spatial and
+ * All equations are discretized using a fully-coupled vertex-centered
+ * finite volume (box) scheme as spatial and
* the implicit Euler method as time discretization.
*
* The primary variables are the pressure \f$p\f$ and the mole or mass fraction of dissolved component \f$x\f$.
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
index 6e68d8e4e1..c85084449d 100644
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ b/dumux/boxmodels/2p/2pmodel.hh
@@ -45,8 +45,8 @@ namespace Dumux
* \f$\alpha \in \{ w, n \}\f$ using a standard multiphase Darcy
* approach as the equation for the conservation of momentum:
\f[
- v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \mbox{\bf K}
- \left(\text{grad} p_\alpha - \varrho_{\alpha} \mbox{\bf g} \right)
+ v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \textbf K}
+ \left(\text{grad}\, p_\alpha - \varrho_{\alpha} {\textbf g} \right)
\f]
*
* By inserting this into the equation for the conservation of the
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index b2f0cdf805..ebd74dd92a 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -55,7 +55,7 @@ namespace Dumux
\frac{k_{r\alpha}}{\mu_\alpha} \mbox{\bf K}
(\text{grad}\, p_\alpha - \varrho_{\alpha} \mbox{\bf g}) \right\}
\nonumber \\ \nonumber \\
- &-& \sum_\alpha \text{div} \left\{{\bf D_{\alpha, pm}^\kappa} \varrho_{\alpha} \text{grad}\, X^\kappa_{\alpha} \right\}
+ &-& \sum_\alpha \text{div} \left\{{\bf D}_{\alpha, pm}^\kappa \varrho_{\alpha} \text{grad}\, X^\kappa_{\alpha} \right\}
- \sum_\alpha q_\alpha^\kappa = 0 \qquad \kappa \in \{w, a\} \, ,
\alpha \in \{w, g\}
\f}
diff --git a/dumux/boxmodels/2p2cni/2p2cnimodel.hh b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
index 2f551b8fb1..ad8891db35 100644
--- a/dumux/boxmodels/2p2cni/2p2cnimodel.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
@@ -47,7 +47,7 @@ namespace Dumux {
- \sum_\alpha \text{div} \left\{ \varrho_\alpha X_\alpha^\kappa
\frac{k_{r\alpha}}{\mu_\alpha} \mbox{\bf K}
(\text{grad}\, p_\alpha - \varrho_{\alpha} \mbox{\bf g}) \right\}\\
- &-& \sum_\alpha \text{div} \left\{{\bf D_{\alpha, pm}^\kappa} \varrho_{\alpha} \text{grad}\, X^\kappa_{\alpha} \right\}
+ &-& \sum_\alpha \text{div} \left\{{\bf D}_{\alpha, pm}^\kappa \varrho_{\alpha} \text{grad}\, X^\kappa_{\alpha} \right\}
- \sum_\alpha q_\alpha^\kappa = 0 \qquad \kappa \in \{w, a\} \, ,
\alpha \in \{w, n\}
* \f}
diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh
index 0d41f8b3e9..3ba9de566f 100644
--- a/dumux/boxmodels/3p3c/3p3cmodel.hh
+++ b/dumux/boxmodels/3p3c/3p3cmodel.hh
@@ -59,13 +59,13 @@ namespace Dumux
* \f{eqnarray}
&& \phi \frac{\partial (\sum_\alpha \varrho_{\text{mol}, \alpha} x_\alpha^\kappa
S_\alpha )}{\partial t}
- - \sum\limits_\alpha \nabla \cdot \left\{ \frac{k_{r\alpha}}{\mu_\alpha}
+ - \sum\limits_\alpha \text{div} \left\{ \frac{k_{r\alpha}}{\mu_\alpha}
\varrho_{\text{mol}, \alpha} x_\alpha^\kappa \mbox{\bf K}
- (\nabla p_\alpha - \varrho_{\text{mass}, \alpha} \mbox{\bf g}) \right\}
+ (\text{grad}\, p_\alpha - \varrho_{\text{mass}, \alpha} \mbox{\bf g}) \right\}
\nonumber \\
\nonumber \\
- && - \sum\limits_\alpha \nabla \cdot \left\{ D_{pm}^\kappa \varrho_{\text{mol},
- \alpha } \nabla x_\alpha^\kappa \right\}
+ && - \sum\limits_\alpha \text{div} \left\{ D_{pm}^\kappa \varrho_{\text{mol},
+ \alpha } \text{grad}\, x_\alpha^\kappa \right\}
- q^\kappa = 0 \qquad \forall \kappa , \; \forall \alpha
\f}
*
diff --git a/dumux/boxmodels/3p3cni/3p3cnimodel.hh b/dumux/boxmodels/3p3cni/3p3cnimodel.hh
index 233712bd74..d5a701dda5 100644
--- a/dumux/boxmodels/3p3cni/3p3cnimodel.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnimodel.hh
@@ -52,13 +52,13 @@ namespace Dumux {
* \f{eqnarray*}
&& \phi \frac{\partial (\sum_\alpha \varrho_{\text{mol}, \alpha} x_\alpha^\kappa
S_\alpha )}{\partial t}
- - \sum\limits_\alpha \nabla \cdot \left\{ \frac{k_{r\alpha}}{\mu_\alpha}
+ - \sum\limits_\alpha \text{div} \left\{ \frac{k_{r\alpha}}{\mu_\alpha}
\varrho_{\text{mol}, \alpha} x_\alpha^\kappa \mbox{\bf K}
- (\nabla p_\alpha - \varrho_{\text{mass}, \alpha} \mbox{\bf g}) \right\}
+ (\text{grad}\; p_\alpha - \varrho_{\text{mass}, \alpha} \mbox{\bf g}) \right\}
\nonumber \\
\nonumber \\
- && - \sum\limits_\alpha \nabla \cdot \left\{ D_{pm}^\kappa \varrho_{\text{mol},
- \alpha } \nabla x_\alpha^\kappa \right\}
+ && - \sum\limits_\alpha \text{div} \left\{ D_{pm}^\kappa \varrho_{\text{mol},
+ \alpha } \text{grad} \; x_\alpha^\kappa \right\}
- q^\kappa = 0 \qquad \forall \kappa , \; \forall \alpha
\f}
*
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
index df69183cae..e31c2f9245 100644
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ b/dumux/boxmodels/richards/richardsmodel.hh
@@ -48,9 +48,9 @@ namespace Dumux
\f[
\frac{\partial\;\phi S_\alpha \rho_\alpha}{\partial t}
-
- \mathbf{div} \left\{
- \rho_\alpha \frac{k_{r\alpha}}{\mu_\alpha}\;K
- \mathbf{grad}\left[
+ \text{div} \left\{
+ \rho_\alpha \frac{k_{r\alpha}}{\mu_\alpha}\; {\textbf K}
+ \text{grad}\left[
p_\alpha - g\rho_\alpha
\right]
\right\}
--
GitLab