Merge branch 'cherry-pick-47fd9752' into 'releases/3.0'

Merge branch 'bugfix/turbulentdissipation_nc' into 'master'

See merge request !1437

dumux/freeflow/compositional/iofields.hh

@@ -67,7 +67,7 @@ struct FreeflowNCIOFields
 
                 // the eddy diffusivity is recalculated for an arbitrary component which is not the phase component
                 if (turbulenceModel)
-                    out.addVolumeVariable([j](const auto& v){ return v.effectiveDiffusivity(0, j) - v.diffusionCoefficient(0, j); }, "D_t");
+                    out.addVolumeVariable([j](const auto& v){ return v.effectiveDiffusivity(0, j) - v.diffusionCoefficient(0, j); }, "D_t^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(0));
             }
         }
     }

test/references/test_ff_rans2c_zeroeq.vtu

@@ -288,7 +288,7 @@
           0.999928 0.999882 0.999849 0.99982 0.999811 0.999818 0.999831 0.999842 0.999849 0.999853 0.999997 0.999992
           0.999987 0.99998 0.999965 0.999945 0.999925 0.999908 0.999894 0.999885
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           4.44173e-07 3.80685e-08 3.10819e-08 2.82641e-08 2.67748e-08 2.58393e-08 2.52041e-08 2.47543e-08 2.44332e-08 2.42345e-08 2.42739e-07 4.29038e-07
           3.51714e-07 3.2052e-07 3.03945e-07 2.93507e-07 2.86412e-07 2.81384e-07 2.77792e-07 2.75568e-07 8.9742e-07 1.59199e-06 1.31548e-06 1.20489e-06
           1.14534e-06 1.10764e-06 1.08195e-06 1.06371e-06 1.05065e-06 1.04255e-06 2.29294e-06 4.0865e-06 3.41397e-06 3.15147e-06 3.00699e-06 2.91485e-06

test/references/test_ff_rans2cni_kepsilon_twolayer-reference.vtu

@@ -459,7 +459,7 @@
           2.27249e-05 2.27267e-05 2.27296e-05 2.27339e-05 2.27399e-05 2.27476e-05 2.27572e-05 2.27685e-05 2.27817e-05 2.27958e-05 2.27242e-05 2.27244e-05
           2.27247e-05 2.27252e-05 2.27261e-05 2.27273e-05 2.27289e-05 2.2731e-05 2.27336e-05 2.27366e-05
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           8.25382e-10 1.0932e-11 5.05274e-12 3.90888e-12 2.94107e-12 2.57548e-12 2.39753e-12 2.33086e-12 2.33536e-12 2.38889e-12 1.15927e-09 4.3331e-10
           2.01503e-10 1.55708e-10 1.17074e-10 1.02475e-10 9.53684e-11 9.27005e-11 9.28701e-11 9.49924e-11 9.80988e-09 3.44033e-09 1.61604e-09 1.24686e-09
           9.36577e-10 8.19276e-10 7.62171e-10 7.40672e-10 7.41922e-10 7.58804e-10 5.24774e-08 1.69992e-08 8.10171e-09 6.23915e-09 4.68053e-09 4.09093e-09

test/references/test_ff_rans2cni_kepsilon_wallfunction-reference.vtu

@@ -171,7 +171,7 @@
           0.999777 0.999775 0.999775 0.999776 0.99999 0.999975 0.999958 0.999941 0.999925 0.99991 0.999897 0.999884
           0.999873 0.999864
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000112751 0.000111746 0.000110531 0.00010919 0.000107777 0.000106333 0.000104886 0.000103456 0.000102059 0.000100704 0.000180137 0.000168326
           0.000158127 0.00014943 0.000142169 0.000136282 0.000131697 0.000128334 0.000126108 0.000125099 0.000187052 0.00018119 0.000175916 0.000171096
           0.000166645 0.000162518 0.000158688 0.000155147 0.000151898 0.0001491 0.000187432 0.000182251 0.000177877 0.000174106 0.000170796 0.00016785

test/references/test_ff_rans2cni_komega-reference.vtu

