From 60d7a71eaf6f47f950c64cf854f9edc42f82e0c7 Mon Sep 17 00:00:00 2001
From: Andrew Heather <andy@shelob.opencfd.co.uk>
Date: Thu, 29 Sep 2016 16:24:08 +0100
Subject: [PATCH] STYLE: forceCoeffs - minor code updates
---
.../forces/forceCoeffs/forceCoeffs.C | 38 ++++++++++---------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
index dc365a131fd..221f1fea638 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -156,25 +156,27 @@ void Foam::functionObjects::forceCoeffs::writeIntegratedData
const List<Field<scalar>>& coeff
) const
{
+ if (!log)
+ {
+ return;
+ }
+
scalar pressure = sum(coeff[0]);
scalar viscous = sum(coeff[1]);
scalar porous = sum(coeff[2]);
scalar total = pressure + viscous + porous;
- if (log)
- {
- Info<< " " << title << " : " << total << token::TAB
- << "("
- << "pressure: " << pressure << token::TAB
- << "viscous: " << viscous;
-
- if (porosity_)
- {
- Info<< token::TAB << "porous: " << porous;
- }
+ Info<< " " << title << " : " << total << token::TAB
+ << "("
+ << "pressure: " << pressure << token::TAB
+ << "viscous: " << viscous;
- Info<< ")" << endl;
+ if (porosity_)
+ {
+ Info<< token::TAB << "porous: " << porous;
}
+
+ Info<< ")" << endl;
}
@@ -388,21 +390,21 @@ bool Foam::functionObjects::forceCoeffs::execute()
if (writeFields_)
{
const volVectorField& force =
- obr_.lookupObject<volVectorField>(fieldName("force"));
+ lookupObject<volVectorField>(fieldName("force"));
const volVectorField& moment =
- obr_.lookupObject<volVectorField>(fieldName("moment"));
+ lookupObject<volVectorField>(fieldName("moment"));
volVectorField& forceCoeff =
const_cast<volVectorField&>
(
- obr_.lookupObject<volVectorField>(fieldName("forceCoeff"))
+ lookupObject<volVectorField>(fieldName("forceCoeff"))
);
volVectorField& momentCoeff =
const_cast<volVectorField&>
(
- obr_.lookupObject<volVectorField>(fieldName("momentCoeff"))
+ lookupObject<volVectorField>(fieldName("momentCoeff"))
);
dimensionedScalar f0("f0", dimForce, Aref_*pDyn);
@@ -421,10 +423,10 @@ bool Foam::functionObjects::forceCoeffs::write()
if (writeFields_)
{
const volVectorField& forceCoeff =
- obr_.lookupObject<volVectorField>(fieldName("forceCoeff"));
+ lookupObject<volVectorField>(fieldName("forceCoeff"));
const volVectorField& momentCoeff =
- obr_.lookupObject<volVectorField>(fieldName("momentCoeff"));
+ lookupObject<volVectorField>(fieldName("momentCoeff"));
forceCoeff.write();
momentCoeff.write();
--
GitLab