From b23d80916b86a58d6e1c1bcd58590d34a7871214 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 16 Aug 2016 11:31:14 +0100
Subject: [PATCH] lagrangian:: hasWallImpactDistance() need not be virtual
---
src/lagrangian/basic/Cloud/Cloud.H | 9 ++++-----
.../clouds/Templates/CollidingCloud/CollidingCloud.H | 2 +-
.../clouds/Templates/KinematicCloud/KinematicCloud.H | 2 +-
src/lagrangian/solidParticle/solidParticleCloud.H | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 1c9998327c9..cb6b5eee817 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -207,7 +207,7 @@ public:
// non-zero wall distance values. By default, assume
// that they can't (default for wallImpactDistance in
// particle is 0.0).
- virtual bool hasWallImpactDistance() const
+ bool hasWallImpactDistance() const
{
return false;
}
@@ -259,6 +259,9 @@ public:
//- Remove particle from cloud and delete
void deleteParticle(ParticleType&);
+ //- Remove lost particles from cloud and delete
+ void deleteLostParticles();
+
//- Reset the particles
void cloudReset(const Cloud<ParticleType>& c);
@@ -298,10 +301,6 @@ public:
const CompactIOField<Field<DataType>, DataType>& data
) const;
- //- Read the field data for the cloud of particles. Dummy at
- // this level.
- virtual void readFields();
-
// Write
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
index 009f36ba2e5..44145eefdd6 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
@@ -193,7 +193,7 @@ public:
// then the wall impact distance should be zero.
// Otherwise, it should be allowed to be the value from
// the Parcel.
- virtual bool hasWallImpactDistance() const;
+ bool hasWallImpactDistance() const;
// Sub-models
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index c891dda802b..105075ad2f4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -326,7 +326,7 @@ public:
//- Switch to specify if particles of the cloud can return
// non-zero wall distance values - true for kinematic parcels
- virtual bool hasWallImpactDistance() const;
+ bool hasWallImpactDistance() const;
// References to the mesh and databases
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H
index 26dd9e5d1fa..47149ec8b06 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.H
+++ b/src/lagrangian/solidParticle/solidParticleCloud.H
@@ -94,7 +94,7 @@ public:
// Access
- virtual bool hasWallImpactDistance() const;
+ bool hasWallImpactDistance() const;
inline const fvMesh& mesh() const;
--
GitLab