From 3f21c5788fad3d4d4858973a17fa20711fe0fe95 Mon Sep 17 00:00:00 2001 From: ignis Date: Fri, 4 Aug 2017 00:22:19 +0900 Subject: [PATCH] correct SLFMFoam code indentation - removing tabs --- solvers_post/SLFMFoam/Math.H | 476 ++++++++++++------------- solvers_post/SLFMFoam/SLFMFoam.C | 8 +- solvers_post/SLFMFoam/createFields.H | 14 +- solvers_post/SLFMFoam/preIntegration.H | 26 +- solvers_post/SLFMFoam/setSDR.H | 16 +- solvers_post/SLFMFoam/updateYi.H | 18 +- 6 files changed, 279 insertions(+), 279 deletions(-) diff --git a/solvers_post/SLFMFoam/Math.H b/solvers_post/SLFMFoam/Math.H index 471142b..87a24e5 100644 --- a/solvers_post/SLFMFoam/Math.H +++ b/solvers_post/SLFMFoam/Math.H @@ -108,44 +108,44 @@ inline double simpson(scalar min, scalar max, scalar interval, scalarField& ftn) inline double integration(scalar deltaftn, scalarField& MFcut, scalarField& Neta, scalarField& pdf, scalarField& f) { - double result = 0.0; - double min, max, interval; - if(deltaftn < 0.5) //one delta function (deltaftn == 0) - { - for(label i=0; i<= (Neta[MFcut.size()-1]);i++) - { - if(pdf[i] > 1e-30) - { - result = f[i]; - } - } - } - else if(deltaftn > 0.5 && deltaftn < 1.5) //two delta function (deltaftn == 1) - { - for(label i=0; i<= (Neta[MFcut.size()-1]);i++) - { - if(pdf[i] > 1e-30) - { - result += 0.5*f[i]; - } - } - } - else if(deltaftn > 1.5) //not a delta function (deltaftn == 2) - { - scalarField ftn = pdf*f; - for(label i=0; i<(MFcut.size()-1); i++ ) - { - min = Neta[i]; - max = Neta[i+1]; - interval = (MFcut[i+1]-MFcut[i])/(max-min); - result += simpson(min, max, interval, ftn); - } - } - else - { - //Integration error - } - return result; + double result = 0.0; + double min, max, interval; + if(deltaftn < 0.5) //one delta function (deltaftn == 0) + { + for(label i=0; i<= (Neta[MFcut.size()-1]);i++) + { + if(pdf[i] > 1e-30) + { + result = f[i]; + } + } + } + else if(deltaftn > 0.5 && deltaftn < 1.5) //two delta function (deltaftn == 1) + { + for(label i=0; i<= (Neta[MFcut.size()-1]);i++) + { + if(pdf[i] > 1e-30) + { + result += 0.5*f[i]; + } + } + } + else if(deltaftn > 1.5) //not a delta function (deltaftn == 2) + { + scalarField ftn = pdf*f; + for(label i=0; i<(MFcut.size()-1); i++ ) + { + min = Neta[i]; + max = Neta[i+1]; + interval = (MFcut[i+1]-MFcut[i])/(max-min); + result += simpson(min, max, interval, ftn); + } + } + else + { + //Integration error + } + return result; } //inline double trapz() @@ -161,50 +161,50 @@ inline double integration(scalar deltaftn, scalarField& MFcut, scalarField& Neta // Equation 17 inline double lognormalPDF(scalar Nst, scalar Nst_local) { - double result, numerator; - const double pi = 3.141592; - const double sigmaN = 1.0; - - numerator = sqr(std::log(Nst/Nst_local)+0.5*sqr(sigmaN)); - result = std::exp(-0.5*numerator/sqr(sigmaN)); - result = result/std::sqrt(2.0*pi)/Nst/sigmaN; + double result, numerator; + const double pi = 3.141592; + const double sigmaN = 1.0; - return result; + numerator = sqr(std::log(Nst/Nst_local)+0.5*sqr(sigmaN)); + result = std::exp(-0.5*numerator/sqr(sigmaN)); + result = result/std::sqrt(2.0*pi)/Nst/sigmaN; + + return result; } //Returns the integral of the lognormalPDF function between a and b, by //ten-point Gauss-Legendre integration, Numerical Recipe 2nd Ed. p.140 inline double qgaus(scalar a, scalar b, scalar Nst_local) { - double dx, xm, xr, result; - static double w[] = { + double dx, xm, xr, result; + static double w[] = { 0.2955242247, - 0.2692667193, - 0.2190863625, - 0.1494513491, - 0.0666713443 - }; - static double x[] = { - 0.1488743389, - 0.4333953941, - 0.6794095682, - 0.8650633666, - 0.9739065285 - }; + 0.2692667193, + 0.2190863625, + 0.1494513491, + 0.0666713443 + }; + static double x[] = { + 0.1488743389, + 0.4333953941, + 0.6794095682, + 0.8650633666, + 0.9739065285 + }; - xm = 0.5*(b+a); - xr = 0.5*(b-a); - result = 0.0; - - for(label i=0 ; i<5 ; i++) - { - dx = xr*x[i]; - result = result + w[i]*(lognormalPDF(xm+dx, Nst_local) - + lognormalPDF(xm-dx, Nst_local)); - } - result = xr*result; + xm = 0.5*(b+a); + xr = 0.5*(b-a); + result = 0.0; - return result; + for(label i=0 ; i<5 ; i++) + { + dx = xr*x[i]; + result = result + w[i]*(lognormalPDF(xm+dx, Nst_local) + + lognormalPDF(xm-dx, Nst_local)); + } + result = xr*result; + + return result; } //Returns the P_N(Nst)*dNst @@ -212,190 +212,190 @@ inline double qgaus(scalar a, scalar b, scalar Nst_local) // Equation 16 inline void calculate_PdNst(scalar NumofNst, scalarField& Nst, scalar Nst_local, scalarField& result) { - const double alarge = 1000.0; - scalar a,b; + const double alarge = 1000.0; + scalar a,b; - if(Nst_local > 0.5*Nst[0]) - { - a = 0.0; - b = 0.5*(Nst[0]+Nst[1]); - result[0] = qgaus(a, b, Nst_local); + if(Nst_local > 0.5*Nst[0]) + { + a = 0.0; + b = 0.5*(Nst[0]+Nst[1]); + result[0] = qgaus(a, b, Nst_local); - for(label i=1 ; i<(NumofNst-1) ; i++) - { - a = 0.5*(Nst[i]+Nst[i-1]); - b = 0.5*(Nst[i]+Nst[i+1]); - result[i] = qgaus(a, b, Nst_local); - } - - a = 0.5*(Nst[NumofNst-1]+Nst[NumofNst-2]); - b = alarge; - result[NumofNst-1] = qgaus(a, b, Nst_local); - } - else - { - result[0] = 1.0; - for(label i=1 ; i=0 ; jj--) - { - if(eta_temp[jj] > eta[j]) - { - higher_eta = eta_temp[jj]; - hindex = jj; - } - } + for(label j=0; j=0 ; jj--) + { + if(eta_temp[jj] > eta[j]) + { + higher_eta = eta_temp[jj]; + hindex = jj; + } + } - frac = (eta[j]-lower_eta)/(higher_eta-lower_eta); + frac = (eta[j]-lower_eta)/(higher_eta-lower_eta); - for(label m=0 ; m > mvConvection ( - fv::convectionScheme::New - ( - mesh, - fields, - phi, - mesh.divScheme("div(phi,Yi_h)") - ) + fv::convectionScheme::New + ( + mesh, + fields, + phi, + mesh.divScheme("div(phi,Yi_h)") + ) ); #include "createMRF.H" diff --git a/solvers_post/SLFMFoam/preIntegration.H b/solvers_post/SLFMFoam/preIntegration.H index e91560b..b0a60cb 100644 --- a/solvers_post/SLFMFoam/preIntegration.H +++ b/solvers_post/SLFMFoam/preIntegration.H @@ -26,16 +26,16 @@ scalarFieldArray2d Rtable scalarFieldArray3d Ytable ( - postSpeciesN, - scalarFieldArray2d - ( - etamax+1, - scalarFieldArray1d - ( - NVar+1, - scalarField(NstList.size(), 0) - ) - ) + postSpeciesN, + scalarFieldArray2d + ( + etamax+1, + scalarFieldArray1d + ( + NVar+1, + scalarField(NstList.size(), 0) + ) + ) ); Info<<"Construct C1 coefficient table"<