From 3a429894b10389cfa91633ef1ef3f833826b54a9 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Fri, 29 Jul 2022 13:59:15 +0100
Subject: [PATCH] STYLE: lagrangian intermediate library - renamed log_ to
logToFile_ to disambiguate against output to Info
---
.../FacePostProcessing/FacePostProcessing.C | 6 +++---
.../FacePostProcessing/FacePostProcessing.H | 2 +-
.../ParticleCollector/ParticleCollector.C | 6 +++---
.../ParticleCollector/ParticleCollector.H | 2 +-
.../CloudFunctionObjects/RemoveParcels/RemoveParcels.C | 6 +++---
.../CloudFunctionObjects/RemoveParcels/RemoveParcels.H | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index 12c6875e998..e358155e50c 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -44,7 +44,7 @@ void Foam::FacePostProcessing<CloudType>::makeLogFile
)
{
// Create the output file if not already created
- if (log_)
+ if (logToFile_)
{
DebugInfo << "Creating output file." << endl;
@@ -256,7 +256,7 @@ Foam::FacePostProcessing<CloudType>::FacePostProcessing
faceZoneIDs_(),
surfaceFormat_(this->coeffDict().getWord("surfaceFormat")),
resetOnWrite_(this->coeffDict().getBool("resetOnWrite")),
- log_(this->coeffDict().getBool("log")),
+ logToFile_(this->coeffDict().getBool("log")),
totalTime_(0.0),
mass_(),
massTotal_(),
@@ -337,7 +337,7 @@ Foam::FacePostProcessing<CloudType>::FacePostProcessing
faceZoneIDs_(pff.faceZoneIDs_),
surfaceFormat_(pff.surfaceFormat_),
resetOnWrite_(pff.resetOnWrite_),
- log_(pff.log_),
+ logToFile_(pff.logToFile_),
totalTime_(pff.totalTime_),
mass_(pff.mass_),
massTotal_(pff.massTotal_),
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
index 087b116d401..d729e491bfc 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
@@ -78,7 +78,7 @@ class FacePostProcessing
bool resetOnWrite_;
//- Flag to indicate whether data should be written to file
- bool log_;
+ bool logToFile_;
//- Total time
scalar totalTime_;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index d00227e33cf..63c165ab79f 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -45,7 +45,7 @@ void Foam::ParticleCollector<CloudType>::makeLogFile
)
{
// Create the output file if not already created
- if (log_)
+ if (logToFile_)
{
DebugInfo<< "Creating output file" << endl;
@@ -520,7 +520,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
parcelType_(this->coeffDict().getOrDefault("parcelType", -1)),
removeCollected_(this->coeffDict().getBool("removeCollected")),
resetOnWrite_(this->coeffDict().getBool("resetOnWrite")),
- log_(this->coeffDict().getBool("log")),
+ logToFile_(this->coeffDict().getBool("log")),
points_(),
faces_(),
faceTris_(),
@@ -605,7 +605,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
parcelType_(pc.parcelType_),
removeCollected_(pc.removeCollected_),
resetOnWrite_(pc.resetOnWrite_),
- log_(pc.log_),
+ logToFile_(pc.logToFile_),
points_(pc.points_),
faces_(pc.faces_),
faceTris_(pc.faceTris_),
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
index b4bdd2ce3eb..a934557a0b2 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
@@ -144,7 +144,7 @@ private:
bool resetOnWrite_;
//- Flag to indicate whether data should be written to file
- bool log_;
+ bool logToFile_;
//- List of points
Field<point> points_;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C
index fb429212b21..dd92c540d52 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C
@@ -43,7 +43,7 @@ void Foam::RemoveParcels<CloudType>::makeLogFile
)
{
// Create the output file if not already created
- if (log_)
+ if (logToFile_)
{
DebugInfo<< "Creating output file." << endl;
@@ -158,7 +158,7 @@ Foam::RemoveParcels<CloudType>::RemoveParcels
nParcels_(),
mass_(),
typeId_(this->coeffDict().template getOrDefault<label>("parcelType", -1)),
- log_(this->coeffDict().getBool("log")),
+ logToFile_(this->coeffDict().getBool("log")),
resetOnWrite_(this->coeffDict().getBool("resetOnWrite")),
resetOnStart_(this->coeffDict().getBool("resetOnStart")),
outputFilePtr_()
@@ -239,7 +239,7 @@ Foam::RemoveParcels<CloudType>::RemoveParcels
nParcels_(rpf.nParcels_),
mass_(rpf.mass_),
typeId_(rpf.typeId_),
- log_(rpf.log_),
+ logToFile_(rpf.logToFile_),
resetOnWrite_(rpf.resetOnWrite_),
resetOnStart_(rpf.resetOnStart_),
outputFilePtr_()
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.H
index c89f5adffeb..31d1469033e 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.H
@@ -89,7 +89,7 @@ class RemoveParcels
label typeId_;
//- Flag to indicate whether data should be written to file
- bool log_;
+ bool logToFile_;
//- Flag to reset counters on write
bool resetOnWrite_;
--
GitLab