From 8ffb5df7b094ccbc46f5c5fab070e973ca6d696a Mon Sep 17 00:00:00 2001 From: Andreas Lauser <and@poware.org> Date: Fri, 20 Jan 2012 16:36:40 +0000 Subject: [PATCH] fix LaTeX errors in formulas that was a lot of fun! git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7478 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- doc/doxygen/html/dummy.gif | 0 dumux/boxmodels/MpNc/MpNcmodel.hh | 19 ++++++++++--------- dumux/decoupled/2p2c/fvpressure2p2c.hh | 10 +++++----- dumux/material/fluidsystems/1pfluidsystem.hh | 4 ++-- .../fluidsystems/2pimmisciblefluidsystem.hh | 4 ++-- .../material/fluidsystems/basefluidsystem.hh | 4 ++-- .../material/fluidsystems/h2on2fluidsystem.hh | 4 ++-- .../1p2c/interstitialfluidtrailfluidsystem.hh | 4 ++-- 8 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 doc/doxygen/html/dummy.gif diff --git a/doc/doxygen/html/dummy.gif b/doc/doxygen/html/dummy.gif deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dumux/boxmodels/MpNc/MpNcmodel.hh b/dumux/boxmodels/MpNc/MpNcmodel.hh index dfcd924489..718b67ba4d 100644 --- a/dumux/boxmodels/MpNc/MpNcmodel.hh +++ b/dumux/boxmodels/MpNc/MpNcmodel.hh @@ -44,14 +44,15 @@ namespace Dumux * the conservation of momentum: * \f[ v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \boldsymbol{K} - \left(\text{grad} p_\alpha - \varrho_{\alpha} \boldsymbol{g} \right) - * \f] + \left( + \text{grad} p_\alpha - \varrho_{\alpha} \boldsymbol{g} + \right) + \f] * * By inserting this into the equations for the conservation of the * components, one gets one transport equation for each component \f$\kappa\f$ - * \f{equation*} + * \f[ \sum_{\kappa} \left( - % \phi \frac{\partial \varrho_\alpha x_\alpha^\kappa S_\alpha}{\partial t} - \nabla \cdot @@ -60,16 +61,16 @@ namespace Dumux \frac{k_{r\alpha}}{\mu_\alpha} \boldsymbol{K} (\nabla p_\alpha - \varrho_{\alpha} \boldsymbol{g}) \right\} - \left) + \right) = q^\kappa - \f{equation*} + \f] * with \f$\overline M_\alpha\f$ being the average molar mass of the phase \f$\alpha\f$: * \f[ \overline M_\alpha = \sum_\kappa M^\kappa \; x_\alpha^\kappa \f] * * For the missing \f$M\f$ model assumptions, the model assumes that * if a fluid phase is not present, the sum of the mole fractions of * this fluid phase is smaller than \f$1\f$, i.e. - * \f[ \forall \alpha: S_\alpha = 0 \implies \sum_\kappa x_\alpha^\kappa \leq 1 \] + * \f[ \forall \alpha: S_\alpha = 0 \implies \sum_\kappa x_\alpha^\kappa \leq 1 \f] * * Also, if a fluid phase may be present at a given spatial location * its saturation must be positive: @@ -91,7 +92,7 @@ namespace Dumux * \f[ \Phi(a,b) = a + b - \sqrt{a^2 + b^2} \;. \f] * * Though this model uses - * \f[ \Phi(a,b) = \min \{a, b}}\;, \f] + * \f[ \Phi(a,b) = \min \{a, b \}\;, \f] * because of its piecewise linearity. * * These equations are then discretized using a fully-implicit vertex @@ -102,7 +103,7 @@ namespace Dumux * The model assumes thermodynamic equilibrium and uses the following * primary variables: * - * - The componentfugacities \f$f^1, \dots, f^{N} + * - The componentfugacities \f$f^1, \dots, f^{N}\f$ * - The pressure of the first phase \f$p_1\f$ * - The saturations of the first \f$M-1\f$ phases \f$S_1, \dots, S_{M-1}\f$ * - Temperature \f$T\f$ if the energy equation is enabled diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh index bc63604b79..1ef948f11b 100644 --- a/dumux/decoupled/2p2c/fvpressure2p2c.hh +++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh @@ -225,7 +225,7 @@ void FVPressure2P2C<TypeTag>::getSource(Dune::FieldVector<Scalar, 2>& sourceEntr /** for first == true, there is no storage contribution. * for first == false, the storage term comprises the compressibility (due to a change in * pressure from last timestep): - * \f[ V_i c_{t,i}& \frac{p^t_i - p^{t-\Delta t}_i}{\Delta t} \f] + * \f[ V_i c_{t,i} \frac{p^t_i - p^{t-\Delta t}_i}{\Delta t} \f] * and the damped error introduced by the incorrect transport of the last timestep: * \f[ V_i \alpha_r \frac{v_{t} - \phi}{\Delta t} \f]. * The latter is damped according to Fritz 2011. @@ -304,8 +304,8 @@ void FVPressure2P2C<TypeTag>::getStorage(Dune::FieldVector<Scalar, 2>& storageEn \frac{\frac{\partial v_{t,j}}{\partial C^{\kappa}_j}-\frac{\partial v_{t,i}}{\partial C^{\kappa}_i}}{\Delta x} X^{\kappa}_{\alpha} \left( \frac{p_{\alpha,j}^t - p^{t}_{\alpha,i}}{\Delta x} + \varrho_{\alpha} \mathbf{g}\right) \f] * This includes a boundary integral and a volume integral, because - * \f$ \frac{\partial v_{t,i}}{\partial C^{\kappa}_i}} \f$ is not constant. - * Here, \f$ \mathbf{u} \f$ is the normalized vector connecting the cell centers, and \f$ \mathbf{n}_{\gamma_{ij} \f$ + * \f$ \frac{\partial v_{t,i}}{\partial C^{\kappa}_i} \f$ is not constant. + * Here, \f$ \mathbf{u} \f$ is the normalized vector connecting the cell centers, and \f$ \mathbf{n}_{\gamma_{ij}} \f$ * represents the normal of the face \f$ \gamma{ij} \f$. * \param entries The Matrix and RHS entries * \param intersection Intersection between cell I and J @@ -526,9 +526,9 @@ void FVPressure2P2C<TypeTag>::getFlux(Dune::FieldVector<Scalar, 2>& entries, * \f[ - A_{\gamma_{ij}} \cdot \mathbf{K} \cdot \mathbf{u} \cdot (\mathbf{n}_{\gamma_{ij}} \cdot \mathbf{u}) \sum_{\alpha} \varrho_{\alpha} \lambda_{\alpha} \sum_{\kappa} \frac{\partial v_{t}}{\partial C^{\kappa}} X^{\kappa}_{\alpha} \left( \frac{p_{\alpha,j}^t - p^{t}_{\alpha,i}}{\Delta x} + \varrho_{\alpha} \mathbf{g}\right) \;, \f] - * where we skip the volume integral assuming \f$ \frac{\partial v_{t,i}}{\partial C^{\kappa}_i}} \f$ + * where we skip the volume integral assuming \f$ \frac{\partial v_{t,i}}{\partial C^{\kappa}_i} \f$ * to be constant at the boundary. - * Here, \f$ \mathbf{u} \f$ is the normalized vector connecting the cell centers, and \f$ \mathbf{n}_{\gamma_{ij} \f$ + * Here, \f$ \mathbf{u} \f$ is the normalized vector connecting the cell centers, and \f$ \mathbf{n}_{\gamma_{ij}} \f$ * represents the normal of the face \f$ \gamma{ij} \f$. * \param entries The Matrix and RHS entries * \param intersection Intersection between cell I and J diff --git a/dumux/material/fluidsystems/1pfluidsystem.hh b/dumux/material/fluidsystems/1pfluidsystem.hh index ecdf9ef31d..0fd1909083 100644 --- a/dumux/material/fluidsystems/1pfluidsystem.hh +++ b/dumux/material/fluidsystems/1pfluidsystem.hh @@ -282,9 +282,9 @@ public: * component in a fluid phase [mol^2 * s / (kg*m^3)] * * Molecular diffusion of a compoent \f$\kappa\f$ is caused by a - * gradient of the chemical potential and follows the law + * mathbf{grad}ient of the chemical potential and follows the law * - * \f[ J = - D \grad mu_\kappa \f] + * \f[ J = - D \mathbf{grad} mu_\kappa \f] * * where \f$\mu_\kappa\f$ is the component's chemical potential, * \f$D\f$ is the diffusion coefficient and \f$J\f$ is the diff --git a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh index ec0f80b09d..bb63ed14b9 100644 --- a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh +++ b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh @@ -313,9 +313,9 @@ public: * a component in a fluid phase [mol^2 * s / (kg*m^3)] * * Molecular diffusion of a compoent \f$\kappa\f$ is caused by a - * gradient of the chemical potential and follows the law + * mathbf{grad}ient of the chemical potential and follows the law * - * \f[ J = - D \grad mu_\kappa \f] + * \f[ J = - D \mathbf{grad} mu_\kappa \f] * * where \f$\mu_\kappa\f$ is the component's chemical potential, * \f$D\f$ is the diffusion coefficient and \f$J\f$ is the diff --git a/dumux/material/fluidsystems/basefluidsystem.hh b/dumux/material/fluidsystems/basefluidsystem.hh index a61a2d2273..4a28085e92 100644 --- a/dumux/material/fluidsystems/basefluidsystem.hh +++ b/dumux/material/fluidsystems/basefluidsystem.hh @@ -87,9 +87,9 @@ public: * a component in a fluid phase [mol^2 * s / (kg*m^3)] * * Molecular diffusion of a compoent \f$\kappa\f$ is caused by a - * gradient of the chemical potential and follows the law + * mathbf{grad}ient of the chemical potential and follows the law * - * \f[ J = - D \grad mu_\kappa \f] + * \f[ J = - D \mathbf{grad} mu_\kappa \f] * * where \f$\mu_\kappa\f$ is the component's chemical potential, * \f$D\f$ is the diffusion coefficient and \f$J\f$ is the diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh index de5e897bdf..5e8f420a60 100644 --- a/dumux/material/fluidsystems/h2on2fluidsystem.hh +++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh @@ -501,9 +501,9 @@ public: * component in a fluid phase [mol^2 * s / (kg*m^3)] * * Molecular diffusion of a compoent \f$\kappa\f$ is caused by a - * gradient of the chemical potential and follows the law + * mathbf{grad}ient of the chemical potential and follows the law * - * \f[ J = - D \grad mu_\kappa \f] + * \f[ J = - D \mathbf{grad} mu_\kappa \f] * * where \f$\mu_\kappa\f$ is the component's chemical potential, * \f$D\f$ is the diffusion coefficient and \f$J\f$ is the diff --git a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh index 11afa681cb..489a84f9af 100644 --- a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh +++ b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh @@ -257,9 +257,9 @@ public: * component in a fluid phase [mol^2 * s / (kg*m^3)] * * Molecular diffusion of a compoent \f$\kappa\f$ is caused by a - * gradient of the chemical potential and follows the law + * mathbf{grad}ient of the chemical potential and follows the law * - * \f[ J = - D \grad mu_\kappa \f] + * \f[ J = - D \mathbf{grad} mu_\kappa \f] * * where \f$\mu_\kappa\f$ is the component's chemical potential, * \f$D\f$ is the diffusion coefficient and \f$J\f$ is the -- GitLab