diff --git a/applications/solvers/incompressible/simpleFoam/Allwmake b/applications/solvers/incompressible/simpleFoam/Allwmake index 577d11018f..79109c8f04 100755 --- a/applications/solvers/incompressible/simpleFoam/Allwmake +++ b/applications/solvers/incompressible/simpleFoam/Allwmake @@ -3,6 +3,10 @@ cd ${0%/*} || exit 1 # run from this directory set -x wmake + +wmake SRFSimpleFoam +wmake MRFSimpleFoam +wmake windSimpleFoam wmake porousSimpleFoam # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C similarity index 64% rename from tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C rename to applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C index c00bc032ff..8125321157 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C +++ b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,19 +22,19 @@ License along with OpenFOAM. If not, see . Application - rhoPisoTwinParcelFoam + MRFSimpleFoam Description - Transient solver for compressible, turbulent flow with two thermo-clouds. + Steady-state solver for incompressible, turbulent flow of non-Newtonian + fluids with MRF regions. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "basicPsiThermo.H" -#include "turbulenceModel.H" - -#include "basicThermoCloud.H" -#include "basicKinematicCloud.H" +#include "singlePhaseTransportModel.H" +#include "RASModel.H" +#include "MRFZones.H" +#include "simpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,54 +44,32 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createMesh.H" - #include "readGravitationalAcceleration.H" #include "createFields.H" - #include "createClouds.H" - #include "readPISOControls.H" #include "initContinuityErrs.H" - #include "readTimeControls.H" - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" + + MRFZones mrfZones(mesh); + mrfZones.correctBoundaryVelocity(U); + + simpleControl simple(mesh); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; - while (runTime.run()) + while (simple.loop()) { - #include "readTimeControls.H" - #include "readPISOControls.H" - #include "compressibleCourantNo.H" - #include "setDeltaT.H" - - runTime++; - Info<< "Time = " << runTime.timeName() << nl << endl; - thermoCloud1.evolve(); + p.storePrevIter(); - kinematicCloud1.evolve(); - - - #include "rhoEqn.H" - - // --- PIMPLE loop - for (int ocorr=1; ocorr<=nOuterCorr; ocorr++) + // --- Pressure-velocity SIMPLE corrector { #include "UEqn.H" - - // --- PISO loop - for (int corr=1; corr<=nCorr; corr++) - { - #include "hsEqn.H" - #include "pEqn.H" - } + #include "pEqn.H" } turbulence->correct(); - rho = thermo.rho(); - runTime.write(); Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" diff --git a/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/Make/files new file mode 100644 index 0000000000..56c194272d --- /dev/null +++ b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/Make/files @@ -0,0 +1,3 @@ +MRFSimpleFoam.C + +EXE = $(FOAM_APPBIN)/MRFSimpleFoam diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/Make/options similarity index 97% rename from tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/options rename to applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/Make/options index 1223bdd06f..81310cc2e0 100644 --- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I.. \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ -I$(LIB_SRC)/transportModels \ diff --git a/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/UEqn.H new file mode 100644 index 0000000000..27d50944ce --- /dev/null +++ b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/UEqn.H @@ -0,0 +1,12 @@ + // Momentum predictor + + tmp UEqn + ( + fvm::div(phi, U) + + turbulence->divDevReff(U) + ); + mrfZones.addCoriolis(UEqn()); + + UEqn().relax(); + + solve(UEqn() == -fvc::grad(p)); diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/pEqn.H similarity index 70% rename from tutorials/incompressible/simpleWindFoam/simpleWindFoam/pEqn.H rename to applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/pEqn.H index 2f45b98012..81f5c20480 100644 --- a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/pEqn.H +++ b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/pEqn.H @@ -1,9 +1,12 @@ +{ p.boundaryField().updateCoeffs(); - volScalarField AU = UEqn().A(); - U = UEqn().H()/AU; + volScalarField rAU(1.0/UEqn().A()); + U = rAU*UEqn().H(); UEqn.clear(); - phi = fvc::interpolate(U) & mesh.Sf(); + + phi = fvc::interpolate(U, "interpolate(HbyA)") & mesh.Sf(); + mrfZones.relativeFlux(phi); adjustPhi(phi, U, p); // Non-orthogonal pressure corrector loop @@ -11,7 +14,7 @@ { fvScalarMatrix pEqn ( - fvm::laplacian(1.0/AU, p) == fvc::div(phi) + fvm::laplacian(rAU, p) == fvc::div(phi) ); pEqn.setReference(pRefCell, pRefValue); @@ -29,5 +32,6 @@ p.relax(); // Momentum corrector - U -= fvc::grad(p)/AU; + U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); +} diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/files new file mode 100644 index 0000000000..3250f4139d --- /dev/null +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/files @@ -0,0 +1,3 @@ +SRFSimpleFoam.C + +EXE = $(FOAM_APPBIN)/SRFSimpleFoam diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options similarity index 97% rename from tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/options rename to applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options index cc3cd5e731..66a349da05 100644 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I.. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C similarity index 90% rename from tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C rename to applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index aac457a468..d3b5067c4f 100644 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - simpleSRFFoam + SRFSimpleFoam Description Steady-state solver for incompressible, turbulent flow of non-Newtonian @@ -34,6 +34,7 @@ Description #include "singlePhaseTransportModel.H" #include "RASModel.H" #include "SRFModel.H" +#include "simpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,20 +46,19 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "initContinuityErrs.H" + simpleControl simple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; - while (runTime.loop()) + while (simple.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; - #include "readSIMPLEControls.H" - #include "initConvergenceCheck.H" - p.storePrevIter(); - // Pressure-velocity SIMPLE corrector + // --- Pressure-velocity SIMPLE corrector { #include "UrelEqn.H" #include "pEqn.H" @@ -87,8 +87,6 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - - #include "convergenceCheck.H" } Info<< "End\n" << endl; diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/UrelEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H similarity index 57% rename from tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/UrelEqn.H rename to applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H index ac0bc044b7..38c64acb7b 100644 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/UrelEqn.H +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H @@ -1,4 +1,5 @@ // Relative momentum predictor + tmp UrelEqn ( fvm::div(phi, Urel) @@ -8,9 +9,4 @@ UrelEqn().relax(); - eqnResidual = solve - ( - UrelEqn() == -fvc::grad(p) - ).initialResidual(); - - maxResidual = max(eqnResidual, maxResidual); + solve(UrelEqn() == -fvc::grad(p)); diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H rename to applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H similarity index 53% rename from tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/pEqn.H rename to applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H index b2bc37fd5d..beb73bd341 100644 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/pEqn.H +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H @@ -1,34 +1,37 @@ { p.boundaryField().updateCoeffs(); - volScalarField AUrel = UrelEqn().A(); - Urel = UrelEqn().H()/AUrel; + + volScalarField rAUrel(1.0/UrelEqn().A()); + Urel = rAUrel*UrelEqn().H(); UrelEqn.clear(); - phi = fvc::interpolate(Urel) & mesh.Sf(); + + phi = fvc::interpolate(Urel, "interpolate(HbyA)") & mesh.Sf(); adjustPhi(phi, Urel, p); // Non-orthogonal pressure corrector loop - for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + for (int nonOrth=0; nonOrth<=simple.nNonOrthCorr(); nonOrth++) { fvScalarMatrix pEqn ( - fvm::laplacian(1.0/AUrel, p) == fvc::div(phi) + fvm::laplacian(rAUrel, p) == fvc::div(phi) ); pEqn.setReference(pRefCell, pRefValue); + pEqn.solve(); - if (nonOrth == nNonOrthCorr) + if (nonOrth == simple.nNonOrthCorr()) { phi -= pEqn.flux(); - } + } } -# include "continuityErrs.H" + #include "continuityErrs.H" // Explicitly relax pressure for momentum corrector p.relax(); // Momentum corrector - Urel -= fvc::grad(p)/AUrel; + Urel -= rAUrel*fvc::grad(p); Urel.correctBoundaryConditions(); } diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H index e6fb6bf89e..0ee8abf0be 100644 --- a/applications/solvers/incompressible/simpleFoam/UEqn.H +++ b/applications/solvers/incompressible/simpleFoam/UEqn.H @@ -1,4 +1,4 @@ - // Solve the Momentum equation + // Momentum predictor tmp UEqn ( diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H index 4bd84f59c4..699cdcb3cf 100644 --- a/applications/solvers/incompressible/simpleFoam/pEqn.H +++ b/applications/solvers/incompressible/simpleFoam/pEqn.H @@ -1,9 +1,11 @@ +{ p.boundaryField().updateCoeffs(); - volScalarField AU(UEqn().A()); - U = UEqn().H()/AU; + volScalarField rAU(1.0/UEqn().A()); + U = rAU*UEqn().H(); UEqn.clear(); - phi = fvc::interpolate(U) & mesh.Sf(); + + phi = fvc::interpolate(U, "interpolate(HbyA)") & mesh.Sf(); adjustPhi(phi, U, p); // Non-orthogonal pressure corrector loop @@ -11,7 +13,7 @@ { fvScalarMatrix pEqn ( - fvm::laplacian(1.0/AU, p) == fvc::div(phi) + fvm::laplacian(rAU, p) == fvc::div(phi) ); pEqn.setReference(pRefCell, pRefValue); @@ -30,5 +32,6 @@ p.relax(); // Momentum corrector - U -= fvc::grad(p)/AU; + U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); +} diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index af2a913615..beb50f0f3f 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) p.storePrevIter(); - // Pressure-velocity SIMPLE corrector + // --- Pressure-velocity SIMPLE corrector { #include "UEqn.H" #include "pEqn.H" diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/files new file mode 100644 index 0000000000..d7fe780806 --- /dev/null +++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/files @@ -0,0 +1,3 @@ +windSimpleFoam.C + +EXE = $(FOAM_APPBIN)/windSimpleFoam diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/Make/options b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/options similarity index 97% rename from tutorials/incompressible/simpleWindFoam/simpleWindFoam/Make/options rename to applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/options index 648de52f52..057788a483 100644 --- a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I.. \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ -I$(LIB_SRC)/transportModels \ diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H similarity index 100% rename from tutorials/incompressible/simpleWindFoam/simpleWindFoam/UEqn.H rename to applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/simpleWindFoam.C b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C similarity index 98% rename from tutorials/incompressible/simpleWindFoam/simpleWindFoam/simpleWindFoam.C rename to applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C index 3f97daa4d9..f2d095ae8f 100644 --- a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/simpleWindFoam.C +++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C @@ -46,6 +46,8 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "initContinuityErrs.H" + IObasicSourceList actuationDisks(mesh); + simpleControl simple(mesh); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/conversion/datToFoam/Make/files b/applications/utilities/mesh/conversion/datToFoam/Make/files new file mode 100644 index 0000000000..93d1ed79c4 --- /dev/null +++ b/applications/utilities/mesh/conversion/datToFoam/Make/files @@ -0,0 +1,3 @@ +datToFoam.C + +EXE = $(FOAM_APPBIN)/datToFoam diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/options b/applications/utilities/mesh/conversion/datToFoam/Make/options similarity index 100% rename from tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/options rename to applications/utilities/mesh/conversion/datToFoam/Make/options diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C similarity index 97% rename from tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C rename to applications/utilities/mesh/conversion/datToFoam/datToFoam.C index f234587a2d..8c14410f5b 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C +++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) FatalError.exit(); } -# include "createTime.H" + #include "createTime.H" std::ifstream plot3dFile(args.args()[1].c_str()); diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H b/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H index 4b042ab63f..885ebb4805 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H @@ -1,3 +1,6 @@ + fileName path(UMean.rootPath()/UMean.caseName()/"graphs"/UMean.instance()); + mkDir(path); + scalarField UMeanXvalues ( channelIndexing.collapse(UMean.component(vector::X)()) @@ -42,19 +45,19 @@ const scalarField& y = channelIndexing.y(); - makeGraph(y, UMeanXvalues, "Uf", UMean.path(), gFormat); - makeGraph(y, urmsValues, "u", UMean.path(), gFormat); - makeGraph(y, vrmsValues, "v", UMean.path(), gFormat); - makeGraph(y, wrmsValues, "w", UMean.path(), gFormat); - makeGraph(y, RxyValues, "uv", UMean.path(), gFormat); - makeGraph(y, kValues, "k", UMean.path(), gFormat); + makeGraph(y, UMeanXvalues, "Uf", path, gFormat); + makeGraph(y, urmsValues, "u", path, gFormat); + makeGraph(y, vrmsValues, "v", path, gFormat); + makeGraph(y, wrmsValues, "w", path, gFormat); + makeGraph(y, RxyValues, "uv", path, gFormat); + makeGraph(y, kValues, "k", path, gFormat); - makeGraph(y, pPrime2MeanValues, "pPrime2Mean", UMean.path(), gFormat); + makeGraph(y, pPrime2MeanValues, "pPrime2Mean", path, gFormat); /* - makeGraph(y, epsilonValues, "epsilon", UMean.path(), gFormat); - makeGraph(y, nuMeanValues, "nu", UMean.path(), gFormat); - makeGraph(y, nuPrimeValues, "nuPrime", UMean.path(), gFormat); - makeGraph(y, gammaDotMeanValues, "gammaDot", UMean.path(), gFormat); - makeGraph(y, gammaDotPrimeValues, "gammaDotPrime", UMean.path(), gFormat); + makeGraph(y, epsilonValues, "epsilon", path, gFormat); + makeGraph(y, nuMeanValues, "nu", path, gFormat); + makeGraph(y, nuPrimeValues, "nuPrime", path, gFormat); + makeGraph(y, gammaDotMeanValues, "gammaDot", path, gFormat); + makeGraph(y, gammaDotPrimeValues, "gammaDotPrime", path, gFormat); */ diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions index 0a006348a5..e7f1ad40a6 100644 --- a/bin/tools/CleanFunctions +++ b/bin/tools/CleanFunctions @@ -76,7 +76,10 @@ cleanCase() rm -rf processor* > /dev/null 2>&1 rm -rf probes* > /dev/null 2>&1 rm -rf forces* > /dev/null 2>&1 + rm -rf graphs* > /dev/null 2>&1 rm -rf sets > /dev/null 2>&1 + rm -rf surfaceSampling > /dev/null 2>&1 + rm -rf cuttingPlane > /dev/null 2>&1 rm -rf system/machines > /dev/null 2>&1 if [ -d constant/polyMesh ] diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index c44b3393d5..d276de95ce 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -257,7 +257,7 @@ Foam::Time::Time graphFormat_("raw"), runTimeModifiable_(true), - readLibs_(controlDict_, "libs"), + libs_(controlDict_, "libs"), functionObjects_(*this) { // Explicitly set read flags on objectRegistry so anything constructed @@ -343,7 +343,7 @@ Foam::Time::Time graphFormat_("raw"), runTimeModifiable_(true), - readLibs_(controlDict_, "libs"), + libs_(controlDict_, "libs"), functionObjects_(*this) { // Explicitly set read flags on objectRegistry so anything constructed @@ -430,7 +430,7 @@ Foam::Time::Time graphFormat_("raw"), runTimeModifiable_(true), - readLibs_(controlDict_, "libs"), + libs_(controlDict_, "libs"), functionObjects_(*this) {} diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H index c1fe271a96..28ff775a68 100644 --- a/src/OpenFOAM/db/Time/Time.H +++ b/src/OpenFOAM/db/Time/Time.H @@ -166,8 +166,8 @@ private: //- Is runtime modification of dictionaries allowed? Switch runTimeModifiable_; - //- Instantiate a dummy class to cause the reading of dynamic libraries - dlLibraryTable::readDlLibrary readLibs_; + //- Any loaded dynamic libraries + dlLibraryTable libs_; //- Function objects executed at start and on ++, += mutable functionObjectList functionObjects_; @@ -375,6 +375,12 @@ public: return functionObjects_; } + //- External access to the loaded libraries + dlLibraryTable& libs() + { + return libs_; + } + //- Return true if time currently being sub-cycled, otherwise false bool subCycling() const { diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C index e4cfbc88ed..e0a1bbbdd4 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C @@ -36,6 +36,7 @@ License #include "Time.H" #include "PstreamReduceOps.H" +#include "long.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -61,6 +62,36 @@ const Foam::word Foam::functionEntries::codeStream::codeTemplateC = "codeStreamTemplate.C"; +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +const Foam::dictionary& Foam::functionEntries::codeStream::topDict +( + const dictionary& dict +) +{ + const dictionary& p = dict.parent(); + + if (&p != &dict && !p.name().empty()) + { + return topDict(p); + } + else + { + return dict; + } +} + + +Foam::dlLibraryTable& Foam::functionEntries::codeStream::libs +( + const dictionary& dict +) +{ + const IOdictionary& d = static_cast(topDict(dict)); + return const_cast(d.time()).libs(); +} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::functionEntries::codeStream::execute @@ -99,8 +130,15 @@ bool Foam::functionEntries::codeStream::execute const fileName libPath = dynCode.libPath(); // see if library is loaded - void* lib = dlLibraryTable::findLibrary(libPath); - + void* lib = NULL; + if + ( + isA(topDict(parentDict)) + && parentDict.dictName() != Time::controlDictName + ) + { + lib = libs(parentDict).findLibrary(libPath); + } if (!lib) { @@ -110,9 +148,27 @@ bool Foam::functionEntries::codeStream::execute // nothing loaded // avoid compilation if possible by loading an existing library - if (!lib && dlLibraryTable::open(libPath, false)) + if (!lib) { - lib = dlLibraryTable::findLibrary(libPath); + if + ( + isA(topDict(parentDict)) + && parentDict.dictName() != Time::controlDictName + ) + { + // Cached access to dl libs. Guarantees clean up upon destruction + // of Time. + dlLibraryTable& dlLibs = libs(parentDict); + if (dlLibs.open(libPath, false)) + { + lib = dlLibs.findLibrary(libPath); + } + } + else + { + // Uncached opening of libPath + lib = dlOpen(libPath); + } } @@ -167,19 +223,34 @@ bool Foam::functionEntries::codeStream::execute // all processes must wait for compile to finish reduce(create, orOp()); - if (!dlLibraryTable::open(libPath, false)) + if + ( + isA(topDict(parentDict)) + && parentDict.dictName() != Time::controlDictName + ) { - FatalIOErrorIn - ( - "functionEntries::codeStream::execute(..)", - parentDict - ) << "Failed loading library " << libPath << nl - << "Did you add all libraries to the 'libs' entry" - << " in system/controlDict?" - << exit(FatalIOError); - } + // Cached access to dl libs. Guarantees clean up upon destruction + // of Time. + dlLibraryTable& dlLibs = libs(parentDict); + if (!dlLibs.open(libPath, false)) + { + FatalIOErrorIn + ( + "functionEntries::codeStream::execute(..)", + parentDict + ) << "Failed loading library " << libPath << nl + << "Did you add all libraries to the 'libs' entry" + << " in system/controlDict?" + << exit(FatalIOError); + } - lib = dlLibraryTable::findLibrary(libPath); + lib = dlLibs.findLibrary(libPath); + } + else + { + // Uncached opening of libPath + lib = dlOpen(libPath); + } } diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H index f35adcdae3..4da11839f1 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H @@ -98,6 +98,8 @@ SourceFiles namespace Foam { +class dlLibraryTable; + namespace functionEntries { @@ -113,9 +115,14 @@ class codeStream //- Interpreter function type typedef void (*streamingFunctionType)(Ostream&, const dictionary&); - // Private Member Functions + //- Helper function: parent (of parent etc.) of dictionary up to the top + static const dictionary& topDict(const dictionary&); + + //- Helper function: access to dlLibraryTable of Time + static dlLibraryTable& libs(const dictionary& dict); + //- Disallow default bitwise copy construct codeStream(const codeStream&); diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C index 3d1878a5f7..deca23890d 100644 --- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C +++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C @@ -26,11 +26,6 @@ License #include "dlLibraryTable.H" #include "OSspecific.H" -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -Foam::dlLibraryTable Foam::dlLibraryTable::loadedLibraries; - - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::dlLibraryTable::dlLibraryTable() @@ -39,11 +34,13 @@ Foam::dlLibraryTable::dlLibraryTable() {} -Foam::dlLibraryTable::readDlLibrary::readDlLibrary +Foam::dlLibraryTable::dlLibraryTable ( const dictionary& dict, const word& libsEntry ) +: + HashTable >() { open(dict, libsEntry); } @@ -91,14 +88,7 @@ bool Foam::dlLibraryTable::open } else { - if (loadedLibraries.insert(functionLibPtr, functionLibName)) - { - return true; - } - else - { - return false; - } + return insert(functionLibPtr, functionLibName); } } else @@ -117,7 +107,7 @@ bool Foam::dlLibraryTable::close void* libPtr = findLibrary(functionLibName); if (libPtr) { - loadedLibraries.erase(libPtr); + erase(libPtr); if (!dlClose(libPtr)) { @@ -141,7 +131,7 @@ bool Foam::dlLibraryTable::close void* Foam::dlLibraryTable::findLibrary(const fileName& functionLibName) { - forAllConstIter(dlLibraryTable, loadedLibraries, iter) + forAllConstIter(dlLibraryTable, *this, iter) { if (iter() == functionLibName) { diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H index aaf472f67e..c3388907d1 100644 --- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H +++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H @@ -63,30 +63,15 @@ class dlLibraryTable public: - // Static data members - - //- Static data someStaticData - static dlLibraryTable loadedLibraries; - - - // Public classes - - //- Class whose construction causes the reading of dynamic libraries - class readDlLibrary - { - public: - - //- Read all the libraries listed in the 'libsEntry' entry in the - // given dictionary if present - readDlLibrary(const dictionary&, const word& libsEntry); - }; - - // Constructors //- Construct null dlLibraryTable(); + //- Construct from dictionary and name of 'libs' entry giving + // the libraries to load + dlLibraryTable(const dictionary&, const word&); + //- Destructor ~dlLibraryTable(); @@ -95,23 +80,23 @@ public: // Member Functions //- Open the named library, optionally with warnings if problems occur - static bool open(const fileName& name, const bool verbose = true); + bool open(const fileName& name, const bool verbose = true); //- Close the named library, optionally with warnings if problems occur - static bool close(const fileName& name, const bool verbose = true); + bool close(const fileName& name, const bool verbose = true); //- Find the handle of the named library - static void* findLibrary(const fileName& name); + void* findLibrary(const fileName& name); //- Open all the libraries listed in the 'libsEntry' entry in the // given dictionary if present - static bool open(const dictionary&, const word& libsEntry); + bool open(const dictionary&, const word& libsEntry); //- Open all the libraries listed in the 'libsEntry' entry in the // given dictionary if present and check the additions // to the given constructor table template - static bool open + bool open ( const dictionary&, const word& libsEntry, diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index fcc9e11438..721f61e949 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,6 +26,7 @@ License #include "functionObject.H" #include "dictionary.H" #include "dlLibraryTable.H" +#include "Time.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -57,7 +58,7 @@ Foam::autoPtr Foam::functionObject::New Info<< "Selecting function " << functionType << endl; } - dlLibraryTable::open + const_cast(t).libs().open ( functionDict, "functionObjectLibs", diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index fe1cba2ba6..0f86477c64 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New { const word agglomeratorType(controlDict.lookup("agglomerator")); - dlLibraryTable::open + const_cast(mesh.thisDb().time()).libs().open ( controlDict, "geometricGAMGAgglomerationLibs", @@ -159,7 +159,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New { const word agglomeratorType(controlDict.lookup("agglomerator")); - dlLibraryTable::open + const_cast(mesh.thisDb().time()).libs().open ( controlDict, "algebraicGAMGAgglomerationLibs", diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C index 4189f303c7..a7f4ae98e6 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ Foam::autoPtr Foam::dynamicFvMesh::New(const IOobject& io) Info<< "Selecting dynamicFvMesh " << dynamicFvMeshTypeName << endl; - dlLibraryTable::open + const_cast(io.time()).libs().open ( dict, "dynamicFvMeshLibs", diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C index 6231e58669..7f8c8486e0 100644 --- a/src/dynamicMesh/motionSolver/motionSolver.C +++ b/src/dynamicMesh/motionSolver/motionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,7 @@ Foam::autoPtr Foam::motionSolver::New(const polyMesh& mesh) Info<< "Selecting motion solver: " << solverTypeName << endl; - dlLibraryTable::open + const_cast(mesh.time()).libs().open ( solverDict, "motionSolverLibs", diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C index 8dd28c5e07..6d268371b6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C @@ -59,60 +59,66 @@ void* Foam::codedFixedValueFvPatchField::loadLibrary const fileName& libPath, const string& globalFuncName, const dictionary& contextDict -) +) const { void* lib = 0; // avoid compilation by loading an existing library - if (!libPath.empty() && dlLibraryTable::open(libPath, false)) + if (!libPath.empty()) { - lib = dlLibraryTable::findLibrary(libPath); + dlLibraryTable& libs = const_cast(this->db().time()).libs(); - // verify the loaded version and unload if needed - if (lib) + if (libs.open(libPath, false)) { - // provision for manual execution of code after loading - if (dlSymFound(lib, globalFuncName)) - { - loaderFunctionType function = - reinterpret_cast - ( - dlSym(lib, globalFuncName) - ); + lib = libs.findLibrary(libPath); - if (function) + // verify the loaded version and unload if needed + if (lib) + { + // provision for manual execution of code after loading + if (dlSymFound(lib, globalFuncName)) { - (*function)(true); // force load + loaderFunctionType function = + reinterpret_cast + ( + dlSym(lib, globalFuncName) + ); + + if (function) + { + (*function)(true); // force load + } + else + { + FatalIOErrorIn + ( + "codedFixedValueFvPatchField::" + "updateLibrary()", + contextDict + ) << "Failed looking up symbol " << globalFuncName + << nl << "from " << libPath << exit(FatalIOError); + } } else { FatalIOErrorIn ( - "codedFixedValueFvPatchField::updateLibrary()", + "codedFixedValueFvPatchField::loadLibrary()", contextDict ) << "Failed looking up symbol " << globalFuncName << nl << "from " << libPath << exit(FatalIOError); - } - } - else - { - FatalIOErrorIn - ( - "codedFixedValueFvPatchField::loadLibrary()", - contextDict - ) << "Failed looking up symbol " << globalFuncName << nl - << "from " << libPath << exit(FatalIOError); - lib = 0; - if (!dlLibraryTable::close(libPath, false)) - { - FatalIOErrorIn - ( - "codedFixedValueFvPatchField::loadLibrary()", - contextDict - ) << "Failed unloading library " - << libPath - << exit(FatalIOError); + lib = 0; + if (!libs.close(libPath, false)) + { + FatalIOErrorIn + ( + "codedFixedValueFvPatchField::loadLibrary()", + contextDict + ) << "Failed unloading library " + << libPath + << exit(FatalIOError); + } } } } @@ -128,15 +134,19 @@ void Foam::codedFixedValueFvPatchField::unloadLibrary const fileName& libPath, const string& globalFuncName, const dictionary& contextDict -) +) const { void* lib = 0; - if (!libPath.empty()) + if (libPath.empty()) { - lib = dlLibraryTable::findLibrary(libPath); + return; } + dlLibraryTable& libs = const_cast(this->db().time()).libs(); + + lib = libs.findLibrary(libPath); + if (!lib) { return; @@ -166,7 +176,7 @@ void Foam::codedFixedValueFvPatchField::unloadLibrary } } - if (!dlLibraryTable::close(libPath, false)) + if (!libs.close(libPath, false)) { FatalIOErrorIn ( @@ -334,7 +344,7 @@ void Foam::codedFixedValueFvPatchField::updateLibrary() const // the correct library was already loaded => we are done - if (dlLibraryTable::findLibrary(libPath)) + if (const_cast(this->db().time()).libs().findLibrary(libPath)) { return; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H index 04cfff8930..096c02da00 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H @@ -130,20 +130,20 @@ class codedFixedValueFvPatchField ); //- Load specified library and execute globalFuncName(true) - static void* loadLibrary + void* loadLibrary ( const fileName& libPath, const string& globalFuncName, const dictionary& contextDict - ); + ) const; //- Execute globalFuncName(false) and unload specified library - static void unloadLibrary + void unloadLibrary ( const fileName& libPath, const string& globalFuncName, const dictionary& contextDict - ); + ) const; //- Set the rewrite vars controlling the Type static void setFieldTemplates(dynamicCode& dynCode); diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C index 5dcdf627c7..ef173a1174 100644 --- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C +++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C @@ -54,60 +54,65 @@ void* Foam::codedFunctionObject::loadLibrary const fileName& libPath, const string& globalFuncName, const dictionary& contextDict -) +) const { void* lib = 0; // avoid compilation by loading an existing library - if (!libPath.empty() && dlLibraryTable::open(libPath, false)) + if (!libPath.empty()) { - lib = dlLibraryTable::findLibrary(libPath); + dlLibraryTable& libs = const_cast(time_).libs(); - // verify the loaded version and unload if needed - if (lib) + if (libs.open(libPath, false)) { - // provision for manual execution of code after loading - if (dlSymFound(lib, globalFuncName)) - { - loaderFunctionType function = - reinterpret_cast - ( - dlSym(lib, globalFuncName) - ); + lib = libs.findLibrary(libPath); - if (function) + // verify the loaded version and unload if needed + if (lib) + { + // provision for manual execution of code after loading + if (dlSymFound(lib, globalFuncName)) { - (*function)(true); // force load + loaderFunctionType function = + reinterpret_cast + ( + dlSym(lib, globalFuncName) + ); + + if (function) + { + (*function)(true); // force load + } + else + { + FatalIOErrorIn + ( + "codedFunctionObject::updateLibrary()", + contextDict + ) << "Failed looking up symbol " << globalFuncName + << nl << "from " << libPath << exit(FatalIOError); + } } else { FatalIOErrorIn ( - "codedFunctionObject::updateLibrary()", + "codedFunctionObject::loadLibrary()", contextDict ) << "Failed looking up symbol " << globalFuncName << nl << "from " << libPath << exit(FatalIOError); - } - } - else - { - FatalIOErrorIn - ( - "codedFunctionObject::loadLibrary()", - contextDict - ) << "Failed looking up symbol " << globalFuncName << nl - << "from " << libPath << exit(FatalIOError); - lib = 0; - if (!dlLibraryTable::close(libPath, false)) - { - FatalIOErrorIn - ( - "codedFunctionObject::loadLibrary()", - contextDict - ) << "Failed unloading library " - << libPath - << exit(FatalIOError); + lib = 0; + if (!libs.close(libPath, false)) + { + FatalIOErrorIn + ( + "codedFunctionObject::loadLibrary()", + contextDict + ) << "Failed unloading library " + << libPath + << exit(FatalIOError); + } } } } @@ -122,15 +127,19 @@ void Foam::codedFunctionObject::unloadLibrary const fileName& libPath, const string& globalFuncName, const dictionary& contextDict -) +) const { void* lib = 0; - if (!libPath.empty()) + if (libPath.empty()) { - lib = dlLibraryTable::findLibrary(libPath); + return; } + dlLibraryTable& libs = const_cast(time_).libs(); + + lib = libs.findLibrary(libPath); + if (!lib) { return; @@ -160,7 +169,7 @@ void Foam::codedFunctionObject::unloadLibrary } } - if (!dlLibraryTable::close(libPath, false)) + if (!libs.close(libPath, false)) { FatalIOErrorIn ( @@ -274,7 +283,7 @@ void Foam::codedFunctionObject::updateLibrary() const // the correct library was already loaded => we are done - if (dlLibraryTable::findLibrary(libPath)) + if (const_cast(time_).libs().findLibrary(libPath)) { return; } diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H index 0827dcd575..052d8762a1 100644 --- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H +++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H @@ -88,20 +88,20 @@ protected: typedef void (*loaderFunctionType)(bool); //- Load specified library and execute globalFuncName(true) - static void* loadLibrary + void* loadLibrary ( const fileName& libPath, const string& globalFuncName, const dictionary& contextDict - ); + ) const; //- Execute globalFuncName(false) and unload specified library - static void unloadLibrary + void unloadLibrary ( const fileName& libPath, const string& globalFuncName, const dictionary& contextDict - ); + ) const; //- Create library based on the dynamicCodeContext diff --git a/src/sampling/graphField/makeGraph.C b/src/sampling/graphField/makeGraph.C index a7886e8304..7bd5d42f06 100644 --- a/src/sampling/graphField/makeGraph.C +++ b/src/sampling/graphField/makeGraph.C @@ -62,7 +62,17 @@ void makeGraph const word& graphFormat ) { - makeGraph(x, vsf.internalField(), name, vsf.path(), graphFormat); + fileName path(vsf.rootPath()/vsf.caseName()/"graphs"/vsf.instance()); + mkDir(path); + + makeGraph + ( + x, + vsf.internalField(), + name, + path, + graphFormat + ); } diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files deleted file mode 100644 index 3931e4e0c1..0000000000 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -datToFoam.C - -EXE = $(FOAM_USER_APPBIN)/datToFoam diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C deleted file mode 100644 index 0e5b8c3776..0000000000 --- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C +++ /dev/null @@ -1,127 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. - \\/ 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 - MRFSimpleFoam - -Description - Steady-state solver for incompressible, turbulent flow of non-Newtonian - fluids with MRF regions. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "RASModel.H" -#include "MRFZones.H" -#include "simpleControl.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - - #include "createTime.H" - #include "createMesh.H" - #include "createFields.H" - #include "initContinuityErrs.H" - - simpleControl simple(mesh); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (simple.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - p.storePrevIter(); - - // Pressure-velocity SIMPLE corrector - { - // Momentum predictor - tmp UEqn - ( - fvm::div(phi, U) - + turbulence->divDevReff(U) - ); - mrfZones.addCoriolis(UEqn()); - - UEqn().relax(); - - solve(UEqn() == -fvc::grad(p)); - - p.boundaryField().updateCoeffs(); - volScalarField rAU(1.0/UEqn().A()); - U = rAU*UEqn().H(); - UEqn.clear(); - - phi = fvc::interpolate(U, "interpolate(HbyA)") & mesh.Sf(); - mrfZones.relativeFlux(phi); - adjustPhi(phi, U, p); - - // Non-orthogonal pressure corrector loop - for (int nonOrth=0; nonOrth<=simple.nNonOrthCorr(); nonOrth++) - { - fvScalarMatrix pEqn - ( - fvm::laplacian(rAU, p) == fvc::div(phi) - ); - - pEqn.setReference(pRefCell, pRefValue); - pEqn.solve(); - - if (nonOrth == simple.nNonOrthCorr()) - { - phi -= pEqn.flux(); - } - } - - #include "continuityErrs.H" - - // Explicitly relax pressure for momentum corrector - p.relax(); - - // Momentum corrector - U -= rAU*fvc::grad(p); - U.correctBoundaryConditions(); - } - - turbulence->correct(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/files b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/files deleted file mode 100644 index d99fb9ad01..0000000000 --- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -MRFSimpleFoam.C - -EXE = $(FOAM_USER_APPBIN)/MRFSimpleFoam diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H deleted file mode 100644 index 869a5899cc..0000000000 --- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H +++ /dev/null @@ -1,46 +0,0 @@ - Info<< "Reading field p\n" << endl; - volScalarField p - ( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - Info<< "Reading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - -# include "createPhi.H" - - - label pRefCell = 0; - scalar pRefValue = 0.0; - setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue); - - - singlePhaseTransportModel laminarTransport(U, phi); - - autoPtr turbulence - ( - incompressible::RASModel::New(U, phi, laminarTransport) - ); - - - MRFZones mrfZones(mesh); - mrfZones.correctBoundaryVelocity(U); diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/0/Urel rename to tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon rename to tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/k b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/0/k rename to tutorials/incompressible/SRFSimpleFoam/mixer/0/k diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/0/nut rename to tutorials/incompressible/SRFSimpleFoam/mixer/0/nut diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/omega b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/0/omega rename to tutorials/incompressible/SRFSimpleFoam/mixer/0/omega diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/p b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/0/p rename to tutorials/incompressible/SRFSimpleFoam/mixer/0/p diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/RASProperties similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties rename to tutorials/incompressible/SRFSimpleFoam/mixer/constant/RASProperties diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/SRFProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/constant/SRFProperties rename to tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict rename to tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/blockMeshDict diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/boundary similarity index 89% rename from tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary rename to tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/boundary index 092c65fdd9..3d60346947 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary +++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/boundary @@ -47,6 +47,9 @@ FoamFile nFaces 1600; startFace 101720; neighbourPatch cyclic_half1; + transform rotational; + rotationAxis (0 0 1); + rotationCentre (0 0 0); } cyclic_half1 { @@ -54,6 +57,9 @@ FoamFile nFaces 1600; startFace 103320; neighbourPatch cyclic_half0; + transform rotational; + rotationAxis (0 0 1); + rotationCentre (0 0 0); } ) diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/transportProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/constant/transportProperties rename to tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict similarity index 97% rename from tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict rename to tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict index 470a21b92f..2baa2e29bc 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict +++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application simpleSRFFoam; +application SRFSimpleFoam; startFrom startTime; diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes rename to tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution similarity index 100% rename from tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution rename to tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties index ec2d268129..29418e51f7 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties @@ -19,7 +19,7 @@ Ubar Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 ); transportModel Newtonian; -nu nu [ 0 2 -1 0 0 0 0 ] 1e-3; +nu nu [ 0 2 -1 0 0 0 0 ] 1e-8; // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary index 20436074fd..1706b78169 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format ascii; + format binary; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon index 5c6c53664d..cd01a77c0a 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon +++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon @@ -25,6 +25,8 @@ boundaryField { type turbulentMixingLengthDissipationRateInlet; mixingLength 0.01; + phi phi; + k k; value uniform 1; } outlet1 @@ -45,7 +47,7 @@ boundaryField Cmu 0.09; kappa 0.41; E 9.8; - value uniform 0; + value uniform 1; } fan_half0 { diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k index 18cb53d519..b7eff37a13 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k +++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k @@ -25,6 +25,8 @@ boundaryField { type turbulentIntensityKineticEnergyInlet; intensity 0.05; + U U; + phi phi; value uniform 1; } outlet1 @@ -42,7 +44,7 @@ boundaryField baffles { type kqRWallFunction; - value uniform 0; + value uniform 1; } fan_half0 { diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary index dc9ecffb7b..117139f505 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format ascii; + format binary; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary index 9e50e525a5..2ae95dfe28 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary +++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary @@ -21,433 +21,433 @@ FoamFile { type patch; nFaces 320; - startFace 1027872; + startFace 1028059; } inlet { type patch; nFaces 64; - startFace 1028192; + startFace 1028379; } outlet { type patch; nFaces 64; - startFace 1028256; + startFace 1028443; } lowerWall { type wall; nFaces 5330; - startFace 1028320; + startFace 1028507; } upperWall { type patch; nFaces 160; - startFace 1033650; + startFace 1033837; } motorBike_frt-fairing:001%1 { type wall; - nFaces 5416; - startFace 1033810; + nFaces 5410; + startFace 1033997; } motorBike_windshield:002%2 { type wall; nFaces 50; - startFace 1039226; + startFace 1039407; } motorBike_rr-wh-rim:005%5 { type wall; - nFaces 137; - startFace 1039276; + nFaces 136; + startFace 1039457; } motorBike_rr-wh-rim:010%10 { type wall; nFaces 340; - startFace 1039413; + startFace 1039593; } motorBike_fr-wh-rim:011%11 { type wall; nFaces 473; - startFace 1039753; + startFace 1039933; } motorBike_fr-wh-brake-disk:012%12 { type wall; nFaces 54; - startFace 1040226; + startFace 1040406; } motorBike_frame:016-shadow%13 { type wall; nFaces 98; - startFace 1040280; + startFace 1040460; } motorBike_rear-susp:014%14 { type wall; - nFaces 844; - startFace 1040378; + nFaces 847; + startFace 1040558; } motorBike_rear-susp:014-shadow%15 { type wall; - nFaces 461; - startFace 1041222; + nFaces 462; + startFace 1041405; } motorBike_frame:016%16 { type wall; - nFaces 67; - startFace 1041683; + nFaces 64; + startFace 1041867; } motorBike_rr-wh-rim:005-shadow%17 { type wall; nFaces 70; - startFace 1041750; + startFace 1041931; } motorBike_rr-wh-chain-hub:022%22 { type wall; nFaces 141; - startFace 1041820; + startFace 1042001; } motorBike_rearseat%24 { type wall; nFaces 430; - startFace 1041961; + startFace 1042142; } motorBike_frt-fairing%25 { type wall; nFaces 626; - startFace 1042391; + startFace 1042572; } motorBike_windshield%26 { type wall; - nFaces 368; - startFace 1043017; + nFaces 379; + startFace 1043198; } motorBike_headlights%27 { type wall; nFaces 161; - startFace 1043385; + startFace 1043577; } motorBike_driversseat%28 { type wall; nFaces 368; - startFace 1043546; + startFace 1043738; } motorBike_rear-body%29 { type wall; nFaces 2077; - startFace 1043914; + startFace 1044106; } motorBike_fuel-tank%30 { type wall; nFaces 912; - startFace 1045991; + startFace 1046183; } motorBike_exhaust%31 { type wall; nFaces 2392; - startFace 1046903; + startFace 1047095; } motorBike_rr-wh-rim%32 { type wall; nFaces 1430; - startFace 1049295; + startFace 1049487; } motorBike_fr-mud-guard%33 { type wall; - nFaces 624; - startFace 1050725; + nFaces 634; + startFace 1050917; } motorBike_fr-wh-rim%34 { type wall; nFaces 591; - startFace 1051349; + startFace 1051551; } motorBike_fr-wh-brake-disk%35 { type wall; - nFaces 427; - startFace 1051940; + nFaces 426; + startFace 1052142; } motorBike_fr-brake-caliper%36 { type wall; nFaces 164; - startFace 1052367; + startFace 1052568; } motorBike_fr-wh-tyre%37 { type wall; nFaces 1116; - startFace 1052531; + startFace 1052732; } motorBike_hbars%38 { type wall; nFaces 535; - startFace 1053647; + startFace 1053848; } motorBike_fr-forks%39 { type wall; nFaces 1140; - startFace 1054182; + startFace 1054383; } motorBike_chain%40 { type wall; nFaces 474; - startFace 1055322; + startFace 1055523; } motorBike_rr-wh-tyre%41 { type wall; nFaces 1787; - startFace 1055796; + startFace 1055997; } motorBike_square-dial%42 { type wall; nFaces 6; - startFace 1057583; + startFace 1057784; } motorBike_round-dial%43 { type wall; nFaces 17; - startFace 1057589; + startFace 1057790; } motorBike_dial-holder%44 { type wall; nFaces 87; - startFace 1057606; + startFace 1057807; } motorBike_rear-susp%45 { type wall; nFaces 1786; - startFace 1057693; + startFace 1057894; } motorBike_rear-brake-lights%46 { type wall; nFaces 53; - startFace 1059479; + startFace 1059680; } motorBike_rear-light-bracket%47 { type wall; nFaces 163; - startFace 1059532; + startFace 1059733; } motorBike_frame%48 { type wall; nFaces 2040; - startFace 1059695; + startFace 1059896; } motorBike_rear-mud-guard%49 { type wall; - nFaces 663; - startFace 1061735; + nFaces 660; + startFace 1061936; } motorBike_rear-susp-spring-damp%50 { type wall; nFaces 107; - startFace 1062398; + startFace 1062596; } motorBike_fairing-inner-plate%51 { type wall; nFaces 445; - startFace 1062505; + startFace 1062703; } motorBike_clutch-housing%52 { type wall; nFaces 970; - startFace 1062950; + startFace 1063148; } motorBike_radiator%53 { type wall; - nFaces 39; - startFace 1063920; + nFaces 40; + startFace 1064118; } motorBike_water-pipe%54 { type wall; nFaces 104; - startFace 1063959; + startFace 1064158; } motorBike_water-pump%55 { type wall; nFaces 74; - startFace 1064063; + startFace 1064262; } motorBike_engine%56 { type wall; nFaces 2389; - startFace 1064137; + startFace 1064336; } motorBike_rear-shock-link%57 { type wall; - nFaces 26; - startFace 1066526; + nFaces 25; + startFace 1066725; } motorBike_rear-brake-fluid-pot-bracket%58 { type wall; - nFaces 44; - startFace 1066552; + nFaces 46; + startFace 1066750; } motorBike_rear-brake-fluid-pot%59 { type wall; nFaces 53; - startFace 1066596; + startFace 1066796; } motorBike_footpeg%60 { type wall; nFaces 86; - startFace 1066649; + startFace 1066849; } motorBike_rr-wh-chain-hub%61 { type wall; nFaces 122; - startFace 1066735; + startFace 1066935; } motorBike_rear-brake-caliper%62 { type wall; nFaces 142; - startFace 1066857; + startFace 1067057; } motorBike_rider-helmet%65 { type wall; nFaces 583; - startFace 1066999; + startFace 1067199; } motorBike_rider-visor%66 { type wall; nFaces 95; - startFace 1067582; + startFace 1067782; } motorBike_rider-boots%67 { type wall; nFaces 1025; - startFace 1067677; + startFace 1067877; } motorBike_rider-gloves%68 { type wall; nFaces 319; - startFace 1068702; + startFace 1068902; } motorBike_rider-body%69 { type wall; nFaces 4555; - startFace 1069021; + startFace 1069221; } motorBike_frame:0%70 { type wall; nFaces 37; - startFace 1073576; + startFace 1073776; } motorBike_frt-fairing:001-shadow%74 { type wall; - nFaces 3317; - startFace 1073613; + nFaces 3329; + startFace 1073813; } motorBike_windshield-shadow%75 { type wall; - nFaces 236; - startFace 1076930; + nFaces 237; + startFace 1077142; } motorBike_fr-mud-guard-shadow%81 { type wall; - nFaces 350; - startFace 1077166; + nFaces 348; + startFace 1077379; } motorBike_fr-wh-brake-disk-shadow%83 { type wall; - nFaces 186; - startFace 1077516; + nFaces 187; + startFace 1077727; } motorBike_rear-mud-guard-shadow%84 { type wall; - nFaces 388; - startFace 1077702; + nFaces 394; + startFace 1077914; } motorBike_rear-susp-spring-damp-shadow%85 { type wall; nFaces 41; - startFace 1078090; + startFace 1078308; } motorBike_radiator-shadow%86 { type wall; - nFaces 22; - startFace 1078131; + nFaces 20; + startFace 1078349; } motorBike_rear-shock-link-shadow%87 { type wall; - nFaces 9; - startFace 1078153; + nFaces 10; + startFace 1078369; } motorBike_rear-brake-fluid-pot-bracket-shadow%88 { type wall; - nFaces 22; - startFace 1078162; + nFaces 20; + startFace 1078379; } motorBike_rr-wh-chain-hub-shadow%89 { type wall; nFaces 53; - startFace 1078184; + startFace 1078399; } ) diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/files b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/files deleted file mode 100644 index cd5e01f8b4..0000000000 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -simpleSRFFoam.C - -EXE = $(FOAM_USER_APPBIN)/simpleSRFFoam diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/convergenceCheck.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/convergenceCheck.H deleted file mode 100644 index 8958063193..0000000000 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/convergenceCheck.H +++ /dev/null @@ -1,9 +0,0 @@ -// check convergence - -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} - diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/initConvergenceCheck.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/initConvergenceCheck.H deleted file mode 100644 index b56197f22a..0000000000 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/initConvergenceCheck.H +++ /dev/null @@ -1,7 +0,0 @@ -// initialize values for convergence checks - - scalar eqnResidual = 1, maxResidual = 0; - scalar convergenceCriterion = 0; - - simple.readIfPresent("convergence", convergenceCriterion); - diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/Make/files b/tutorials/incompressible/simpleWindFoam/simpleWindFoam/Make/files deleted file mode 100644 index 1037405fab..0000000000 --- a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -simpleWindFoam.C - -EXE = $(FOAM_APPBIN)/simpleWindFoam diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/convergenceCheck.H b/tutorials/incompressible/simpleWindFoam/simpleWindFoam/convergenceCheck.H deleted file mode 100644 index 3fc56b1125..0000000000 --- a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/convergenceCheck.H +++ /dev/null @@ -1,6 +0,0 @@ -if (maxResidual < convergenceCriterion) -{ - Info<< "reached convergence criterion: " << convergenceCriterion << endl; - runTime.writeAndEnd(); - Info<< "latestTime = " << runTime.timeName() << endl; -} diff --git a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/createFields.H b/tutorials/incompressible/simpleWindFoam/simpleWindFoam/createFields.H deleted file mode 100644 index 1d512f923d..0000000000 --- a/tutorials/incompressible/simpleWindFoam/simpleWindFoam/createFields.H +++ /dev/null @@ -1,44 +0,0 @@ - Info<< "Reading field p\n" << endl; - volScalarField p - ( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - Info<< "Reading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - -# include "createPhi.H" - - - label pRefCell = 0; - scalar pRefValue = 0.0; - setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue); - - - singlePhaseTransportModel laminarTransport(U, phi); - - autoPtr turbulence - ( - incompressible::RASModel::New(U, phi, laminarTransport) - ); - - IObasicSourceList actuationDisks(mesh); diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/U b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/U similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/U rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/U diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/epsilon b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/epsilon similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/epsilon rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/epsilon diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/ABLConditions b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/ABLConditions similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/ABLConditions rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/ABLConditions diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/fixedInlet b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/fixedInlet rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/fixedInlet diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/initialConditions b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/initialConditions rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/initialConditions diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/sideAndTopPatches b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/sideAndTopPatches similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/include/sideAndTopPatches rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/sideAndTopPatches diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/k b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/k similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/k rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/k diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/nut b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/nut similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/nut rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/nut diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/0/p b/tutorials/incompressible/windSimpleFoam/turbineSiting/0/p similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/0/p rename to tutorials/incompressible/windSimpleFoam/turbineSiting/0/p diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/Allclean b/tutorials/incompressible/windSimpleFoam/turbineSiting/Allclean similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/Allclean rename to tutorials/incompressible/windSimpleFoam/turbineSiting/Allclean diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/Allrun b/tutorials/incompressible/windSimpleFoam/turbineSiting/Allrun similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/Allrun rename to tutorials/incompressible/windSimpleFoam/turbineSiting/Allrun diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/RASProperties b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/RASProperties similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/constant/RASProperties rename to tutorials/incompressible/windSimpleFoam/turbineSiting/constant/RASProperties diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/polyMesh/blockMeshDict b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/constant/polyMesh/blockMeshDict rename to tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/blockMeshDict diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/polyMesh/boundary b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/boundary similarity index 98% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/constant/polyMesh/boundary rename to tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/boundary index e47d69bab0..b537d1e19b 100644 --- a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/polyMesh/boundary +++ b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/boundary @@ -50,7 +50,7 @@ FoamFile terrain_patch0 { type wall; - nFaces 18201; + nFaces 16037; startFace 369404; } ) diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/sourcesProperties b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/constant/sourcesProperties rename to tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/transportProperties b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/transportProperties similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/constant/transportProperties rename to tutorials/incompressible/windSimpleFoam/turbineSiting/constant/transportProperties diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/constant/triSurface/terrain.stl b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/triSurface/terrain.stl similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/constant/triSurface/terrain.stl rename to tutorials/incompressible/windSimpleFoam/turbineSiting/constant/triSurface/terrain.stl diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/makeZones b/tutorials/incompressible/windSimpleFoam/turbineSiting/makeZones similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/makeZones rename to tutorials/incompressible/windSimpleFoam/turbineSiting/makeZones diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/changeDictionaryDict b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/changeDictionaryDict similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/changeDictionaryDict rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/changeDictionaryDict diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/controlDict b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/controlDict similarity index 97% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/controlDict rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/controlDict index 1837391d74..eaf9c2d54a 100644 --- a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/controlDict +++ b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application simpleWindFoam; +application windSimpleFoam; startFrom latestTime; diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict-4proc b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-4proc similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict-4proc rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-4proc diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict-nonPar b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-nonPar similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict-nonPar rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-nonPar diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict-par b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-par similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/decomposeParDict-par rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-par diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSchemes similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/fvSchemes rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSchemes diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/fvSolution rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/snappyHexMeshDict similarity index 100% rename from tutorials/incompressible/simpleWindFoam/turbineSiting/system/snappyHexMeshDict rename to tutorials/incompressible/windSimpleFoam/turbineSiting/system/snappyHexMeshDict diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/files b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/files deleted file mode 100644 index 26c96aaa90..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -rhoPisoTwinParcelFoam.C - -EXE = $(FOAM_USER_APPBIN)/rhoPisoTwinParcelFoam diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options deleted file mode 100644 index e9e6907d81..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ /dev/null @@ -1,34 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude - -EXE_LIBS = \ - -llagrangian \ - -llagrangianIntermediate \ - -lfiniteVolume \ - -lmeshTools \ - -lthermophysicalFunctions \ - -lbasicThermophysicalModels \ - -lreactionThermophysicalModels \ - -lSLGThermo \ - -lspecie \ - -lradiationModels \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ - -lregionModels \ - -lsurfaceFilmModels diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H deleted file mode 100644 index 28fee73086..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H +++ /dev/null @@ -1,17 +0,0 @@ - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) - == - thermoCloud1.SU(U) - + kinematicCloud1.SU(U) - + rho.dimensionedInternalField()*g - ); - - UEqn.relax(); - - if (momentumPredictor) - { - solve(UEqn == -fvc::grad(p)); - } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H deleted file mode 100644 index e67571f4ec..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H +++ /dev/null @@ -1,20 +0,0 @@ - Info<< "Constructing thermoCloud1" << endl; - basicThermoCloud thermoCloud1 - ( - "thermoCloud1", - rho, - U, - g, - slgThermo - ); - - Info<< "Constructing kinematicCloud1" << endl; - basicKinematicCloud kinematicCloud1 - ( - "kinematicCloud1", - rho, - U, - thermo.mu(), - g - ); - diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H deleted file mode 100644 index 83aed2ffa4..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H +++ /dev/null @@ -1,63 +0,0 @@ - Info<< "Reading thermophysical properties\n" << endl; - - autoPtr pThermo - ( - basicPsiThermo::New(mesh) - ); - basicPsiThermo& thermo = pThermo(); - - SLGThermo slgThermo(mesh, thermo); - - volScalarField& p = thermo.p(); - volScalarField& hs = thermo.hs(); - const volScalarField& psi = thermo.psi(); - - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - thermo.rho() - ); - - Info<< "\nReading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - -# include "compressibleCreatePhi.H" - - - Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence - ( - compressible::turbulenceModel::New - ( - rho, - U, - phi, - thermo - ) - ); - - - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hsEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hsEqn.H deleted file mode 100644 index 62c27d08f8..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hsEqn.H +++ /dev/null @@ -1,17 +0,0 @@ -{ - fvScalarMatrix hsEqn - ( - fvm::ddt(rho, hs) - + fvm::div(phi, hs) - - fvm::laplacian(turbulence->alphaEff(), hs) - == - DpDt - + thermoCloud1.Sh(hs) - ); - - hsEqn.relax(); - - hsEqn.solve(); - - thermo.correct(); -} diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H deleted file mode 100644 index 4168eb0e34..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H +++ /dev/null @@ -1,68 +0,0 @@ -rho = thermo.rho(); - -volScalarField rAU(1.0/UEqn.A()); -U = rAU*UEqn.H(); - -if (transonic) -{ - surfaceScalarField phid - ( - "phid", - fvc::interpolate(psi) - *( - (fvc::interpolate(U) & mesh.Sf()) - + fvc::ddtPhiCorr(rAU, rho, U, phi) - ) - ); - - for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvm::div(phid, p) - - fvm::laplacian(rho*rAU, p) - ); - - pEqn.solve(); - - if (nonOrth == nNonOrthCorr) - { - phi == pEqn.flux(); - } - } -} -else -{ - phi = - fvc::interpolate(rho) - *( - (fvc::interpolate(U) & mesh.Sf()) - + fvc::ddtPhiCorr(rAU, rho, U, phi) - ); - - for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvc::div(phi) - - fvm::laplacian(rho*rAU, p) - ); - - pEqn.solve(); - - if (nonOrth == nNonOrthCorr) - { - phi += pEqn.flux(); - } - } -} - -#include "rhoEqn.H" -#include "compressibleContinuityErrs.H" - -U -= rAU*fvc::grad(p); -U.correctBoundaryConditions(); - -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G deleted file mode 100644 index 69cef39968..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G +++ /dev/null @@ -1,54 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object G; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 0 -3 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - top - { - type MarshakRadiation; - T T; - emissivity 1.0; - value uniform 0; - } - bottom - { - type MarshakRadiation; - T T; - emissivity 1.0; - value uniform 0; - } - walls - { - type MarshakRadiation; - T T; - emissivity 1.0; - value uniform 0; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T deleted file mode 100644 index b5521be7b6..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 400; - -boundaryField -{ - top - { - type fixedValue; - value uniform 400; - } - - bottom - { - type zeroGradient; - } - - walls - { - type zeroGradient; - } - - symmetry - { - type symmetryPlane; - } - - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U deleted file mode 100644 index 9b98140dad..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - top - { - type fixedValue; - value uniform (0 0 0); - } - bottom - { - type fixedValue; - value uniform (0 0 0); - } - walls - { - type fixedValue; - value uniform (0 0 0); - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat deleted file mode 100644 index 5e87a88c97..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphat; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - top - { - type alphatWallFunction; - value uniform 0; - } - bottom - { - type alphatWallFunction; - value uniform 0; - } - walls - { - type alphatWallFunction; - value uniform 0; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon deleted file mode 100644 index b7941eebca..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 5390.5; - -boundaryField -{ - top - { - type compressible::epsilonWallFunction; - value uniform 5390.5; - } - bottom - { - type compressible::epsilonWallFunction; - value uniform 5390.5; - } - walls - { - type compressible::epsilonWallFunction; - value uniform 5390.5; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k deleted file mode 100644 index acd719c143..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 37.5; - -boundaryField -{ - top - { - type compressible::kqRWallFunction; - value uniform 37.5; - } - bottom - { - type compressible::kqRWallFunction; - value uniform 37.5; - } - walls - { - type compressible::kqRWallFunction; - value uniform 37.5; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut deleted file mode 100644 index f586f8ac11..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object mut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - top - { - type mutkWallFunction; - value uniform 0; - } - bottom - { - type mutkWallFunction; - value uniform 0; - } - walls - { - type mutkWallFunction; - value uniform 0; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p deleted file mode 100644 index af9dc4be7d..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p +++ /dev/null @@ -1,2549 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField nonuniform List -2500 -( -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -5e+05 -) -; - -boundaryField -{ - top - { - type zeroGradient; - } - bottom - { - type zeroGradient; - } - walls - { - type zeroGradient; - } - symmetry - { - type symmetryPlane; - } - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties deleted file mode 100644 index 77446d563d..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object RASProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -RASModel kEpsilon; - -turbulence on; - -printCoeffs on; - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g deleted file mode 100644 index 4fea433a00..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value ( 0 -9.81 0 ); - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions deleted file mode 100644 index 21af8dbc7c..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class vectorField; - object kinematicCloud1Positions; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -( -(0.0075 0.5 0.05) -(0.0125 0.5 0.05) -(0.0175 0.5 0.05) -(0.0225 0.5 0.05) -(0.0275 0.5 0.05) -(0.0325 0.5 0.05) -(0.0375 0.5 0.05) -(0.0425 0.5 0.05) -(0.0475 0.5 0.05) -(0.0075 0.4 0.05) -(0.0125 0.4 0.05) -(0.0175 0.4 0.05) -(0.0225 0.4 0.05) -(0.0275 0.4 0.05) -(0.0325 0.4 0.05) -(0.0375 0.4 0.05) -(0.0425 0.4 0.05) -(0.0475 0.4 0.05) -) -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties deleted file mode 100644 index 5f1209a11f..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ /dev/null @@ -1,104 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object kinematicCloud1Properties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solution -{ - active true; - coupled true; - transient yes; - cellValueSourceCorrection on; - - sourceTerms - { - schemes - { - U explicit 1; - } - } - - interpolationSchemes - { - rho cell; - U cellPoint; - mu cell; - } - - integrationSchemes - { - U Euler; - } -} - -constantProperties -{ - parcelTypeId 2; - - rhoMin 1e-15; - minParticleMass 1e-15; - - rho0 5000; - - youngsModulus 1e9; - poissonsRatio 0.35; -} - -subModels -{ - particleForces - { - sphereDrag; - gravity; - } - - injectionModel manualInjection; - - dispersionModel stochasticDispersionRAS; - - patchInteractionModel standardWallInteraction; - - postProcessingModel none; - - surfaceFilmModel none; - - manualInjectionCoeffs - { - massTotal 0.0002; - parcelBasisType mass; - SOI 0; - positionsFile "kinematicCloud1Positions"; - U0 ( 0 0 0 ); - sizeDistribution - { - type RosinRammler; - RosinRammlerDistribution - { - minValue 5e-05; - maxValue 0.0001; - d 7.5e-05; - n 0.5; - } - } - } - - standardWallInteractionCoeffs - { - type rebound; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict deleted file mode 100644 index 682fa07bdc..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict +++ /dev/null @@ -1,87 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 1.0; - -vertices -( - (0 0 0) - (0.05 0 0) - (0.05 0.5 0) - (0 0.5 0) - (0 0 0.1) - (0.05 0 0.1) - (0.05 0.5 0.1) - (0 0.5 0.1) - (0.5 0 0) - (0.5 0.5 0) - (0.5 0 0.1) - (0.5 0.5 0.1) - (0.05 1 0) - (0 1 0) - (0.05 1 0.1) - (0 1 0.1) -); - -blocks -( - hex (0 1 2 3 4 5 6 7) (5 50 1) simpleGrading (1 1 1) - hex (1 8 9 2 5 10 11 6) (40 50 1) simpleGrading (1 1 1) - hex (3 2 12 13 7 6 14 15) (5 50 1) simpleGrading (1 1 1) -); - -edges -( -); - -patches -( - wall top - ( - (13 15 14 12) - ) - wall bottom - ( - (0 1 5 4) - (1 8 10 5) - ) - wall walls - ( - (8 9 11 10) - (9 2 6 11) - (2 12 14 6) - ) - symmetryPlane symmetry - ( - (4 7 3 0) - (7 15 13 3) - ) - empty frontAndBack - ( - (0 3 2 1) - (3 13 12 2) - (1 2 9 8) - (5 6 7 4) - (6 14 15 7) - (10 11 6 5) - ) -); - -mergePatchPairs -( -); - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary deleted file mode 100644 index fdcd8938f8..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary +++ /dev/null @@ -1,52 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -5 -( - top - { - type wall; - nFaces 5; - startFace 4855; - } - bottom - { - type wall; - nFaces 45; - startFace 4860; - } - walls - { - type wall; - nFaces 140; - startFace 4905; - } - symmetry - { - type symmetryPlane; - nFaces 100; - startFace 5045; - } - frontAndBack - { - type empty; - nFaces 5000; - startFace 5145; - } -) - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions deleted file mode 100644 index 32278f5681..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class vectorField; - object limestonePositions; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -( -(0.0075 0.55 0.05) -(0.0125 0.55 0.05) -(0.0175 0.55 0.05) -(0.0225 0.55 0.05) -(0.0275 0.55 0.05) -(0.0325 0.55 0.05) -(0.0375 0.55 0.05) -(0.0425 0.55 0.05) -(0.0475 0.55 0.05) -(0.0075 0.45 0.05) -(0.0125 0.45 0.05) -(0.0175 0.45 0.05) -(0.0225 0.45 0.05) -(0.0275 0.45 0.05) -(0.0325 0.45 0.05) -(0.0375 0.45 0.05) -(0.0425 0.45 0.05) -(0.0475 0.45 0.05) -) -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties deleted file mode 100644 index 00654b1d57..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ /dev/null @@ -1,126 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object thermoCloud1Properties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solution -{ - active true; - coupled true; - transient yes; - cellValueSourceCorrection on; - - sourceTerms - { - schemes - { - U explicit 1; - hs explicit 1; - } - } - - interpolationSchemes - { - rho cell; - mu cell; - U cellPoint; - T cell; - Cp cell; - } - - integrationSchemes - { - U Euler; - T analytical; - } -} - -constantProperties -{ - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - minParticleMass 1e-15; - - rho0 2500; - T0 300; - Cp0 900; - - youngsModulus 1e9; - poissonsRatio 0.35; - - epsilon0 1; - f0 0.5; - - Pr 0.7; -} - -subModels -{ - particleForces - { - sphereDrag; - gravity; - } - - injectionModel manualInjection; - - dispersionModel stochasticDispersionRAS; - - patchInteractionModel standardWallInteraction; - - heatTransferModel RanzMarshall; - - postProcessingModel none; - - surfaceFilmModel none; - - radiation off; - - manualInjectionCoeffs - { - massTotal 0.0001; - parcelBasisType mass; - SOI 0; - positionsFile "thermoCloud1Positions"; - U0 ( 0 0 0 ); - sizeDistribution - { - type RosinRammler; - RosinRammlerDistribution - { - minValue 5e-06; - maxValue 0.0005; - d 5e-05; - n 0.5; - } - } - } - - standardWallInteractionCoeffs - { - type rebound; - } - - RanzMarshallCoeffs - { - // thermal shielding - BirdCorrection false; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties deleted file mode 100644 index 38d196f30e..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties +++ /dev/null @@ -1,31 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType hsPsiThermo>>>>; - -mixture -{ - nMoles 1; - molWeight 28.9; - Cp 1007; - Hf 0; - mu 1.84e-05; - Pr 0.7; -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties deleted file mode 100644 index 3e945495c5..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RASModel; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict deleted file mode 100644 index eb8745b62b..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict +++ /dev/null @@ -1,55 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application rhoPisoTwinParcelFoam; - -startFrom latestTime; - -startTime 0; - -stopAt endTime; - -endTime 0.5; - -deltaT 0.0001; - -writeControl adjustableRunTime; - -writeInterval 0.01; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 10; - -writeCompression off; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable true; - -adjustTimeStep yes; - -maxCo 0.2; - -maxDeltaT 1; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict deleted file mode 100644 index dc1e1a9083..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict +++ /dev/null @@ -1,45 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object decomposeParDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 4; - -method scotch; - -simpleCoeffs -{ - n ( 2 2 1 ); - delta 0.001; -} - -hierarchicalCoeffs -{ - n ( 1 1 1 ); - delta 0.001; - order xyz; -} - -manualCoeffs -{ - dataFile ""; -} - -distributed no; - -roots ( ); - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes deleted file mode 100644 index d12a51f36c..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes +++ /dev/null @@ -1,72 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss upwind; - div(phid,p) Gauss upwind; - div(phiU,p) Gauss linear; - div(phi,hs) Gauss upwind; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; - div(U) Gauss linear; - div((muEff*dev2(T(grad(U))))) Gauss linear; - div(phi,Yi_h) Gauss upwind; -} - -laplacianSchemes -{ - default Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; - laplacian(mut,U) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(alphaEff,hs) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution deleted file mode 100644 index 297f433f2d..0000000000 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - "(rho|G)" - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - } - - p - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - - "(U|hs|R|k|epsilon)" - { - $p; - tolerance 1e-05; - relTol 0; - } - - "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)" - { - $p; - } -} - -PISO -{ - transonic yes; - nCorrectors 2; - nNonOrthogonalCorrectors 0; - momentumPredictor yes; -} - - -// ************************************************************************* //