diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C index 3dd82a9ae1..26eff0247c 100644 --- a/src/lagrangian/basic/particle/particle.C +++ b/src/lagrangian/basic/particle/particle.C @@ -1018,12 +1018,6 @@ void Foam::particle::transformProperties(const vector&) {} -Foam::scalar Foam::particle::wallImpactDistance(const vector&) const -{ - return 0.0; -} - - void Foam::particle::prepareForParallelTransfer() { // Convert the face index to be local to the processor patch diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H index e6c4c6da9f..a1f6eabb5b 100644 --- a/src/lagrangian/basic/particle/particle.H +++ b/src/lagrangian/basic/particle/particle.H @@ -582,10 +582,6 @@ public: // according to the given separation vector virtual void transformProperties(const vector& separation); - //- The nearest distance to a wall that - // the particle can be in the n direction - virtual scalar wallImpactDistance(const vector& n) const; - // Parallel transfer diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index 7c37b189ed..38fc53e5ba 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -418,16 +418,6 @@ void Foam::KinematicParcel::transformProperties } -template -Foam::scalar Foam::KinematicParcel::wallImpactDistance -( - const vector& -) const -{ - return 0.5*d_; -} - - // * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // #include "KinematicParcelIO.C" diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 613df5a993..fca3f73d8d 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -604,10 +604,6 @@ public: // according to the given separation vector virtual void transformProperties(const vector& separation); - //- The nearest distance to a wall that the particle can be - // in the n direction - virtual scalar wallImpactDistance(const vector& n) const; - // I-O diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H index 243d82df36..d3ac75f41e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,10 +118,6 @@ public: // timestep to meet the criteria of the collision model virtual label nSubCycles() const = 0; - //- Indicates whether model determines wall collisions or not, - // used to determine what value to use for wallImpactDistance - virtual bool controlsWallInteraction() const = 0; - // Collision function virtual void collide() = 0; }; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C index 98ba196957..3c57d6aabf 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,13 +71,6 @@ bool Foam::NoCollision::active() const } -template -bool Foam::NoCollision::controlsWallInteraction() const -{ - return false; -} - - template void Foam::NoCollision::collide() {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H index 5c7a857e37..31439e5b7d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,10 +90,6 @@ public: //- Flag to indicate whether model activates collision model virtual bool active() const; - //- Indicates whether model determines wall collisions or not, - // used to determine what value to use for wallImpactDistance - virtual bool controlsWallInteraction() const; - // Collision function virtual void collide(); }; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C index 16ce178ef5..c1dd0fea6b 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C @@ -620,13 +620,6 @@ Foam::label Foam::PairCollision::nSubCycles() const } -template -bool Foam::PairCollision::controlsWallInteraction() const -{ - return true; -} - - template void Foam::PairCollision::collide() { diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H index bb6449e843..0a9b7d43a9 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -173,10 +173,6 @@ public: // timestep to meet the criteria of the collision model. virtual label nSubCycles() const; - //- Indicates whether model determines wall collisions or not, - // used to determine what value to use for wallImpactDistance - virtual bool controlsWallInteraction() const; - // Collision function virtual void collide(); }; diff --git a/src/lagrangian/solidParticle/solidParticle.C b/src/lagrangian/solidParticle/solidParticle.C index 407b9fee3b..94cbc02b79 100644 --- a/src/lagrangian/solidParticle/solidParticle.C +++ b/src/lagrangian/solidParticle/solidParticle.C @@ -134,10 +134,4 @@ void Foam::solidParticle::transformProperties(const vector& separation) } -Foam::scalar Foam::solidParticle::wallImpactDistance(const vector&) const -{ - return 0.5*d_; -} - - // ************************************************************************* // diff --git a/src/lagrangian/solidParticle/solidParticle.H b/src/lagrangian/solidParticle/solidParticle.H index a76bf778af..e9e5d0cd72 100644 --- a/src/lagrangian/solidParticle/solidParticle.H +++ b/src/lagrangian/solidParticle/solidParticle.H @@ -213,10 +213,6 @@ public: // according to the given separation vector virtual void transformProperties(const vector& separation); - //- The nearest distance to a wall that - // the particle can be in the n direction - virtual scalar wallImpactDistance(const vector& n) const; - // I-O