diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C
deleted file mode 100644
index 4567f620cd6e887596b1080275aa99de5235d167..0000000000000000000000000000000000000000
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Application
- LTSReactingFoam
-
-Description
- Local time stepping (LTS) solver for steady, compressible, laminar or
- turbulent reacting and non-reacting flow.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "turbulentFluidThermoModel.H"
-#include "psiCombustionModel.H"
-#include "multivariateScheme.H"
-#include "pimpleControl.H"
-#include "fvIOoptionList.H"
-#include "fvcSmooth.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
- #include "setRootCase.H"
- #include "createTime.H"
- #include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
- #include "readGravitationalAcceleration.H"
- #include "createFields.H"
- #include "createMRF.H"
- #include "createFvOptions.H"
- #include "initContinuityErrs.H"
- #include "createRDeltaT.H"
-
- // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
- Info<< "\nStarting time loop\n" << endl;
-
- while (runTime.run())
- {
- runTime++;
-
- Info<< "Time = " << runTime.timeName() << nl << endl;
-
- #include "setRDeltaT.H"
-
- #include "rhoEqn.H"
-
- // --- Pressure-velocity PIMPLE corrector loop
- while (pimple.loop())
- {
- if (pimple.turbCorr())
- {
- turbulence->correct();
- }
-
- #include "UEqn.H"
- #include "YEqn.H"
- #include "EEqn.H"
-
- // --- Pressure corrector loop
- while (pimple.correct())
- {
- #include "pEqn.H"
- }
- }
-
- runTime.write();
-
- Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
- << " ClockTime = " << runTime.elapsedClockTime() << " s"
- << nl << endl;
- }
-
- Info<< "End\n" << endl;
-
- return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/files b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/files
deleted file mode 100644
index 0b81e7a03247e0f362b71cc12cee85fd0c9f134e..0000000000000000000000000000000000000000
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-LTSReactingFoam.C
-
-EXE = $(FOAM_APPBIN)/LTSReactingFoam
diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options
deleted file mode 100644
index b11553a4717d9bfa35c54591c97b81ea339bf76f..0000000000000000000000000000000000000000
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options
+++ /dev/null
@@ -1,30 +0,0 @@
-EXE_INC = -ggdb3 \
- -I.. \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
- -I$(LIB_SRC)/ODE/lnInclude \
- -I$(LIB_SRC)/combustionModels/lnInclude
-
-EXE_LIBS = \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
- -lsampling \
- -lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lreactionThermophysicalModels \
- -lspecie \
- -lcompressibleTransportModels \
- -lfluidThermophysicalModels \
- -lchemistryModel \
- -lODE \
- -lcombustionModels
diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/createRDeltaT.H b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/createRDeltaT.H
deleted file mode 100644
index c445eaee71e69d203e425df155dfa058ea71a170..0000000000000000000000000000000000000000
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/createRDeltaT.H
+++ /dev/null
@@ -1,14 +0,0 @@
- volScalarField rDeltaT
- (
- IOobject
- (
- "rDeltaT",
- runTime.timeName(),
- mesh,
- IOobject::READ_IF_PRESENT,
- IOobject::AUTO_WRITE
- ),
- mesh,
- dimensionedScalar("one", dimless/dimTime, 1),
- zeroGradientFvPatchScalarField::typeName
- );
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index ceb380ef2469941522b7bf7699d68ab36fe61ab0..f47b9c934663d99f012a0a5cf216f2874ecda1cf 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -35,6 +35,8 @@ Description
#include "multivariateScheme.H"
#include "pimpleControl.H"
#include "fvIOoptionList.H"
+#include "localEulerDdtScheme.H"
+#include "fvcSmooth.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,14 +48,19 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
+ #include "createRDeltaT.H"
+ #include "initContinuityErrs.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"
- #include "initContinuityErrs.H"
- #include "readTimeControls.H"
- #include "compressibleCourantNo.H"
- #include "setInitialDeltaT.H"
+
+ if (!LTS)
+ {
+ #include "readTimeControls.H"
+ #include "CourantNo.H"
+ #include "setInitialDeltaT.H"
+ }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,10 +69,19 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readTimeControls.H"
- #include "compressibleCourantNo.H"
- #include "setDeltaT.H"
+
+ if (LTS)
+ {
+ #include "setRDeltaT.H"
+ }
+ else
+ {
+ #include "compressibleCourantNo.H"
+ #include "setDeltaT.H"
+ }
runTime++;
+
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "rhoEqn.H"
diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
similarity index 98%
rename from applications/solvers/combustion/reactingFoam/LTSReactingFoam/setRDeltaT.H
rename to applications/solvers/combustion/reactingFoam/setRDeltaT.H
index 6e771864a06a98305c2c2d894f99cbbd98248419..a01f9bac3bec2726972c8aeacabf5898b7cd2aa3 100644
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/setRDeltaT.H
+++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
@@ -24,6 +24,8 @@ License
\*---------------------------------------------------------------------------*/
{
+ volScalarField& rDeltaT = trDeltaT();
+
const dictionary& pimpleDict = pimple.dict();
// Maximum flow Courant number
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/CH4
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/CO2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/CO2
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/H2O b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/H2O
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/N2
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/O2
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/T
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/U
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/Ydefault
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/alphat
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/0/p
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/combustionProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/combustionProperties
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/g b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/g
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/g
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/g
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/polyMesh/boundary
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/polyMesh/boundary
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/reactions b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/reactions
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/reactions
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/reactions
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
similarity index 97%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/controlDict
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
index 41925e2e0d57497df9c4d9e7c43d9163cc40b605..792dbf2499ca318abda7351be8e06956f96640a0 100644
--- a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application LTSReactingFoam;
+application reactingFoam;
startFrom startTime;
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSolution
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution