From d87c1252af702394243f7c8f86116362e93a4c8d Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 7 Mar 2011 15:45:55 +0000 Subject: [PATCH 1/2] PDRFoam: Updated to compile SP --- .../combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index c4444bcfd0..7f4aa91722 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -73,7 +73,7 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const const volSymmTensorField& CT = mesh.lookupObject("CT"); const volScalarField& Nv = mesh.lookupObject("Nv"); - const volSymmTensorField& nsv = + const volSymmTensorField& nsv = mesh.lookupObject("nsv"); tmp tN @@ -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; From 165439372409a90a088ed35b4ed099e08bf5889c Mon Sep 17 00:00:00 2001 From: sergio Date: Mon, 7 Mar 2011 16:51:08 +0000 Subject: [PATCH 2/2] STY: adding name to PDRFoam tutorial --- .../{ => FlamePropagationWithObstacles}/0/Aw | 2 +- .../{ => FlamePropagationWithObstacles}/0/B | 2 +- .../{ => FlamePropagationWithObstacles}/0/CR | 2 +- .../{ => FlamePropagationWithObstacles}/0/CT | 2 +- .../0/Lobs | 2 +- .../{ => FlamePropagationWithObstacles}/0/Nv | 2 +- .../{ => FlamePropagationWithObstacles}/0/Su | 0 .../{ => FlamePropagationWithObstacles}/0/T | 0 .../{ => FlamePropagationWithObstacles}/0/Tu | 0 .../{ => FlamePropagationWithObstacles}/0/U | 0 .../{ => FlamePropagationWithObstacles}/0/Xi | 0 .../0/alphat | 0 .../{ => FlamePropagationWithObstacles}/0/b | 0 .../0/betav | 2 +- .../0/epsilon | 0 .../0/epsilon.old | 0 .../{ => FlamePropagationWithObstacles}/0/ft | 0 .../{ => FlamePropagationWithObstacles}/0/k | 0 .../0/k.old | 0 .../{ => FlamePropagationWithObstacles}/0/mut | 0 .../{ => FlamePropagationWithObstacles}/0/nsv | 2 +- .../{ => FlamePropagationWithObstacles}/0/p | 0 .../Allclean | 0 .../Allrun | 3 +- .../README | 3 +- .../constant/PDRProperties | 0 .../constant/RASProperties | 0 .../constant/combustionProperties | 0 .../constant/dynamicMeshDict | 0 .../constant/g | 0 .../constant/polyMesh/blockMeshDict | 0 .../constant/polyMesh/boundary | 0 .../constant/thermophysicalProperties | 4 +- .../constant/turbulenceProperties | 0 .../fuels/propane.dat | 3 +- .../makeBlockedFaceSet.setSet | 0 .../system/PDRMeshDict | 0 .../system/changeDictionaryDict | 0 .../system/controlDict | 3 +- .../system/decomposeParDict | 0 .../system/fvSchemes | 172 +++++++++--------- .../system/fvSolution | 107 ++++++----- 42 files changed, 151 insertions(+), 160 deletions(-) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Aw (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/B (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/CR (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/CT (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Lobs (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Nv (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Su (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/T (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Tu (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/U (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Xi (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/alphat (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/b (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/betav (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/epsilon (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/epsilon.old (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/ft (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/k (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/k.old (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/mut (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/nsv (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/p (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/Allclean (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/Allrun (95%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/README (83%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/PDRProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/RASProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/combustionProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/dynamicMeshDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/g (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/polyMesh/blockMeshDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/polyMesh/boundary (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/thermophysicalProperties (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/turbulenceProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/fuels/propane.dat (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/makeBlockedFaceSet.setSet (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/PDRMeshDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/changeDictionaryDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/controlDict (98%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/decomposeParDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/fvSchemes (93%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/fvSolution (90%) diff --git a/tutorials/combustion/PDRFoam/0/Aw b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw similarity index 99% rename from tutorials/combustion/PDRFoam/0/Aw rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw index 6ef274bb0c..6e623345fc 100644 --- a/tutorials/combustion/PDRFoam/0/Aw +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 -1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 18.372496 diff --git a/tutorials/combustion/PDRFoam/0/B b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B similarity index 99% rename from tutorials/combustion/PDRFoam/0/B rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B index db76de1d70..00b545c496 100644 --- a/tutorials/combustion/PDRFoam/0/B +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (1.785697 0 0 1.785697 0 1.875) diff --git a/tutorials/combustion/PDRFoam/0/CR b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR similarity index 99% rename from tutorials/combustion/PDRFoam/0/CR rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR index 0b694da8a1..37b3633fa3 100644 --- a/tutorials/combustion/PDRFoam/0/CR +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 -1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (98.997697 0 0 77.711245 0 30.754852) diff --git a/tutorials/combustion/PDRFoam/0/CT b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT similarity index 99% rename from tutorials/combustion/PDRFoam/0/CT rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT index 80fdec42e6..3349ea01c1 100644 --- a/tutorials/combustion/PDRFoam/0/CT +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 -1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (4.501854 0 0 3.437531 0 1.537743) diff --git a/tutorials/combustion/PDRFoam/0/Lobs b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs similarity index 99% rename from tutorials/combustion/PDRFoam/0/Lobs rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs index 63b65fa6f2..4ddf9c2b17 100644 --- a/tutorials/combustion/PDRFoam/0/Lobs +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 0.2 diff --git a/tutorials/combustion/PDRFoam/0/Nv b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv similarity index 99% rename from tutorials/combustion/PDRFoam/0/Nv rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv index b31b2996cb..a75358670c 100644 --- a/tutorials/combustion/PDRFoam/0/Nv +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 2.019581 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 99% rename from tutorials/combustion/PDRFoam/0/betav rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav index 1e8a7c8ccb..61726ff235 100644 --- a/tutorials/combustion/PDRFoam/0/betav +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 0 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 99% rename from tutorials/combustion/PDRFoam/0/nsv rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv index ae922c5dbe..d32af7d773 100644 --- a/tutorials/combustion/PDRFoam/0/nsv +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (0.634791 0 0 0.634791 0 0.03) 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 95% rename from tutorials/combustion/PDRFoam/Allrun rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun index c3595df050..a972b6806a 100755 --- a/tutorials/combustion/PDRFoam/Allrun +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun @@ -14,5 +14,4 @@ runApplication PDRMesh # Run runApplication PDRFoam -# ----------------------------------------------------------------- end-of-file - +# ----------------------------------------------------------------- end-of-file \ No newline at end of file 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 8a5eab0d9d..bbf97c6866 100644 --- a/tutorials/combustion/PDRFoam/README +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README @@ -8,5 +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. \ No newline at end of file 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 99% rename from tutorials/combustion/PDRFoam/constant/thermophysicalProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties index 561cfd6f12..401abd41ee 100644 --- a/tutorials/combustion/PDRFoam/constant/thermophysicalProperties +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties @@ -59,6 +59,4 @@ burntProducts Ts 170.672; } -// ************************************************************************* // - - +// ************************************************************************* // \ No newline at end of file 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 99% rename from tutorials/combustion/PDRFoam/fuels/propane.dat rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat index fc8760c431..c13dca170a 100644 --- a/tutorials/combustion/PDRFoam/fuels/propane.dat +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat @@ -69,5 +69,4 @@ SCOPECoeffs 0 ); } - } - +} \ No newline at end of file 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 98% rename from tutorials/combustion/PDRFoam/system/controlDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict index b26483da7c..920dd2a521 100644 --- a/tutorials/combustion/PDRFoam/system/controlDict +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict @@ -51,5 +51,4 @@ maxCo 0.3; maxDeltaT 1; -// ************************************************************************* // - +// ************************************************************************* // \ No newline at end of file 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 93% rename from tutorials/combustion/PDRFoam/system/fvSchemes rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes index 35dc92e170..d600158ce4 100755 --- a/tutorials/combustion/PDRFoam/system/fvSchemes +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes @@ -1,87 +1,85 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - - div(phi,U) Gauss limitedLinearV 1; - div(phiU,p) Gauss limitedLinear 1; - div(phid,p) Gauss limitedLinear 1; - div(phi,k) Gauss limitedLinear 1; - div(phi,epsilon) Gauss limitedLinear 1; - - div(phiXi,Xi) Gauss limitedLinear 1; - div(phiSt,b) Gauss limitedLinear01 1; - - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - ft limitedLinear01 1; - b limitedLinear01 1; - Xi limitedLinear 1; - h limitedLinear 1; - hu limitedLinear 1; - }; - - div((Su*grad(b))) Gauss linear; - div((U+((Su*Xi)*grad(b)))) Gauss linear; - div((muEff*dev2(T(grad(U))))) Gauss linear; - div(U) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian((rho*inv((((1)*A(U))+((((0.5*rho)*CR)*mag(U))+((((Csu*(1))*betav)*muEff)*sqr(Aw)))))),p) Gauss linear limited 0.333; - laplacian(Db,b) Gauss linear limited 0.333; - laplacian(Db,ft) Gauss linear limited 0.333; - laplacian(Db,h) Gauss linear limited 0.333; - laplacian(Db,hu) Gauss linear limited 0.333; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default limited 0.333; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(p) Gauss linear; +} + +divSchemes +{ + default none; + + div(phi,U) Gauss limitedLinearV 1; + div(phiU,p) Gauss limitedLinear 1; + div(phid,p) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; + div(phi,epsilon) Gauss limitedLinear 1; + + div(phiXi,Xi) Gauss limitedLinear 1; + div(phiSt,b) Gauss limitedLinear01 1; + + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + ft limitedLinear01 1; + b limitedLinear01 1; + Xi limitedLinear 1; + h limitedLinear 1; + hu limitedLinear 1; + }; + + div((Su*grad(b))) Gauss linear; + div((U+((Su*Xi)*grad(b)))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; + div(U) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear limited 0.333; + laplacian(DkEff,k) Gauss linear limited 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; + laplacian((rho*inv((((1)*A(U))+((((0.5*rho)*CR)*mag(U))+((((Csu*(1))*betav)*muEff)*sqr(Aw)))))),p) Gauss linear limited 0.333; + laplacian(Db,b) Gauss linear limited 0.333; + laplacian(Db,ft) Gauss linear limited 0.333; + laplacian(Db,h) Gauss linear limited 0.333; + laplacian(Db,hu) Gauss linear limited 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited 0.333; +} + +fluxRequired +{ + default no; + p; +} +// ************************************************************************* // diff --git a/tutorials/combustion/PDRFoam/system/fvSolution b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution similarity index 90% rename from tutorials/combustion/PDRFoam/system/fvSolution rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution index 418cb8e9fc..8a927992fe 100755 --- a/tutorials/combustion/PDRFoam/system/fvSolution +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution @@ -1,54 +1,53 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -solvers -{ - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - - p - { - solver PCG; - preconditioner DIC; - tolerance 1e-6; - relTol 0; - }; - - "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - momentumPredictor true; -} - - -// ************************************************************************* // +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + }; + + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-6; + relTol 0; + }; + + "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 0; + momentumPredictor true; +} + + +// ************************************************************************* //