diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/files b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/files new file mode 100644 index 0000000000..d306da47df --- /dev/null +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/files @@ -0,0 +1,3 @@ +XiEngineFoam.C + +EXE = $(FOAM_APPBIN)/XiEngineFoam diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options similarity index 95% rename from applications/solvers/combustion/engineFoam/Make/options rename to applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options index 6fe414c1bb..957735be5e 100644 --- a/applications/solvers/combustion/engineFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/combustion/engineFoam/UEqn.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H similarity index 100% rename from applications/solvers/combustion/engineFoam/UEqn.H rename to applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C similarity index 98% rename from applications/solvers/combustion/engineFoam/engineFoam.C rename to applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index a1f29f3e1f..1dd347fd1f 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - engineFoam + XiEngineFoam Group grpCombustionSolvers diff --git a/applications/solvers/combustion/engineFoam/logSummary.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H similarity index 100% rename from applications/solvers/combustion/engineFoam/logSummary.H rename to applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H similarity index 100% rename from applications/solvers/combustion/engineFoam/pEqn.H rename to applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H diff --git a/applications/solvers/combustion/engineFoam/startSummary.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/startSummary.H similarity index 100% rename from applications/solvers/combustion/engineFoam/startSummary.H rename to applications/solvers/combustion/XiFoam/XiEngineFoam/startSummary.H diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index ac4a300545..1e267e19ed 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/combustion/engineFoam/readEngineTimeControls.H b/applications/solvers/combustion/engineFoam/readEngineTimeControls.H deleted file mode 100644 index cccee289dd..0000000000 --- a/applications/solvers/combustion/engineFoam/readEngineTimeControls.H +++ /dev/null @@ -1,3 +0,0 @@ - #include "createTimeControls.H" - - maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/applications/solvers/combustion/engineFoam/Make/files b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/files similarity index 100% rename from applications/solvers/combustion/engineFoam/Make/files rename to applications/solvers/lagrangian/sprayFoam/engineFoam/Make/files diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options rename to applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C similarity index 95% rename from applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C rename to applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 2aff98b498..955f056198 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C +++ b/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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - sprayEngineFoam + engineFoam Group grpLagrangianSolvers grpMovingMeshSolvers @@ -80,7 +80,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(); diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/logSummary.H b/applications/solvers/lagrangian/sprayFoam/engineFoam/logSummary.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/logSummary.H rename to applications/solvers/lagrangian/sprayFoam/engineFoam/logSummary.H diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/startSummary.H b/applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/startSummary.H rename to applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files deleted file mode 100644 index 17d05fbdf7..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -sprayEngineFoam.C - -EXE = $(FOAM_APPBIN)/sprayEngineFoam diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H deleted file mode 100644 index cccee289dd..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H +++ /dev/null @@ -1,3 +0,0 @@ - #include "createTimeControls.H" - - maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/applications/solvers/combustion/coldEngineFoam/readEngineTimeControls.H b/src/engine/include/readEngineTimeControls.H similarity index 100% rename from applications/solvers/combustion/coldEngineFoam/readEngineTimeControls.H rename to src/engine/include/readEngineTimeControls.H diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/Su b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/Su rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/Su diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/T b/tutorials/combustion/XiEngineFoam/kivaTest/-180/T similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/T rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/T diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/Tu b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/Tu rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/U b/tutorials/combustion/XiEngineFoam/kivaTest/-180/U similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/U rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/U diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/Xi b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/Xi rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/alphat rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/b b/tutorials/combustion/XiEngineFoam/kivaTest/-180/b similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/b rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/b diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/epsilon rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/ft b/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/ft rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/ft diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/fu b/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/fu rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/fu diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/XiEngineFoam/kivaTest/-180/k similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/k rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/k diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/nut b/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/nut rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/nut diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/p b/tutorials/combustion/XiEngineFoam/kivaTest/-180/p similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/-180/p rename to tutorials/combustion/XiEngineFoam/kivaTest/-180/p diff --git a/tutorials/combustion/engineFoam/kivaTest/Allclean b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/Allclean rename to tutorials/combustion/XiEngineFoam/kivaTest/Allclean diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/Allrun rename to tutorials/combustion/XiEngineFoam/kivaTest/Allrun diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties rename to tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry rename to tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties rename to tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties rename to tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties diff --git a/tutorials/combustion/engineFoam/kivaTest/otape17 b/tutorials/combustion/XiEngineFoam/kivaTest/otape17 similarity index 99% rename from tutorials/combustion/engineFoam/kivaTest/otape17 rename to tutorials/combustion/XiEngineFoam/kivaTest/otape17 index fa408730c0..7625ac58f4 100644 --- a/tutorials/combustion/engineFoam/kivaTest/otape17 +++ b/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 diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict similarity index 98% rename from tutorials/combustion/engineFoam/kivaTest/system/controlDict rename to tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict index 57744257b5..bd92c36a9b 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application engineFoam; +application XiEngineFoam; startFrom startTime; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/system/fvSchemes rename to tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution similarity index 100% rename from tutorials/combustion/engineFoam/kivaTest/system/fvSolution rename to tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution diff --git a/tutorials/combustion/engineFoam/freePiston/0/T b/tutorials/combustion/coldEngineFoam/freePiston/0/T similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/T rename to tutorials/combustion/coldEngineFoam/freePiston/0/T diff --git a/tutorials/combustion/engineFoam/freePiston/0/U b/tutorials/combustion/coldEngineFoam/freePiston/0/U similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/U rename to tutorials/combustion/coldEngineFoam/freePiston/0/U diff --git a/tutorials/combustion/engineFoam/freePiston/0/air b/tutorials/combustion/coldEngineFoam/freePiston/0/air similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/air rename to tutorials/combustion/coldEngineFoam/freePiston/0/air diff --git a/tutorials/combustion/engineFoam/freePiston/0/alphat b/tutorials/combustion/coldEngineFoam/freePiston/0/alphat similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/alphat rename to tutorials/combustion/coldEngineFoam/freePiston/0/alphat diff --git a/tutorials/combustion/engineFoam/freePiston/0/epsilon b/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/epsilon rename to tutorials/combustion/coldEngineFoam/freePiston/0/epsilon diff --git a/tutorials/combustion/engineFoam/freePiston/0/include/boundaryConditions b/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/include/boundaryConditions rename to tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions diff --git a/tutorials/combustion/engineFoam/freePiston/0/include/caseSettings b/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/include/caseSettings rename to tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings diff --git a/tutorials/combustion/engineFoam/freePiston/0/k b/tutorials/combustion/coldEngineFoam/freePiston/0/k similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/k rename to tutorials/combustion/coldEngineFoam/freePiston/0/k diff --git a/tutorials/combustion/engineFoam/freePiston/0/nut b/tutorials/combustion/coldEngineFoam/freePiston/0/nut similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/nut rename to tutorials/combustion/coldEngineFoam/freePiston/0/nut diff --git a/tutorials/combustion/engineFoam/freePiston/0/p b/tutorials/combustion/coldEngineFoam/freePiston/0/p similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/0/p rename to tutorials/combustion/coldEngineFoam/freePiston/0/p diff --git a/tutorials/combustion/engineFoam/freePiston/constant/engineGeometry b/tutorials/combustion/coldEngineFoam/freePiston/constant/engineGeometry similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/constant/engineGeometry rename to tutorials/combustion/coldEngineFoam/freePiston/constant/engineGeometry diff --git a/tutorials/combustion/engineFoam/freePiston/constant/g b/tutorials/combustion/coldEngineFoam/freePiston/constant/g similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/constant/g rename to tutorials/combustion/coldEngineFoam/freePiston/constant/g diff --git a/tutorials/combustion/engineFoam/freePiston/constant/include/reactions.air b/tutorials/combustion/coldEngineFoam/freePiston/constant/include/reactions.air similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/constant/include/reactions.air rename to tutorials/combustion/coldEngineFoam/freePiston/constant/include/reactions.air diff --git a/tutorials/combustion/engineFoam/freePiston/constant/include/thermo.air b/tutorials/combustion/coldEngineFoam/freePiston/constant/include/thermo.air similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/constant/include/thermo.air rename to tutorials/combustion/coldEngineFoam/freePiston/constant/include/thermo.air diff --git a/tutorials/combustion/engineFoam/freePiston/constant/thermophysicalProperties b/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/constant/thermophysicalProperties rename to tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties diff --git a/tutorials/combustion/engineFoam/freePiston/constant/turbulenceProperties b/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/constant/turbulenceProperties rename to tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties diff --git a/tutorials/combustion/engineFoam/freePiston/system/blockMeshDict b/tutorials/combustion/coldEngineFoam/freePiston/system/blockMeshDict similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/system/blockMeshDict rename to tutorials/combustion/coldEngineFoam/freePiston/system/blockMeshDict diff --git a/tutorials/combustion/engineFoam/freePiston/system/controlDict b/tutorials/combustion/coldEngineFoam/freePiston/system/controlDict similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/system/controlDict rename to tutorials/combustion/coldEngineFoam/freePiston/system/controlDict diff --git a/tutorials/combustion/engineFoam/freePiston/system/fvSchemes b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/system/fvSchemes rename to tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes diff --git a/tutorials/combustion/engineFoam/freePiston/system/fvSolution b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSolution similarity index 100% rename from tutorials/combustion/engineFoam/freePiston/system/fvSolution rename to tutorials/combustion/coldEngineFoam/freePiston/system/fvSolution