From 3a960a33f1ddaaa0d7536f6db256e2ac8513dcfb Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 7 Nov 2011 14:14:25 +0000 Subject: [PATCH 1/3] STYLE: Minor code formatting --- .../FacePostProcessing/FacePostProcessing.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C index e907b2d599..0f2a765ea8 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C @@ -80,12 +80,12 @@ void Foam::FacePostProcessing::write() const Time& time = mesh.time(); const faceZoneMesh& fzm = mesh.faceZones(); scalar timeNew = time.value(); - scalar timeElapsed = timeNew-timeOld_; + scalar timeElapsed = timeNew - timeOld_; totalTime_ += timeElapsed; const scalar alpha = (totalTime_ - timeElapsed)/totalTime_; - const scalar beta = timeElapsed/totalTime_; //correct + const scalar beta = timeElapsed/totalTime_; forAll(faceZoneIDs_, zoneI) { @@ -96,7 +96,7 @@ void Foam::FacePostProcessing::write() const label procI = Pstream::myProcNo(); - Info<< "particleFaceFlowRate output:" << nl; + Info<< type() << " output:" << nl; List zoneMassTotal(mass_.size()); List zoneMassFlowRate(massFlowRate_.size()); From 6c00cf87ec7449d3ff77fac1d30d6385beeeadc8 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 7 Nov 2011 14:14:25 +0000 Subject: [PATCH 2/3] STYLE: Minor code formatting --- .../FacePostProcessing/FacePostProcessing.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C index e907b2d599..f0cff914b4 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C @@ -80,12 +80,12 @@ void Foam::FacePostProcessing::write() const Time& time = mesh.time(); const faceZoneMesh& fzm = mesh.faceZones(); scalar timeNew = time.value(); - scalar timeElapsed = timeNew-timeOld_; + scalar timeElapsed = timeNew - timeOld_; totalTime_ += timeElapsed; const scalar alpha = (totalTime_ - timeElapsed)/totalTime_; - const scalar beta = timeElapsed/totalTime_; //correct + const scalar beta = timeElapsed/totalTime_; forAll(faceZoneIDs_, zoneI) { From 51eb1ac5b643fc9f8885973e99951bb09395e658 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 7 Nov 2011 14:25:51 +0000 Subject: [PATCH 3/3] BUG: chemFoam - density output on start-up was misleading due to presence of call to thermo.correct() - corresponds to mantis bug report 333 --- .../combustion/chemFoam/readInitialConditions.H | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H index 817ed264f9..3fbb13a0fc 100644 --- a/applications/solvers/combustion/chemFoam/readInitialConditions.H +++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H @@ -1,13 +1,5 @@ word constProp(initialConditions.lookup("constantProperty")); - if (constProp == "pressure" || constProp == "volume") - { - Info << constProp << " will be held constant." << nl - << " p = " << p[0] << " [Pa]" << nl - << " T = " << thermo.T()[0] << " [K] " << nl - << " rho = " << rho[0] << " [kg/m3]" << nl - << endl; - } - else + if ((constProp != "pressure") && (constProp != "volume")) { FatalError << "in initialConditions, unknown constantProperty type " << constProp << nl << " Valid types are: pressure volume." @@ -110,3 +102,10 @@ scalar integratedHeat = 0.0; + Info << constProp << " will be held constant." << nl + << " p = " << p[0] << " [Pa]" << nl + << " T = " << thermo.T()[0] << " [K] " << nl + << " rho = " << rho[0] << " [kg/m3]" << nl + << endl; + +