diff --git a/src/lbm/BackwardChimera.cpp b/src/lbm/BackwardChimera.cpp index 38b81322906dcf7099d1392074d57767fd87d6ca..d52ebba05abf9a0144b5d4487ba632f3672f008c 100644 --- a/src/lbm/BackwardChimera.cpp +++ b/src/lbm/BackwardChimera.cpp @@ -1,4 +1,4 @@ -#include "BackwardChimera.h +#include "BackwardChimera.h" #include <basics/Core/RealConstants.h> @@ -8,22 +8,22 @@ void VF::LBM::forwardInverseChimeraWithK(real &mfa, real &mfb, real &mfc, real v { const real m2 = mfa + mfc; const real m1 = mfc - mfa; - const real m0 = m2 + mfb; + real m0 = m2 + mfb; mfa = m0; m0 *= Kinverse; - m0 += c1; + m0 += c1o1; mfb = (m1 * Kinverse - m0 * vv) * K; - mfc = ((m2 - c2 * m1 * vv) * Kinverse + v2 * m0) * K; + mfc = ((m2 - c2o1 * m1 * vv) * Kinverse + v2 * m0) * K; } void VF::LBM::backwardInverseChimeraWithK(real &mfa, real &mfb, real &mfc, real vv, real v2, real Kinverse, real K) { - const real m0 = (((mfc - mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + c1) * (v2 - vv) * c1o2) * K; - const real m1 = (((mfa - mfc) - c2 * mfb * vv) * Kinverse + (mfa * Kinverse + c1) * (-v2)) * K; + const real m0 = (((mfc - mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + c1o1) * (v2 - vv) * c1o2) * K; + const real m1 = (((mfa - mfc) - c2o1 * mfb * vv) * Kinverse + (mfa * Kinverse + c1o1) * (-v2)) * K; - mfc = (((mfc + mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + c1) * (v2 + vv) * c1o2) * K; + mfc = (((mfc + mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + c1o1) * (v2 + vv) * c1o2) * K; mfa = m0; mfb = m1; } @@ -33,7 +33,7 @@ void VF::LBM::forwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2) const real m1 = (mfa + mfc) + mfb; const real m2 = mfc - mfa; - mfc = (mfc + mfa) + (v2 * m1 - c2 * vv * m2); + mfc = (mfc + mfa) + (v2 * m1 - c2o1 * vv * m2); mfb = m2 - vv * m1; mfa = m1; } @@ -41,7 +41,7 @@ void VF::LBM::forwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2) void VF::LBM::backwardChimera(real &mfa, real &mfb, real &mfc, real vv, real v2) { const real ma = (mfc + mfa * (v2 - vv)) * c1o2 + mfb * (vv - c1o2); - const real mb = ((mfa - mfc) - mfa * v2) - c2 * mfb * vv; + const real mb = ((mfa - mfc) - mfa * v2) - c2o1 * mfb * vv; mfc = (mfc + mfa * (v2 + vv)) * c1o2 + mfb * (vv + c1o2); mfb = mb;