change types of fuel group indices (to label)

This commit is contained in:
ignis 2017-08-29 20:34:16 +09:00
parent 7cb810dede
commit 2a4a3b1f3e
2 changed files with 4 additions and 4 deletions

View file

@ -1,7 +1,7 @@
if(fvc::domainIntegrate(F[group]*rho).value() >= fuelperFG) if(fvc::domainIntegrate(F[group]*rho).value() >= fuelperFG)
{ {
NewFGindex = NewFGindex + 1; NewFGindex = NewFGindex + 1;
if(group < (nf-1.5)) if(group < (nf-1))
{ {
group++; group++;
forAll(mf.boundaryFieldRef(), patchi) forAll(mf.boundaryFieldRef(), patchi)
@ -17,7 +17,7 @@ if(fvc::domainIntegrate(F[group]*rho).value() >= fuelperFG)
} }
eventRecordFile<<runTime.value()<<tab<<"New flame group is injected"<<tab<<group<<endl; eventRecordFile<<runTime.value()<<tab<<"New flame group is injected"<<tab<<group<<endl;
} }
else if(group > (nf-1.5)) else if(group >= (nf-1))
{ {
//retain group, BC //retain group, BC
forAll(rho, celli) forAll(rho, celli)

View file

@ -81,7 +81,7 @@ word fuelName(CMCdict.lookup("fuel_name"));
word CMCresults_Time(CMCdict.lookup("CMCresults_Time")); word CMCresults_Time(CMCdict.lookup("CMCresults_Time"));
scalar previousnf(readScalar(CMCdict.lookup("previousnf"))); scalar previousnf(readScalar(CMCdict.lookup("previousnf")));
scalar fuelperFG(readScalar(CMCdict.lookup("fuelperFG"))); scalar fuelperFG(readScalar(CMCdict.lookup("fuelperFG")));
scalar nf(readScalar(CMCdict.lookup("nf"))); label nf(readLabel(CMCdict.lookup("nf")));
scalar etamax( readScalar(CMCdict.lookup("etamax")) ); scalar etamax( readScalar(CMCdict.lookup("etamax")) );
scalarField etaValue(etamax+1, 0.0); scalarField etaValue(etamax+1, 0.0);
@ -149,7 +149,7 @@ else if(uni_eta == false)
} }
scalarField ChemDeltaT( (etamax+1)*nf, 0.0000001); //initial chemical time step; scalarField ChemDeltaT( (etamax+1)*nf, 0.0000001); //initial chemical time step;
scalar group(0); //flame group number to add evaporation source (default = 0), Flamegroup.H line# 29 label group(0); //flame group number to add evaporation source (default = 0), Flamegroup.H line# 29
//Peta field //Peta field