From 9ef700fb2482d4cd52f3e71cb5d6ec560827ba53 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Mon, 25 Feb 2019 17:48:29 +0100
Subject: [PATCH] [RANS][WeightedAverages] correct weighted averages to use the
 correct cell size.

---
 dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh     | 4 ++--
 .../rans/twoeq/komega/staggered/fluxvariables.hh         | 9 +++++----
 .../rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh  | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
index 17f5c5a6fe..6c2a0cf892 100644
--- a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh
@@ -116,8 +116,8 @@ public:
 
         // average and distance
         Scalar coeff = arithmeticMean(insideCoeff, outsideCoeff,
-                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
-                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm());
+                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm());
         Scalar distance = 0.0;
 
         // adapt boundary handling
diff --git a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
index bc76b71421..48a716b1dc 100644
--- a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh
@@ -127,12 +127,13 @@ public:
         insideCoeff_w *= insideVolVars.extrusionFactor();
         outsideCoeff_w *= outsideVolVars.extrusionFactor();
 
+        // average and distance
         Scalar coeff_k = arithmeticMean(insideCoeff_k, outsideCoeff_k,
-                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
-                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm());
+                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm());
         Scalar coeff_w = arithmeticMean(insideCoeff_w, outsideCoeff_w,
-                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
-                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm());
+                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm());
         Scalar distance = 0.0;
 
         // adapt boundary handling
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
index 0add605a22..18c1388b4b 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh
@@ -129,11 +129,11 @@ public:
 
         // average and distance
         Scalar coeff_k = arithmeticMean(insideCoeff_k, outsideCoeff_k,
-                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
-                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm());
+                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm());
         Scalar coeff_e = arithmeticMean(insideCoeff_e, outsideCoeff_e,
-                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
-                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm());
+                                        (outsideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm());
         Scalar distance = 0.0;
 
         // adapt boundary handling
-- 
GitLab