mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -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),
|
||||||
|
|||||||
@ -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_;
|
||||||
|
|||||||
Reference in New Issue
Block a user