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

[Equil] Eliminate use of 'goto' in vcs_MultiPhaseEquil

Browse source
This commit is contained in:
Ray Speth 2016-11-13 22:23:04 -05:00
parent 7d3ebdd358
commit 955d5de98a
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/equil/vcs_MultiPhaseEquil.cpp
View file

@ -106,7 +106,7 @@ int vcs_MultiPhaseEquil::equilibrate_TV(int XY, doublereal xtarget,
double Verr = fabs((Vtarget - Vnow)/Vtarget);
if (Verr < err) {
goto done;
return iSuccess;
}
double Pnew;
// find dV/dP
@ -139,10 +139,6 @@ int vcs_MultiPhaseEquil::equilibrate_TV(int XY, doublereal xtarget,
}
throw CanteraError("vcs_MultiPhase::equilibrate_TV",
"No convergence for V");
done:
;
return iSuccess;
}
int vcs_MultiPhaseEquil::equilibrate_HP(doublereal Htarget,
@ -239,7 +235,7 @@ int vcs_MultiPhaseEquil::equilibrate_HP(doublereal Htarget,
plogf(" H rel error = %g, cp = %g, HConvErr = %g\n",
Herr, cpb, HConvErr);
}
goto done;
return iSuccess;
}
double Tnew = Tnow + dT;
if (Tnew < 0.0) {
@ -260,9 +256,6 @@ int vcs_MultiPhaseEquil::equilibrate_HP(doublereal Htarget,
}
throw CanteraError("MultiPhase::equilibrate_HP",
"No convergence for T");
done:
;
return iSuccess;
}
int vcs_MultiPhaseEquil::equilibrate_SP(doublereal Starget,