[rans] Change averaging methods for the two-eq models

dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh

@@ -133,8 +133,9 @@ public:
         outsideCoeff_e *= outsideVolVars.extrusionFactor();
 
         // average and distance
-        Scalar coeff_k = (insideCoeff_k + outsideCoeff_k) * 0.5;
-        Scalar coeff_e = (insideCoeff_e + outsideCoeff_e) * 0.5;
+        // is more stable with simple/unweighted arithmetic mean
+        Scalar coeff_k = arithmeticMean(insideCoeff_k, outsideCoeff_k);
+        Scalar coeff_e = arithmeticMean(insideCoeff_e, outsideCoeff_e);
         Scalar distance = 0.0;
 
         // adapt boundary handling

dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh

@@ -127,9 +127,12 @@ public:
         insideCoeff_w *= insideVolVars.extrusionFactor();
         outsideCoeff_w *= outsideVolVars.extrusionFactor();
 
-        // average and distance
-        Scalar coeff_k = (insideCoeff_k - outsideCoeff_k) * 0.5;
-        Scalar coeff_w = (insideCoeff_w - outsideCoeff_w) * 0.5;
+        Scalar coeff_k = arithmeticMean(insideCoeff_k, outsideCoeff_k,
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (outsideScv.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());
         Scalar distance = 0.0;
 
         // adapt boundary handling

dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh

@@ -128,8 +128,12 @@ public:
         outsideCoeff_e *= outsideVolVars.extrusionFactor();
 
         // average and distance
-        Scalar coeff_k = (insideCoeff_k + outsideCoeff_k) * 0.5;
-        Scalar coeff_e = (insideCoeff_e + outsideCoeff_e) * 0.5;
+        Scalar coeff_k = arithmeticMean(insideCoeff_k, outsideCoeff_k,
+                                        (insideScv.dofPosition() - scvf.ipGlobal()).two_norm(),
+                                        (outsideScv.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());
         Scalar distance = 0.0;
 
         // adapt boundary handling

test/freeflow/rans/CMakeLists.txt

@@ -28,7 +28,7 @@ dune_add_test(NAME test_pipe_laufer_lowrekepsilon
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_lowrekepsilon.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00064.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00066.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_lowrekepsilon test_pipe_laufer_reference.input")
 target_compile_definitions(test_pipe_laufer_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
 
@@ -38,7 +38,7 @@ dune_add_test(NAME test_pipe_laufer_komega
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/pipe_laufer_komega.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00056.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/pipe_laufer_reference-00055.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_pipe_laufer_komega test_pipe_laufer_reference.input")
 target_compile_definitions(test_pipe_laufer_komega PUBLIC "KOMEGA=1")
 

test/freeflow/rans/test_pipe_laufer.input

@@ -25,7 +25,7 @@ EddyViscosityModel = "baldwinLomax"
 UseStoredEddyViscosity = false
 
 [KEpsilon]
-YPlusThreshold = 30.
+YPlusThreshold = 40.
 
 [Assembly]
 NumericDifferenceMethod = 0