From 35aed42fbd7088855306c08a30aa9bb1ccf5f0fd Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 26 Jul 2013 21:33:57 +0000
Subject: [PATCH] [Equil] Raise exceptions instead of aborting execution

---
 src/equil/vcs_MultiPhaseEquil.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp
index fd176ed43..9ae063ae8 100644
--- a/src/equil/vcs_MultiPhaseEquil.cpp
+++ b/src/equil/vcs_MultiPhaseEquil.cpp
@@ -995,8 +995,7 @@ int  vcs_Cantera_to_vprob(Cantera::MultiPhase* mphase,
             VolPhase->m_eqnState = VCS_EOS_CONSTANT;
             break;
         case cSurf:
-            plogf("cSurf not handled yet\n");
-            exit(EXIT_FAILURE);
+            throw CanteraError("VCSnonideal", "cSurf not handled yet.");
         case cStoichSubstance:
             VolPhase->m_eqnState = VCS_EOS_STOICH_SUB;
             break;
@@ -1006,8 +1005,7 @@ int  vcs_Cantera_to_vprob(Cantera::MultiPhase* mphase,
             }
             break;
         case cEdge:
-            plogf("cEdge not handled yet\n");
-            exit(EXIT_FAILURE);
+            throw CanteraError("VCSnonideal", "cEdge not handled yet.");
         case cIdealSolidSolnPhase0:
         case cIdealSolidSolnPhase1:
         case cIdealSolidSolnPhase2: