Merge branch 'cherry-pick-ab3d1a5b' into 'releases/3.3'

Merge branch 'fix/quad-precision-adl' into 'master'

See merge request !2404

dumux/common/timeloop.hh

@@ -348,7 +348,8 @@ public:
         if (verbose_)
         {
             const auto cpuTime = wallClockTime();
-            const auto percent = std::round( time_ / endTime_ * 100 );
+            using std::round;            
+            const auto percent = round( time_ / endTime_ * 100 );
             std::cout << Fmt::format("[{:3.0f}%] ", percent)
                       << Fmt::format("Time step {} done in {:.2g} seconds. ", timeStepIdx_, timeStepWallClockTime_)
                       << Fmt::format("Wall clock time: {:.2g}, time: {:.5g}, time step size: {:.5g}\n", cpuTime, time_, previousTimeStepSize_);

dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh

@@ -72,7 +72,7 @@ public:
         using std::max;
         const Scalar diffCoeff = volVars.diffusionCoefficient(phaseIdx, compIdxI, compIdxJ);
         const Scalar porosity = volVars.porosity();
-        const Scalar sat = max(volVars.saturation(phaseIdx), 0.0);
+        const Scalar sat = max<Scalar>(volVars.saturation(phaseIdx), 0.0);
         return porosity * (sat*sat*sat) * cbrt(porosity * sat) * diffCoeff;
     }