diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H index 0ceb2cae5f..7721cadaeb 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H @@ -29,19 +29,19 @@ Description Basic sub-grid obstacle flame-wrinking enhancement factor model. Details supplied by J Puttock 2/7/06. - Sub-grid flame area generation + Sub-grid flame area generation <\b> \f$ n = N - \hat{\dwea{\vec{U}}}.n_{s}.\hat{\dwea{\vec{U}}} \f$ \f$ n_{r} = \sqrt{n} \f$ where: - \f$ \hat{\dwea{\vec{U}}} = \dwea{\vec{U}} / \vert \dwea{\vec{U}} - \vert \f$ + \f$ \hat{\dwea{\vec{U}}} = \dwea{\vec{U}} / \vert \dwea{\vec{U}} + \vert \f$ - \f$ b = \hat{\dwea{\vec{U}}}.B.\hat{\dwea{\vec{U}}} / n_{r} \f$ + \f$ b = \hat{\dwea{\vec{U}}}.B.\hat{\dwea{\vec{U}}} / n_{r} \f$ - where + where: \f$ B \f$ is the file "B". @@ -52,8 +52,11 @@ Description The flame area enhancement factor \f$ \Xi_{sub} \f$ is expected to approach: - \f[ \Xi_{{sub}_{eq}} = 1 + max(2.2 \sqrt{b}, min(0.34 \frac{\vert \dwea{\vec{U}} - \vert}{{\vec{U}}^{'}}, 1.6)) \times min(\frac{n}{4}, 1) \f] + \f[ + \Xi_{{sub}_{eq}} = + 1 + max(2.2 \sqrt{b}, min(0.34 \frac{\vert \dwea{\vec{U}} + \vert}{{\vec{U}}^{'}}, 1.6)) \times min(\frac{n}{4}, 1) + \f] SourceFiles diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H index 145a24c21a..d843214ab3 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H @@ -29,43 +29,48 @@ Description Basic sub-grid obstacle drag model. Details supplied by J Puttock 2/7/06. - Sub-grid drag term + Sub-grid drag term <\b> The resistance term (force per unit of volume) is given by: - \f[ - R = -\frac{1}{2} \rho \vert \dwea{\vec{U}} \vert \dwea{\vec{U}}.D + \f[ + R = -\frac{1}{2} \rho \vert \dwea{\vec{U}} \vert \dwea{\vec{U}}.D \f] where: - \f$ D \f$ is the tensor field "CR" in \f$ m^{-1} \f$ + \f$ D \f$ is the tensor field "CR" in \f$ m^{-1} \f$ - This is term is treated implicitly in UEqn.H + This is term is treated implicitly in UEqn.H - Sub-grid turbulence generation + Sub-grid turbulence generation <\b> - The turbulence source term \f$ G_{R} \f$ occurring in the - \f$ \kappa-\epsilon \f$ equations for the generation of turbulence due to interaction with unresolved obstacles : + The turbulence source term \f$ G_{R} \f$ occurring in the + \f$ \kappa-\epsilon \f$ equations for the generation of turbulence due + to interaction with unresolved obstacles : - \f$ G_{R} = C_{s}\beta_{\nu} \mu_{eff} A_{w}^{2}(\dwea{\vec{U}}-\dwea{\vec{U}_{s}})^2 + \frac{1}{2} - \rho \vert \dwea{\vec{U}} \vert \dwea{\vec{U}}.T.\dwea{\vec{U}} \f$ + \f$ G_{R} = C_{s}\beta_{\nu} + \mu_{eff} A_{w}^{2}(\dwea{\vec{U}}-\dwea{\vec{U}_{s}})^2 + \frac{1}{2} + \rho \vert \dwea{\vec{U}} \vert \dwea{\vec{U}}.T.\dwea{\vec{U}} \f$ - where: + where: - \f$ C_{s} \f$ = 1 + \f$ C_{s} \f$ = 1 - \f$ \beta_{\nu} \f$ is the volume porosity (file "betav"). + \f$ \beta_{\nu} \f$ is the volume porosity (file "betav"). - \f$ \mu_{eff} \f$ is the effective viscosity. + \f$ \mu_{eff} \f$ is the effective viscosity. - \f$ A_{w}^{2}\f$ is the obstacle surface area per unit of volume (file "Aw"). + \f$ A_{w}^{2}\f$ is the obstacle surface area per unit of volume + (file "Aw"). - \f$ \dwea{\vec{U}_{s}} \f$ is the slip velocity and is considered \f$ \frac{1}{2}. \dwea{\vec{U}} \f$. + \f$ \dwea{\vec{U}_{s}} \f$ is the slip velocity and is considered + \f$ \frac{1}{2}. \dwea{\vec{U}} \f$. - \f$ T \f$ is a tensor in the file CT. + \f$ T \f$ is a tensor in the file CT. - The term \f$ G_{R} \f$ is treated explicitly in the \f$ \kappa-\epsilon \f$ Eqs in the PDRkEpsilon.C file. + The term \f$ G_{R} \f$ is treated explicitly in the \f$ \kappa-\epsilon + \f$ Eqs in the PDRkEpsilon.C file. SourceFiles diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H index 1680f26e09..2b76f9bc92 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H @@ -29,8 +29,9 @@ Description Base-class for all Xi models used by the b-Xi combustion model. See Technical Report SH/RE/01R for details on the PDR modelling. - Xi is given through an algebraic expression (algebraic.H), by solving a transport equation (transport.H) or a fixed value (fixed.H). See report - TR/HGW/10 for details on the Weller two equations model. + Xi is given through an algebraic expression (algebraic.H), + by solving a transport equation (transport.H) or a fixed value (fixed.H). + See report TR/HGW/10 for details on the Weller two equations model. In the algebraic and transport methods \f$\Xi_{eq}\f$ is calculated in similar way. In the algebraic approach, \f$\Xi_{eq}\f$ is the value used in @@ -53,7 +54,8 @@ Description where: - \f$ G_\eta \f$ is the generation rate of wrinkling due to turbulence interaction. + \f$ G_\eta \f$ is the generation rate of wrinkling due to turbulence + interaction. \f$ G_{in} = \kappa \rho_{u}/\rho_{b} \f$ is the generation rate due to the flame inestability. @@ -68,11 +70,13 @@ Description where: \f$ R \f$ is the total removal. + \f$ G_\eta \f$ is a model constant. \f$ \Xi_{\eta_{eq}} \f$ is the flame wrinkling due to turbulence. - \f$ \Xi_{{in}_{eq}} \f$ is the equilibrium level of the flame wrinkling generated by inestability. It is a constant (default 2.5). + \f$ \Xi_{{in}_{eq}} \f$ is the equilibrium level of the flame wrinkling + generated by inestability. It is a constant (default 2.5). SourceFiles diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H index 430126b123..8c65453b94 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H @@ -28,23 +28,31 @@ Class Description Laminar flame speed obtained from the SCOPE correlation. - Seven parameters are specified in terms of polynomial functions of stoichiometry. Two polynomials are fitted, covering different parts of the flammable range. If the mixture is outside the fitted range, linear interpolation is used between the extreme of the polynomio and the upper or lower flammable limit with the Markstein number constant. + Seven parameters are specified in terms of polynomial functions of + stoichiometry. Two polynomials are fitted, covering different parts of the + flammable range. If the mixture is outside the fitted range, linear + interpolation is used between the extreme of the polynomio and the upper or + lower flammable limit with the Markstein number constant. - Variations of pressure and temperature from the reference values are taken into account through \f$ pexp \f$ and \f$ texp \f$ + Variations of pressure and temperature from the reference values are taken + into account through \f$ pexp \f$ and \f$ texp \f$ - The laminar burning velocity fitting polynomio is: + The laminar burning velocity fitting polynomial is: - \f$ Su = a_{0}(1+a_{1}x+K+..a_{i}x^{i}..+a_{6}x^{6}) (p/p_{ref})^{pexp} (T/T_{ref})^{texp} \f$ + \f$ Su = a_{0}(1+a_{1}x+K+..a_{i}x^{i}..+a_{6}x^{6}) (p/p_{ref})^{pexp} + (T/T_{ref})^{texp} \f$ where: - \f$ a_{i} \f$ are the polinomial coefficients. + \f$ a_{i} \f$ are the polinomial coefficients. - \f$ pexp \f$ and \f$ texp \f$ are the pressure and temperature factors respectively. + \f$ pexp \f$ and \f$ texp \f$ are the pressure and temperature factors + respectively. - \f$ x \f$ is the equivalence ratio. + \f$ x \f$ is the equivalence ratio. - \f$ T_{ref} \f$ and \f$ p_{ref} \f$ are the temperature and pressure references for the laminar burning velocity. + \f$ T_{ref} \f$ and \f$ p_{ref} \f$ are the temperature and pressure + references for the laminar burning velocity. SourceFiles diff --git a/etc/settings.csh b/etc/settings.csh index 2c9a0eb656..4bcf3eb510 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -187,7 +187,7 @@ case MPICH-GM: setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-gm breaksw -case MPICH-GM: +case HPMPI: setenv MPI_HOME /opt/hpmpi setenv MPI_ARCH_PATH $MPI_HOME setenv MPICH_ROOT=$MPI_ARCH_PATH diff --git a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C index efcb639170..d7fcc910ae 100644 --- a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C +++ b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C @@ -49,7 +49,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff) ( IOobject ( - "anisotropicFilterCoeff", + "laplaceFilterCoeff", mesh.time().timeName(), mesh ), @@ -70,7 +70,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd) ( IOobject ( - "anisotropicFilterCoeff", + "laplaceFilterCoeff", mesh.time().timeName(), mesh ),