diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile index f8079abb1303b93368f1cdeebe89491a4b80ebfa..ee97f543f500d4cd18d965825e6e65353d21c367 100644 --- a/doc/Doxygen/Doxyfile +++ b/doc/Doxygen/Doxyfile @@ -754,7 +754,7 @@ WARN_FORMAT = "$file:$line: $text" # messages should be written. If left blank the output is written to standard # error (stderr). -WARN_LOGFILE = +WARN_LOGFILE = Doxygen.warnings #--------------------------------------------------------------------------- # Configuration options related to the input files diff --git a/doc/Doxygen/Macros/tensorOperator.sty b/doc/Doxygen/Macros/tensorOperator.sty index bd8fe6857973965aeb00bd8ef82d03b279de6c87..9232acb186889af032166056fc59915a987e7663 100644 --- a/doc/Doxygen/Macros/tensorOperator.sty +++ b/doc/Doxygen/Macros/tensorOperator.sty @@ -54,13 +54,14 @@ \newcommand{\Hodge} {\ensuremath{\operatorname{\stackrel{\displaystyle \ast}{}}}} \newcommand{\hyd} {\ensuremath{\operatorname{hyd}}} -\renewcommand{\max} {\ensuremath{\operatorname{max}}} -\renewcommand{\min} {\ensuremath{\operatorname{min}}} +%\renewcommand{\max} {\ensuremath{\operatorname{max}}} +%\renewcommand{\min} {\ensuremath{\operatorname{min}}} \newcommand{\inv} {\ensuremath{\operatorname{inv}}} \newcommand{\sym} {\ensuremath{\operatorname{symm}}} % symm ? \newcommand{\skw} {\ensuremath{\operatorname{skew}}} % skew already defined \newcommand{\tr} {\ensuremath{\operatorname{tr}}} \newcommand{\trans}[1] {\ensuremath{#1^{\operatorname{T}}}} +\newcommand{\symm}[1] {\ensuremath{frac{1}{2}\left(#1 + {#1}^T\right)}} % alternative tensor operators for hypersonics etc. % ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H index 66606f09bf83f4408a74f3e2d6ca749df8e8b61e..3b3f279e97016a6e8976ec17a235d596b7d833e0 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H @@ -38,13 +38,13 @@ Description The Nu number is calculated as: \f[ - Nu = a \, \text{Re}^b \, \text{Pr}^c + Nu = a \, \textrm{Re}^b \, \textrm{Pr}^c \f] and the heat transfer coefficient as: \f[ - htc = \frac{\text{Nu} \, K}{ds} + htc = \frac{\textrm{Nu} \, K}{ds} \f] where diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H index 66758bc4d7b6ed2ee7aa1b8092dd88f34474bb37..1da35b00b0b4f5ade5e49bba9f9a78f98abde56b 100644 --- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H +++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H @@ -97,7 +97,7 @@ Usage min | Minimum point (single box) | vector | cond'l | - max | Maximum point (single box) | vector | cond'l | - span | Box width (single box) | vector | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H index 52ae643ddedc0616c3291cc1c93635c9ecf0f87b..1a42aa8b00d9d3912702b2e3307f613e2ad1dab0 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H @@ -86,7 +86,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input cellSets | wordList | cond'l | - set | Name of input cellSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H index 8e39500ba386d875ed2d0c05b35f34ecb6301811..dbd6f18f8a341ae800b7902dc5630ad3b36230d1 100644 --- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H +++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H @@ -98,7 +98,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input faceSets | wordList | cond'l | - set | Name of input faceSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H index 7bad0f2e1981f44033dd937fe0720422ec163008..a471c6f76e581aa4e951b1317cf5098bb5783c46 100644 --- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H +++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H @@ -95,7 +95,7 @@ Usage Entry | Description | Type | Req'd | Dflt zones | Names of input faceZones | wordRes | cond'l | - zone | Name of input faceZone | wordRe | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/cellSources/patchToCell/patchToCell.H b/src/meshTools/sets/cellSources/patchToCell/patchToCell.H index 307e3f0703899dcc98251f9c2ee63131413d31c7..4f78764288403723e66d219dec21a341c862f6a5 100644 --- a/src/meshTools/sets/cellSources/patchToCell/patchToCell.H +++ b/src/meshTools/sets/cellSources/patchToCell/patchToCell.H @@ -84,7 +84,7 @@ Usage Entry | Description | Type | Req'd | Dflt patches | Names of patches or wildcards | wordList | cond'l | - patch | Name of patch or wildcard | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H index dd99adedbc65026ba6a9049f80ee2ed50b8d46e6..7d5432501d8846a91f2d6751781580b0c51cf512 100644 --- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H +++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H @@ -95,7 +95,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input pointSets | wordList | cond'l | - set | Name of input pointSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H index 11f63165485f9932c25d25c63e3f912ada233e4d..a83ce416ecac4d6096059e3d6de99a5f89b6c5e5 100644 --- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H +++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H @@ -86,7 +86,7 @@ Usage Entry | Description | Type | Req'd | Dflt zones | Names of input cellZones | wordRes | cond'l | - zone | Name of input cellZone | wordRe | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H index 0f81e945aec4f78fbb914f624d818a94a2a900d7..ecd4b0b305b277527f4b5049db616559ffbbcb14 100644 --- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H +++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H @@ -97,7 +97,7 @@ Usage min | Minimum point (single box) | vector | cond'l | - max | Maximum point (single box) | vector | cond'l | - span | Box width (single box) | vector | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H index 66fb9eaba81870348e5813db077fd766d987853f..6b8fa0ed0f7c421d1d7d92e4fce73f239a888f56 100644 --- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H +++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H @@ -94,7 +94,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input cellSets | wordList | cond'l | - set | Name of input cellSet | word | cond'l | - - \verbatim + \endverbatm Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H index f2f432a80eed749e43eb6f079c296008a0bb98e8..67642a41ea947864ba5adfeb4089e667c76bb46e 100644 --- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H +++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H @@ -86,7 +86,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input faceSets | wordList | cond'l | - set | Name of input faceSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H index 79ffc44e6a5c9310a56a60bac8ca7992d900ddda..844824483d78cb72b3c5918bb2c2c0e3c3e2c839 100644 --- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H +++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H @@ -85,7 +85,7 @@ Usage Entry | Description | Type | Req'd | Dflt patches | Names of patches | wordList | cond'l | - patch | Name of patch | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H index 170ccfd1a2286af7c485d49cd92b045c8cea8532..ea632bc4819003531d8446acc42fb387e47830e6 100644 --- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H +++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H @@ -96,7 +96,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input pointSets | wordList | cond'l | - set | Name of input pointSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H index efad9bc4e7b146261d1497b9bb56df6447ab3c38..3369ea17db8919e2b2c161f4fa47a085bce8c82d 100644 --- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H +++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H @@ -86,7 +86,7 @@ Usage Entry | Description | Type | Req'd | Dflt zones | Names of input faceZones | wordRes | cond'l | - zone | Name of input faceZone | wordRe | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H index 3bb64d6e4e3e1fe270a0eeb937a7e9320b808c0a..462c29285c228598b1dcf638783d9daf7cfc5817 100644 --- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H +++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H @@ -97,7 +97,7 @@ Usage min | Minimum point (single box) | vector | cond'l | - max | Maximum point (single box) | vector | cond'l | - span | Box width (single box) | vector | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H index b2c7bb54ea4d41b691ec7f3c1e2cf2814b78c627..7ff71fb09f7c54298ccc3966867c2a391cf04323 100644 --- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H +++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H @@ -93,7 +93,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input cellSets | wordList | cond'l | - set | Name of input cellSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H index 7d0a58f22a2a1d8ec58361363899cde2740d0314..8e12ef2740e9c6ab09693dd3a5dc3586d3422a95 100644 --- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H +++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H @@ -94,7 +94,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input faceSets | wordList | cond'l | - set | Name of input faceSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H index 261181a079067b9191a561dbb873a3106494b298..55efeceb8d5f706e458fa9589ebbfb638662cd56 100644 --- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H +++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H @@ -86,7 +86,7 @@ Usage Entry | Description | Type | Req'd | Dflt sets | Names of input pointSets | wordList | cond'l | - set | Name of input pointSet | word | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H index 2405fe4221746c8547c18df6c8597a031d60edaf..8f44db859eb4b8308d57ac8358a10e690cdca012 100644 --- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H +++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H @@ -86,7 +86,7 @@ Usage Entry | Description | Type | Req'd | Dflt zones | Names of input pointZones | wordRes | cond'l | - zone | Name of input pointZone | wordRe | cond'l | - - \verbatim + \endverbatim Note The order of precedence among the conditional mandatory entries from the diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.H index 0a8a3d753e4bf0dec464e5bf1b90e6b1b342dd4f..e054fd12dbfcee834afb3856e13743e3bb9bd504 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.H +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.H @@ -36,11 +36,11 @@ Description \f[ \frac{d c}{d t} = - k_{abs} w (c_{int} - c_{p_{w}}) + k_{des} (c_{p_{w} - c_{int}}) + k_{abs} w (c_{int} - c_{p_{w}}) + k_{des} (c_{p_{w}} - c_{int}) \f] \f[ - w = max(1 - c_{p_{w}/max, 0); + w = \max(1 - c_{p_{w}}/max, 0) \f] where diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H index 1a789cc5d7b3babe94f85ada93fdf9237fb2d4df..dce21a824167bc6180709d8aae8d0e7c8c9c41fd 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H @@ -33,7 +33,7 @@ Description \f[ C_1 (v_i^{2/3} + v_j^{2/3}) (v_i^{2/9} + v_j^{2/9})^{1/2} \frac{\epsilon_c^{1/3}}{1 + \alpha_d} - \text{exp} + \textrm{exp} \left[ - C_2 \frac{\mu_c \rho_c}{\sigma^2} \frac{\epsilon_c}{(1 + \alpha_d)^{3}} diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.H index 5976fa6daa88261259d81a2aa3d9b88e59489ba7..dd051de582a9bdb82f149ec8b78820536dadef86 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.H +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.H @@ -30,7 +30,7 @@ Description Model of Luo (1993). The coalescence rate is calculated by \f[ - &\frac{\pi}{4} (d_i + d_j)^2 u_{ij} + \frac{\pi}{4} (d_i + d_j)^2 u_{ij} \mathrm{exp} \left[ - C_1 diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C index fbc9b9629d92fbf8a7a66bfa8247ee844307ad97..a67ec0769403d0ad5b09e3d5b32a6f4c86ea824b 100644 --- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C +++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C @@ -613,7 +613,7 @@ void Foam::radiation::viewFactor::calculate() if (pp.size() > 0) { scalarField& qrp = qrBf[patchID]; - const scalarField& sf = mesh_.magSf().boundaryField()[patchID]; + //const scalarField& sf = mesh_.magSf().boundaryField()[patchID]; const labelList& agglom = finalAgglom_[patchID]; label nAgglom = max(agglom)+1;