From 8d70babf134f86759e83efd93b69d444756f83fa Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Jun 2009 15:19:51 +0100 Subject: [PATCH 1/6] adding time and region options --- .../lagrangian/particleTracks/particleTracks.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C index 0c88172f7c..596c9e4f88 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C @@ -46,11 +46,14 @@ using namespace Foam; int main(int argc, char *argv[]) { + timeSelector::addOptions(); + #include "addRegionOption.H" + #include "setRootCase.H" #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); - #include "createMesh.H" + #include "createNamedMesh.H" #include "createFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From 784c4b8261e0539c994e37d2e3c1a01cd610d8e9 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Jun 2009 18:31:36 +0100 Subject: [PATCH 2/6] tutorial solver and case updates --- .../rhoPisoTwinParcelFoam/Make/options | 5 +- .../rhoPisoTwinParcelFoam/UEqn.H | 4 +- .../rhoPisoTwinParcelFoam/createClouds.H | 4 +- .../rhoPisoTwinParcelFoam/createFields.H | 15 ++--- .../rhoPisoTwinParcelFoam/hEqn.H | 4 +- .../rhoPisoTwinParcelFoam/pEqn.H | 8 +-- .../rhoPisoTwinParcelFoam.C | 47 +++++++-------- .../simplifiedSiwek/0/epsilon | 19 ++++--- .../rhoPisoTwinParcelFoam/simplifiedSiwek/0/k | 19 ++++--- .../constant/kinematicCloud1Properties | 57 +++++++++---------- .../constant/polyMesh/boundary | 5 +- .../constant/thermoCloud1Properties | 43 +++++++++----- .../constant/turbulenceProperties | 21 +++++++ 13 files changed, 142 insertions(+), 109 deletions(-) create mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options index cffe6f344a..2f17d01ffb 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options @@ -4,9 +4,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -llagrangian \ @@ -15,7 +16,7 @@ EXE_LIBS = \ -lmeshTools \ -lthermophysicalFunctions \ -lbasicThermophysicalModels \ - -lcombustionThermophysicalModels \ + -lreactionThermophysicalModels \ -lspecie \ -lradiation \ -lcompressibleRASModels \ diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H index 4d58a14da8..5f2e597a15 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H @@ -4,8 +4,8 @@ + fvm::div(phi, U) + turbulence->divDevRhoReff(U) == - thermoCloud1.SU1() - + kinematicCloud1.SU1() + thermoCloud1.SU() + + kinematicCloud1.SU() + rho.dimensionedInternalField()*g ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H index bdf17e19ef..ff41634a4e 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H @@ -5,7 +5,7 @@ rho, U, g, - thermo() + thermo ); Info<< "Constructing kinematicCloud1" << endl; @@ -14,7 +14,7 @@ "kinematicCloud1", rho, U, - thermo().mu(), + thermo.mu(), g ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H index b07398a031..cebd44cfd4 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H @@ -1,13 +1,14 @@ Info<< "Reading thermophysical properties\n" << endl; - autoPtr thermo + autoPtr pThermo ( - basicThermo::New(mesh) + basicPsiThermo::New(mesh) ); + basicPsiThermo& thermo = pThermo(); - volScalarField& p = thermo->p(); - volScalarField& h = thermo->h(); - const volScalarField& psi = thermo->psi(); + volScalarField& p = thermo.p(); + volScalarField& h = thermo.h(); + const volScalarField& psi = thermo.psi(); volScalarField rho ( @@ -19,7 +20,7 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - thermo->rho() + thermo.rho() ); Info<< "\nReading field U\n" << endl; @@ -48,7 +49,7 @@ rho, U, phi, - thermo() + thermo ) ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H index 5359c9c2ce..2b3b60ce98 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H @@ -6,12 +6,12 @@ - fvm::laplacian(turbulence->alphaEff(), h) == DpDt - + thermoCloud1.Sh1() + + thermoCloud1.Sh() ); hEqn.relax(); hEqn.solve(); - thermo->correct(); + thermo.correct(); } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H index b506245034..9443f909a3 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H @@ -1,4 +1,4 @@ -rho = thermo->rho(); +rho = thermo.rho(); volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); @@ -8,7 +8,7 @@ if (transonic) surfaceScalarField phid ( "phid", - fvc::interpolate(thermo->psi()) + fvc::interpolate(psi) *( (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) @@ -35,8 +35,8 @@ if (transonic) else { phi = - fvc::interpolate(rho)* - ( + fvc::interpolate(rho) + *( (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C index 1082636303..77715fd48c 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "basicThermo.H" +#include "basicPsiThermo.H" #include "turbulenceModel.H" #include "basicThermoCloud.H" @@ -41,62 +41,59 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" -# include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" + #include "readEnvironmentalProperties.H" + #include "createFields.H" + #include "createClouds.H" + #include "readPISOControls.H" + #include "initContinuityErrs.H" + #include "readTimeControls.H" + #include "compressibleCourantNo.H" + #include "setInitialDeltaT.H" -# include "createTime.H" -# include "createMesh.H" -# include "readEnvironmentalProperties.H" -# include "createFields.H" -# include "createClouds.H" -# include "readPISOControls.H" -# include "initContinuityErrs.H" -# include "readTimeControls.H" -# include "compressibleCourantNo.H" -# include "setInitialDeltaT.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { -# include "readTimeControls.H" -# include "readPISOControls.H" -# include "compressibleCourantNo.H" -# include "setDeltaT.H" + #include "readTimeControls.H" + #include "readPISOControls.H" + #include "compressibleCourantNo.H" + #include "setDeltaT.H" runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - Info<< "Evolving thermoCloud1" << endl; thermoCloud1.evolve(); thermoCloud1.info(); - Info<< "Evolving kinematicCloud1" << endl; kinematicCloud1.evolve(); kinematicCloud1.info(); -# include "rhoEqn.H" + #include "rhoEqn.H" // --- PIMPLE loop for (int ocorr=1; ocorr<=nOuterCorr; ocorr++) { -# include "UEqn.H" + #include "UEqn.H" // --- PISO loop for (int corr=1; corr<=nCorr; corr++) { -# include "hEqn.H" -# include "pEqn.H" + #include "hEqn.H" + #include "pEqn.H" } } turbulence->correct(); - rho = thermo->rho(); + rho = thermo.rho(); runTime.write(); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon index ec63ed1672..9fcf588c0c 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,28 +23,28 @@ boundaryField { top { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 5390.5; } - bottom { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 5390.5; } - walls { - type zeroGradient; + 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 index b2e4f58aab..9abb57fdb0 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,28 +23,28 @@ boundaryField { top { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 37.5; } - bottom { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 37.5; } - walls { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 37.5; } - symmetry { type symmetryPlane; } - frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 4a7f8b7b2b..8c69fb42b5 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -21,20 +21,27 @@ DragModel SphereDrag; DispersionModel StochasticDispersionRAS; -WallInteractionModel StandardWallInteraction; +PatchInteractionModel StandardWallInteraction; -minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - -rho0 rho0 [ 1 -3 0 0 0 ] 5000; +PostProcessingModel none; coupled true; +cellValueSourceCorrection on; + parcelTypeId 2; +constantProperties +{ + rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; + minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; + rho0 rho0 [ 1 -3 0 0 0 ] 5000; +} + interpolationSchemes { rho cell; - U cellPointFace; + U cellPoint; mu cell; } @@ -43,12 +50,21 @@ integrationSchemes U Euler; } +particleForces +{ + gravity on; + virtualMass off; + Cvm 0.5; + pressureGradient off; + gradU gradU; +} + ManualInjectionCoeffs { - parcelBasisType mass; massTotal massTotal [ 1 0 0 0 0 ] 0.0002; + parcelBasisType mass; SOI 0; - positionsFile kinematicCloud1Positions; + positionsFile "kinematicCloud1Positions"; U0 ( 0 0 0 ); parcelPDF { @@ -70,29 +86,10 @@ ConeInjectionCoeffs position ( 0.25 0.25 0.05 ); direction ( 0 -1 0 ); parcelsPerSecond 10000; - volumeFlowRate Constant; - volumeFlowRateCoeffs - { - value 0.01; - } - - Umag Constant; - UmagCoeffs - { - value 50; - } - - thetaInner Constant; - thetaInnerCoeffs - { - value 0; - } - - thetaOuter Constant; - thetaOuterCoeffs - { - value 30; - } + volumeFlowRate Constant 0.01; + Umag Constant 50; + thetaInner Constant 0; + thetaOuter Constant 30; parcelPDF { diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary index b8848e2d9c..b130d7bc0a 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index fd752a082c..a7c19443e2 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -21,33 +21,37 @@ DragModel SphereDrag; DispersionModel StochasticDispersionRAS; -WallInteractionModel StandardWallInteraction; +PatchInteractionModel StandardWallInteraction; HeatTransferModel RanzMarshall; +PostProcessingModel none; + radiation off; -minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - -rho0 rho0 [ 1 -3 0 0 0 ] 2500; - -T0 T0 [ 0 0 0 1 0 ] 300; - -cp0 cp0 [ 0 2 -2 -1 0 ] 900; - -epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - -f0 f0 [ 0 0 0 0 0 ] 0.5; - coupled true; +cellValueSourceCorrection on; + parcelTypeId 1; +constantProperties +{ + rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; + TMin TMin [ 0 0 0 1 0 ] 200; + minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; + rho0 rho0 [ 1 -3 0 0 0 ] 2500; + T0 T0 [ 0 0 0 1 0 ] 300; + cp0 cp0 [ 0 2 -2 -1 0 ] 900; + epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; + f0 f0 [ 0 0 0 0 0 ] 0.5; +} + interpolationSchemes { rho cell; - U cellPointFace; mu cell; + U cellPoint; T cell; Cp cell; } @@ -58,12 +62,21 @@ integrationSchemes T Analytical; } +particleForces +{ + gravity on; + virtualMass off; + Cvm 0.5; + pressureGradient off; + gradU gradU; +} + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 0.0001; parcelBasisType mass; SOI 0; - positionsFile thermoCloud1Positions; + positionsFile "thermoCloud1Positions"; U0 ( 0 0 0 ); parcelPDF { diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties new file mode 100644 index 0000000000..78f28eca60 --- /dev/null +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // From 435712967f4c59399b527666932570553bf63439 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Jun 2009 18:36:58 +0100 Subject: [PATCH 3/6] updates to dieselFoam tutorial --- .../combustion/dieselFoam/aachenBomb/0/alphat | 4 ++-- .../dieselFoam/aachenBomb/0/epsilon | 4 ++-- .../combustion/dieselFoam/aachenBomb/0/k | 4 ++-- .../combustion/dieselFoam/aachenBomb/0/mut | 2 +- .../combustion/dieselFoam/aachenBomb/0/spray | 20 ------------------- .../aachenBomb/constant/chemistryProperties | 6 ++++-- .../constant/thermophysicalProperties | 2 +- 7 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/spray diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat index 2684dd73c8..c56c4724ce 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ boundaryField { walls { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon index e9dd46eb33..e38ed02784 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ boundaryField { walls { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 90; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k index 251a39ce81..b037171c72 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/k +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ boundaryField { walls { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut index e687f9b8fa..2750ce32ec 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/mut +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/spray b/tutorials/combustion/dieselFoam/aachenBomb/0/spray deleted file mode 100644 index c5f9cb2f59..0000000000 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/spray +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object spray; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -( -) - -// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties index be340ec092..72c8fd655e 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties @@ -15,9 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +psiChemistryModel ODEChemistryModel; + chemistry off; -chemistrySolver ODE; +chemistrySolver ode; initialChemicalTimeStep 1e-07; @@ -32,7 +34,7 @@ EulerImplicitCoeffs equilibriumRateLimiter off; } -ODECoeffs +odeCoeffs { ODESolver SIBS; eps 0.05; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties index 2423823385..f94afe7312 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hMixtureThermo; +thermoType hPsiMixtureThermo>; CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; From 2c2c0163ca6eded9d6ad1ee80b2ecc9dd300fbe8 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Jun 2009 18:57:44 +0100 Subject: [PATCH 4/6] XiFoam tutorial updates --- tutorials/combustion/XiFoam/les/Allrun | 17 +++++++ .../XiFoam/les/pitzDaily/0/alphaSgs | 49 +++++++++++++++++++ .../XiFoam/les/pitzDaily3D/0/alphaSgs | 49 +++++++++++++++++++ .../combustion/XiFoam/{ => ras}/Allclean | 0 tutorials/combustion/XiFoam/{ => ras}/Allrun | 0 5 files changed, 115 insertions(+) create mode 100755 tutorials/combustion/XiFoam/les/Allrun create mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs create mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs rename tutorials/combustion/XiFoam/{ => ras}/Allclean (100%) rename tutorials/combustion/XiFoam/{ => ras}/Allrun (100%) diff --git a/tutorials/combustion/XiFoam/les/Allrun b/tutorials/combustion/XiFoam/les/Allrun new file mode 100755 index 0000000000..e43b54e4e3 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/Allrun @@ -0,0 +1,17 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name from directory +application="XiFoam" + +cases=" \ +pitzDaily \ +pitzDaily3D +" + +for i in $cases; do + blockMesh -case $i + $application -case $i +done + diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs new file mode 100644 index 0000000000..9a83c0337e --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object alphaSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs new file mode 100644 index 0000000000..c5331748ae --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object alphaSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/Allclean b/tutorials/combustion/XiFoam/ras/Allclean similarity index 100% rename from tutorials/combustion/XiFoam/Allclean rename to tutorials/combustion/XiFoam/ras/Allclean diff --git a/tutorials/combustion/XiFoam/Allrun b/tutorials/combustion/XiFoam/ras/Allrun similarity index 100% rename from tutorials/combustion/XiFoam/Allrun rename to tutorials/combustion/XiFoam/ras/Allrun From 81dfb596d65547f36b35685df9ac84c368331c78 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 23 Jun 2009 19:06:21 +0100 Subject: [PATCH 5/6] rhoPimpleFoam tutorial updates --- .../compressible/rhoPimpleFoam/angledDuct/0/alphat | 8 ++++---- .../compressible/rhoPimpleFoam/angledDuct/0/epsilon | 10 +++++----- tutorials/compressible/rhoPimpleFoam/angledDuct/0/k | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat index f609fa6c14..dc2104f83c 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat @@ -23,22 +23,22 @@ boundaryField { front { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } back { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } wall { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } porosityWall { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } inlet diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon index 502e048957..e4dccfe577 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon @@ -23,27 +23,27 @@ boundaryField { front { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } back { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } wall { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } porosityWall { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } inlet { - type turbulentMixingLengthDissipationRateInlet; + type compressible::turbulentMixingLengthDissipationRateInlet; mixingLength 0.005; value uniform 200; } diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k index 6171b9506b..36be49f2ea 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k @@ -23,22 +23,22 @@ boundaryField { front { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } back { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } wall { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } porosityWall { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } inlet From 441b8b0832a16f7a92540ec2f7e444bda203a593 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 24 Jun 2009 12:27:18 +0100 Subject: [PATCH 6/6] more tutorial updates --- .../hotRadiationRoom/0/p | 8 ++-- .../hotRadiationRoom/0/pd | 48 ------------------- .../hotRadiationRoom/system/fvSchemes | 4 +- .../hotRadiationRoom/system/fvSolution | 8 ++-- .../hotRadiationRoomFvDOM/0/p | 8 ++-- .../hotRadiationRoomFvDOM/0/pd | 48 ------------------- .../hotRadiationRoomFvDOM/system/fvSchemes | 4 +- .../hotRadiationRoomFvDOM/system/fvSolution | 8 ++-- .../multiRegionHeater/Allrun | 8 ++-- .../MRFSimpleFoam/mixerVessel2D/makeMesh | 8 ++-- .../constant/radiationProperties | 2 +- .../les/throttle/system/cellSetDict.1 | 10 +++- .../les/throttle/system/cellSetDict.2 | 10 +++- .../les/throttle/system/cellSetDict.3 | 10 +++- .../les/throttle3D/system/cellSetDict.1 | 10 +++- .../les/throttle3D/system/cellSetDict.2 | 10 +++- .../les/throttle3D/system/cellSetDict.3 | 10 +++- .../les/depthCharge2D/0/{pd.org => p.org} | 2 +- .../les/depthCharge2D/Allrun | 2 +- .../les/depthCharge2D/system/fvSchemes | 8 ++-- .../les/depthCharge2D/system/fvSolution | 4 +- .../les/depthCharge2D/system/setFieldsDict | 28 ++++++++++- .../les/depthCharge3D/0/{pd.org => p.org} | 2 +- .../les/depthCharge3D/Allclean | 2 +- .../les/depthCharge3D/Allrun | 2 +- .../les/depthCharge3D/system/fvSchemes | 8 ++-- .../les/depthCharge3D/system/fvSolution | 4 +- .../les/depthCharge3D/system/setFieldsDict | 28 ++++++++++- .../ras/damBreakWithObstacle/0-orig/{pd => p} | 2 +- .../ras/damBreakWithObstacle/0/{pd => p} | 2 +- .../ras/damBreakWithObstacle/system/fvSchemes | 6 +-- .../damBreakWithObstacle/system/fvSolution | 9 ++-- .../ras/sloshingTank2D/0/{pd => p} | 2 +- .../ras/sloshingTank2D/system/controlDict | 2 +- .../ras/sloshingTank2D/system/fvSchemes | 6 +-- .../ras/sloshingTank2D/system/fvSolution | 7 ++- .../ras/sloshingTank2D/system/setFieldsDict | 5 +- .../ras/sloshingTank2D3DoF/0/{pd => p} | 2 +- .../ras/sloshingTank2D3DoF/system/fvSchemes | 6 +-- .../ras/sloshingTank2D3DoF/system/fvSolution | 7 ++- .../sloshingTank2D3DoF/system/setFieldsDict | 5 +- .../ras/sloshingTank3D/0/{pd => p} | 2 +- .../ras/sloshingTank3D/system/fvSchemes | 6 +-- .../ras/sloshingTank3D/system/fvSolution | 7 ++- .../ras/sloshingTank3D/system/setFieldsDict | 5 +- .../ras/sloshingTank3D3DoF/0/{pd => p} | 2 +- .../ras/sloshingTank3D3DoF/system/fvSchemes | 6 +-- .../ras/sloshingTank3D3DoF/system/fvSolution | 7 ++- .../sloshingTank3D3DoF/system/setFieldsDict | 5 +- .../ras/sloshingTank3D6DoF/0/{pd => p} | 2 +- .../ras/sloshingTank3D6DoF/system/fvSchemes | 6 +-- .../ras/sloshingTank3D6DoF/system/fvSolution | 7 ++- .../damBreak/0/pd => laminar/damBreak/0/p} | 2 +- .../laminar/damBreak/system/fvSchemes | 6 +-- .../laminar/damBreak/system/fvSolution | 4 +- .../interFoam/les/nozzleFlow2D/0/{pd => p} | 2 +- .../les/nozzleFlow2D/system/fvSchemes | 6 +-- .../les/nozzleFlow2D/system/fvSolution | 4 +- tutorials/multiphase/interFoam/ras/Allrun | 2 +- .../multiphase/interFoam/ras/damBreak/0/U | 7 +-- .../ras/damBreak/0/{gamma.org => alpha1} | 2 +- .../ras/damBreak/0/{gamma => alpha1.org} | 2 +- .../interFoam/ras/damBreak/0/epsilon | 12 ++--- .../multiphase/interFoam/ras/damBreak/0/k | 12 ++--- .../damBreak/0/pd => ras/damBreak/0/p} | 2 +- .../interFoam/ras/damBreak/system/fvSchemes | 10 ++-- .../interFoam/ras/damBreak/system/fvSolution | 10 ++-- .../0/pd => damBreak4phase/0/p} | 2 +- .../laminar/damBreak4phase/system/fvSolution | 4 +- .../0/pd => damBreak4phaseFine/0/p} | 2 +- .../damBreak4phaseFine/system/fvSolution | 4 +- 71 files changed, 252 insertions(+), 263 deletions(-) delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd rename tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/{pd.org => p.org} (98%) rename tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/{pd.org => p.org} (97%) rename tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/{pd => p} (98%) rename tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/{pd => p} (98%) rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/{pd => p} (98%) rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/{pd => p} (98%) rename tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/{pd => p} (97%) rename tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/{pd => p} (97%) rename tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/{pd => p} (97%) rename tutorials/multiphase/interFoam/{ras/damBreak/0/pd => laminar/damBreak/0/p} (98%) rename tutorials/multiphase/interFoam/les/nozzleFlow2D/0/{pd => p} (98%) rename tutorials/multiphase/interFoam/ras/damBreak/0/{gamma.org => alpha1} (98%) rename tutorials/multiphase/interFoam/ras/damBreak/0/{gamma => alpha1.org} (98%) rename tutorials/multiphase/interFoam/{laminar/damBreak/0/pd => ras/damBreak/0/p} (98%) rename tutorials/multiphase/multiphaseInterFoam/laminar/{damBreak4phaseFine/0/pd => damBreak4phase/0/p} (98%) rename tutorials/multiphase/multiphaseInterFoam/laminar/{damBreak4phase/0/pd => damBreak4phaseFine/0/p} (98%) diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p index f200e3eeb0..bb1ff51259 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p @@ -22,25 +22,25 @@ boundaryField { floor { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } ceiling { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } fixedWalls { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } box { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd deleted file mode 100644 index 1841d7882f..0000000000 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object pd; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - floor - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - ceiling - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - fixedWalls - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - box - { - type fixedFluxBuoyantPressure; - value uniform 0; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes index 2263c09775..cd290308eb 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes @@ -41,7 +41,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -62,7 +62,7 @@ snGradSchemes fluxRequired { default no; - pd ; + p; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution index f6c1f9453a..25a07616b3 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - pd + p { solver PCG; preconditioner DIC; @@ -69,14 +69,14 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { rho 1; - pd 0.3; + p 0.3; U 0.7; h 0.7; k 0.7; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p index f200e3eeb0..bb1ff51259 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p @@ -22,25 +22,25 @@ boundaryField { floor { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } ceiling { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } fixedWalls { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } box { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd deleted file mode 100644 index 1841d7882f..0000000000 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object pd; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - floor - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - ceiling - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - fixedWalls - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - box - { - type fixedFluxBuoyantPressure; - value uniform 0; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes index 0800e9f932..ee909d216c 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes @@ -42,7 +42,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -63,7 +63,7 @@ snGradSchemes fluxRequired { default no; - pd ; + p; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution index a5d6208674..685132185b 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - pd + p { solver GAMG; tolerance 1e-06; @@ -73,14 +73,14 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { rho 1.0; - pd 0.3; + p 0.3; U 0.7; h 0.7; k 0.7; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index 1fce68e81c..c3c4b5e504 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -15,13 +15,13 @@ runApplication splitMeshRegions -cellZones for i in bottomAir topAir heater leftSolid rightSolid do - changeDictionary -region $i + changeDictionary -region $i >& log.changeDictionary.$i done # remove fluid fields from solid regions (important for post-processing) for i in heater leftSolid rightSolid do - rm -f 0*/$i/{mut,alphat,epsilon,k,p,pd,U} + rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U} done # remove solid fields from fluid regions (important for post-processing) @@ -37,7 +37,7 @@ done # Decompose for i in bottomAir topAir heater leftSolid rightSolid do - decomposePar -region $i + decomposePar -region $i >& log.decomposePar.$i done # Run @@ -47,7 +47,7 @@ runParallel chtMultiRegionFoam 4 system/machines # Reconstruct for i in bottomAir topAir heater leftSolid rightSolid do - reconstructPar -region $i + reconstructPar -region $i >& log.reconstructPar.$i done diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh index b0be10d8e5..b4fc1a22ef 100755 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh @@ -1,11 +1,13 @@ #!/bin/sh +set -x m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict -blockMesh -cellSet +blockMesh >& log.blockMesh +cellSet >& log.cellSet + #- MRF determines its own faceZone if not supplied #cp system/faceSetDict_rotorFaces system/faceSetDict #faceSet #cp system/faceSetDict_noBoundaryFaces system/faceSetDict #faceSet -setsToZones -noFlipMap +setsToZones -noFlipMap >& log.setsToZones diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties index 82b67c9f1f..ca03722b1c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties @@ -17,7 +17,7 @@ FoamFile radiation off; -radiationModel noRadiation; +radiationModel none; solverFreq 10; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 index a7c7e625e5..bfa0d6ac4f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.1; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); +topoSetSources +( + boxToCell + { + box (0.004 -0.001 -1) (0.012 0.001 1); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 index 470258895d..d9684898c8 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.2; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); +topoSetSources +( + boxToCell + { + box (0.0045 -0.00075 -1) (0.0095 0.00075 1); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 index 530c710e1f..10f2c880a5 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.3; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); +topoSetSources +( + boxToCell + { + box (0.00475 -0.000375 -1) (0.009 0.000375 1); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 index a7c7e625e5..88755b2299 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.1; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); +topoSetSources +( + boxToCell + { + box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 index 470258895d..a29931d08f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.2; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); +topoSetSources +( + boxToCell + { + box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 index 530c710e1f..8ff387dd87 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.3; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); +topoSetSources +( + boxToCell + { + box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org similarity index 98% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/pd.org rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org index 5f5f977f43..72b59f9e90 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun index f4e775f4ba..f2a0345d68 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun @@ -7,6 +7,6 @@ application="compressibleInterFoam" runApplication blockMesh cp 0/alpha1.org 0/alpha1 -cp 0/pd.org 0/pd +cp 0/p.org 0/p runApplication setFields runApplication $application diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes index 373e1ca67d..0233a5951a 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes div(rho*phi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss interfaceCompression 1; - div(phi,pd) Gauss upwind; + div(phi,p) Gauss upwind; div(phi,k) Gauss vanLeer; div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -53,9 +53,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - gamma ; + p; + pcorr; + gamma; } diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution index 3416674d07..f93b56c204 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution @@ -45,7 +45,7 @@ solvers solver diagonal; } - pd + p { solver GAMG; tolerance 1e-07; @@ -60,7 +60,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict index d199264332..00e706b1e5 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict @@ -15,9 +15,33 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 ); +defaultFieldValues +( + volScalarFieldValue alpha1 1 + volScalarFieldValue p 100000 +); -regions ( sphereToCell { centre ( 0.5 0.5 0 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } ); +regions +( + sphereToCell + { + centre ( 0.5 0.5 0 ); + radius 0.1; + fieldValues + ( + volScalarFieldValue alpha1 0 + volScalarFieldValue p 1000000 + ); + } + boxToCell + { + box ( -10 1 -1 ) ( 10 10 1 ); + fieldValues + ( + volScalarFieldValue alpha1 0 + ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org similarity index 97% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/pd.org rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org index efe6f4ca9c..3377670aaf 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd.org; + object p.org; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean index c422ce058e..99cd62d923 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean @@ -2,4 +2,4 @@ foamCleanTutorials cases rm -rf processor* -rm -rf 0/pd.gz 0/alpha1.gz +rm -rf 0/p.gz 0/alpha1.gz diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun index 3302513ed6..7b9b11445e 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun @@ -7,7 +7,7 @@ application="compressibleInterFoam" runApplication blockMesh cp 0/alpha1.org 0/alpha1 -cp 0/pd.org 0/pd +cp 0/p.org 0/p runApplication setFields runApplication decomposePar hostname > system/machines diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes index 373e1ca67d..0233a5951a 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes div(rho*phi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss interfaceCompression 1; - div(phi,pd) Gauss upwind; + div(phi,p) Gauss upwind; div(phi,k) Gauss vanLeer; div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -53,9 +53,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - gamma ; + p; + pcorr; + gamma; } diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution index 3416674d07..f93b56c204 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution @@ -45,7 +45,7 @@ solvers solver diagonal; } - pd + p { solver GAMG; tolerance 1e-07; @@ -60,7 +60,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict index fb686e791c..3b3c397cb9 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict @@ -15,9 +15,33 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 ); +defaultFieldValues +( + volScalarFieldValue alpha1 1 + volScalarFieldValue p 100000 +); -regions ( sphereToCell { centre ( 0.5 0.5 0.5 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } ); +regions +( + sphereToCell + { + centre ( 0.5 0.5 0.5 ); + radius 0.1; + fieldValues + ( + volScalarFieldValue alpha1 0 + volScalarFieldValue p 1000000 + ); + } + boxToCell + { + box ( -10 1 -1 ) ( 10 10 1 ); + fieldValues + ( + volScalarFieldValue alpha1 0 + ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/pd b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/pd rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p index 0136109909..b3a944b216 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/pd +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/pd b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/pd rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p index 0136109909..b3a944b216 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes index c563a4cd8f..a6ed1d4174 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution index 2ca306273d..fe7b6a8851 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -122,9 +122,8 @@ PISO nAlphaSubCycles 3; cAlpha 1; - pdRefPoint (0.51 0.51 0.51); - pdRefValue 0; - pRefValue 0; + pRefPoint (0.51 0.51 0.51); + pRefValue 0; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p index 020ff7cc00..c69b424dc7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict index e4a69588f6..35735bacbb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict @@ -54,7 +54,7 @@ functions probes { type probes; - name probes; + functionObjectLibs ( "libsampling.so" ); outputControl timeStep; outputInterval 1; probeLocations diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes index 3a940dbe40..2f7da16bb6 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict index 7ff571c6d1..ec8d1717d5 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p index 020ff7cc00..c69b424dc7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict index 7ff571c6d1..ec8d1717d5 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p similarity index 97% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p index ac7e49da81..d27ad70eb9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict index 2f947e6241..bceaad67ce 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p similarity index 97% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p index ac7e49da81..d27ad70eb9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict index 7ff571c6d1..ec8d1717d5 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p similarity index 97% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p index ac7e49da81..d27ad70eb9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/pd b/tutorials/multiphase/interFoam/laminar/damBreak/0/p similarity index 98% rename from tutorials/multiphase/interFoam/ras/damBreak/0/pd rename to tutorials/multiphase/interFoam/laminar/damBreak/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/pd +++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes index d242b76b75..0b17c289c2 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha1 ; + p; + pcorr; + alpha1; } diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution index b1b00223fc..6c3a8c5da3 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0; } - pd + p { solver PCG; preconditioner DIC; @@ -33,7 +33,7 @@ solvers relTol 0.05; } - pdFinal + pFinal { solver PCG; preconditioner DIC; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p similarity index 98% rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p index b533fbc016..8f01f473bb 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes index 2a273c5e51..153a1ea73a 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes @@ -56,9 +56,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha1 ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution index 660482ad37..4642da1396 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-07; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun index c01b35fcbd..e222cf7e15 100755 --- a/tutorials/multiphase/interFoam/ras/Allrun +++ b/tutorials/multiphase/interFoam/ras/Allrun @@ -32,7 +32,7 @@ cloneCase damBreak damBreakFine cd damBreakFine # Modify case setDamBreakFine - cp ../damBreak/0/gamma.org 0/gamma + cp ../damBreak/0/alpha1.org 0/alpha1 # And execute runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/U b/tutorials/multiphase/interFoam/ras/damBreak/0/U index d4cc4c65a6..7ea3a0c323 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/U +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -38,7 +39,6 @@ boundaryField atmosphere { type pressureInletOutletVelocity; - phi phi; value uniform (0 0 0); } defaultFaces @@ -47,4 +47,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 similarity index 98% rename from tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 index 742f297443..36d4d31dcd 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object gamma; + object alpha1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org similarity index 98% rename from tutorials/multiphase/interFoam/ras/damBreak/0/gamma rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org index 742f297443..36d4d31dcd 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object gamma; + object alpha1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon index 92ed8a7d75..b49a804284 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -3 0 0 0 0 ]; +dimensions [0 2 -3 0 0 0 0]; internalField uniform 0.1; @@ -24,28 +24,24 @@ boundaryField leftWall { type epsilonWallFunction; - value uniform 0; + value uniform 0.1; } - rightWall { type epsilonWallFunction; - value uniform 0; + value uniform 0.1; } - lowerWall { type epsilonWallFunction; - value uniform 0; + value uniform 0.1; } - atmosphere { type inletOutlet; inletValue uniform 0.1; value uniform 0.1; } - defaultFaces { type empty; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/0/k index c8071de03b..897224d725 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/k +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/k @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -2 0 0 0 0 ]; +dimensions [0 2 -2 0 0 0 0]; internalField uniform 0.1; @@ -24,28 +24,24 @@ boundaryField leftWall { type kQRWallFunction; - value uniform 0; + value uniform 0.1; } - rightWall { type kQRWallFunction; - value uniform 0; + value uniform 0.1; } - lowerWall { type kQRWallFunction; - value uniform 0; + value uniform 0.1; } - atmosphere { type inletOutlet; inletValue uniform 0.1; value uniform 0.1; } - defaultFaces { type empty; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/pd b/tutorials/multiphase/interFoam/ras/damBreak/0/p similarity index 98% rename from tutorials/multiphase/interFoam/laminar/damBreak/0/pd rename to tutorials/multiphase/interFoam/ras/damBreak/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/0/pd +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes index 499ad01e5c..81f8e2c48b 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes @@ -28,8 +28,8 @@ gradSchemes divSchemes { div(rho*phi,U) Gauss linear; - div(phi,gamma) Gauss vanLeer; - div(phirb,gamma) Gauss interfaceCompression; + div(phi,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss interfaceCompression; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; @@ -57,9 +57,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - gamma ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution index ea7bd97c27..6af3dad37e 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0; } - pd + p { solver PCG; preconditioner DIC; @@ -33,7 +33,7 @@ solvers relTol 0.05; } - pdFinal + pFinal { solver PCG; preconditioner DIC; @@ -87,9 +87,9 @@ PISO momentumPredictor no; nCorrectors 3; nNonOrthogonalCorrectors 0; - nGammaCorr 1; - nGammaSubCycles 4; - cGamma 2; + nAlphaCorr 1; + nAlphaSubCycles 4; + cAlpha 2; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/pd b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p similarity index 98% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/pd rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/pd +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 8c303f9540..47957b22b3 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-07; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/pd b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p similarity index 98% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/pd rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/pd +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index 8c303f9540..47957b22b3 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-07; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner