diff --git a/src/lbm/constants/NumericConstants.h b/src/lbm/constants/NumericConstants.h index 1c81192a615d7b99fb90671b7a553247d166147f..d47042cc46074dad3b3de666051c855c53cbcff8 100644 --- a/src/lbm/constants/NumericConstants.h +++ b/src/lbm/constants/NumericConstants.h @@ -9,46 +9,52 @@ namespace vf::lbm::constant #ifdef VF_DOUBLE_ACCURACY static constexpr double c1o2 = 0.5; static constexpr double c3o2 = 1.5; -static constexpr double c1o3 = 0.333333333333333; -static constexpr double c2o3 = 0.666666666666667; +static constexpr double c1o3 = (1.0 / 3.0);// 0.333333333333333; +static constexpr double c2o3 = (2.0 / 3.0);// 0.666666666666667; static constexpr double c1o4 = 0.25; static constexpr double c3o4 = 0.75; -static constexpr double c1o6 = 0.166666666666667; -static constexpr double c1o7 = 0.142857142857143; +static constexpr double c1o6 = (1.0 / 6.0);// 0.166666666666667; +static constexpr double c1o7 = (1.0 / 7.0);// 0.142857142857143; static constexpr double c1o8 = 0.125; +<<<<<<< Updated upstream static constexpr double c1o9 = 0.111111111111111; static constexpr double c2o9 = 0.222222222222222; static constexpr double c4o9 = 0.444444444444444; static constexpr double c4o10 = 0.4; +======= +static constexpr double c1o9 = (1.0 / 9.0);// 0.111111111111111; +static constexpr double c2o9 = (2.0 / 9.0);// 0.222222222222222; +static constexpr double c4o9 = (4.0 / 9.0);// 0.444444444444444; +>>>>>>> Stashed changes static constexpr double c1o10 = 0.1; -static constexpr double c1o12 = 0.083333333333333; -static constexpr double c1o16 = 0.0625; -static constexpr double c3o16 = 0.1875; -static constexpr double c9o16 = 0.5625; -static constexpr double c1o18 = 0.055555555555556; +static constexpr double c1o12 = (1.0 / 12.0);// 0.083333333333333; +static constexpr double c1o16 = (1.0 / 16.0);// 0.0625; +static constexpr double c3o16 = (3.0 / 16.0);// 0.1875; +static constexpr double c9o16 = (9.0 / 16.0);// 0.5625; +static constexpr double c1o18 = (1.0 / 18.0);// 0.055555555555556; static constexpr double c1o20 = 0.05; -static constexpr double c19o20 = 0.95; +static constexpr double c19o20 = (19.0 / 20.0);// 0.95; static constexpr double c21o20 = 1.05; -static constexpr double c1o24 = 0.041666666666667; -static constexpr double c1o27 = 0.037037037037037; -static constexpr double c3o32 = 0.09375; +static constexpr double c1o24 = (1.0 / 24.0);// 0.041666666666667; +static constexpr double c1o27 = (1.0 / 27.0);// 0.037037037037037; +static constexpr double c3o32 = (3.0 / 32.0);// 0.09375; static constexpr double c4o32 = 0.125; -static constexpr double c1o36 = 0.027777777777778; -static constexpr double c1o48 = 0.020833333333333; -static constexpr double c1o64 = 0.015625; -static constexpr double c3o64 = 0.046875; -static constexpr double c9o64 = 0.140625; -static constexpr double c27o64 = 0.421875; -static constexpr double c1o66 = 0.015151515151515; -static constexpr double c1o72 = 0.013888888888889; -static constexpr double c1o264 = 0.003787878787879; -static constexpr double c8o27 = 0.296296296296296; -static constexpr double c2o27 = 0.074074074074074; -static constexpr double c1o54 = 0.018518518518519; +static constexpr double c1o36 = (1.0 / 36.0);// 0.027777777777778; +static constexpr double c1o48 = (1.0 / 48.0);// 0.020833333333333; +static constexpr double c1o64 = (1.0 / 64.0);// 0.015625; +static constexpr double c3o64 = (3.0 / 64.0);// 0.046875; +static constexpr double c9o64 = (9.0 / 64.0);// 0.140625; +static constexpr double c27o64 = (27.0 / 64.0);// 0.421875; +static constexpr double c1o66 = (1.0 / 66.0);// 0.015151515151515; +static constexpr double c1o72 = (1.0 / 72.0);// 0.013888888888889; +static constexpr double c1o264 = (1.0 / 264.0);// 0.003787878787879; +static constexpr double c8o27 = (8.0 / 27.0);// 0.296296296296296; +static constexpr double c2o27 = (2.0 / 27.0);// 0.074074074074074; +static constexpr double c1o54 = (1.0 / 54.0);// 0.018518518518519; static constexpr double c1o100 = 0.01; -static constexpr double c99o100 = 0.99; -static constexpr double c1o126 = 0.007936507936508; -static constexpr double c1o216 = 0.004629629629630; +static constexpr double c99o100 = (99.0 / 100.0);// 0.99; +static constexpr double c1o126 = (1.0 / 126.0);// 0.007936507936508; +static constexpr double c1o216 = (1.0 / 216.0);// 0.004629629629630; static constexpr double c5o4 = 1.25; static constexpr double c4o3 = 1.333333333333333; static constexpr double c9o4 = 2.25;