@@ -383,7 +383,7 @@
           2.27246e-05 2.27256e-05 2.27271e-05 2.27291e-05 2.27318e-05 2.27351e-05 2.27391e-05 2.27437e-05 2.27491e-05 2.27549e-05 2.27242e-05 2.27243e-05
           2.27244e-05 2.27247e-05 2.27251e-05 2.27256e-05 2.27263e-05 2.27272e-05 2.27283e-05 2.27295e-05
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           1.45701e-14 6.69834e-18 6.48827e-18 8.50082e-18 1.051e-17 1.2055e-17 1.3068e-17 1.36609e-17 1.39896e-17 1.43453e-17 8.20894e-13 1.92242e-15
           1.86202e-15 2.43949e-15 3.01681e-15 3.45997e-15 3.75027e-15 3.9206e-15 4.01442e-15 4.11684e-15 1.4391e-11 9.8794e-14 9.57538e-14 1.25417e-13
           1.55079e-13 1.77848e-13 1.92761e-13 2.01508e-13 2.06324e-13 2.11584e-13 1.3905e-10 2.1656e-12 2.10343e-12 2.75395e-12 3.40464e-12 3.90412e-12

test/references/test_ff_rans2cni_lowrekepsilon-reference.vtu

@@ -383,7 +383,7 @@
           2.27248e-05 2.27258e-05 2.27271e-05 2.27288e-05 2.27307e-05 2.27329e-05 2.27355e-05 2.27385e-05 2.27417e-05 2.2745e-05 2.27242e-05 2.27243e-05
           2.27244e-05 2.27247e-05 2.27249e-05 2.27253e-05 2.27257e-05 2.27263e-05 2.27269e-05 2.27275e-05
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           1.41713e-11 2.83794e-13 1.43113e-13 1.1687e-13 1.12694e-13 1.16788e-13 1.2532e-13 1.36846e-13 1.50856e-13 1.68614e-13 4.48849e-10 1.28896e-11
           6.45843e-12 5.26318e-12 5.06943e-12 5.24986e-12 5.63064e-12 6.14635e-12 6.77396e-12 7.57022e-12 3.20725e-09 1.05702e-10 5.23505e-11 4.25003e-11
           4.08513e-11 4.22497e-11 4.52733e-11 4.93881e-11 5.44064e-11 6.07851e-11 1.53857e-08 5.48989e-10 2.67653e-10 2.16142e-10 2.07154e-10 2.13847e-10

test/references/test_ff_rans2cni_oneeq-reference.vtu

@@ -364,7 +364,7 @@
           2.27242e-05 2.27243e-05 2.27244e-05 2.27245e-05 2.27247e-05 2.27249e-05 2.27252e-05 2.27255e-05 2.27259e-05 2.27263e-05 2.27241e-05 2.27241e-05
           2.27241e-05 2.27241e-05 2.27242e-05 2.27242e-05 2.27242e-05 2.27242e-05 2.27242e-05 2.27242e-05
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           0 2.67475e-15 5.02394e-15 4.7993e-15 4.36968e-15 4.04666e-15 3.83001e-15 3.69211e-15 3.61338e-15 3.5877e-15 2.37169e-20 3.68536e-13
           7.03575e-13 6.72819e-13 6.12237e-13 5.6661e-13 5.36009e-13 5.16538e-13 5.05426e-13 5.01809e-13 3.79471e-19 5.66479e-12 1.11601e-11 1.07343e-11
           9.78273e-12 9.05833e-12 8.57096e-12 8.26058e-12 8.0836e-12 8.02667e-12 3.01544e-18 4.42286e-11 9.21777e-11 8.98834e-11 8.22846e-11 7.63403e-11

test/references/test_ff_rans2cni_zeroeq.vtu

@@ -345,7 +345,7 @@
           2.27245e-05 2.2726e-05 2.2732e-05 2.27531e-05 2.27938e-05 2.28479e-05 2.29067e-05 2.29651e-05 2.30215e-05 2.30748e-05 2.27241e-05 2.27242e-05
           2.27245e-05 2.27256e-05 2.27308e-05 2.27446e-05 2.27693e-05 2.2804e-05 2.28464e-05 2.28924e-05
         </DataArray>
-        <DataArray type="Float32" Name="D_t" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D_t^H2O_gas" NumberOfComponents="1" format="ascii">
           4.42283e-07 3.48802e-08 2.87272e-08 2.62784e-08 2.49959e-08 2.42e-08 2.36689e-08 2.33019e-08 2.30513e-08 2.29518e-08 2.22728e-07 3.95325e-07
           3.268e-07 2.99409e-07 2.85004e-07 2.76048e-07 2.70066e-07 2.65929e-07 2.63102e-07 2.61971e-07 8.33797e-07 1.48528e-06 1.23663e-06 1.13742e-06
           1.08469e-06 1.05176e-06 1.02971e-06 1.01445e-06 1.00398e-06 9.99763e-07 2.16996e-06 3.88265e-06 3.26475e-06 3.02261e-06 2.89143e-06 2.80899e-06