From 2a4a3b1f3e35cc56bab55dfad41abbd395ffd52b Mon Sep 17 00:00:00 2001 From: ignis Date: Tue, 29 Aug 2017 20:34:16 +0900 Subject: [PATCH] change types of fuel group indices (to label) --- solvers_post/LagrangianCMCFoam/InjNewFG.H | 4 ++-- solvers_post/LagrangianCMCFoam/readCMCProperties.H | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/solvers_post/LagrangianCMCFoam/InjNewFG.H b/solvers_post/LagrangianCMCFoam/InjNewFG.H index d3d2c07..5734810 100644 --- a/solvers_post/LagrangianCMCFoam/InjNewFG.H +++ b/solvers_post/LagrangianCMCFoam/InjNewFG.H @@ -1,7 +1,7 @@ if(fvc::domainIntegrate(F[group]*rho).value() >= fuelperFG) { NewFGindex = NewFGindex + 1; - if(group < (nf-1.5)) + if(group < (nf-1)) { group++; forAll(mf.boundaryFieldRef(), patchi) @@ -17,7 +17,7 @@ if(fvc::domainIntegrate(F[group]*rho).value() >= fuelperFG) } eventRecordFile< (nf-1.5)) + else if(group >= (nf-1)) { //retain group, BC forAll(rho, celli) diff --git a/solvers_post/LagrangianCMCFoam/readCMCProperties.H b/solvers_post/LagrangianCMCFoam/readCMCProperties.H index 782664b..7c3e54b 100644 --- a/solvers_post/LagrangianCMCFoam/readCMCProperties.H +++ b/solvers_post/LagrangianCMCFoam/readCMCProperties.H @@ -81,7 +81,7 @@ word fuelName(CMCdict.lookup("fuel_name")); word CMCresults_Time(CMCdict.lookup("CMCresults_Time")); scalar previousnf(readScalar(CMCdict.lookup("previousnf"))); scalar fuelperFG(readScalar(CMCdict.lookup("fuelperFG"))); -scalar nf(readScalar(CMCdict.lookup("nf"))); +label nf(readLabel(CMCdict.lookup("nf"))); scalar etamax( readScalar(CMCdict.lookup("etamax")) ); 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; -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