>, absoluteEnthalpy>
thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
int main(int argc, char *argv[])
{
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 83ae17e368..9879031cf8 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see .
Application
- adiabaticFlameT
+ equilibriumFlameT
Description
Calculates the equilibrium flame temperature for a given fuel and
diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook
index 551af76c6c..e450665861 100755
--- a/bin/tools/pre-commit-hook
+++ b/bin/tools/pre-commit-hook
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -147,7 +147,7 @@ checkIllegalCode()
do
case "$f" in
# exclude potential makefiles
- (*[Mm]akefile* | wmake/rules/*)
+ (*[Mm]akefile* | wmake/rules/* | *.f* | *.v[cf]proj | *.pdf | *.png | *.html | *.gif | *.css)
;;
(*)
fileType=`file -b $f`
diff --git a/doc/Doxygen/README b/doc/Doxygen/README
new file mode 100644
index 0000000000..911dbfd83f
--- /dev/null
+++ b/doc/Doxygen/README
@@ -0,0 +1,26 @@
+Building the Doxygen help for OpenFOAM
+======================================
+
+The HTML documentation of OpenFOAM can be built using the Doxygen
+software. Images in the documentation are generated using "dot", a
+program within the graphviz software package. To build the
+documentation on the Ubuntu Linux system, for example, the user should
+install both doxygen and graphviz packages, e.g. by typing in a
+terminal window:
+
+ sudo apt-get install doxygen graphviz
+
+The Doxygen documentation will build automatically for a user that is
+configured to run OpenFOAM, i.e. has environment variables such as
+$WM_PROJECT_DIR set. The user must also ensure they have write
+permission for the directory that Doxygen writes files to.
+
+The Doygen configuration file, Doxyfile, in the
+$WM_PROJECT_DIR/doc/Doxygen directory is configured to work with
+Doxygen versions 1.6.3-1.8.1.
+
+
+**Note**:
+ For versions of Doxygen below 1.7, the final in the
+ _Header file (line 37) must be deleted before running Doxygen to
+ produce the correctly formatted HTML files.
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
index 3917d167bd..f99a71cc35 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,7 +39,7 @@ Description
\vartable
x_p | patch values
- x_{ref} | refernce patch values
+ x_{ref} | reference patch values
n | time level
\alpha | fraction of new random component added to previous time value
C_{RMS} | RMS coefficient
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 32473b8acf..94eb19932e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,12 +49,12 @@ bool Foam::InjectionModel::prepareForNextTimeStep
(
const scalar time,
label& newParcels,
- scalar& newVolume
+ scalar& newVolumeFraction
)
{
// Initialise values
newParcels = 0;
- newVolume = 0.0;
+ newVolumeFraction = 0.0;
bool validInjection = false;
// Return if not started injection event
@@ -72,9 +72,9 @@ bool Foam::InjectionModel::prepareForNextTimeStep
newParcels = this->parcelsToInject(t0, t1);
// Volume of parcels to inject
- newVolume = this->volumeToInject(t0, t1);
+ newVolumeFraction = this->volumeToInject(t0, t1)/volumeTotal_;
- if (newVolume > 0)
+ if (newVolumeFraction > 0)
{
if (newParcels > 0)
{
@@ -196,7 +196,7 @@ template
Foam::scalar Foam::InjectionModel::setNumberOfParticles
(
const label parcels,
- const scalar volume,
+ const scalar volumeFraction,
const scalar diameter,
const scalar rho
)
@@ -206,10 +206,10 @@ Foam::scalar Foam::InjectionModel::setNumberOfParticles
{
case pbMass:
{
- nP =
- volume/volumeTotal_
- *massTotal_/rho
- /(parcels*pi/6.0*pow3(diameter));
+ scalar volumep = pi/6.0*pow3(diameter);
+ scalar volumeTot = massTotal_/rho;
+
+ nP = (volumeFraction*volumeTot + delayedVolume_)/(parcels*volumep);
break;
}
case pbNumber:
@@ -501,11 +501,10 @@ void Foam::InjectionModel::inject(TrackData& td)
label parcelsAdded = 0;
scalar massAdded = 0.0;
label newParcels = 0;
- scalar newVolume = 0.0;
+ scalar newVolumeFraction = 0.0;
- if (prepareForNextTimeStep(time, newParcels, newVolume))
+ if (prepareForNextTimeStep(time, newParcels, newVolumeFraction))
{
- newVolume += delayedVolume_;
scalar delayedVolume = 0;
const scalar trackTime = this->owner().solution().trackTime();
@@ -580,7 +579,7 @@ void Foam::InjectionModel::inject(TrackData& td)
setNumberOfParticles
(
newParcels,
- newVolume,
+ newVolumeFraction,
pPtr->d(),
pPtr->rho()
);
@@ -644,7 +643,7 @@ void Foam::InjectionModel::injectSteadyState
for (label parcelI = 0; parcelI < newParcels; parcelI++)
{
// Volume to inject is split equally amongst all parcel streams
- scalar newVolume = volumeTotal_/newParcels;
+ scalar newVolumeFraction = 1.0/scalar(newParcels);
// Determine the injection position and owner cell,
// tetFace and tetPt
@@ -691,7 +690,7 @@ void Foam::InjectionModel::injectSteadyState
setNumberOfParticles
(
1,
- newVolume,
+ newVolumeFraction,
pPtr->d(),
pPtr->rho()
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 64e085edcc..a5492a12b6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -150,7 +150,7 @@ protected:
(
const scalar time,
label& newParcels,
- scalar& newVolume
+ scalar& newVolumeFraction
);
//- Find the cell that contains the supplied position
@@ -169,7 +169,7 @@ protected:
virtual scalar setNumberOfParticles
(
const label parcels,
- const scalar volume,
+ const scalar volumeFraction,
const scalar diameter,
const scalar rho
);
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index 7818666137..9e0539c615 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -39,15 +39,16 @@ namespace Foam
template<>
const char*
- NamedEnum::names[] =
+ NamedEnum::names[] =
{
"add",
"subtract",
"min",
- "max"
+ "max",
+ "average"
};
- const NamedEnum
+ const NamedEnum
fieldValues::fieldValueDelta::operationTypeNames_;
}