diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 70a069475f..7f4aa91722 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -130,13 +130,13 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4)) ); - const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), 1e-4))); + const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), scalar(1e-4)))); const scalarField cellWidth(pow(mesh.V(), 1.0/3.0)); const scalarField upLocal(uPrimeCoef_*sqrt((U & CT & U)*cellWidth)); - const scalarField deltaUp(upLocal*(max(1.0, pow(nr, 0.5)) - 1.0)); + const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0)); up.internalField() += deltaUp; diff --git a/tutorials/combustion/PDRFoam/0/Aw b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw similarity index 100% rename from tutorials/combustion/PDRFoam/0/Aw rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw diff --git a/tutorials/combustion/PDRFoam/0/B b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B similarity index 100% rename from tutorials/combustion/PDRFoam/0/B rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B diff --git a/tutorials/combustion/PDRFoam/0/CR b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR similarity index 100% rename from tutorials/combustion/PDRFoam/0/CR rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR diff --git a/tutorials/combustion/PDRFoam/0/CT b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT similarity index 100% rename from tutorials/combustion/PDRFoam/0/CT rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT diff --git a/tutorials/combustion/PDRFoam/0/Lobs b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs similarity index 100% rename from tutorials/combustion/PDRFoam/0/Lobs rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs diff --git a/tutorials/combustion/PDRFoam/0/Nv b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv similarity index 100% rename from tutorials/combustion/PDRFoam/0/Nv rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv diff --git a/tutorials/combustion/PDRFoam/0/Su b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Su similarity index 100% rename from tutorials/combustion/PDRFoam/0/Su rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Su diff --git a/tutorials/combustion/PDRFoam/0/T b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/T similarity index 100% rename from tutorials/combustion/PDRFoam/0/T rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/T diff --git a/tutorials/combustion/PDRFoam/0/Tu b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Tu similarity index 100% rename from tutorials/combustion/PDRFoam/0/Tu rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Tu diff --git a/tutorials/combustion/PDRFoam/0/U b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/U similarity index 100% rename from tutorials/combustion/PDRFoam/0/U rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/U diff --git a/tutorials/combustion/PDRFoam/0/Xi b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Xi similarity index 100% rename from tutorials/combustion/PDRFoam/0/Xi rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Xi diff --git a/tutorials/combustion/PDRFoam/0/alphat b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/alphat similarity index 100% rename from tutorials/combustion/PDRFoam/0/alphat rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/alphat diff --git a/tutorials/combustion/PDRFoam/0/b b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/b similarity index 100% rename from tutorials/combustion/PDRFoam/0/b rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/b diff --git a/tutorials/combustion/PDRFoam/0/betav b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav similarity index 100% rename from tutorials/combustion/PDRFoam/0/betav rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav diff --git a/tutorials/combustion/PDRFoam/0/epsilon b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon similarity index 100% rename from tutorials/combustion/PDRFoam/0/epsilon rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon diff --git a/tutorials/combustion/PDRFoam/0/epsilon.old b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon.old similarity index 100% rename from tutorials/combustion/PDRFoam/0/epsilon.old rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon.old diff --git a/tutorials/combustion/PDRFoam/0/ft b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/ft similarity index 100% rename from tutorials/combustion/PDRFoam/0/ft rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/ft diff --git a/tutorials/combustion/PDRFoam/0/k b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k similarity index 100% rename from tutorials/combustion/PDRFoam/0/k rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k diff --git a/tutorials/combustion/PDRFoam/0/k.old b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k.old similarity index 100% rename from tutorials/combustion/PDRFoam/0/k.old rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k.old diff --git a/tutorials/combustion/PDRFoam/0/mut b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/mut similarity index 100% rename from tutorials/combustion/PDRFoam/0/mut rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/mut diff --git a/tutorials/combustion/PDRFoam/0/nsv b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv similarity index 100% rename from tutorials/combustion/PDRFoam/0/nsv rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv diff --git a/tutorials/combustion/PDRFoam/0/p b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/p similarity index 100% rename from tutorials/combustion/PDRFoam/0/p rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/p diff --git a/tutorials/combustion/PDRFoam/Allclean b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allclean similarity index 100% rename from tutorials/combustion/PDRFoam/Allclean rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allclean diff --git a/tutorials/combustion/PDRFoam/Allrun b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun similarity index 100% rename from tutorials/combustion/PDRFoam/Allrun rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun diff --git a/tutorials/combustion/PDRFoam/README b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README similarity index 83% rename from tutorials/combustion/PDRFoam/README rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README index 7a3d975e87..13d0f4a923 100644 --- a/tutorials/combustion/PDRFoam/README +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README @@ -8,4 +8,4 @@ Step to introduce the PDR fields: 1) Create zero-size patches for wall or/and coupled baffles in the boundary file. 2) Specify the boundary contitions for these patches in the fields. -3) Create the new PDR mesh using the PDRMesh utility +3) Create the new PDR mesh using the PDRMesh utility. diff --git a/tutorials/combustion/PDRFoam/constant/PDRProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/PDRProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties diff --git a/tutorials/combustion/PDRFoam/constant/RASProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/RASProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/RASProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/RASProperties diff --git a/tutorials/combustion/PDRFoam/constant/combustionProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/combustionProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/combustionProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/combustionProperties diff --git a/tutorials/combustion/PDRFoam/constant/dynamicMeshDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/dynamicMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/constant/dynamicMeshDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/dynamicMeshDict diff --git a/tutorials/combustion/PDRFoam/constant/g b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/g similarity index 100% rename from tutorials/combustion/PDRFoam/constant/g rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/g diff --git a/tutorials/combustion/PDRFoam/constant/polyMesh/blockMeshDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/constant/polyMesh/blockMeshDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/blockMeshDict diff --git a/tutorials/combustion/PDRFoam/constant/polyMesh/boundary b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/boundary similarity index 100% rename from tutorials/combustion/PDRFoam/constant/polyMesh/boundary rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/boundary diff --git a/tutorials/combustion/PDRFoam/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/thermophysicalProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties diff --git a/tutorials/combustion/PDRFoam/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/turbulenceProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/turbulenceProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/turbulenceProperties diff --git a/tutorials/combustion/PDRFoam/fuels/propane.dat b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat similarity index 100% rename from tutorials/combustion/PDRFoam/fuels/propane.dat rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat diff --git a/tutorials/combustion/PDRFoam/makeBlockedFaceSet.setSet b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/makeBlockedFaceSet.setSet similarity index 100% rename from tutorials/combustion/PDRFoam/makeBlockedFaceSet.setSet rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/makeBlockedFaceSet.setSet diff --git a/tutorials/combustion/PDRFoam/system/PDRMeshDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/PDRMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/PDRMeshDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/PDRMeshDict diff --git a/tutorials/combustion/PDRFoam/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/changeDictionaryDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/changeDictionaryDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/changeDictionaryDict diff --git a/tutorials/combustion/PDRFoam/system/controlDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/controlDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict diff --git a/tutorials/combustion/PDRFoam/system/decomposeParDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/decomposeParDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/decomposeParDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/decomposeParDict diff --git a/tutorials/combustion/PDRFoam/system/fvSchemes b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes similarity index 98% rename from tutorials/combustion/PDRFoam/system/fvSchemes rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes index 46bde9af3f..5aeba77ebb 100755 --- a/tutorials/combustion/PDRFoam/system/fvSchemes +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes @@ -22,7 +22,7 @@ ddtSchemes gradSchemes { - default Gauss linear; + default Gauss linear; grad(p) Gauss linear; } @@ -83,5 +83,4 @@ fluxRequired p; } - // ************************************************************************* // diff --git a/tutorials/combustion/PDRFoam/system/fvSolution b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution similarity index 93% rename from tutorials/combustion/PDRFoam/system/fvSolution rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution index ae9e3e0a0a..8a927992fe 100755 --- a/tutorials/combustion/PDRFoam/system/fvSolution +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution @@ -15,7 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - solvers { rho @@ -29,9 +28,9 @@ solvers p { solver PCG; - preconditioner DIC; - tolerance 1e-6; - relTol 0; + preconditioner DIC; + tolerance 1e-6; + relTol 0; }; "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"