diff --git a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H index bb7ebdef4fbcbaf41afa2e0abe6427b8943c0e67..e469bafa346c78f4a94aadcba842626841204650 100644 --- a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H +++ b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H @@ -15,7 +15,7 @@ ( 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), fvc::surfaceSum(amaxSf)().dimensionedInternalField() - /(2*maxCo*mesh.V()) + /((2*maxCo)*mesh.V()) ); // Update tho boundary values of the reciprocal time-step diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options index f45eb9de17385e2f86ab415a49d208c256d8c7aa..9215e76b2e9cd9ce30ed78c6fee9d3b5ed42aa54 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options @@ -1,10 +1,12 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ - -lfiniteVolume + -lfiniteVolume \ + -lmeshTools diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H index eac3ffe59762a01211170ba304595293c36ebe11..954b2a8b3a9c1c7311a0c5dc99636e7735fea205 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H @@ -6,11 +6,7 @@ { fvScalarMatrix alpha1Eqn ( - #ifdef LTSSOLVE - fv::localEulerDdtScheme<scalar>(mesh, rDeltaT.name()).fvmDdt(alpha1) - #else fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1) - #endif + fv::gaussConvectionScheme<scalar> ( mesh, @@ -34,16 +30,6 @@ { Info<< "Applying the previous iteration correction flux" << endl; - #ifdef LTSSOLVE - MULES::LTScorrect - ( - alpha1, - phiAlpha, - tphiAlphaCorr0(), - mixture.alphaMax(), - 0 - ); - #else MULES::correct ( alpha1, @@ -52,7 +38,6 @@ mixture.alphaMax(), 0 ); - #endif phiAlpha += tphiAlphaCorr0(); } @@ -84,16 +69,6 @@ tmp<surfaceScalarField> tphiAlphaCorr(tphiAlphaUn() - phiAlpha); volScalarField alpha10("alpha10", alpha1); - #ifdef LTSSOLVE - MULES::LTScorrect - ( - alpha1, - tphiAlphaUn(), - tphiAlphaCorr(), - mixture.alphaMax(), - 0 - ); - #else MULES::correct ( alpha1, @@ -102,7 +77,6 @@ mixture.alphaMax(), 0 ); - #endif // Under-relax the correction for all but the 1st corrector if (aCorr == 0) @@ -119,16 +93,6 @@ { phiAlpha = tphiAlphaUn; - #ifdef LTSSOLVE - MULES::explicitLTSSolve - ( - alpha1, - phi, - phiAlpha, - mixture.alphaMax(), - 0 - ); - #else MULES::explicitSolve ( alpha1, @@ -137,7 +101,6 @@ mixture.alphaMax(), 0 ); - #endif } } diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C deleted file mode 100644 index 69867e43167634cb7a9c518d8d6e12b87a56e2a8..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C +++ /dev/null @@ -1,119 +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 <http://www.gnu.org/licenses/>. - -Application - interFoam - -Description - Solver for 2 incompressible, isothermal immiscible fluids using a VOF - (volume of fluid) phase-fraction based interface capturing approach. - - The momentum and other fluid properties are of the "mixture" and a single - momentum equation is solved. - - Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - - For a two-fluid approach see twoPhaseEulerFoam. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "CMULES.H" -#include "EulerDdtScheme.H" -#include "localEulerDdtScheme.H" -#include "CrankNicolsonDdtScheme.H" -#include "subCycle.H" -#include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulentTransportModel.H" -#include "fvcSmooth.H" -#include "pimpleControl.H" -#include "fvIOoptionList.H" -#include "CorrectPhi.H" -#include "fixedFluxPressureFvPatchScalarField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createTime.H" - #include "createMesh.H" - - pimpleControl pimple(mesh); - - #include "initContinuityErrs.H" - #include "createFields.H" - #include "createMRF.H" - #include "createFvOptions.H" - #include "correctPhi.H" - #include "CourantNo.H" - #include "createRDeltaT.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - #include "setrDeltaT.H" - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "alphaControls.H" - - #define LTSSOLVE - #include "alphaEqnSubCycle.H" - #undef LTSSOLVE - - mixture.correct(); - - turbulence->correct(); - - #include "UEqn.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/multiphase/interFoam/LTSInterFoam/Make/files b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/files deleted file mode 100644 index db8b3af426e048fcb0857ec82650dd8a08868468..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -LTSInterFoam.C - -EXE = $(FOAM_APPBIN)/LTSInterFoam diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options deleted file mode 100644 index f0762e15d2ea8816f627c0439c411d4f1222967d..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options +++ /dev/null @@ -1,22 +0,0 @@ -EXE_INC = \ - -I.. \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -EXE_LIBS = \ - -limmiscibleIncompressibleTwoPhaseMixture \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lfiniteVolume \ - -lmeshTools \ - -lfvOptions \ - -lsampling diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/createRDeltaT.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/createRDeltaT.H deleted file mode 100644 index c7ac1758481c49e74c02f6d9d12f211f672465f0..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/createRDeltaT.H +++ /dev/null @@ -1,31 +0,0 @@ -scalar maxDeltaT -( - pimple.dict().lookupOrDefault<scalar>("maxDeltaT", GREAT) -); - -volScalarField rDeltaT -( - IOobject - ( - "rDeltaT", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), - zeroGradientFvPatchScalarField::typeName -); - -volScalarField rSubDeltaT -( - IOobject - ( - "rSubDeltaT", - runTime.timeName(), - mesh - ), - mesh, - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT) -); diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H index 635e52874d28e3023e32de22fe7be0d5c1c91949..96f8473e91b5dd3ff43797cdcd603e8249afde0c 100644 --- a/applications/solvers/multiphase/interFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interFoam/alphaEqn.H @@ -77,11 +77,15 @@ { fvScalarMatrix alpha1Eqn ( - #ifdef LTSSOLVE - fv::localEulerDdtScheme<scalar>(mesh, rDeltaT.name()).fvmDdt(alpha1) - #else - fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1) - #endif + ( + LTS + ? fv::localEulerDdtScheme<scalar> + ( + mesh, + trSubDeltaT().name() + ).fvmDdt(alpha1) + : fv::EulerDdtScheme<scalar>(mesh).fvmDdt(alpha1) + ) + fv::gaussConvectionScheme<scalar> ( mesh, @@ -104,11 +108,7 @@ if (alphaApplyPrevCorr && tphiAlphaCorr0.valid()) { Info<< "Applying the previous iteration compression flux" << endl; - #ifdef LTSSOLVE - MULES::LTScorrect(alpha1, phiAlpha, tphiAlphaCorr0(), 1, 0); - #else MULES::correct(alpha1, phiAlpha, tphiAlphaCorr0(), 1, 0); - #endif phiAlpha += tphiAlphaCorr0(); } @@ -154,11 +154,7 @@ tmp<surfaceScalarField> tphiAlphaCorr(tphiAlphaUn() - phiAlpha); volScalarField alpha10("alpha10", alpha1); - #ifdef LTSSOLVE - MULES::LTScorrect(alpha1, tphiAlphaUn(), tphiAlphaCorr(), 1, 0); - #else MULES::correct(alpha1, tphiAlphaUn(), tphiAlphaCorr(), 1, 0); - #endif // Under-relax the correction for all but the 1st corrector if (aCorr == 0) @@ -175,11 +171,7 @@ { phiAlpha = tphiAlphaUn; - #ifdef LTSSOLVE - MULES::explicitLTSSolve(alpha1, phi, phiAlpha, 1, 0); - #else MULES::explicitSolve(alpha1, phiCN, phiAlpha, 1, 0); - #endif } alpha2 = 1.0 - alpha1; diff --git a/applications/solvers/multiphase/interFoam/createRDeltaT.H b/applications/solvers/multiphase/interFoam/createRDeltaT.H new file mode 100644 index 0000000000000000000000000000000000000000..b45dff137e4df5fb5005062e10f75c289812f4d1 --- /dev/null +++ b/applications/solvers/multiphase/interFoam/createRDeltaT.H @@ -0,0 +1,47 @@ +bool LTS = + word(mesh.ddtScheme("default")) + == fv::localEulerDdtScheme<scalar>::typeName; + +tmp<volScalarField> trDeltaT; +tmp<volScalarField> trSubDeltaT; + +if (LTS) +{ + scalar maxDeltaT + ( + pimple.dict().lookupOrDefault<scalar>("maxDeltaT", GREAT) + ); + + trDeltaT = tmp<volScalarField> + ( + new volScalarField + ( + IOobject + ( + "rDeltaT", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + mesh, + 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), + zeroGradientFvPatchScalarField::typeName + ) + ); + + trSubDeltaT = tmp<volScalarField> + ( + new volScalarField + ( + IOobject + ( + "rSubDeltaT", + runTime.timeName(), + mesh + ), + mesh, + 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT) + ) + ); +} diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 5cdd025140573a0727a6b19921eb23c2282b9524..779265e548026f2b6d89491975f42ff7861873ac 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -45,6 +45,8 @@ Description #include "fvIOoptionList.H" #include "CorrectPhi.H" #include "fixedFluxPressureFvPatchScalarField.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,7 +62,6 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createMRF.H" #include "createFvOptions.H" - #include "readTimeControls.H" volScalarField rAU ( @@ -78,8 +79,14 @@ int main(int argc, char *argv[]) #include "correctPhi.H" #include "createUf.H" - #include "CourantNo.H" - #include "setInitialDeltaT.H" + #include "createRDeltaT.H" + + if (!LTS) + { + #include "readTimeControls.H" + #include "CourantNo.H" + #include "setInitialDeltaT.H" + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -87,10 +94,17 @@ int main(int argc, char *argv[]) while (runTime.run()) { #include "readControls.H" - #include "alphaCourantNo.H" - #include "CourantNo.H" - #include "setDeltaT.H" + if (LTS) + { + #include "setRDeltaT.H" + } + else + { + #include "CourantNo.H" + #include "alphaCourantNo.H" + #include "setDeltaT.H" + } runTime++; diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 348f7e970938af16af2043f0b4c96025dc5c5823..a5b3a64853a954e9fe33301f0d405bba074de8f9 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -49,6 +49,8 @@ Description #include "fvIOoptionList.H" #include "CorrectPhi.H" #include "fixedFluxPressureFvPatchScalarField.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,10 +66,15 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createMRF.H" #include "createFvOptions.H" - #include "readTimeControls.H" #include "correctPhi.H" - #include "CourantNo.H" - #include "setInitialDeltaT.H" + #include "createRDeltaT.H" + + if (!LTS) + { + #include "readTimeControls.H" + #include "CourantNo.H" + #include "setInitialDeltaT.H" + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,9 +83,17 @@ int main(int argc, char *argv[]) while (runTime.run()) { #include "readTimeControls.H" - #include "CourantNo.H" - #include "alphaCourantNo.H" - #include "setDeltaT.H" + + if (LTS) + { + #include "setRDeltaT.H" + } + else + { + #include "CourantNo.H" + #include "alphaCourantNo.H" + #include "setDeltaT.H" + } runTime++; diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H index e0fe8ff6aff63267531869e9565aa8c7aaa0444f..69dda6cd3677a5feb5095294228352a364ba5d8d 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H @@ -72,19 +72,41 @@ phiAlpha1 -= phiAlpha1BD; // Calculate the limiter for alpha1 - MULES::limiter - ( - allLambda, - 1.0/runTime.deltaT().value(), - geometricOneField(), - alpha1, - phiAlpha1BD, - phiAlpha1, - zeroField(), - zeroField(), - 1, - 0 - ); + if (LTS) + { + const volScalarField& rDeltaT = + mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT"); + + MULES::limiter + ( + allLambda, + rDeltaT, + geometricOneField(), + alpha1, + phiAlpha1BD, + phiAlpha1, + zeroField(), + zeroField(), + 1, + 0 + ); + } + else + { + MULES::limiter + ( + allLambda, + 1.0/runTime.deltaT().value(), + geometricOneField(), + alpha1, + phiAlpha1BD, + phiAlpha1, + zeroField(), + zeroField(), + 1, + 0 + ); + } // Create the complete flux for alpha2 surfaceScalarField phiAlpha2 @@ -113,19 +135,41 @@ phiAlpha2 -= phiAlpha2BD; // Further limit the limiter for alpha2 - MULES::limiter - ( - allLambda, - 1.0/runTime.deltaT().value(), - geometricOneField(), - alpha2, - phiAlpha2BD, - phiAlpha2, - zeroField(), - zeroField(), - 1, - 0 - ); + if (LTS) + { + const volScalarField& rDeltaT = + mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT"); + + MULES::limiter + ( + allLambda, + rDeltaT, + geometricOneField(), + alpha2, + phiAlpha2BD, + phiAlpha2, + zeroField(), + zeroField(), + 1, + 0 + ); + } + else + { + MULES::limiter + ( + allLambda, + 1.0/runTime.deltaT().value(), + geometricOneField(), + alpha2, + phiAlpha2BD, + phiAlpha2, + zeroField(), + zeroField(), + 1, + 0 + ); + } // Construct the limited fluxes phiAlpha1 = phiAlpha1BD + lambda*phiAlpha1; diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index 4afb877d299ccd27106361ea62c18e0f7e550d0d..546b10bcee660f32a83c6fa7cee3f1077b05abee 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -39,6 +39,8 @@ Description #include "fvIOoptionList.H" #include "CorrectPhi.H" #include "fixedFluxPressureFvPatchScalarField.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,10 +56,15 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createMRF.H" #include "createFvOptions.H" - #include "readTimeControls.H" - #include "CourantNo.H" - #include "setInitialDeltaT.H" #include "correctPhi.H" + #include "createRDeltaT.H" + + if (!LTS) + { + #include "readTimeControls.H" + #include "CourantNo.H" + #include "setInitialDeltaT.H" + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,9 +73,17 @@ int main(int argc, char *argv[]) while (runTime.run()) { #include "readTimeControls.H" - #include "CourantNo.H" - #include "alphaCourantNo.H" - #include "setDeltaT.H" + + if (LTS) + { + #include "setRDeltaT.H" + } + else + { + #include "CourantNo.H" + #include "alphaCourantNo.H" + #include "setDeltaT.H" + } runTime++; diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H b/applications/solvers/multiphase/interFoam/setRDeltaT.H similarity index 93% rename from applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H rename to applications/solvers/multiphase/interFoam/setRDeltaT.H index 3f8ba982cf9c644a203541499d90fd9aa7f51520..0752857a9b20468b8a05ba8a438a49e443c08b7f 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H +++ b/applications/solvers/multiphase/interFoam/setRDeltaT.H @@ -1,4 +1,7 @@ { + volScalarField& rDeltaT = trDeltaT(); + volScalarField& rSubDeltaT = trSubDeltaT(); + const dictionary& pimpleDict = pimple.dict(); scalar maxCo @@ -132,7 +135,8 @@ << ", " << gMax(1/rDeltaT.internalField()) << endl; } - #include "alphaControls.H" + const dictionary& alphaControls = mesh.solverDict(alpha1.name()); + label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles"))); rSubDeltaT = rDeltaT*nAlphaSubCycles; } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options index 68bcd9ef06f4228e90f1fa9e852783691e64630b..cccb31514dc70f1381ac66652cb7b4b3ac396f04 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options @@ -5,9 +5,11 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lfiniteVolume + -lfiniteVolume \ + -lmeshTools diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options index e05b53a962535c68c3ba33c7d9e11227a0d197f2..f6419312ce83b50b89f38bffdb731c4d0cf77a10 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options @@ -8,9 +8,9 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options index 393dd2a992743127aeb6958cd773057f87cf873d..f8ffa1cfc7c28ba2f35d5eedb3d84de955a90146 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options @@ -3,9 +3,11 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lfiniteVolume + -lfiniteVolume \ + -lmeshTools diff --git a/applications/solvers/compressible/rhoCentralFoam/createRDeltaT.H b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H similarity index 93% rename from applications/solvers/compressible/rhoCentralFoam/createRDeltaT.H rename to src/finiteVolume/cfdTools/general/include/createRDeltaT.H index 44d181383c75ee4aa3f362724b103509fde7e6a5..dae76f4cab9f31d5c5156cc7b761c9e68c4275fe 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createRDeltaT.H +++ b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H @@ -1,5 +1,5 @@ bool LTS = - word(mesh.ddtScheme("ddt(rho)")) + word(mesh.ddtScheme("default")) == fv::localEulerDdtScheme<scalar>::typeName; tmp<volScalarField> trDeltaT; diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C index 5c3f71487db1f9b274f09657ff886877ba6e595d..d5cd3fba5d656e1a79a4c2758eb907f3bf74f034 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C +++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,25 +48,4 @@ void Foam::MULES::correct } -void Foam::MULES::LTScorrect -( - volScalarField& psi, - const surfaceScalarField& phi, - surfaceScalarField& phiPsiCorr, - const scalar psiMax, - const scalar psiMin -) -{ - LTScorrect - ( - geometricOneField(), - psi, - phi, - phiPsiCorr, - zeroField(), zeroField(), - psiMax, psiMin - ); -} - - // ************************************************************************* // diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H index 76400a9a05200db75f4e1a7155a4b9a749eb4969..fe0d353c70c59ec09c9149652c2c52481434ad59 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H +++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULES.H @@ -94,29 +94,6 @@ void correct const scalar psiMin ); -template<class RhoType, class SpType, class SuType> -void LTScorrect -( - const RhoType& rho, - volScalarField& psi, - const surfaceScalarField& phi, - surfaceScalarField& phiCorr, - const SpType& Sp, - const SuType& Su, - const scalar psiMax, - const scalar psiMin -); - -void LTScorrect -( - volScalarField& psi, - const surfaceScalarField& phi, - surfaceScalarField& phiCorr, - const scalar psiMax, - const scalar psiMin -); - - template<class RdeltaTType, class RhoType, class SpType, class SuType> void limiterCorr ( diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C index be0d8fbaa49dc28555fe162c9b4eac795d6cb348..ecd7671fe95b5750e051430c35de07b45d696bc7 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C +++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C @@ -25,6 +25,7 @@ License #include "CMULES.H" #include "fvcSurfaceIntegrate.H" +#include "localEulerDdtScheme.H" #include "slicedSurfaceFields.H" #include "wedgeFvPatch.H" #include "syncTools.H" @@ -87,56 +88,49 @@ void Foam::MULES::correct ) { const fvMesh& mesh = psi.mesh(); - const scalar rDeltaT = 1.0/mesh.time().deltaTValue(); - limitCorr - ( - rDeltaT, - rho, - psi, - phi, - phiCorr, - Sp, - Su, - psiMax, - psiMin - ); - - correct(rDeltaT, rho, psi, phi, phiCorr, Sp, Su); -} + bool LTS = + word(mesh.ddtScheme("default")) + == fv::localEulerDdtScheme<scalar>::typeName; + if (LTS) + { + const volScalarField& rDeltaT = + mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT"); -template<class RhoType, class SpType, class SuType> -void Foam::MULES::LTScorrect -( - const RhoType& rho, - volScalarField& psi, - const surfaceScalarField& phi, - surfaceScalarField& phiCorr, - const SpType& Sp, - const SuType& Su, - const scalar psiMax, - const scalar psiMin -) -{ - const fvMesh& mesh = psi.mesh(); + limitCorr + ( + rDeltaT, + rho, + psi, + phi, + phiCorr, + Sp, + Su, + psiMax, + psiMin + ); + correct(rDeltaT, rho, psi, phi, phiCorr, Sp, Su); + } + else + { + const scalar rDeltaT = 1.0/mesh.time().deltaTValue(); - const volScalarField& rDeltaT = - mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT"); + limitCorr + ( + rDeltaT, + rho, + psi, + phi, + phiCorr, + Sp, + Su, + psiMax, + psiMin + ); - limitCorr - ( - rDeltaT, - rho, - psi, - phi, - phiCorr, - Sp, - Su, - psiMax, - psiMin - ); - correct(rDeltaT, rho, psi, phi, phiCorr, Sp, Su); + correct(rDeltaT, rho, psi, phi, phiCorr, Sp, Su); + } } diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C index cb0970b5c4f269b5e1022ea060e2aa27448da675..f9fb29f17ec92098a5eb1d7470a355eb4b8aa0a2 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C +++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,27 +48,6 @@ void Foam::MULES::explicitSolve } -void Foam::MULES::explicitLTSSolve -( - volScalarField& psi, - const surfaceScalarField& phi, - surfaceScalarField& phiPsi, - const scalar psiMax, - const scalar psiMin -) -{ - explicitLTSSolve - ( - geometricOneField(), - psi, - phi, - phiPsi, - zeroField(), zeroField(), - psiMax, psiMin - ); -} - - void Foam::MULES::limitSum(UPtrList<scalarField>& phiPsiCorrs) { forAll(phiPsiCorrs[0], facei) diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H index 66930ee8a3fa5af52c149627a9d147dfa042125e..47a44542163157f9b46df6814ec4efa79d70f5c4 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H +++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H @@ -103,29 +103,6 @@ void explicitSolve const scalar psiMin ); -template<class RhoType, class SpType, class SuType> -void explicitLTSSolve -( - const RhoType& rho, - volScalarField& psi, - const surfaceScalarField& phiBD, - surfaceScalarField& phiPsi, - const SpType& Sp, - const SuType& Su, - const scalar psiMax, - const scalar psiMin -); - -void explicitLTSSolve -( - volScalarField& psi, - const surfaceScalarField& phiBD, - surfaceScalarField& phiPsi, - const scalar psiMax, - const scalar psiMin -); - - template<class RdeltaTType, class RhoType, class SpType, class SuType> void limiter ( diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C index 638f99cc18a13b5a21f319311456799a2dbd2b20..83eebdb1523ab3fa3a7a3c7e4478bcdfe4acadf6 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C +++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C @@ -26,6 +26,7 @@ License #include "MULES.H" #include "upwind.H" #include "fvcSurfaceIntegrate.H" +#include "localEulerDdtScheme.H" #include "slicedSurfaceFields.H" #include "wedgeFvPatch.H" #include "syncTools.H" @@ -107,63 +108,54 @@ void Foam::MULES::explicitSolve ) { const fvMesh& mesh = psi.mesh(); - const scalar rDeltaT = 1.0/mesh.time().deltaTValue(); psi.correctBoundaryConditions(); - limit - ( - rDeltaT, - rho, - psi, - phi, - phiPsi, - Sp, - Su, - psiMax, - psiMin, - false - ); - - explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su); -} + bool LTS = + word(mesh.ddtScheme("default")) + == fv::localEulerDdtScheme<scalar>::typeName; + if (LTS) + { + const volScalarField& rDeltaT = + mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT"); -template<class RhoType, class SpType, class SuType> -void Foam::MULES::explicitLTSSolve -( - const RhoType& rho, - volScalarField& psi, - const surfaceScalarField& phi, - surfaceScalarField& phiPsi, - const SpType& Sp, - const SuType& Su, - const scalar psiMax, - const scalar psiMin -) -{ - const fvMesh& mesh = psi.mesh(); - - const volScalarField& rDeltaT = - mesh.objectRegistry::lookupObject<volScalarField>("rSubDeltaT"); + limit + ( + rDeltaT, + rho, + psi, + phi, + phiPsi, + Sp, + Su, + psiMax, + psiMin, + false + ); - psi.correctBoundaryConditions(); + explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su); + } + else + { + const scalar rDeltaT = 1.0/mesh.time().deltaTValue(); - limit - ( - rDeltaT, - rho, - psi, - phi, - phiPsi, - Sp, - Su, - psiMax, - psiMin, - false - ); + limit + ( + rDeltaT, + rho, + psi, + phi, + phiPsi, + Sp, + Su, + psiMax, + psiMin, + false + ); - explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su); + explicitSolve(rDeltaT, rho, psi, phiPsi, Sp, Su); + } } diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/U b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/U similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/U rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/U diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/alpha.water b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/alpha.water similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/alpha.water rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/alpha.water diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/k b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/k similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/k rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/k diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/nut b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/nut similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/nut rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/nut diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/omega b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/omega similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/omega rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/omega diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/p_rgh b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/p_rgh similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/p_rgh rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/p_rgh diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/0.org/pointDisplacement b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/pointDisplacement similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/0.org/pointDisplacement rename to tutorials/multiphase/interFoam/ras/DTCHull/0.org/pointDisplacement diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/Allclean b/tutorials/multiphase/interFoam/ras/DTCHull/Allclean similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/Allclean rename to tutorials/multiphase/interFoam/ras/DTCHull/Allclean diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/Allrun b/tutorials/multiphase/interFoam/ras/DTCHull/Allrun similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/Allrun rename to tutorials/multiphase/interFoam/ras/DTCHull/Allrun diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/README b/tutorials/multiphase/interFoam/ras/DTCHull/README similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/README rename to tutorials/multiphase/interFoam/ras/DTCHull/README diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/constant/dynamicMeshDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/dynamicMeshDict rename to tutorials/multiphase/interFoam/ras/DTCHull/constant/dynamicMeshDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/g b/tutorials/multiphase/interFoam/ras/DTCHull/constant/g similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/g rename to tutorials/multiphase/interFoam/ras/DTCHull/constant/g diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/hRef b/tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/hRef rename to tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/transportProperties rename to tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/triSurface/README b/tutorials/multiphase/interFoam/ras/DTCHull/constant/triSurface/README similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/triSurface/README rename to tutorials/multiphase/interFoam/ras/DTCHull/constant/triSurface/README diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/turbulenceProperties rename to tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/blockMeshDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict similarity index 98% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/controlDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict index c2713242cedbcb1a2692208cc0e7d60044a7f1b2..8678787a005907a65a9722174eccda46872e0466 100644 --- a/tutorials/multiphase/LTSInterFoam/DTCHull/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application LTSInterFoam; +application interFoam; startFrom startTime; diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/decomposeParDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/decomposeParDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/decomposeParDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/decomposeParDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSchemes b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSchemes rename to tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSolution rename to tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/meshQualityDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/refineMeshDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/setFieldsDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/snappyHexMeshDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/surfaceFeatureExtractDict rename to tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1 similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.1 rename to tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1 diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2 similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.2 rename to tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2 diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3 similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.3 rename to tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3 diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4 similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.4 rename to tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4 diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5 similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.5 rename to tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5 diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6 similarity index 100% rename from tutorials/multiphase/LTSInterFoam/DTCHull/system/topoSetDict.6 rename to tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6