From 45d527853d1a0a7ae2d300c72ef82fd39f74f450 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 9 Aug 2019 10:05:14 +0200
Subject: [PATCH] ENH: additional xorOp, bitXorOp, xorEqOp, bitXorEqOp
 reduction operators

---
 src/OpenFOAM/primitives/ops/ops.H | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index 2692eff18f..7161d90cd5 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -46,7 +46,6 @@ namespace Foam
 // Assignment operation taking two parameters, returning void.
 // Alters the value of the first parameter.
 //     Eg, plusEqOp for (x += y)
-
 #define EqOp(opName, op)                                                       \
                                                                                \
     template<class T1, class T2>                                               \
@@ -83,8 +82,10 @@ EqOp(maxMagSqrEq, x = (magSqr(x) >= magSqr(y) ? x : y))
 
 EqOp(andEq, x = (x && y))
 EqOp(orEq,  x = (x || y))
+EqOp(xorEq, x = (x != y))
 EqOp(bitAndEq, x = (x & y))
 EqOp(bitOrEq,  x = (x | y))
+EqOp(bitXorEq, x = (x ^ y))
 
 EqOp(eqMinus, x = -y)
 
@@ -223,11 +224,13 @@ Op(minMagSqr, (magSqr(x)<=magSqr(y) ? x : y))
 Op(maxMagSqr, (magSqr(x)>=magSqr(y) ? x : y))
 Op(minMod, minMod(x, y))
 
-Op(bitOr, (x | y))
 Op(bitAnd, (x & y))
+Op(bitOr,  (x | y))
+Op(bitXor, (x ^ y))
 
 BoolOp(and, x && y)
-BoolOp(or, x || y)
+BoolOp(or,  x || y)
+BoolOp(xor, x != y)     // Or as (!x != !y) to force bool context?
 BoolOp(equal, x == y)
 BoolOp(notEqual, x != y)
 BoolOp(less, x < y)