Merge remote branch 'OpenCFD/master' into olesenm

src/lagrangian/basic/Particle/Particle.C

@@ -528,6 +528,34 @@ void Foam::Particle<ParticleType>::hitPatch
 {}
 
 
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+template<class ParticleType>
+bool Foam::operator==
+(
+    const Particle<ParticleType>& pA,
+    const Particle<ParticleType>& pB
+)
+{
+    return
+    (
+        pA.origProc() == pB.origProc()
+        && pA.origId() == pB.origId()
+    );
+}
+
+
+template<class ParticleType>
+bool Foam::operator!=
+(
+    const Particle<ParticleType>& pA,
+    const Particle<ParticleType>& pB
+)
+{
+    return !(pA == pB);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "ParticleIO.C"

src/lagrangian/basic/Particle/Particle.H

@@ -59,6 +59,8 @@ class polyPatch;
 template<class ParticleType>
 class Particle;
 
+// Friend Operators
+
 template<class ParticleType>
 Ostream& operator<<
 (
@@ -66,6 +68,11 @@ Ostream& operator<<
     const Particle<ParticleType>&
 );
 
+template<class ParticleType>
+bool operator==(const Particle<ParticleType>&, const Particle<ParticleType>&);
+
+template<class ParticleType>
+bool operator!=(const Particle<ParticleType>&, const Particle<ParticleType>&);
 
 /*---------------------------------------------------------------------------*\
                            Class Particle Declaration
@@ -467,13 +474,25 @@ public:
         //- Write the particle data
         void write(Ostream& os, bool writeFields) const;
 
-    // Ostream Operator
+    // Friend Operators
 
         friend Ostream& operator<< <ParticleType>
         (
             Ostream&,
             const Particle<ParticleType>&
         );
+
+        friend bool operator== <ParticleType>
+        (
+            const Particle<ParticleType>& pA,
+            const Particle<ParticleType>& pB
+        );
+
+        friend bool operator!= <ParticleType>
+        (
+            const Particle<ParticleType>& pA,
+            const Particle<ParticleType>& pB
+        );
 };