Merge branch 'HrvojeJasak'

applications/solvers/combustion/rhoReactingFoam/pEqn.H

@@ -31,7 +31,12 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr)
+            if
+            (
+                ocorr == nOuterCorr
+             && corr == nCorr
+             && nonOrth == nNonOrthCorr
+            )
             {
                 pEqn.solve(mesh.solver(p.name() + "Final"));
             }
@@ -64,7 +69,12 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr)
+            if
+            (
+                ocorr == nOuterCorr
+             && corr == nCorr
+             && nonOrth == nNonOrthCorr
+            )
             {
                 pEqn.solve(mesh.solver(p.name() + "Final"));
             }

applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C

@@ -42,16 +42,16 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readChemistryProperties.H"
-    #include "readGravitationalAcceleration.H"
-    #include "createFields.H"
-    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
-    #include "compressibleCourantNo.H"
-    #include "setInitialDeltaT.H"
+#   include "setRootCase.H"
+#   include "createTime.H"
+#   include "createMesh.H"
+#   include "readChemistryProperties.H"
+#   include "readGravitationalAcceleration.H"
+#   include "createFields.H"
+#   include "initContinuityErrs.H"
+#   include "readTimeControls.H"
+#   include "compressibleCourantNo.H"
+#   include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,27 +59,27 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readTimeControls.H"
-        #include "readPISOControls.H"
-        #include "compressibleCourantNo.H"
-        #include "setDeltaT.H"
+#       include "readTimeControls.H"
+#       include "readPISOControls.H"
+#       include "compressibleCourantNo.H"
+#       include "setDeltaT.H"
 
         runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "chemistry.H"
-        #include "rhoEqn.H"
+#       include "chemistry.H"
+#       include "rhoEqn.H"
 
         for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
         {
-            #include "UEqn.H"
-            #include "YEqn.H"
-            #include "hsEqn.H"
+#           include "UEqn.H"
+#           include "YEqn.H"
+#           include "hsEqn.H"
 
             // --- PISO loop
             for (int corr=1; corr<=nCorr; corr++)
             {
-                #include "pEqn.H"
+#               include "pEqn.H"
             }
         }
 

src/OpenFOAM/fields/Fields/Field/Field.H

@@ -194,6 +194,12 @@ public:
         //- Clone
         tmp<Field<Type> > clone() const;
 
+        //- Return a pointer to a new Field created on freestore
+        static autoPtr<Field<Type> > New(Istream& is)
+        {
+            return autoPtr<Field<Type> >(new Field<Type>(is));
+        }
+
         //- Return a pointer to a new calculatedFvPatchFieldField created on
         //  freestore without setting patchField values
         template<class Type2>