From 3d2df7cdf6acd780427b0ba7f5f33cc0d55af9a4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 12 Apr 2023 15:10:04 +0200
Subject: [PATCH] COMP: remove unused variables, etc in Cloud
---
.../wallBoundedParticleTemplates.C | 2 +-
.../clouds/Templates/DSMCCloud/DSMCCloud.C | 38 ++++++++-----------
src/lagrangian/basic/Cloud/Cloud.H | 2 +-
src/lagrangian/basic/Cloud/CloudIO.C | 4 +-
.../injectedParticle/injectedParticleIO.C | 2 +-
.../ReactingMultiphaseParcelIO.C | 2 +-
6 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
index e331976d215..895f8104ae7 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
@@ -460,7 +460,7 @@ void Foam::wallBoundedParticle::writeFields(const TrackCloudType& c)
{
particle::writeFields(c);
- label np = c.size();
+ const label np = c.size();
IOField<point> localPosition
(
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 3c18e98a9ec..0be3c472cd1 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -615,33 +615,27 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
rndGen_(Pstream::myProcNo()),
boundaryT_
(
- volScalarField
+ IOobject
(
- IOobject
- (
- "boundaryT",
- mesh_.time().timeName(),
- mesh_,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh_
- )
+ "boundaryT",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh_
),
boundaryU_
(
- volVectorField
+ IOobject
(
- IOobject
- (
- "boundaryU",
- mesh_.time().timeName(),
- mesh_,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh_
- )
+ "boundaryU",
+ mesh_.time().timeName(),
+ mesh_,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh_
),
binaryCollisionModel_
(
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index e295f600d4c..44696ae669a 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -222,7 +222,7 @@ public:
IOobject fieldIOobject
(
const word& fieldName,
- IOobjectOption::readOption rOpt
+ IOobjectOption::readOption rOpt = IOobjectOption::NO_READ
) const;
//- Check lagrangian data field
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 21e46bbc115..ad8d0574ea4 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -199,8 +199,8 @@ Foam::IOobject Foam::Cloud<ParticleType>::fieldIOobject
time().timeName(),
*this,
rOpt,
- IOobject::NO_WRITE,
- IOobject::NO_REGISTER
+ IOobjectOption::NO_WRITE,
+ IOobjectOption::NO_REGISTER
);
}
diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
index 60e9f383dbe..5a44f4caa50 100644
--- a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
+++ b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
@@ -142,7 +142,7 @@ void Foam::injectedParticle::writeFields(const Cloud<injectedParticle>& c)
// Note: not writing local position_ - defer to base particle class
- label np = c.size();
+ const label np = c.size();
IOField<label> tag(c.fieldIOobject("tag", IOobject::NO_READ), np);
IOField<scalar> soi(c.fieldIOobject("soi", IOobject::NO_READ), np);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index f309f8db8a2..f5e5987fa2c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -336,7 +336,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readObjects
{
ParcelType::readObjects(c, obr);
- const label np = c.size();
+ // const label np = c.size();
const bool readOnProc = c.size();
// The composition fractions
--
GitLab