Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
henry
2009-07-10 12:59:53 +01:00
2 changed files with 7 additions and 8 deletions

View File

@ -67,6 +67,7 @@ Foam::spray::spray
time0_(runTime_.value()), time0_(runTime_.value()),
mesh_(U.mesh()), mesh_(U.mesh()),
rndGen_(label(0)), rndGen_(label(0)),
g_(g.value()),
U_(U), U_(U),
rho_(rho), rho_(rho),
@ -181,7 +182,6 @@ Foam::spray::spray
), ),
subCycles_(readLabel(sprayProperties_.lookup("subCycles"))), subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
g_(g.value()),
gasProperties_(gasProperties), gasProperties_(gasProperties),
composition_(composition), composition_(composition),

View File

@ -79,6 +79,9 @@ class spray
//- Random number generator //- Random number generator
Random rndGen_; Random rndGen_;
//- Acceleration due to gravity
const vector& g_;
// References to the physical fields // References to the physical fields
@ -121,10 +124,6 @@ class spray
const label subCycles_; const label subCycles_;
//- Acceleration due to gravity
const vector& g_;
// Composition properties // Composition properties
const PtrList<gasThermoPhysics>& gasProperties_; const PtrList<gasThermoPhysics>& gasProperties_;