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

src/lagrangian/dieselSpray/spray/spray.C

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

src/lagrangian/dieselSpray/spray/spray.H

@@ -79,6 +79,9 @@ class spray
             //- Random number generator
             Random rndGen_;
 
+        //- Acceleration due to gravity
+        const vector& g_;
+
 
         // References to the physical fields
 
@@ -93,14 +96,14 @@ class spray
 
 
         //- Ambient Pressure
-            scalar ambientPressure_;
+        scalar ambientPressure_;
 
         //- Ambient Temperature
-            scalar ambientTemperature_;
+        scalar ambientTemperature_;
 
 
         //- The injectors
-            IOPtrList<injector> injectors_;
+        IOPtrList<injector> injectors_;
 
 
         // References to the spray sub-models
@@ -121,10 +124,6 @@ class spray
         const label subCycles_;
 
 
-        //- Acceleration due to gravity
-        const vector& g_;
-
-
         // Composition properties
 
             const PtrList<gasThermoPhysics>& gasProperties_;