From 6043a0f3a87574ff3eeb22cd567689bdd9ec7118 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 28 Jun 2015 11:01:04 +0100 Subject: [PATCH] reactingParcelFoam, coalChemistryFoam: Added LTS support Replaces LTSReactingParcelFoam and LTSCoalChemistryFoam Select LTS via the ddtScheme: ddtSchemes { default localEuler rDeltaT; } --- .../LTSCoalChemistryFoam.C | 120 ------------------ .../LTSCoalChemistryFoam/Make/files | 3 - .../LTSCoalChemistryFoam/Make/options | 58 --------- .../coalChemistryFoam/coalChemistryFoam.C | 27 +++- .../{LTSCoalChemistryFoam => }/setRDeltaT.H | 2 + .../LTSReactingParcelFoam.C | 113 ----------------- .../LTSReactingParcelFoam/Make/files | 3 - .../LTSReactingParcelFoam/Make/options | 56 -------- .../LTSReactingParcelFoam/createRDeltaT.H | 14 -- .../reactingParcelFoam/reactingParcelFoam.C | 27 +++- .../{LTSReactingParcelFoam => }/setRDeltaT.H | 2 + .../counterFlowFlame2DLTS}/0/CH4 | 0 .../counterFlowFlame2DLTS}/0/CO2 | 0 .../counterFlowFlame2DLTS}/0/H2O | 0 .../counterFlowFlame2DLTS}/0/N2 | 0 .../counterFlowFlame2DLTS}/0/O2 | 0 .../counterFlowFlame2DLTS}/0/T | 0 .../counterFlowFlame2DLTS}/0/U | 0 .../counterFlowFlame2DLTS}/0/nut | 0 .../counterFlowFlame2DLTS}/0/p | 0 .../counterFlowFlame2DLTS}/0/rho | 0 .../constant/chemistryProperties | 0 .../constant/combustionProperties | 0 .../counterFlowFlame2DLTS}/constant/g | 0 .../constant/polyMesh/boundary | 0 .../constant/radiationProperties | 0 .../constant/reactingCloud1Properties | 0 .../counterFlowFlame2DLTS}/constant/reactions | 0 .../constant/thermo.compressibleGas | 0 .../constant/thermophysicalProperties | 0 .../constant/turbulenceProperties | 0 .../system/blockMeshDict | 0 .../counterFlowFlame2DLTS}/system/controlDict | 2 +- .../counterFlowFlame2DLTS}/system/fvSchemes | 0 .../counterFlowFlame2DLTS}/system/fvSolution | 0 .../verticalChannelLTS}/0.org/H2O | 0 .../verticalChannelLTS}/0.org/T | 0 .../verticalChannelLTS}/0.org/U | 0 .../verticalChannelLTS}/0.org/air | 0 .../verticalChannelLTS}/0.org/alphat | 0 .../verticalChannelLTS}/0.org/k | 0 .../verticalChannelLTS}/0.org/nut | 0 .../verticalChannelLTS}/0.org/omega | 0 .../verticalChannelLTS}/0.org/p | 0 .../verticalChannelLTS}/0/H2O | 0 .../verticalChannelLTS}/0/T | 0 .../verticalChannelLTS}/0/U | 0 .../verticalChannelLTS}/0/air | 0 .../verticalChannelLTS}/0/alphat | 0 .../verticalChannelLTS}/0/k | 0 .../verticalChannelLTS}/0/nut | 0 .../verticalChannelLTS}/0/omega | 0 .../verticalChannelLTS}/0/p | 0 .../verticalChannelLTS}/Allclean | 0 .../constant/chemistryProperties | 0 .../constant/combustionProperties | 0 .../verticalChannelLTS}/constant/g | 0 .../constant/particleTrackDict | 0 .../constant/polyMesh/boundary | 61 +++++++++ .../constant/radiationProperties | 0 .../constant/reactingCloud1Properties | 0 .../verticalChannelLTS}/constant/reactions | 0 .../constant/thermo.incompressiblePoly | 0 .../constant/thermophysicalProperties | 0 .../constant/turbulenceProperties | 0 .../verticalChannelLTS}/system/blockMeshDict | 0 .../verticalChannelLTS}/system/controlDict | 2 +- .../verticalChannelLTS}/system/fvSchemes | 0 .../verticalChannelLTS}/system/fvSolution | 0 .../interFoam/ras/waterChannel/README | 6 - 70 files changed, 109 insertions(+), 387 deletions(-) delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/LTSCoalChemistryFoam.C delete mode 100755 applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/files delete mode 100755 applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/options rename applications/solvers/lagrangian/coalChemistryFoam/{LTSCoalChemistryFoam => }/setRDeltaT.H (98%) delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/files delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/createRDeltaT.H rename applications/solvers/lagrangian/reactingParcelFoam/{LTSReactingParcelFoam => }/setRDeltaT.H (98%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/CH4 (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/CO2 (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/H2O (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/N2 (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/O2 (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/T (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/U (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/nut (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/p (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/0/rho (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/chemistryProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/combustionProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/g (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/polyMesh/boundary (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/radiationProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/reactingCloud1Properties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/reactions (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/thermo.compressibleGas (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/constant/turbulenceProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/system/blockMeshDict (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/system/controlDict (96%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/system/fvSchemes (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/counterFlowFlame2D => reactingParcelFoam/counterFlowFlame2DLTS}/system/fvSolution (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/H2O (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/T (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/U (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/air (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/alphat (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/k (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/nut (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/omega (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0.org/p (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/H2O (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/T (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/U (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/air (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/alphat (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/k (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/nut (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/omega (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/0/p (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/Allclean (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/chemistryProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/combustionProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/g (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/particleTrackDict (100%) create mode 100644 tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/radiationProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/reactingCloud1Properties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/reactions (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/thermo.incompressiblePoly (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/constant/turbulenceProperties (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/system/blockMeshDict (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/system/controlDict (97%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/system/fvSchemes (100%) rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel => reactingParcelFoam/verticalChannelLTS}/system/fvSolution (100%) delete mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/README diff --git a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/LTSCoalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/LTSCoalChemistryFoam.C deleted file mode 100644 index 9fe207f31..000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/LTSCoalChemistryFoam.C +++ /dev/null @@ -1,120 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 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 . - -Application - LTSCoalChemistryFoam - -Description - Local time stepping (LTS) solver for steady simulation of: - - compressible, - - turbulent flow, - with - - coal and limestone parcel injections, - - energy source, and - - combustion. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "turbulentFluidThermoModel.H" -#include "basicThermoCloud.H" -#include "coalCloud.H" -#include "psiCombustionModel.H" -#include "fvIOoptionList.H" -#include "radiationModel.H" -#include "SLGThermo.H" -#include "pimpleControl.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 "createClouds.H" - #include "createRadiationModel.H" - #include "initContinuityErrs.H" - #include "createRDeltaT.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - rhoEffLagrangian = coalParcels.rhoEff() + limestoneParcels.rhoEff(); - pDyn = 0.5*rho*magSqr(U); - - coalParcels.evolve(); - limestoneParcels.evolve(); - - #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/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/files b/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/files deleted file mode 100755 index b0d27fc87..000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -LTSCoalChemistryFoam.C - -EXE = $(FOAM_APPBIN)/LTSCoalChemistryFoam diff --git a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/options deleted file mode 100755 index d777874d6..000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/Make/options +++ /dev/null @@ -1,58 +0,0 @@ -EXE_INC = \ - -I.. \ - -I../../reactingParcelFoam/LTSReactingParcelFoam \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(FOAM_SOLVERS)/combustion/reactingFoam \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -EXE_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -lcoalCombustion\ - -lspecie \ - -lcompressibleTransportModels \ - -lfluidThermophysicalModels \ - -lliquidProperties \ - -lliquidMixtureProperties \ - -lsolidProperties \ - -lsolidMixtureProperties \ - -lthermophysicalFunctions \ - -lreactionThermophysicalModels \ - -lSLGThermo \ - -lchemistryModel \ - -lradiationModels \ - -lregionModels \ - -lsurfaceFilmModels \ - -lODE \ - -lcombustionModels \ - -lfvOptions \ - -lsampling diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index c4201b84e..c9a081f43 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -44,6 +44,8 @@ Description #include "radiationModel.H" #include "SLGThermo.H" #include "pimpleControl.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,16 +58,21 @@ 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 "createClouds.H" #include "createRadiationModel.H" - #include "initContinuityErrs.H" - #include "readTimeControls.H" - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" + + if (!LTS) + { + #include "readTimeControls.H" + #include "CourantNo.H" + #include "setInitialDeltaT.H" + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -74,8 +81,16 @@ 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++; diff --git a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H similarity index 98% rename from applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/setRDeltaT.H rename to applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H index e9697c790..79cdd1aac 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/LTSCoalChemistryFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H @@ -24,6 +24,8 @@ License \*---------------------------------------------------------------------------*/ { + volScalarField& rDeltaT = trDeltaT(); + const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C deleted file mode 100644 index 02da9ebcb..000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C +++ /dev/null @@ -1,113 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-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 . - -Application - LTSReactingParcelFoam - -Description - Local time stepping (LTS) solver for steady, compressible, laminar or - turbulent reacting and non-reacting flow with multiphase Lagrangian - parcels and porous media, including run-time selectable finitite volume - options, e.g. sources, constraints - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "turbulentFluidThermoModel.H" -#include "basicReactingMultiphaseCloud.H" -#include "rhoCombustionModel.H" -#include "radiationModel.H" -#include "IOporosityModelList.H" -#include "fvIOoptionList.H" -#include "SLGThermo.H" -#include "fvcSmooth.H" -#include "pimpleControl.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 "createRadiationModel.H" - #include "createClouds.H" - #include "initContinuityErrs.H" - #include "createRDeltaT.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - parcels.evolve(); - - #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/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/files b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/files deleted file mode 100644 index 1efa8dad4..000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -LTSReactingParcelFoam.C - -EXE = $(FOAM_APPBIN)/LTSReactingParcelFoam diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options deleted file mode 100644 index fb26012e5..000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options +++ /dev/null @@ -1,56 +0,0 @@ -EXE_INC = \ - -I.. \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - - -EXE_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -lspecie \ - -lcompressibleTransportModels \ - -lfluidThermophysicalModels \ - -lliquidProperties \ - -lliquidMixtureProperties \ - -lsolidProperties \ - -lsolidMixtureProperties \ - -lthermophysicalFunctions \ - -lreactionThermophysicalModels \ - -lSLGThermo \ - -lchemistryModel \ - -lradiationModels \ - -lODE \ - -lregionModels \ - -lsurfaceFilmModels \ - -lcombustionModels \ - -lfvOptions \ - -lsampling diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/createRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/createRDeltaT.H deleted file mode 100644 index c445eaee7..000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/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/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 34adbb474..e122e959f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -39,6 +39,8 @@ Description #include "fvIOoptionList.H" #include "SLGThermo.H" #include "pimpleControl.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,15 +54,20 @@ int main(int argc, char *argv[]) pimpleControl pimple(mesh); + #include "createRDeltaT.H" + #include "initContinuityErrs.H" #include "createFields.H" #include "createRadiationModel.H" #include "createClouds.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" + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,8 +76,16 @@ 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++; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H similarity index 98% rename from applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/setRDeltaT.H rename to applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H index caa9b4167..d599d491f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H @@ -24,6 +24,8 @@ License \*---------------------------------------------------------------------------*/ { + volScalarField& rDeltaT = trDeltaT(); + const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CH4 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CH4 rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CO2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CO2 rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/H2O b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/H2O rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/T b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/T rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/U b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/U rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/nut b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/nut rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/p b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/p rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/rho b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/rho rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/combustionProperties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/polyMesh/boundary similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/polyMesh/boundary diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/radiationProperties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactingCloud1Properties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactions b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactions similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactions rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactions diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.compressibleGas rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/blockMeshDict rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict similarity index 96% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict index e27ca2653..ac6e8ac1e 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application LTSReactingParcelFoam; +application reactingParcelFoam; startFrom startTime; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/H2O similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/H2O rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/H2O diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/T similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/T rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/T diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/U rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/air similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/air rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/air diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/alphat similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/alphat rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/alphat diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/k similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/k diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/nut similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/nut rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/nut diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/omega similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/omega diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/p similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/p rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/p diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/H2O rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/T rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/U rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/air rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/alphat rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/nut rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/p rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/combustionProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/g rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/particleTrackDict rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary new file mode 100644 index 000000000..74eb1fa77 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary @@ -0,0 +1,61 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +6 +( + back + { + type symmetryPlane; + inGroups 1(symmetryPlane); + nFaces 9340; + startFace 265900; + } + front + { + type symmetryPlane; + inGroups 1(symmetryPlane); + nFaces 9340; + startFace 275240; + } + inletCentral + { + type patch; + nFaces 100; + startFace 284580; + } + inletSides + { + type patch; + nFaces 200; + startFace 284680; + } + outlet + { + type patch; + nFaces 300; + startFace 284880; + } + walls + { + type wall; + inGroups 1(wall); + nFaces 9320; + startFace 285180; + } +) + +// ************************************************************************* // diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/radiationProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactions b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactions similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactions rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactions diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/blockMeshDict rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict similarity index 97% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict index 350b043ca..f9ae462cd 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application LTSReactingParcelFoam; +application reactingParcelFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution similarity index 100% rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/README b/tutorials/multiphase/interFoam/ras/waterChannel/README deleted file mode 100644 index 470115a6a..000000000 --- a/tutorials/multiphase/interFoam/ras/waterChannel/README +++ /dev/null @@ -1,6 +0,0 @@ -- This case uses blockMesh and extrudeMesh to create a channel geometry. - - See Allmesh script to generate geometry. -- The case is set up to run with interFoam. -- For running with LTSInterFoam, an alternative set of main files from - system directory (controlDict, etc) are included in LTSInterFoam - subdirectory to replace the existing files set up for interFoam. \ No newline at end of file