diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H index 0b04bdabba..be82d6e2b6 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H @@ -12,7 +12,7 @@ tmp > mvConvection { label inertIndex = -1; - volScalarField Yt = 0.0*Y[0]; + volScalarField Yt(0.0*Y[0]); forAll(Y, i) { diff --git a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H index 50fc7f575b..1690487b45 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H @@ -10,10 +10,14 @@ // turbulent time scale if (turbulentReaction) { - DimensionedField tk = - Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()); - DimensionedField tc = - chemistry.tc()().dimensionedInternalField(); + DimensionedField tk + ( + Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()) + ); + DimensionedField tc + ( + chemistry.tc()().dimensionedInternalField() + ); // Chalmers PaSR model kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H index 3f007e247d..861e69bc84 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H @@ -1,6 +1,6 @@ rho = thermo.rho(); -volScalarField rAU = 1.0/UEqn.A(); +volScalarField rAU(1.0/UEqn.A()); U = rAU*UEqn.H(); if (transonic) diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H index 0ad057e229..31be0cf8ee 100644 --- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H +++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/createFields.H @@ -51,7 +51,7 @@ singlePhaseTransportModel laminarTransport(U, phi); - const volScalarField nu = laminarTransport.nu(); + const volScalarField nu(laminarTransport.nu()); autoPtr turbulence ( diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H index 0ad057e229..31be0cf8ee 100644 --- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H @@ -51,7 +51,7 @@ singlePhaseTransportModel laminarTransport(U, phi); - const volScalarField nu = laminarTransport.nu(); + const volScalarField nu(laminarTransport.nu()); autoPtr turbulence ( diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H index ac369f3df4..e9d540f3a9 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H @@ -13,7 +13,7 @@ tmp > mvConvection { label inertIndex = -1; - volScalarField Yt = 0.0*Y[0]; + volScalarField Yt(0.0*Y[0]); forAll(Y, i) { diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H index 50fc7f575b..1690487b45 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H @@ -10,10 +10,14 @@ // turbulent time scale if (turbulentReaction) { - DimensionedField tk = - Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()); - DimensionedField tc = - chemistry.tc()().dimensionedInternalField(); + DimensionedField tk + ( + Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()) + ); + DimensionedField tc + ( + chemistry.tc()().dimensionedInternalField() + ); // Chalmers PaSR model kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk); diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H index 9d03624e43..4a28b0dd94 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H @@ -5,7 +5,7 @@ // pressure solution - done in 2 parts. Part 1: thermo.rho() -= psi*p; - volScalarField rAU = 1.0/UEqn.A(); + volScalarField rAU(1.0/UEqn.A()); U = rAU*UEqn.H(); if (pZones.size() > 0) diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H index da9a289d69..8526b590a2 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H @@ -12,7 +12,7 @@ tmp > mvConvection { label inertIndex = -1; - volScalarField Yt = 0.0*Y[0]; + volScalarField Yt(0.0*Y[0]); forAll(Y, i) { diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H index 12ed815d1d..5dd7ce9cb0 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H @@ -10,10 +10,14 @@ // turbulent time scale if (turbulentReaction) { - DimensionedField tk = - Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()); - DimensionedField tc = - chemistry.tc()().dimensionedInternalField(); + DimensionedField tk + ( + Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()) + ); + DimensionedField tc + ( + chemistry.tc()().dimensionedInternalField() + ); // Chalmers PaSR model kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk); diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H index f957ab017e..9d028d4502 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H @@ -1,6 +1,6 @@ rho = thermo.rho(); -volScalarField rAU = 1.0/UEqn.A(); +volScalarField rAU(1.0/UEqn.A()); U = rAU*UEqn.H(); if (transonic) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H index c4a929c449..a180973321 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H @@ -12,7 +12,7 @@ tmp > mvConvection { label inertIndex = -1; - volScalarField Yt = 0.0*Y[0]; + volScalarField Yt(0.0*Y[0]); forAll(Y, i) { diff --git a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H index 50fc7f575b..1690487b45 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H @@ -10,10 +10,14 @@ // turbulent time scale if (turbulentReaction) { - DimensionedField tk = - Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()); - DimensionedField tc = - chemistry.tc()().dimensionedInternalField(); + DimensionedField tk + ( + Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon()) + ); + DimensionedField tc + ( + chemistry.tc()().dimensionedInternalField() + ); // Chalmers PaSR model kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H index d5de608bd2..560fbc9895 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H @@ -1,6 +1,6 @@ rho = thermo.rho(); -volScalarField rAU = 1.0/UEqn.A(); +volScalarField rAU(1.0/UEqn.A()); U = rAU*UEqn.H(); if (transonic) diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H index 4e2f9766a8..53c6b25d81 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H @@ -14,7 +14,7 @@ tmp > mvConvection if (solveSpecies) { label inertIndex = -1; - volScalarField Yt = 0.0*Y[0]; + volScalarField Yt(0.0*Y[0]); forAll(Y, i) { diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H index e7d7c55dbb..322289684d 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H @@ -5,7 +5,7 @@ // pressure solution - done in 2 parts. Part 1: thermo.rho() -= psi*p; - volScalarField rAU = 1.0/UEqn.A(); + volScalarField rAU(1.0/UEqn.A()); U = rAU*UEqn.H(); if (pZones.size() > 0) diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H b/applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H index 26ebe6fc67..0e26fcdac1 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H @@ -59,7 +59,8 @@ Info<< "Time scales min/max:" << endl; invTauFlow.max(1.0/maxDeltaT); - Info<< " Flow = " << gMin(1/invTauFlow.internalField()) << ", " + Info<< " Flow = " + << gMin(1/invTauFlow.internalField()) << ", " << gMax(1/invTauFlow.internalField()) << endl; } @@ -68,13 +69,16 @@ Info<< "Time scales min/max:" << endl; // ~~~~~~~~~~~~~~~~~~~~~~ { - scalarField tau = - runTime.deltaTValue()*mag(parcels.Srho() + massSource.SuTot()); + scalarField tau + ( + runTime.deltaTValue()*mag(parcels.Srho() + massSource.SuTot()) + ); tau = alphaTauRho*rho/(tau + ROOTVSMALL); - Info<< " Density = " << min(maxDeltaT, gMin(tau)) << ", " - << min(maxDeltaT, gMax(tau)) << endl; + Info<< " Density = " + << min(maxDeltaT, gMin(tau)) << ", " + << min(maxDeltaT, gMax(tau)) << endl; invTauFlow.internalField() = max(invTauFlow.internalField(), 1/tau); } @@ -86,7 +90,8 @@ Info<< "Time scales min/max:" << endl; { /* // Method 1 - mag(U) limit using 'small' nominal velocity - scalarField tau = + scalarField tau + ( runTime.deltaTValue() *mag ( @@ -94,7 +99,8 @@ Info<< "Time scales min/max:" << endl; + parcels.UTrans()/(mesh.V()*runTime.deltaT()) + momentumSource.Su() ) - /rho; + /rho + ); const scalar nomMagU(dimensionedScalar("1", dimVelocity, 1)); tau = alphaTauU*(nomMagU + mag(U))/(tau + ROOTVSMALL); @@ -128,13 +134,15 @@ Info<< "Time scales min/max:" << endl; fvc::interpolate(runTime.deltaT()*UEqnRhs) & mesh.Sf() ); - scalarField tau = + scalarField tau + ( alphaTauU*rho /fvc::surfaceSum ( mag(phi + phiSU)*mesh.deltaCoeffs()/mesh.magSf() + dimensionedScalar("SMALL", dimDensity/dimTime, ROOTVSMALL) - ); + ) + ); */ /* @@ -150,7 +158,8 @@ Info<< "Time scales min/max:" << endl; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ { - scalarField tau = + scalarField tau + ( runTime.deltaTValue() *mag ( @@ -159,7 +168,8 @@ Info<< "Time scales min/max:" << endl; + energySource.Su() + chemistrySh ) - /rho; + /rho + ); tau = alphaTauTemp*thermo.Cp()*T/(tau + ROOTVSMALL); @@ -178,7 +188,8 @@ Info<< "Time scales min/max:" << endl; forAll(Y, fieldI) { const volScalarField& Yi = Y[fieldI]; - const scalarField deltaYi = + const scalarField deltaYi + ( runTime.deltaTValue() *mag ( @@ -186,7 +197,8 @@ Info<< "Time scales min/max:" << endl; + massSource.Su(fieldI) + parcels.Srho(fieldI) ) - /rho; + /rho + ); tau = min ( diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H index 4a6bc55de5..83aed2ffa4 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H @@ -57,5 +57,7 @@ Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt = - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); + volScalarField DpDt + ( + fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) + ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H index 3d414f4af6..4168eb0e34 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H @@ -1,6 +1,6 @@ rho = thermo.rho(); -volScalarField rAU = 1.0/UEqn.A(); +volScalarField rAU(1.0/UEqn.A()); U = rAU*UEqn.H(); if (transonic)