From 1789098e5acb540cbe7f768e2644d0e5036bf0aa Mon Sep 17 00:00:00 2001 From: graham Date: Fri, 14 May 2010 15:58:05 +0100 Subject: [PATCH] ENH: Adding WallSiteData collection and passing it to the wall model. Adding tangential forces (with no memory) to wall model. --- .../PairCollision/PairCollision.C | 92 ++++++++++++++---- .../PairCollision/PairCollision.H | 8 +- .../PairSpringSliderDashpot.C | 8 +- .../WallInteractionSiteIO.C | 82 ---------------- .../WallModel/WallModel/WallModel.H | 6 +- .../WallSpringSliderDashpot.C | 95 +++++++++++++++++-- .../WallSpringSliderDashpot.H | 10 +- .../WallSiteData.C} | 26 ++--- .../WallSiteData.H} | 40 ++++---- .../WallSiteDataI.H} | 8 +- 10 files changed, 214 insertions(+), 161 deletions(-) delete mode 100644 src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteIO.C rename src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/{WallInteractionSite/WallInteractionSite.C => WallSiteData/WallSiteData.C} (78%) rename src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/{WallInteractionSite/WallInteractionSite.H => WallSiteData/WallSiteData.H} (79%) rename src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/{WallInteractionSite/WallInteractionSiteI.H => WallSiteData/WallSiteDataI.H} (87%) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C index 27a165c88c..ba7959662d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C @@ -180,12 +180,15 @@ void Foam::PairCollision::wallInteraction() const volVectorField& U = mesh.lookupObject(il_.UName()); // Storage for the wall interaction sites - DynamicList flatSites; + DynamicList flatSitePoints; DynamicList flatSiteExclusionDistancesSqr; - DynamicList otherSites; + DynamicList > flatSiteData; + DynamicList otherSitePoints; DynamicList otherSiteDistances; - DynamicList sharpSites; + DynamicList > otherSiteData; + DynamicList sharpSitePoints; DynamicList sharpSiteExclusionDistancesSqr; + DynamicList > sharpSiteData; forAll(dil, realCellI) { @@ -195,12 +198,15 @@ void Foam::PairCollision::wallInteraction() // Loop over all Parcels in cell forAll(cellOccupancy_[realCellI], cellParticleI) { - flatSites.clear(); + flatSitePoints.clear(); flatSiteExclusionDistancesSqr.clear(); - otherSites.clear(); + flatSiteData.clear(); + otherSitePoints.clear(); otherSiteDistances.clear(); - sharpSites.clear(); + otherSiteData.clear(); + sharpSitePoints.clear(); sharpSiteExclusionDistancesSqr.clear(); + sharpSiteData.clear(); typename CloudType::parcelType& p = *cellOccupancy_[realCellI][cellParticleI]; @@ -233,6 +239,18 @@ void Foam::PairCollision::wallInteraction() scalar normalAlignment = normal & pW/mag(pW); + // Find the patchIndex and wallData for WallSiteData object + label patchI = patchID[realFaceI - mesh.nInternalFaces()]; + + label patchFaceI = + realFaceI - mesh.boundaryMesh()[patchI].start(); + + WallSiteData wSD + ( + patchI, + U.boundaryField()[patchI][patchFaceI] + ); + if (normalAlignment > cosPhiMinFlatWall) { // Guard against a flat interaction being @@ -243,25 +261,29 @@ void Foam::PairCollision::wallInteraction() ( !duplicatePointInList ( - flatSites, + flatSitePoints, nearPt, sqr(r*flatWallDuplicateExclusion) ) ) { - flatSites.append(nearPt); + flatSitePoints.append(nearPt); flatSiteExclusionDistancesSqr.append ( sqr(r) - sqr(nearest.distance()) ); + + flatSiteData.append(wSD); } } else { - otherSites.append(nearPt); + otherSitePoints.append(nearPt); otherSiteDistances.append(nearest.distance()); + + otherSiteData.append(wSD); } } } @@ -294,6 +316,14 @@ void Foam::PairCollision::wallInteraction() scalar normalAlignment = normal & pW/mag(pW); + // Find the patchIndex and wallData for WallSiteData object + + WallSiteData wSD + ( + rwf.patchIndex(), + il_.referredWallData()[refWallFaceI] + ); + if (normalAlignment > cosPhiMinFlatWall) { // Guard against a flat interaction being @@ -304,25 +334,29 @@ void Foam::PairCollision::wallInteraction() ( !duplicatePointInList ( - flatSites, + flatSitePoints, nearPt, sqr(r*flatWallDuplicateExclusion) ) ) { - flatSites.append(nearPt); + flatSitePoints.append(nearPt); flatSiteExclusionDistancesSqr.append ( sqr(r) - sqr(nearest.distance()) ); + + flatSiteData.append(wSD); } } else { - otherSites.append(nearPt); + otherSitePoints.append(nearPt); otherSiteDistances.append(nearest.distance()); + + otherSiteData.append(wSD); } } } @@ -344,13 +378,13 @@ void Foam::PairCollision::wallInteraction() { label orderedIndex = sortedOtherSiteIndices[siteI]; - const point& otherPt = otherSites[orderedIndex]; + const point& otherPt = otherSitePoints[orderedIndex]; if ( !duplicatePointInList ( - flatSites, + flatSitePoints, otherPt, flatSiteExclusionDistancesSqr ) @@ -363,23 +397,32 @@ void Foam::PairCollision::wallInteraction() ( !duplicatePointInList ( - sharpSites, + sharpSitePoints, otherPt, sharpSiteExclusionDistancesSqr ) ) { - sharpSites.append(otherPt); + sharpSitePoints.append(otherPt); sharpSiteExclusionDistancesSqr.append ( sqr(r) - sqr(otherSiteDistances[orderedIndex]) ); + + sharpSiteData.append(otherSiteData[orderedIndex]); } } } - evaluateWall(p, flatSites, sharpSites); + evaluateWall + ( + p, + flatSitePoints, + flatSiteData, + sharpSitePoints, + sharpSiteData + ); } } } @@ -469,11 +512,20 @@ template void Foam::PairCollision::evaluateWall ( typename CloudType::parcelType& p, - const List& flatSites, - const List& sharpSites + const List& flatSitePoints, + const List >& flatSiteData, + const List& sharpSitePoints, + const List >& sharpSiteData ) const { - wallModel_->evaluateWall(p, flatSites, sharpSites); + wallModel_->evaluateWall + ( + p, + flatSitePoints, + flatSiteData, + sharpSitePoints, + sharpSiteData + ); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H index 588f08addd..8d5baa02f8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H @@ -36,7 +36,7 @@ SourceFiles #include "CollisionModel.H" #include "InteractionLists.H" -#include "WallInteractionSite.H" +#include "WallSiteData.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -138,8 +138,10 @@ class PairCollision void evaluateWall ( typename CloudType::parcelType& p, - const List& flatSites, - const List& sharpSites + const List& flatSitePoints, + const List >& flatSiteData, + const List& sharpSitePoints, + const List >& sharpSiteData ) const; 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 bbefa136ca..752120d0be 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 @@ -215,7 +215,7 @@ void Foam::PairSpringSliderDashpot::evaluatePair { scalar kT = 8.0*sqrt(R*normalOverlapMag)*Gstar_; - scalar& etaT = etaN; + scalar etaT = etaN; // Tangential force vector fT_AB; @@ -233,9 +233,9 @@ void Foam::PairSpringSliderDashpot::evaluatePair else { fT_AB = - -kT*tangentialOverlapMag - *tangentialOverlap_AB/tangentialOverlapMag - - etaT*USlip_AB; + -kT*tangentialOverlapMag + *tangentialOverlap_AB/tangentialOverlapMag + - etaT*USlip_AB; } pA.f() += fT_AB; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteIO.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteIO.C deleted file mode 100644 index e90f26ed31..0000000000 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteIO.C +++ /dev/null @@ -1,82 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "WallInteractionSite.H" -#include "IOstreams.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::WallInteractionSite::WallInteractionSite(Istream& is) -: - base1(is), - base2(is), - member1(is), - member2(is) -{ - // Check state of Istream - is.check("Foam::WallInteractionSite::WallInteractionSite(Foam::Istream&)"); -} - - -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // - -template -Foam::Istream& Foam::operator>> -( - Istream& is, - WallInteractionSite& -) -{ - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::WallInteractionSite&)" - ); - - return is; -} - - -template -Foam::Ostream& Foam::operator<< -( - Ostream& os, - const WallInteractionSite& -) -{ - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<" - "(Ostream&, const WallInteractionSite&)" - ); - - return os; -} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H index 7088c4df05..1c4e29a059 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H @@ -133,8 +133,10 @@ public: virtual void evaluateWall ( typename CloudType::parcelType& p, - const List& flatSites, - const List& sharpSites + const List& flatSitePoints, + const List >& flatSiteData, + const List& sharpSitePoints, + const List >& sharpSiteData ) const = 0; }; 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 ba22ef3842..3b425d5e12 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 @@ -66,25 +66,76 @@ void Foam::WallSpringSliderDashpot::evaluateWall ( typename CloudType::parcelType& p, const point& site, + const WallSiteData& data, scalar pNu, scalar pE, scalar Estar, - scalar kN + scalar kN, + scalar Gstar ) const { + scalar pR = p.d()/2; + vector r_PW = p.position() - site; - scalar normalOverlapMag = p.d()/2 - mag(r_PW); + vector U_PW = p.U() - data.wallData(); + + scalar normalOverlapMag = pR - mag(r_PW); vector rHat_PW = r_PW/(mag(r_PW) + VSMALL); scalar etaN = alpha_*sqrt(p.mass()*kN)*pow025(normalOverlapMag); vector fN_PW = - rHat_PW - *(kN*pow(normalOverlapMag, b_) - etaN*(p.U() & rHat_PW)); + rHat_PW + *(kN*pow(normalOverlapMag, b_) - etaN*(U_PW & rHat_PW)); p.f() += fN_PW; + + vector USlip_PW = + U_PW - (U_PW & rHat_PW)*rHat_PW + + (p.omega() ^ (pR*-rHat_PW)); + + scalar deltaT = this->owner().mesh().time().deltaTValue(); + + // For remembering previous overlap + // vector deltaTangentialOverlap_PW = USlip_PW * deltaT; + // tangentialOverlap_PW += deltaTangentialOverlap_PW; + + vector tangentialOverlap_PW = USlip_PW * deltaT; + + scalar tangentialOverlapMag = mag(tangentialOverlap_PW); + + if (tangentialOverlapMag > VSMALL) + { + scalar kT = 8.0*sqrt(pR*normalOverlapMag)*Gstar; + + scalar etaT = etaN; + + // Tangential force + vector fT_PW; + + if (kT*tangentialOverlapMag > mu_*mag(fN_PW)) + { + // Tangential force greater than sliding friction, + // particle slips + + fT_PW = -mu_*mag(fN_PW)*USlip_PW/mag(USlip_PW); + + // tangentialOverlap_PW = vector::zero; + } + else + { + fT_PW = + -kT*tangentialOverlapMag + *tangentialOverlap_PW/tangentialOverlapMag + - etaT*USlip_PW; + } + + p.f() += fT_PW; + + p.torque() += (pR*-rHat_PW) ^ fT_PW; + } } @@ -164,8 +215,10 @@ template void Foam::WallSpringSliderDashpot::evaluateWall ( typename CloudType::parcelType& p, - const List& flatSites, - const List& sharpSites + const List& flatSitePoints, + const List >& flatSiteData, + const List& sharpSitePoints, + const List >& sharpSiteData ) const { scalar pNu = this->owner().constProps().poissonsRatio(); @@ -176,16 +229,38 @@ void Foam::WallSpringSliderDashpot::evaluateWall scalar kN = (4.0/3.0)*sqrt(p.d()/2)*Estar; - forAll(flatSites, siteI) + scalar GStar = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu_ - sqr(nu_))/E_)); + + forAll(flatSitePoints, siteI) { - evaluateWall(p, flatSites[siteI], pNu, pE, Estar, kN); + evaluateWall + ( + p, + flatSitePoints[siteI], + flatSiteData[siteI], + pNu, + pE, + Estar, + kN, + GStar + ); } - forAll(sharpSites, siteI) + forAll(sharpSitePoints, siteI) { // Treating sharp sites like flat sites - evaluateWall(p, sharpSites[siteI], pNu, pE, Estar, kN); + evaluateWall + ( + p, + sharpSitePoints[siteI], + sharpSiteData[siteI], + pNu, + pE, + Estar, + kN, + GStar + ); } } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H index fcc83e22e6..452b4ced18 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H @@ -86,10 +86,12 @@ class WallSpringSliderDashpot ( typename CloudType::parcelType& p, const point& site, + const WallSiteData& data, scalar pNu, scalar pE, scalar Estar, - scalar kN + scalar kN, + scalar Gstar ) const; @@ -124,8 +126,10 @@ public: virtual void evaluateWall ( typename CloudType::parcelType& p, - const List& flatSites, - const List& sharpSites + const List& flatSitePoints, + const List >& flatSiteData, + const List& sharpSitePoints, + const List >& sharpSiteData ) const; }; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSite.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C similarity index 78% rename from src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSite.C rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C index 8dce24bb08..a9aa774c64 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSite.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.C @@ -23,12 +23,12 @@ License \*---------------------------------------------------------------------------*/ -#include "WallInteractionSite.H" +#include "WallSiteData.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::WallInteractionSite::WallInteractionSite() +Foam::WallSiteData::WallSiteData() : patchI_(), wallData_() @@ -36,7 +36,7 @@ Foam::WallInteractionSite::WallInteractionSite() template -Foam::WallInteractionSite::WallInteractionSite +Foam::WallSiteData::WallSiteData ( label patchI, const Type& wallData @@ -50,26 +50,26 @@ Foam::WallInteractionSite::WallInteractionSite // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::WallInteractionSite::~WallInteractionSite() +Foam::WallSiteData::~WallSiteData() {} // * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // template -bool Foam::WallInteractionSite::operator== +bool Foam::WallSiteData::operator== ( - const WallInteractionSite& rhs + const WallSiteData& rhs ) const { - return patchI_ == rhs.patch_ && wallData_ == rhs.wallData_; + return patchI_ == rhs.patchI_ && wallData_ == rhs.wallData_; } template -bool Foam::WallInteractionSite::operator!= +bool Foam::WallSiteData::operator!= ( - const WallInteractionSite& rhs + const WallSiteData& rhs ) const { return !(*this == rhs); @@ -82,7 +82,7 @@ template Foam::Istream& Foam::operator>> ( Istream& is, - WallInteractionSite& wIS + WallSiteData& wIS ) { is >> wIS.patchI_ >> wIS.wallData_; @@ -91,7 +91,7 @@ Foam::Istream& Foam::operator>> is.check ( "Foam::Istream& Foam::operator>>" - "(Foam::Istream&, Foam::WallInteractionSite&)" + "(Foam::Istream&, Foam::WallSiteData&)" ); return is; @@ -102,7 +102,7 @@ template Foam::Ostream& Foam::operator<< ( Ostream& os, - const WallInteractionSite& wIS + const WallSiteData& wIS ) { os << wIS.patchI_ << token::SPACE << wIS.wallData_; @@ -111,7 +111,7 @@ Foam::Ostream& Foam::operator<< os.check ( "Foam::Ostream& Foam::operator<<" - "(Ostream&, const WallInteractionSite&)" + "(Ostream&, const WallSiteData&)" ); return os; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSite.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H similarity index 79% rename from src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSite.H rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H index becede3bc2..a179d4925c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSite.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteData.H @@ -22,21 +22,21 @@ License along with OpenFOAM. If not, see . Class - Foam::WallInteractionSite + Foam::WallSiteData Description Stores the patch ID and templated data to represent a collision with a wall to be passed to the wall model. SourceFiles - WallInteractionSiteI.H - WallInteractionSite.C - WallInteractionSiteIO.C + WallSiteDataI.H + WallSiteData.C + WallSiteDataIO.C \*---------------------------------------------------------------------------*/ -#ifndef WallInteractionSite_H -#define WallInteractionSite_H +#ifndef WallSiteData_H +#define WallSiteData_H #include "label.H" @@ -48,21 +48,21 @@ namespace Foam // Forward declaration of friend functions and operators template -class WallInteractionSite; +class WallSiteData; template -Istream& operator>>(Istream&, WallInteractionSite&); +Istream& operator>>(Istream&, WallSiteData&); template -Ostream& operator<<(Ostream&, const WallInteractionSite&); +Ostream& operator<<(Ostream&, const WallSiteData&); /*---------------------------------------------------------------------------*\ - Class WallInteractionSite Declaration + Class WallSiteData Declaration \*---------------------------------------------------------------------------*/ template -class WallInteractionSite +class WallSiteData { // Private data @@ -78,10 +78,10 @@ public: // Constructors //- Construct null - WallInteractionSite(); + WallSiteData(); //- Construct from components - WallInteractionSite + WallSiteData ( label patchI, const Type& wallData @@ -89,7 +89,7 @@ public: //- Destructor - ~WallInteractionSite(); + ~WallSiteData(); // Member Functions @@ -109,17 +109,17 @@ public: // Member Operators - bool operator==(const WallInteractionSite&) const; - bool operator!=(const WallInteractionSite&) const; + bool operator==(const WallSiteData&) const; + bool operator!=(const WallSiteData&) const; // IOstream Operators friend Istream& operator>> - (Istream&, WallInteractionSite&); + (Istream&, WallSiteData&); friend Ostream& operator<< - (Ostream&, const WallInteractionSite&); + (Ostream&, const WallSiteData&); }; @@ -129,12 +129,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "WallInteractionSiteI.H" +#include "WallSiteDataI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "WallInteractionSite.C" +# include "WallSiteData.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H similarity index 87% rename from src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteI.H rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H index 58023d6325..b28bf3be23 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallInteractionSite/WallInteractionSiteI.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H @@ -28,28 +28,28 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -Foam::label Foam::WallInteractionSite::patchIndex() const +Foam::label Foam::WallSiteData::patchIndex() const { return patchI_; } template -Foam::label& Foam::WallInteractionSite::patchIndex() +Foam::label& Foam::WallSiteData::patchIndex() { return patchI_; } template -const Type& Foam::WallInteractionSite::wallData() const +const Type& Foam::WallSiteData::wallData() const { return wallData_; } template -Type& Foam::WallInteractionSite::wallData() +Type& Foam::WallSiteData::wallData() { return wallData_; }