From dd4151b6b02c1ebd9d5216635f7727aed9eb951a Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 6 May 2008 17:12:23 +0000 Subject: [PATCH] Compile errors found on the sun --- Cantera/src/equil/vcs_VolPhase.cpp | 2 +- Cantera/src/equil/vcs_inest.cpp | 4 ++-- Cantera/src/equil/vcs_solve_TP.cpp | 1 + Cantera/src/equil/vcs_util.cpp | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp index ca8ea2975..dfca2447c 100644 --- a/Cantera/src/equil/vcs_VolPhase.cpp +++ b/Cantera/src/equil/vcs_VolPhase.cpp @@ -769,7 +769,7 @@ double vcs_VolPhase::VolPM_calc() const { Vol += volI; } else { printf("unknown situation\n"); - exit(-1); + std::exit(-1); } } } diff --git a/Cantera/src/equil/vcs_inest.cpp b/Cantera/src/equil/vcs_inest.cpp index f28cb0220..4c1351f8d 100644 --- a/Cantera/src/equil/vcs_inest.cpp +++ b/Cantera/src/equil/vcs_inest.cpp @@ -79,12 +79,12 @@ namespace VCSnonideal { for (j = 0; j < m_numElemConstraints; j++) { if (ElActive[j]) { neActive++; - bb[jj] = gai[j]; + bb[jj] = m_elemAbundancesGoal[j]; jj++; } } for (kspec = 0; kspec < nspecies; ++kspec) { - cc[kspec] = -ff[kspec]; + cc[kspec] = -m_SSfeSpecies[kspec]; jj = 0; for (j = 0; j < m_numElemConstraints; ++j) { if (ElActive[j]) { diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index a3e226252..705d19c5f 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include "vcs_solve.h" #include "vcs_internal.h" diff --git a/Cantera/src/equil/vcs_util.cpp b/Cantera/src/equil/vcs_util.cpp index ffbb3c342..431f70b1f 100644 --- a/Cantera/src/equil/vcs_util.cpp +++ b/Cantera/src/equil/vcs_util.cpp @@ -12,6 +12,7 @@ */ #include #include +#include #include "vcs_internal.h"