From a2a33f1cacf928fad9db6d618ab82a3ee0a09b85 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Fri, 30 Sep 2005 16:38:09 +0000 Subject: [PATCH] *** empty log message *** --- ext/tpx/CarbonDioxide.cpp | 5 +++-- ext/tpx/Heptane.cpp | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ext/tpx/CarbonDioxide.cpp b/ext/tpx/CarbonDioxide.cpp index 54c85c8fd..276fd370c 100755 --- a/ext/tpx/CarbonDioxide.cpp +++ b/ext/tpx/CarbonDioxide.cpp @@ -235,11 +235,12 @@ double CarbonDioxide::up() { // Equation C-6 integrated sum += G[0]*log(T/To); - for (int i=1; i<=5; i++) + int i; + for (i=1; i<=5; i++) sum += G[i]*(pow(T,i) - pow(To,i))/double(i); - for (int i=0; i<=6; i++) { + for (i=0; i<=6; i++) { sum += I(i,egrho, Gamma) * ( C(i, Tinverse, T2inverse, T3inverse, T4inverse) - T*Cprime(i,T2inverse, T3inverse, T4inverse) ); } diff --git a/ext/tpx/Heptane.cpp b/ext/tpx/Heptane.cpp index 59b63c416..62b81eed9 100755 --- a/ext/tpx/Heptane.cpp +++ b/ext/tpx/Heptane.cpp @@ -192,13 +192,13 @@ double Heptane::up() { double egrho = exp(-Gamma*Rho*Rho); double sum = 0.0; - - for (int i=1; i<=5; i++) + int i; + for (i=1; i<=5; i++) sum += G[i]*(pow(T,i) - pow(To,i))/double(i); sum += G[0]*log(T/To); - for (int i=0; i<=6; i++) { + for (i=0; i<=6; i++) { sum += (C(i, Tinverse, T2inverse, T3inverse, T4inverse) - T*Cprime(i,T2inverse, T3inverse, T4inverse))*I(i,egrho, Gamma); }