Merge master, fixing conflicts

This commit is contained in:
graham
2009-09-07 12:23:13 +01:00
553 changed files with 12380 additions and 5241 deletions

View File

@ -29,6 +29,10 @@ License
#include "dictionary.H"
#include "dsmcCloud.H"
#include "constants.H"
using namespace Foam::constant;
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
@ -170,7 +174,8 @@ void Foam::dsmcFields::write()
obr_,
IOobject::NO_READ
),
2.0/(3.0*dsmcCloud::kb*rhoNMean)
2.0/(3.0*physicoChemical::k.value()*rhoNMean)
*(linearKEMean - 0.5*rhoMMean*(UMean & UMean))
);
@ -184,7 +189,7 @@ void Foam::dsmcFields::write()
obr_,
IOobject::NO_READ
),
(2.0/dsmcCloud::kb)*(internalEMean/iDofMean)
(2.0/physicoChemical::k.value())*(internalEMean/iDofMean)
);
Info<< " Calculating overallT field." << endl;
@ -197,7 +202,7 @@ void Foam::dsmcFields::write()
obr_,
IOobject::NO_READ
),
2.0/(dsmcCloud::kb*(3.0*rhoNMean + iDofMean))
2.0/(physicoChemical::k.value()*(3.0*rhoNMean + iDofMean))
*(linearKEMean - 0.5*rhoMMean*(UMean & UMean) + internalEMean)
);
@ -211,7 +216,7 @@ void Foam::dsmcFields::write()
obr_,
IOobject::NO_READ
),
dsmcCloud::kb*rhoNMean*translationalT
physicoChemical::k.value()*rhoNMean*translationalT
);
const fvMesh& mesh = fDMean.mesh();