engineFoam: Renamed engineFoam -> XiEngineFoam and sprayEngineFoam -> engineFoam

XiEngineFoam is a premixed/partially-premixed combustion engine solver which
exclusively uses the Xi flamelet combustion model.

engineFoam is a general engine solver for inhomogeneous combustion with or
without spray supporting run-time selection of the chemistry-based combustion
model.

applications/solvers/combustion/XiFoam/XiEngineFoam/Make/files

@@ -0,0 +1,3 @@
+XiEngineFoam.C
+
+EXE = $(FOAM_APPBIN)/XiEngineFoam

applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SOLVERS)/combustion/XiFoam \
+    -I.. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     -I. \
-    -I../engineFoam \
+    -I../XiFoam/XiEngineFoam \
     -I../XiFoam \
     -I../../compressible/rhoPimpleFoam \
     -I$(LIB_SRC)/engine/lnInclude \

applications/solvers/combustion/engineFoam/readEngineTimeControls.H

@@ -1,3 +0,0 @@
-    #include "createTimeControls.H"
-
-    maxDeltaT = runTime.userTimeToTime(maxDeltaT);

applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 
         runTime++;
 
-        Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl;
+        Info<< "Engine time = " << runTime.theta() << runTime.unit() << endl;
 
         mesh.move();
 

applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files

@@ -1,3 +0,0 @@
-sprayEngineFoam.C
-
-EXE = $(FOAM_APPBIN)/sprayEngineFoam

applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H

@@ -1,3 +0,0 @@
-    #include "createTimeControls.H"
-
-    maxDeltaT = runTime.userTimeToTime(maxDeltaT);

tutorials/combustion/XiEngineFoam/kivaTest/otape17

@@ -1,4 +1,4 @@
- K3PREP/100198 4-valve pentroof engine (082096/1135), 052899/1030               
+ K3PREP/100198 4-valve pentroof engine (082096/1135), 052899/1030
 35023 52043 3
 1 0 0 0 0 -1
 2 0 0 0 0 -1

tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     engineFoam;
+application     XiEngineFoam;
 
 startFrom       startTime;