From 7e0d4565b7c8b3011e24ed2105daa80e3a01d3c2 Mon Sep 17 00:00:00 2001 From: Henry Date: Sun, 23 Sep 2012 22:11:38 +0100 Subject: [PATCH] Thermodynamics: Updated combustion solvers to use EEqn and support h/e or ha/ea --- .../solvers/combustion/PDRFoam/EaEqn.H | 17 +++++++++++++ .../solvers/combustion/PDRFoam/EauEqn.H | 22 ++++++++++++++++ .../solvers/combustion/PDRFoam/PDRFoam.C | 6 ++--- .../solvers/combustion/PDRFoam/createFields.H | 10 +++----- .../solvers/combustion/PDRFoam/haEqn.H | 13 ---------- .../solvers/combustion/PDRFoam/hauEqn.H | 18 ------------- .../solvers/combustion/XiFoam/EaEqn.H | 20 +++++++++++++++ .../solvers/combustion/XiFoam/EauEqn.H | 22 ++++++++++++++++ .../solvers/combustion/XiFoam/XiFoam.C | 6 ++--- .../solvers/combustion/XiFoam/createFields.H | 10 +++----- .../solvers/combustion/XiFoam/haEqn.H | 16 ------------ .../solvers/combustion/XiFoam/hauEqn.H | 18 ------------- .../combustion/engineFoam/engineFoam.C | 6 ++--- .../combustion/engineFoam/logSummary.H | 5 ++-- .../combustion/fireFoam/{YhsEqn.H => YEEqn.H} | 25 +++++++++++-------- .../combustion/fireFoam/createFields.H | 4 +-- .../solvers/combustion/fireFoam/fireFoam.C | 2 +- .../{0 => 0.org}/Aw | 0 .../{0 => 0.org}/B | 0 .../{0 => 0.org}/CR | 0 .../{0 => 0.org}/CT | 0 .../{0 => 0.org}/Lobs | 0 .../{0 => 0.org}/Nv | 0 .../{0 => 0.org}/Su | 0 .../{0 => 0.org}/T | 0 .../{0 => 0.org}/Tu | 0 .../{0 => 0.org}/U | 0 .../{0 => 0.org}/Xi | 0 .../{0 => 0.org}/alphat | 0 .../{0 => 0.org}/b | 0 .../{0 => 0.org}/betav | 0 .../{0 => 0.org}/epsilon | 0 .../{0 => 0.org}/epsilon.old | 0 .../{0 => 0.org}/ft | 0 .../{0 => 0.org}/k | 0 .../{0 => 0.org}/k.old | 0 .../{0 => 0.org}/mut | 0 .../{0 => 0.org}/nsv | 0 .../{0 => 0.org}/p | 0 .../flamePropagationWithObstacles/Allclean | 1 + .../flamePropagationWithObstacles/Allrun | 4 ++- .../constant/polyMesh/boundary | 2 ++ .../constant/polyMesh/boundary | 1 + 43 files changed, 124 insertions(+), 104 deletions(-) create mode 100644 applications/solvers/combustion/PDRFoam/EaEqn.H create mode 100644 applications/solvers/combustion/PDRFoam/EauEqn.H delete mode 100644 applications/solvers/combustion/PDRFoam/haEqn.H delete mode 100644 applications/solvers/combustion/PDRFoam/hauEqn.H create mode 100644 applications/solvers/combustion/XiFoam/EaEqn.H create mode 100644 applications/solvers/combustion/XiFoam/EauEqn.H delete mode 100644 applications/solvers/combustion/XiFoam/haEqn.H delete mode 100644 applications/solvers/combustion/XiFoam/hauEqn.H rename applications/solvers/combustion/fireFoam/{YhsEqn.H => YEEqn.H} (74%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/Aw (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/B (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/CR (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/CT (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/Lobs (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/Nv (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/Su (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/T (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/Tu (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/U (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/Xi (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/alphat (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/b (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/betav (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/epsilon (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/epsilon.old (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/ft (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/k (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/k.old (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/mut (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/nsv (100%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/{0 => 0.org}/p (100%) diff --git a/applications/solvers/combustion/PDRFoam/EaEqn.H b/applications/solvers/combustion/PDRFoam/EaEqn.H new file mode 100644 index 0000000000..03d13f2693 --- /dev/null +++ b/applications/solvers/combustion/PDRFoam/EaEqn.H @@ -0,0 +1,17 @@ +{ + volScalarField& hea = thermo.he(); + + solve + ( + betav*fvm::ddt(rho, hea) + mvConvection->fvmDiv(phi, hea) + + betav*fvc::ddt(rho, K) + fvc::div(phi, K) + + ( + hea.name() == "ea" + ? fvc::div(phi, volScalarField("Ep", p/rho)) + : -betav*dpdt + ) + - fvm::laplacian(Db, hea) + ); + + thermo.correct(); +} diff --git a/applications/solvers/combustion/PDRFoam/EauEqn.H b/applications/solvers/combustion/PDRFoam/EauEqn.H new file mode 100644 index 0000000000..96412cc3c3 --- /dev/null +++ b/applications/solvers/combustion/PDRFoam/EauEqn.H @@ -0,0 +1,22 @@ +if (ign.ignited()) +{ + volScalarField& heau = thermo.heu(); + + solve + ( + betav*fvm::ddt(rho, heau) + mvConvection->fvmDiv(phi, heau) + + (betav*fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou() + + ( + heau.name() == "eau" + ? fvc::div(phi, volScalarField("Ep", p/rho))*rho/thermo.rhou() + : -betav*dpdt*rho/thermo.rhou() + ) + - fvm::laplacian(Db, heau) + + // These terms cannot be used in partially-premixed combustion due to + // the resultant inconsistency between ft and heau transport. + // A possible solution would be to solve for ftu as well as ft. + //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), heau) + //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau) + ); +} diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index ae63ee80c8..ad6e2d0298 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -123,12 +123,12 @@ int main(int argc, char *argv[]) { #include "bEqn.H" #include "ftEqn.H" - #include "hauEqn.H" - #include "haEqn.H" + #include "EauEqn.H" + #include "EaEqn.H" if (!ign.ignited()) { - hau == ha; + thermo.heu() == thermo.he(); } #include "pEqn.H" diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index 561a5ce230..c94bc4fe81 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -5,7 +5,7 @@ psiuReactionThermo::New(mesh) ); psiuReactionThermo& thermo = pThermo(); - thermo.validate(args.executable(), "ha"); + thermo.validate(args.executable(), "ha", "ea"); basicMultiComponentMixture& composition = thermo.composition(); @@ -24,14 +24,10 @@ volScalarField& p = thermo.p(); const volScalarField& psi = thermo.psi(); - volScalarField& ha = thermo.he(); - volScalarField& hau = thermo.heu(); volScalarField& b = composition.Y("b"); Info<< "min(b) = " << min(b).value() << endl; - //const volScalarField& T = thermo->T(); - Info<< "\nReading field U\n" << endl; volVectorField U ( @@ -198,6 +194,6 @@ } fields.add(b); - fields.add(ha); - fields.add(hau); + fields.add(thermo.he()); + fields.add(thermo.heu()); flameWrinkling->addXi(fields); diff --git a/applications/solvers/combustion/PDRFoam/haEqn.H b/applications/solvers/combustion/PDRFoam/haEqn.H deleted file mode 100644 index 20f605f79c..0000000000 --- a/applications/solvers/combustion/PDRFoam/haEqn.H +++ /dev/null @@ -1,13 +0,0 @@ -{ - solve - ( - betav*fvm::ddt(rho, ha) - + mvConvection->fvmDiv(phi, ha) - - fvm::laplacian(Db, ha) - == - betav*dpdt - - betav*(fvc::ddt(rho, K) + fvc::div(phi, K)) - ); - - thermo.correct(); -} diff --git a/applications/solvers/combustion/PDRFoam/hauEqn.H b/applications/solvers/combustion/PDRFoam/hauEqn.H deleted file mode 100644 index 1cc1a1fd35..0000000000 --- a/applications/solvers/combustion/PDRFoam/hauEqn.H +++ /dev/null @@ -1,18 +0,0 @@ -if (ign.ignited()) -{ - solve - ( - betav*fvm::ddt(rho, hau) - + mvConvection->fvmDiv(phi, hau) - - fvm::laplacian(Db, hau) - - // These terms cannot be used in partially-premixed combustion due to - // the resultant inconsistency between ft and hau transport. - // A possible solution would be to solve for ftu as well as ft. - //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hau) - //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hau) - - == - betav*(dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou() - ); -} diff --git a/applications/solvers/combustion/XiFoam/EaEqn.H b/applications/solvers/combustion/XiFoam/EaEqn.H new file mode 100644 index 0000000000..a9e72b4627 --- /dev/null +++ b/applications/solvers/combustion/XiFoam/EaEqn.H @@ -0,0 +1,20 @@ +{ + volScalarField& hea = thermo.he(); + + fvScalarMatrix EaEqn + ( + fvm::ddt(rho, hea) + mvConvection->fvmDiv(phi, hea) + + fvc::ddt(rho, K) + fvc::div(phi, K) + + ( + hea.name() == "ea" + ? fvc::div(phi, volScalarField("Ep", p/rho)) + : -dpdt + ) + - fvm::laplacian(turbulence->alphaEff(), hea) + ); + + EaEqn.relax(); + EaEqn.solve(); + + thermo.correct(); +} diff --git a/applications/solvers/combustion/XiFoam/EauEqn.H b/applications/solvers/combustion/XiFoam/EauEqn.H new file mode 100644 index 0000000000..0d81bd6e60 --- /dev/null +++ b/applications/solvers/combustion/XiFoam/EauEqn.H @@ -0,0 +1,22 @@ +if (ign.ignited()) +{ + volScalarField& heau = thermo.heu(); + + solve + ( + fvm::ddt(rho, heau) + mvConvection->fvmDiv(phi, heau) + + (fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou() + + ( + heau.name() == "eau" + ? fvc::div(phi, volScalarField("Ep", p/rho))*rho/thermo.rhou() + : -dpdt*rho/thermo.rhou() + ) + - fvm::laplacian(turbulence->alphaEff(), heau) + + // These terms cannot be used in partially-premixed combustion due to + // the resultant inconsistency between ft and heau transport. + // A possible solution would be to solve for ftu as well as ft. + //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), heau) + //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau) + ); +} diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 874af9a1fd..1573ede331 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -97,12 +97,12 @@ int main(int argc, char *argv[]) #include "ftEqn.H" #include "bEqn.H" - #include "hauEqn.H" - #include "haEqn.H" + #include "EauEqn.H" + #include "EaEqn.H" if (!ign.ignited()) { - hau == ha; + thermo.heu() == thermo.he(); } // --- Pressure corrector loop diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 25eff6e8b1..17103885e5 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -5,7 +5,7 @@ psiuReactionThermo::New(mesh) ); psiuReactionThermo& thermo = pThermo(); - thermo.validate(args.executable(), "ha"); + thermo.validate(args.executable(), "ha", "ea"); basicMultiComponentMixture& composition = thermo.composition(); @@ -24,14 +24,10 @@ volScalarField& p = thermo.p(); const volScalarField& psi = thermo.psi(); - volScalarField& ha = thermo.he(); - volScalarField& hau = thermo.heu(); volScalarField& b = composition.Y("b"); Info<< "min(b) = " << min(b).value() << endl; - const volScalarField& T = thermo.T(); - Info<< "\nReading field U\n" << endl; volVectorField U @@ -140,5 +136,5 @@ } fields.add(b); - fields.add(ha); - fields.add(hau); + fields.add(thermo.he()); + fields.add(thermo.heu()); diff --git a/applications/solvers/combustion/XiFoam/haEqn.H b/applications/solvers/combustion/XiFoam/haEqn.H deleted file mode 100644 index ffbac948ae..0000000000 --- a/applications/solvers/combustion/XiFoam/haEqn.H +++ /dev/null @@ -1,16 +0,0 @@ -{ - fvScalarMatrix haEqn - ( - fvm::ddt(rho, ha) - + mvConvection->fvmDiv(phi, ha) - - fvm::laplacian(turbulence->alphaEff(), ha) - == - dpdt - - (fvc::ddt(rho, K) + fvc::div(phi, K)) - ); - - haEqn.relax(); - haEqn.solve(); - - thermo.correct(); -} diff --git a/applications/solvers/combustion/XiFoam/hauEqn.H b/applications/solvers/combustion/XiFoam/hauEqn.H deleted file mode 100644 index d9f5767643..0000000000 --- a/applications/solvers/combustion/XiFoam/hauEqn.H +++ /dev/null @@ -1,18 +0,0 @@ -if (ign.ignited()) -{ - solve - ( - fvm::ddt(rho, hau) - + mvConvection->fvmDiv(phi, hau) - - fvm::laplacian(turbulence->alphaEff(), hau) - - // These terms cannot be used in partially-premixed combustion due to - // the resultant inconsistency between ft and hau transport. - // A possible solution would be to solve for ftu as well as ft. - //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hau) - //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hau) - - == - (dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou() - ); -} diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index 267dfb1119..0ee3df6b7b 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -103,12 +103,12 @@ int main(int argc, char *argv[]) #include "ftEqn.H" #include "bEqn.H" - #include "hauEqn.H" - #include "haEqn.H" + #include "EauEqn.H" + #include "EaEqn.H" if (!ign.ignited()) { - hau == ha; + thermo.heu() == thermo.he(); } // --- Pressure corrector loop diff --git a/applications/solvers/combustion/engineFoam/logSummary.H b/applications/solvers/combustion/engineFoam/logSummary.H index 24d8812008..c243b889ae 100644 --- a/applications/solvers/combustion/engineFoam/logSummary.H +++ b/applications/solvers/combustion/engineFoam/logSummary.H @@ -1,5 +1,6 @@ Info<< "Mean pressure:" << p.weightedAverage(mesh.V()).value() << endl; -Info<< "Mean temperature:" << T.weightedAverage(mesh.V()).value() << endl; +Info<< "Mean temperature:" << thermo.T().weightedAverage(mesh.V()).value() + << endl; Info<< "Mean u':" << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() << endl; @@ -7,7 +8,7 @@ Info<< "Mean u':" logSummaryFile << runTime.theta() << tab << p.weightedAverage(mesh.V()).value() << tab - << T.weightedAverage(mesh.V()).value() << tab + << thermo.T().weightedAverage(mesh.V()).value() << tab << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() << tab << 1 - b.weightedAverage(mesh.V()).value() diff --git a/applications/solvers/combustion/fireFoam/YhsEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H similarity index 74% rename from applications/solvers/combustion/fireFoam/YhsEqn.H rename to applications/solvers/combustion/fireFoam/YEEqn.H index 1319a4d5df..340cfc63b1 100644 --- a/applications/solvers/combustion/fireFoam/YhsEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -47,22 +47,27 @@ tmp > mvConvection Y[inertIndex] = scalar(1) - Yt; Y[inertIndex].max(0.0); - fvScalarMatrix hsEqn + volScalarField& he = thermo.he(); + + fvScalarMatrix EEqn ( - fvm::ddt(rho, hs) - + mvConvection->fvmDiv(phi, hs) - - fvm::laplacian(turbulence->alphaEff(), hs) + fvm::ddt(rho, he) + mvConvection->fvmDiv(phi, he) + + fvc::ddt(rho, K) + fvc::div(phi, K) + + ( + he.name() == "e" + ? fvc::div(phi, volScalarField("Ep", p/rho)) + : -dpdt + ) + - fvm::laplacian(turbulence->alphaEff(), he) == - dpdt - - (fvc::ddt(rho, K) + fvc::div(phi, K)) - + combustion->Sh() + combustion->Sh() + radiation->Sh(thermo) - + parcels.Sh(hs) + + parcels.Sh(he) + surfaceFilm.Sh() ); - hsEqn.relax(); - hsEqn.solve(); + EEqn.relax(); + EEqn.solve(); thermo.correct(); diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 873ae28a07..8159ee73aa 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -11,6 +11,7 @@ Info<< "Reading thermophysical properties\n" << endl; psiReactionThermo& thermo = combustion->thermo(); + thermo.validate(args.executable(), "h", "e"); SLGThermo slgThermo(mesh, thermo); @@ -34,7 +35,6 @@ ); volScalarField& p = thermo.p(); - volScalarField& hs = thermo.he(); const volScalarField& T = thermo.T(); const volScalarField& psi = thermo.psi(); @@ -128,7 +128,7 @@ { fields.add(Y[i]); } - fields.add(hs); + fields.add(thermo.he()); IOdictionary additionalControlsDict ( diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index 1d58470cbf..564d7c5390 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) while (pimple.loop()) { #include "UEqn.H" - #include "YhsEqn.H" + #include "YEEqn.H" // --- Pressure corrector loop while (pimple.correct()) diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Su b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Su rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/T b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/T rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Tu b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Tu rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/U b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/U rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Xi b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Xi rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/alphat b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/alphat similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/alphat rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/alphat diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/b b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/b rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon.old similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon.old rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon.old diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/ft b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/ft rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k.old rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/mut b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/mut similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/mut rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/mut diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/p b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p similarity index 100% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/p rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean index c333da2bb3..e9ff2bc87c 100755 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean @@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory cleanCase rm -rf VTK +rm -rf 0 rm -rf constant/polyMesh/sets constant/polyMesh/faces rm -rf constant/polyMesh/faces rm -rf constant/polyMesh/points diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun index 52c5edf8a8..c557b44000 100755 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun @@ -5,11 +5,13 @@ cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions +rm -rf 0 +cp -r 0.org 0 runApplication blockMesh runApplication changeDictionary runApplication topoSet -runApplication PDRMesh +runApplication PDRMesh -overwrite # Run runApplication `getApplication` diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary index c1a9b1f6a2..2ed0ccf403 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary @@ -44,6 +44,7 @@ FoamFile baffleCyclic_half0 { type cyclic; + inGroups 1(cyclic); nFaces 0; startFace 24810; matchTolerance 0.0001; @@ -52,6 +53,7 @@ FoamFile baffleCyclic_half1 { type cyclic; + inGroups 1(cyclic); nFaces 0; startFace 24810; matchTolerance 0.0001; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary index ce658ffe25..6a17bae1f0 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary @@ -38,6 +38,7 @@ FoamFile frontAndBack { type empty; + inGroups 1(empty); nFaces 45000; startFace 45284; }