etamax + 1 to follow C convention

This commit is contained in:
ignis 2017-08-22 03:36:53 +09:00
parent aee22e8680
commit e55b76e3bb
5 changed files with 29 additions and 29 deletions

View file

@ -310,18 +310,18 @@ scalar stretchFac(readScalar(SLFMdict.lookup("stretchFactor")));
scalar lowerN(readScalar(SLFMdict.lookup("lowerN")));
scalar upperN(readScalar(SLFMdict.lookup("upperN")));
scalar Sc(readScalar(SLFMdict.lookup("Sc")));
scalar etamax(lowerN+upperN);
const label etamax(lowerN+upperN+1);
word outletName(SLFMdict.lookup("outletName"));
scalarField etaValue(etamax+1,0);
scalarField etaIndex(etamax+1,0);
scalarField deta_h(etamax+1,0);
scalarField deta_l(etamax+1,0);
scalarField deta_m(etamax+1,0);
scalarField etaValue(etamax,0);
scalarField etaIndex(etamax,0);
scalarField deta_h(etamax,0);
scalarField deta_l(etamax,0);
scalarField deta_m(etamax,0);
#include "setEtaSpace.H"
Info<<"\nNumber of eta-point = "<<etamax+1<<endl;
Info<<"\nNumber of eta-point = "<<etamax<<endl;
scalar NVar(readScalar(SLFMdict.lookup("NVar")));
@ -332,9 +332,9 @@ scalarField varIndex(NVar+1,0);
PtrList<volScalarField> Neta(etamax+1);
PtrList<volScalarField> Neta(etamax);
for(label j=0 ; j<=etamax ; j++)
for(label j=0 ; j<etamax ; j++)
{

View file

@ -1,12 +1,12 @@
scalarFieldArray1d C1table //AMC C1 coefficient table
(
etamax+1,
etamax,
scalarField(NVar+1, 0)
);
scalarFieldArray2d Ttable
(
etamax+1,
etamax,
scalarFieldArray1d
(
NVar+1,
@ -16,7 +16,7 @@ scalarFieldArray2d Ttable
scalarFieldArray2d Rtable
(
etamax+1,
etamax,
scalarFieldArray1d
(
NVar+1,
@ -29,7 +29,7 @@ scalarFieldArray3d Ytable
postSpecieNames.size(),
scalarFieldArray2d
(
etamax+1,
etamax,
scalarFieldArray1d
(
NVar+1,
@ -39,13 +39,13 @@ scalarFieldArray3d Ytable
);
Info<<"Construct C1 coefficient table"<<endl;
for(label j=1 ; j<etamax; j++)
for(label j=1 ; j<etamax-1; j++)
{
bpdf.C1coeff(etaValue[j], varValue, C1table[j]);
}
Info<<"Construct Temp and Rgas table"<<endl;
for(label j=0 ; j<=etamax ; j++)
for(label j=0 ; j<etamax ; j++)
{
scalar mf = etaValue[j];
for(label v=0 ; v<=NVar ; v++)
@ -62,5 +62,5 @@ for(label j=0 ; j<=etamax ; j++)
}
}
}
Info<<j/etamax*100<<"%"<<endl;
Info<<scalar(j+1)/etamax*100<<"%"<<endl;
}

View file

@ -18,7 +18,7 @@ scalarFieldArray2d Y_SLFM //species mass frac. [-]
scalarFieldArray1d
(
Ysize+1,
scalarField(etamax+1,0)
scalarField(etamax,0)
)
);
scalarFieldArray2d W_SLFM //reaction rate [1/sec]
@ -27,33 +27,33 @@ scalarFieldArray2d W_SLFM //reaction rate [1/sec]
scalarFieldArray1d
(
Ysize+1,
scalarField(etamax+1,0)
scalarField(etamax,0)
)
);
scalarFieldArray1d T_SLFM //Temperature [-]
(
NstList.size(),
scalarField(etamax+1,0)
scalarField(etamax,0)
);
scalarFieldArray1d Q_SLFM //Heat source [1/sec]
(
NstList.size(),
scalarField(etamax+1,0)
scalarField(etamax,0)
);
scalarFieldArray1d rho_SLFM //density [g/cm3]
(
NstList.size(),
scalarField(etamax+1, 0)
scalarField(etamax, 0)
);
scalarFieldArray1d h_SLFM //enthalpy [erg/gm]
(
NstList.size(),
scalarField(etamax+1, 0)
scalarField(etamax, 0)
);
scalarFieldArray1d Rgas_SLFM //specific gas constant for meanMW
(
NstList.size(),
scalarField(etamax+1, 0)
scalarField(etamax, 0)
);
for(label n=0 ; n<NstList.size() ; n++)

View file

@ -17,7 +17,7 @@ lowerDelta = stoiMF/lowerSum;
//set boundary and stoichiometric value of eta
etaValue[0] = 0.0;
etaValue[lowerN] = stoiMF;
etaValue[etamax] = 1.0;
etaValue.last() = 1.0;
//set internal value of eta (eta > stoi)
for(label j=0 ; j<upperN-1 ; j++)
@ -34,7 +34,7 @@ for(label j=0 ; j<lowerN-1 ; j++)
Info<<etaValue<<endl;
//calculate delta eta
for(label j=1 ; j<etamax ; j++)
for(label j=1 ; j<etamax-1 ; j++)
{
deta_h[j] = etaValue[j+1] - etaValue[j];
deta_l[j] = etaValue[j] - etaValue[j-1];
@ -45,7 +45,7 @@ for(label j=1 ; j<etamax ; j++)
//Info<<deta_l<<endl;
//Info<<deta_m<<endl;
for(label j=0 ; j<=etamax ; j++)
for(label j=0 ; j<etamax ; j++)
{
etaIndex[j] = j;
}

View file

@ -16,10 +16,10 @@ forAll(mf, cellI)
jl = 0;
jh = 1;
}
else if(mf[cellI] > etaValue[etamax-1])
else if(mf[cellI] > etaValue[etamax-2])
{
jl = etamax-1;
jh = etamax;
jl = etamax-2;
jh = etamax-1;
}
else
{