From 5a8b97e38e0bf028bc2d0e8ba14a095432bd6fd4 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 24 May 2012 16:30:08 +0000 Subject: [PATCH] Removed a 'goto' statement --- src/equil/vcs_MultiPhaseEquil.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index a03e9739e..3142b8430 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -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; } //====================================================================================================================