diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H index 33f021fc7c..96d605dd4a 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H @@ -82,7 +82,7 @@ class WallCollisionRecord // //- Recording whether or not this record has been accessed bool accessed_; - //- The position of wall impact relative to the cell centre + //- The position of wall impact relative to the particle centre vector pRel_; //- Collision data, stored as if the storing particle was the diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C index 5ae80dddaa..37c71946b3 100644 --- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C @@ -31,7 +31,6 @@ License namespace Foam { - defineTemplateTypeNameAndDebug(Cloud, 0); defineParcelTypeNameAndDebug(KinematicCloud, 0); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C index 54bf3ab659..7216ad0914 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C @@ -45,7 +45,8 @@ void Foam::PairSpringSliderDashpot::findMinMaxProperties // Finding minimum diameter to avoid excessive arithmetic - scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_); + scalar dEff = p.d(); + // scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_); RMin = min(dEff, RMin); @@ -158,9 +159,11 @@ void Foam::PairSpringSliderDashpot::evaluatePair { vector r_AB = (pA.position() - pB.position()); - scalar dAEff = pA.d()*cbrt(pA.nParticle()*volumeFactor_); + //scalar dAEff = pA.d()*cbrt(pA.nParticle()*volumeFactor_); + scalar dAEff = pA.d(); - scalar dBEff = pB.d()*cbrt(pB.nParticle()*volumeFactor_); + // scalar dBEff = pB.d()*cbrt(pB.nParticle()*volumeFactor_); + scalar dBEff = pB.d(); scalar normalOverlapMag = 0.5*(dAEff + dBEff) - mag(r_AB); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C index 4bf524e387..b2e05f1ab5 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C @@ -45,7 +45,8 @@ void Foam::WallSpringSliderDashpot::findMinMaxProperties // Finding minimum diameter to avoid excessive arithmetic - scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_); + scalar dEff = p.d(); + // scalar dEff = p.d()*cbrt(p.nParticle()*volumeFactor_); rMin = min(dEff, rMin); @@ -181,7 +182,8 @@ Foam::scalar Foam::WallSpringSliderDashpot::pREff const typename CloudType::parcelType& p ) const { - return p.d()/2*cbrt(p.nParticle()*volumeFactor_); + // return p.d()/2*cbrt(p.nParticle()*volumeFactor_); + return p.d()/2; } template