From 3b64695d62cf6308afb7de780a0847fb192a65c8 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 18 Feb 2014 10:03:24 +0000 Subject: [PATCH] BUG: lagrangian function objects - updated postMove() calls --- .../CloudFunctionObject/CloudFunctionObject.C | 2 +- .../CloudFunctionObject/CloudFunctionObject.H | 2 +- .../CloudFunctionObjectList/CloudFunctionObjectList.C | 2 +- .../CloudFunctionObjectList/CloudFunctionObjectList.H | 2 +- .../CloudFunctionObjects/ParticleCollector/ParticleCollector.C | 2 +- .../CloudFunctionObjects/ParticleCollector/ParticleCollector.H | 2 +- .../submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C | 1 + .../submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H | 1 + .../submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C | 3 ++- .../submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H | 3 ++- 10 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C index e67b0b938c..b0399c5acf 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C @@ -113,7 +113,7 @@ void Foam::CloudFunctionObject::postEvolve() template void Foam::CloudFunctionObject::postMove ( - const typename CloudType::parcelType&, + typename CloudType::parcelType&, const label, const scalar, const point&, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H index 4fe6798676..d5b9369df7 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H @@ -144,7 +144,7 @@ public: //- Post-move hook virtual void postMove ( - const typename CloudType::parcelType& p, + typename CloudType::parcelType& p, const label cellI, const scalar dt, const point& position0, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C index ed3d5534d0..1b1b579d07 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C @@ -136,7 +136,7 @@ void Foam::CloudFunctionObjectList::postEvolve() template void Foam::CloudFunctionObjectList::postMove ( - const typename CloudType::parcelType& p, + typename CloudType::parcelType& p, const label cellI, const scalar dt, const point& position0, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H index 477afe37a5..86ea97799c 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H @@ -112,7 +112,7 @@ public: //- Post-move hook virtual void postMove ( - const typename CloudType::parcelType& p, + typename CloudType::parcelType& p, const label cellI, const scalar dt, const point& position0, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C index 696942626e..bf347c9f30 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C @@ -650,7 +650,7 @@ Foam::ParticleCollector::~ParticleCollector() template void Foam::ParticleCollector::postMove ( - const parcelType& p, + parcelType& p, const label cellI, const scalar dt, const point& position0, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H index cd3b679dba..e7ed170e97 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H @@ -286,7 +286,7 @@ public: //- Post-move hook virtual void postMove ( - const parcelType& p, + parcelType& p, const label cellI, const scalar dt, const point& position0, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C index 317a033844..1e02c0c32e 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C @@ -106,6 +106,7 @@ void Foam::ParticleTrap::postMove parcelType& p, const label cellI, const scalar, + const point&, bool& ) { diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H index 81ccb68e3a..588ffd40c2 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H @@ -132,6 +132,7 @@ public: typename CloudType::parcelType& p, const label cellI, const scalar dt, + const point& position0, bool& keepParticle ); }; diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C index 12188730c3..e8c628ba0e 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C @@ -124,9 +124,10 @@ void Foam::VoidFraction::postEvolve() template void Foam::VoidFraction::postMove ( - const parcelType& p, + parcelType& p, const label cellI, const scalar dt, + const point&, bool& ) { diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H index 502e4aa3ec..a24ac9fb6c 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H @@ -118,9 +118,10 @@ public: //- Post-move hook virtual void postMove ( - const parcelType& p, + parcelType& p, const label cellI, const scalar dt, + const point& position0, bool& keepParticle ); };