research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed a 'goto' statement

Browse source
This commit is contained in:
Ray Speth 2012-05-24 16:30:08 +00:00
parent 15755c1447
commit 5a8b97e38e
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/equil/vcs_MultiPhaseEquil.cpp
View file

@ -373,7 +373,6 @@ int vcs_MultiPhaseEquil::equilibrate_SP(doublereal Starget,
int maxsteps, int loglevel)
{
int maxiter = 100;
int iSuccess;
int strt = estimateEquil;
// Lower bound on T. This will change as we progress in the calculation
@ -409,7 +408,7 @@ int vcs_MultiPhaseEquil::equilibrate_SP(doublereal Starget,
try {
Tnow = m_mix->temperature();
iSuccess = equilibrate_TP(strt, printLvlSub, err, maxsteps, loglevel);
int iSuccess = equilibrate_TP(strt, printLvlSub, err, maxsteps, loglevel);
strt = 0;
Snow = m_mix->entropy();
double pmoles[10];
@ -419,7 +418,6 @@ int vcs_MultiPhaseEquil::equilibrate_SP(doublereal Starget,
plogf("T = %g, Snow = %g ,Tmoles = %g, SperMole = %g\n",
Tnow, Snow, Tmoles, SperMole);
// the equilibrium entropy monotonically increases with T;
// if the current value is below the target, then we know the
// current temperature is too low. Set the lower bounds to the
@ -493,7 +491,7 @@ int vcs_MultiPhaseEquil::equilibrate_SP(doublereal Starget,
plogf(" S rel error = %g, cp = %g, HConvErr = %g\n",
Serr, cpb, SConvErr);
}
goto done;
return iSuccess;
}
Tnew = Tnow + dT;
if (Tnew < 0.0) {
@ -523,9 +521,6 @@ int vcs_MultiPhaseEquil::equilibrate_SP(doublereal Starget,
endLogGroup();
throw CanteraError("MultiPhase::equilibrate_SP",
"No convergence for T");
done:
;
return iSuccess;
}
//====================================================================================================================