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

Rewrote exception handling to be more general and more explicit

Browse source 
CanteraError inerits from std:exception, so now it has a what() method
that is used to print a message describing the exception. Adding an
exception to the Cantera error stack now requires explicitly calling
the .save() method.
This commit is contained in:
Ray Speth 2012-03-05 20:45:56 +00:00
parent e3b5ee802e
commit 54efbaa320
86 changed files with 857 additions and 619 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/doxygen/demo1.cpp
View file

@ -98,11 +98,10 @@ void demoprog()
int main() int main()
{ {
try { try {
demoprog(); demoprog();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(std::cout); std::cout << err.what() << std::endl;
} }
} }

4
doc/doxygen/demo1a.cpp
View file

@ -31,8 +31,8 @@ int main()
try { try {
simple_demo(); simple_demo();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(); std::cout << err.what() << std::endl;
} }
} }

4
doc/doxygen/demoequil.cpp
View file

@ -16,8 +16,8 @@ int main()
try { try {
equil_demo(); equil_demo();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(); std::cout << err.what() << std::endl;
} }
} }

4
doc/doxygen/edemo.cpp
View file

@ -9,8 +9,8 @@ int main(int argc, char** argv)
{ {
try { try {
demoprog(); demoprog();
} catch (Cantera::CanteraError) { } catch (Cantera::CanteraError& err) {
Cantera::showErrors(std::cout); std::cout << err.what() << std::endl;
return 1; return 1;
} }
return 0; return 0;

4
doc/doxygen/except.cpp
View file

@ -17,8 +17,8 @@ int main()
{ {
try { try {
mycode(); mycode();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(); std::cout << err.what() << std::endl;
error("program terminating."); error("program terminating.");
} }
} }

4
doc/doxygen/thermodemo.cpp
View file

@ -34,8 +34,8 @@ int main(int argc, char** argv)
{ {
try { try {
thermo_demo("h2o2.cti","ohmech"); thermo_demo("h2o2.cti","ohmech");
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(); std::cout << err.what() << std::endl;
return 1; return 1;
} }
return 0; return 0;

57
include/cantera/base/ctexceptions.h
View file

@ -54,7 +54,6 @@ namespace Cantera
* where the error occurred. These functions may be eliminated from * where the error occurred. These functions may be eliminated from
* the source code, if the -DNDEBUG option is specified to the * the source code, if the -DNDEBUG option is specified to the
* compiler. * compiler.
*
*/ */
@ -84,21 +83,41 @@ public:
//! Destructor for base class does nothing //! Destructor for base class does nothing
virtual ~CanteraError() throw() {}; virtual ~CanteraError() throw() {};
//! Get a description of the error
const char* what() const throw();
//! Function to put this error onto Cantera's error stack
void save();
//! Method overridden by derived classes to formatted the error message
virtual std::string getMessage() const;
//! Method overridden by derived classes to indicate their type
virtual std::string getClass() const { return "CanteraError"; }
protected: protected:
//! Empty base constructor is made protected so that it may be used only by //! Protected default constructor discourages throwing errors containing no information.
//! inherited classes. CanteraError() : saved_(false) {};
/*!
* We want to discourage throwing an error containing no information. //! Constructor used by derived classes that override getMessage()
*/ CanteraError(std::string procedure);
CanteraError() {};
//! The name of the procedure where the exception occurred
std::string procedure_;
private:
std::string msg_; //!< Message associated with the exception
mutable std::string formattedMessage_; //!< Formatted message returned by what()
bool saved_; //!< Exception has already been saved to Cantera's error stack
}; };
//! Array size error. //! Array size error.
/*! /*!
* This error is thrown if a supplied length to a vector supplied * This error is thrown if a supplied length to a vector supplied
* to Cantera is too small. * to Cantera is too small.
* *
* @ingroup errorhandling * @ingroup errorhandling
*/ */
class ArraySizeError : public CanteraError class ArraySizeError : public CanteraError
{ {
@ -113,13 +132,20 @@ public:
* @param sz This is the length supplied to Cantera. * @param sz This is the length supplied to Cantera.
* @param reqd This is the required length needed by Cantera * @param reqd This is the required length needed by Cantera
*/ */
ArraySizeError(std::string procedure, size_t sz, size_t reqd); ArraySizeError(std::string procedure, size_t sz, size_t reqd) :
CanteraError(procedure), sz_(sz), reqd_(reqd) {}
virtual std::string getMessage() const;
virtual std::string getClass() const { return "ArraySizeError"; }
private:
size_t sz_, reqd_;
}; };
//! An element index is out of range. //! An element index is out of range.
/*! /*!
* * @ingroup errorhandling
* @ingroup errorhandling
*/ */
class ElementRangeError : public CanteraError class ElementRangeError : public CanteraError
{ {
@ -134,9 +160,16 @@ public:
* @param mmax This is the maximum allowed value of the index. The * @param mmax This is the maximum allowed value of the index. The
* minimum allowed value is assumed to be 0. * minimum allowed value is assumed to be 0.
*/ */
ElementRangeError(std::string func, size_t m, size_t mmax); ElementRangeError(std::string func, size_t m, size_t mmax) :
CanteraError(func), m_(m), mmax_(mmax) {}
virtual std::string getMessage() const;
virtual std::string getClass() const { return "ElementRangeError"; }
private:
size_t m_, mmax_;
}; };
//! Print a warning when a deprecated method is called. //! Print a warning when a deprecated method is called.
/*! /*!
* These methods are slated to go away in future releases of Cantera. * These methods are slated to go away in future releases of Cantera.

4
samples/cxx/NASA_coeffs/NASA_coeffs.cpp
View file

@ -96,8 +96,8 @@ int main()
try { try {
demoprog(); demoprog();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
} }

4
samples/cxx/bvp/AxiStagnBVP.h
View file

@ -132,8 +132,8 @@ int main()
// write the solution to a CSV file. // write the solution to a CSV file.
eqs.writeCSV(); eqs.writeCSV();
return 0; return 0;
} catch (Cantera::CanteraError) { } catch (Cantera::CanteraError& err) {
Cantera::showErrors(std::cerr); std::cerr << err.what() << std::endl;
return -1; return -1;
} }
} }

4
samples/cxx/bvp/blasius.cpp
View file

@ -120,8 +120,8 @@ int main()
// write the solution to a CSV file. // write the solution to a CSV file.
eqs.writeCSV(); eqs.writeCSV();
return 0; return 0;
} catch (Cantera::CanteraError) { } catch (Cantera::CanteraError& err) {
Cantera::showErrors(std::cerr); std::cerr << err.what() << std::endl;
return -1; return -1;
} }
} }

4
samples/cxx/combustor/combustor.cpp
View file

@ -130,8 +130,8 @@ int main()
return 0; return 0;
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(std::cout); std::cout << err.what() << std::endl;
std::cout << " terminating... " << std::endl; std::cout << " terminating... " << std::endl;
appdelete(); appdelete();
return 1; return 1;

4
samples/cxx/demo.cpp
View file

@ -119,8 +119,8 @@ int main()
try { try {
demoprog(); demoprog();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(std::cout); std::cout << err.what() << std::endl;
} }
} }

8
samples/cxx/flamespeed/flamespeed.cpp
View file

@ -65,8 +65,8 @@ int flamespeed(int np, void* p)
try { try {
equilibrate(gas,"HP"); equilibrate(gas,"HP");
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
double* yout=new double[nsp]; double* yout=new double[nsp];
gas.getMassFractions(yout); gas.getMassFractions(yout);
@ -260,8 +260,8 @@ int flamespeed(int np, void* p)
fclose(FP); fclose(FP);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(std::cerr); std::cerr << err.what() << std::endl;
std::cerr << "program terminating." << endl; std::cerr << "program terminating." << endl;
return -1; return -1;
} }

4
samples/cxx/kinetics1/kinetics1.cpp
View file

@ -120,8 +120,8 @@ int main()
return retn; return retn;
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
cout << " terminating... " << endl; cout << " terminating... " << endl;
appdelete(); appdelete();
return -1; return -1;

4
samples/cxx/rankine/rankine.cpp
View file

@ -86,8 +86,8 @@ int main()
try { try {
return openRankine(0, 0); return openRankine(0, 0);
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1; return -1;
} }
} }

54
samples/f77/demo_ftnlib.cpp
View file

@ -61,9 +61,9 @@ Transport* _transptr()
#endif #endif
// error handler // error handler
void handleError() void handleError(CanteraError& err)
{ {
showErrors(std::cout); std::cout << err.what() << std::endl;
exit(-1); exit(-1);
} }
@ -96,8 +96,8 @@ extern "C" {
delete _gas; delete _gas;
} }
_gas = new IdealGasMix(fin, fth); _gas = new IdealGasMix(fin, fth);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
#ifdef WITH_TRANSPORT #ifdef WITH_TRANSPORT
try { try {
@ -105,7 +105,7 @@ extern "C" {
delete _trans; delete _trans;
} }
_trans = newTransportMgr(trmodel,_gas,1); _trans = newTransportMgr(trmodel,_gas,1);
} catch (CanteraError) { } catch (CanteraError& err) {
_trans = newTransportMgr("",_gas,1); _trans = newTransportMgr("",_gas,1);
} }
#endif #endif
@ -146,8 +146,8 @@ extern "C" {
{ {
try { try {
_gas->setState_TPX(*T, *P, X); _gas->setState_TPX(*T, *P, X);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
@ -157,8 +157,8 @@ extern "C" {
{ {
try { try {
_gas->setState_TPX(*T, *P, string(X, lenx)); _gas->setState_TPX(*T, *P, string(X, lenx));
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
@ -166,8 +166,8 @@ extern "C" {
{ {
try { try {
_gas->setState_TRY(*T, *rho, Y); _gas->setState_TRY(*T, *rho, Y);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
@ -175,8 +175,8 @@ extern "C" {
{ {
try { try {
_gas->setState_TPY(*T, *p, Y); _gas->setState_TPY(*T, *p, Y);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
@ -184,8 +184,8 @@ extern "C" {
{ {
try { try {
_gas->setState_SP(*s, *p); _gas->setState_SP(*s, *p);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
@ -295,8 +295,8 @@ extern "C" {
} }
string optstr = string(opt, 2); string optstr = string(opt, 2);
equilibrate(*_gas, optstr.c_str()); equilibrate(*_gas, optstr.c_str());
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
#endif #endif
@ -350,8 +350,8 @@ extern "C" {
{ {
try { try {
return _trans->viscosity(); return _trans->viscosity();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return 0.0; return 0.0;
} }
} }
@ -360,8 +360,8 @@ extern "C" {
{ {
try { try {
return _trans->thermalConductivity(); return _trans->thermalConductivity();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return 0.0; return 0.0;
} }
} }
@ -370,8 +370,8 @@ extern "C" {
{ {
try { try {
_trans->getMixDiffCoeffs(diff); _trans->getMixDiffCoeffs(diff);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
@ -379,8 +379,8 @@ extern "C" {
{ {
try { try {
_trans->getThermalDiffCoeffs(dt); _trans->getThermalDiffCoeffs(dt);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
} }
#endif #endif
@ -401,8 +401,8 @@ int main()
{ {
try { try {
return MAIN__(); return MAIN__();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
exit(-1); exit(-1);
} catch (...) { } catch (...) {
cout << "An exception was trapped. Program terminating." << endl; cout << "An exception was trapped. Program terminating." << endl;

4
src/apps/cti2ctml.cpp
View file

@ -81,8 +81,8 @@ int main(int argc, char** argv)
//XML_Node *xd = new XML_Node(); //XML_Node *xd = new XML_Node();
//xc->copy(xd); //xc->copy(xd);
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
return 0; return 0;

24
src/base/application.cpp
View file

@ -457,30 +457,6 @@ XML_Node* Application::get_XML_File(std::string file, int debug)
{ {
XML_LOCK(); XML_LOCK();
std::string path = ""; std::string path = "";
/*
try {
path = findInputFile(file);
}
catch (CanteraError) {
string::size_type idot = file.rfind('.');
string ext = "";
if (idot != string::npos) {
ext = file.substr(idot, file.size());
string ctifile = file.substr(0,idot)+".cti";
try {
path = findInputFile(ctifile);
}
catch (CanteraError) {
path = findInputFile(file);
}
}
else
path = findInputFile(file);
}
*/
// The code above will try to process a cti file if the xml
// file is not found. But I (dgg) don't think it makes much sense,
// so it is replaced by:
path = findInputFile(file); path = findInputFile(file);
#ifdef _WIN32 #ifdef _WIN32
// RFB: For Windows make the path POSIX compliant so code looking for directory // RFB: For Windows make the path POSIX compliant so code looking for directory

61
src/base/ctexceptions.cpp
View file

@ -4,28 +4,66 @@
#include "cantera/base/global.h" #include "cantera/base/global.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include <sstream>
#include <typeinfo>
namespace Cantera { namespace Cantera {
// *** Exceptions *** // *** Exceptions ***
CanteraError::CanteraError(std::string procedure, std::string msg) static const char* stars = "***********************************************************************\n";
{
Application::Instance()->addError(procedure, msg);
}
ArraySizeError::ArraySizeError(std::string proc, size_t sz, size_t reqd) : CanteraError::CanteraError(std::string procedure, std::string msg) :
CanteraError(proc, "Array size ("+int2str(sz)+ msg_(msg),
") too small. Must be at least "+int2str(reqd)) procedure_(procedure),
saved_(false)
{ {
} }
CanteraError::CanteraError(std::string procedure) :
ElementRangeError::ElementRangeError(std::string func, size_t m, size_t mmax) : procedure_(procedure),
CanteraError(func, "Element index " + int2str(m) + saved_(false)
" outside valid range of 0 to " + int2str(mmax-1))
{ {
} }
void CanteraError::save()
{
if (!saved_) {
Application::Instance()->addError(procedure_, getMessage());
saved_ = true;
}
}
const char* CanteraError::what() const throw() {
try {
formattedMessage_ = stars;
formattedMessage_ += getClass() + " thrown by " + procedure_ + ":\n" + getMessage();
if (formattedMessage_.compare(formattedMessage_.size()-1, 1, "\n")) {
formattedMessage_.append("\n");
}
formattedMessage_ += stars;
} catch (...) {
// Something went terribly wrong and we couldn't even format the message.
}
return formattedMessage_.c_str();
}
std::string CanteraError::getMessage() const {
return msg_;
}
std::string ArraySizeError::getMessage() const {
std::stringstream ss;
ss << "Array size (" << sz_ << ") too small. Must be at least " << reqd_ << ".";
return ss.str();
}
std::string ElementRangeError::getMessage() const {
std::stringstream ss;
ss << "Element index " << m_ << " outside valid range of 0 to " << (mmax_-1) << ".";
return ss.str();
}
// *** Warnings *** // *** Warnings ***
void deprecatedMethod(std::string classnm, std::string oldnm, std::string newnm) void deprecatedMethod(std::string classnm, std::string oldnm, std::string newnm)
@ -44,5 +82,4 @@ void removeAtVersion(std::string func, std::string version)
throw CanteraError("removeAtVersion: "+ func,"procedure has been removed."); throw CanteraError("removeAtVersion: "+ func,"procedure has been removed.");
} }
} // namespace Cantera } // namespace Cantera

6
src/clib/Cabinet.h
View file

@ -91,7 +91,8 @@ public:
M* old = data[i]; M* old = data[i];
data.push_back(new M(*old)); data.push_back(new M(*old));
return static_cast<int>(data.size()) - 1; return static_cast<int>(data.size()) - 1;
} catch (Cantera::CanteraError) { } catch (Cantera::CanteraError& err) {
err.save();
return -1; return -1;
} catch (...) { } catch (...) {
return -999; return -999;
@ -110,7 +111,8 @@ public:
M* dest = data[i]; M* dest = data[i];
*dest = *src; *dest = *src;
return 0; return 0;
} catch (Cantera::CanteraError) { } catch (Cantera::CanteraError& err) {
err.save();
return -1; return -1;
} catch (...) { } catch (...) {
return -999; return -999;

210
src/clib/ct.cpp
View file

@ -49,7 +49,8 @@ static PureFluidPhase* purefluid(int n)
} else { } else {
throw CanteraError("purefluid","object is not a PureFluidPhase object"); throw CanteraError("purefluid","object is not a PureFluidPhase object");
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return 0; return 0;
} }
return 0; return 0;
@ -134,7 +135,8 @@ extern "C" {
{ {
try { try {
ThermoCabinet::item(n).setTemperature(t); ThermoCabinet::item(n).setTemperature(t);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -244,7 +246,8 @@ extern "C" {
parseCompString(string(x), xx); parseCompString(string(x), xx);
p.setMoleFractionsByName(xx); p.setMoleFractionsByName(xx);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
//catch (...) {return ERR;} //catch (...) {return ERR;}
@ -278,7 +281,8 @@ extern "C" {
parseCompString(string(y), yy); parseCompString(string(y), yy);
p.setMassFractionsByName(yy); p.setMassFractionsByName(yy);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -333,7 +337,8 @@ extern "C" {
copy(spnm.c_str(), spnm.c_str() + lout, nm); copy(spnm.c_str(), spnm.c_str() + lout, nm);
nm[lout] = '\0'; nm[lout] = '\0';
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
//catch (...) {return ERR;} //catch (...) {return ERR;}
@ -347,7 +352,8 @@ extern "C" {
copy(elnm.c_str(), elnm.c_str() + lout, nm); copy(elnm.c_str(), elnm.c_str() + lout, nm);
nm[lout] = '\0'; nm[lout] = '\0';
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -357,7 +363,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).nAtoms(k,m); return ThermoCabinet::item(n).nAtoms(k,m);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -367,7 +374,8 @@ extern "C" {
try { try {
ThermoCabinet::item(n).addElement(string(name),weight); ThermoCabinet::item(n).addElement(string(name),weight);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -400,7 +408,8 @@ extern "C" {
XML_Node& x = XmlCabinet::item(mxml); XML_Node& x = XmlCabinet::item(mxml);
thermo_t* th = newPhase(x); thermo_t* th = newPhase(x);
return ThermoCabinet::add(th); return ThermoCabinet::add(th);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -419,7 +428,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).enthalpy_mole(); return ThermoCabinet::item(n).enthalpy_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -428,7 +438,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).intEnergy_mole(); return ThermoCabinet::item(n).intEnergy_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -437,7 +448,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).entropy_mole(); return ThermoCabinet::item(n).entropy_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -446,7 +458,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).gibbs_mole(); return ThermoCabinet::item(n).gibbs_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -455,7 +468,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).cp_mole(); return ThermoCabinet::item(n).cp_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -464,7 +478,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).cv_mole(); return ThermoCabinet::item(n).cv_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -473,7 +488,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).pressure(); return ThermoCabinet::item(n).pressure();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -482,7 +498,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).enthalpy_mass(); return ThermoCabinet::item(n).enthalpy_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -491,7 +508,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).intEnergy_mass(); return ThermoCabinet::item(n).intEnergy_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -500,7 +518,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).entropy_mass(); return ThermoCabinet::item(n).entropy_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -509,7 +528,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).gibbs_mass(); return ThermoCabinet::item(n).gibbs_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -518,7 +538,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).cp_mass(); return ThermoCabinet::item(n).cp_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -527,7 +548,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).cv_mass(); return ThermoCabinet::item(n).cv_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -536,7 +558,8 @@ extern "C" {
{ {
try { try {
return ThermoCabinet::item(n).electricPotential(); return ThermoCabinet::item(n).electricPotential();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -573,7 +596,8 @@ extern "C" {
"pressure cannot be negative"); "pressure cannot be negative");
ThermoCabinet::item(n).setPressure(p); ThermoCabinet::item(n).setPressure(p);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -589,7 +613,8 @@ extern "C" {
throw CanteraError("th_set_HP", throw CanteraError("th_set_HP",
"temperature cannot be negative"); "temperature cannot be negative");
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -605,7 +630,8 @@ extern "C" {
throw CanteraError("th_set_UV", throw CanteraError("th_set_UV",
"temperature cannot be negative"); "temperature cannot be negative");
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -615,7 +641,8 @@ extern "C" {
try { try {
ThermoCabinet::item(n).setState_SV(vals[0],vals[1]); ThermoCabinet::item(n).setState_SV(vals[0],vals[1]);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -625,7 +652,8 @@ extern "C" {
try { try {
ThermoCabinet::item(n).setState_SP(vals[0],vals[1]); ThermoCabinet::item(n).setState_SP(vals[0],vals[1]);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -637,7 +665,8 @@ extern "C" {
equilibrate(ThermoCabinet::item(n), XY, solver, rtol, maxsteps, equilibrate(ThermoCabinet::item(n), XY, solver, rtol, maxsteps,
maxiter, loglevel); maxiter, loglevel);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -669,7 +698,8 @@ extern "C" {
} else { } else {
return -10; return -10;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -685,7 +715,8 @@ extern "C" {
} else { } else {
return -10; return -10;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -701,7 +732,8 @@ extern "C" {
} else { } else {
return -10; return -10;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -739,7 +771,8 @@ extern "C" {
{ {
try { try {
return purefluid(n)->satTemperature(p); return purefluid(n)->satTemperature(p);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -748,7 +781,8 @@ extern "C" {
{ {
try { try {
return purefluid(n)->satPressure(t); return purefluid(n)->satPressure(t);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -758,7 +792,8 @@ extern "C" {
try { try {
purefluid(n)->setState_Psat(p, x); purefluid(n)->setState_Psat(p, x);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -768,7 +803,8 @@ extern "C" {
try { try {
purefluid(n)->setState_Tsat(t, x); purefluid(n)->setState_Tsat(t, x);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -845,7 +881,8 @@ extern "C" {
} else { } else {
return 0; return 0;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -859,7 +896,8 @@ extern "C" {
string defphase = string(default_phase); string defphase = string(default_phase);
installReactionArrays(p, k, defphase); installReactionArrays(p, k, defphase);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -932,7 +970,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -947,7 +986,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -967,7 +1007,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -982,7 +1023,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1001,7 +1043,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1017,7 +1060,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1053,7 +1097,8 @@ extern "C" {
return ERR; return ERR;
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1069,7 +1114,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1085,7 +1131,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1100,7 +1147,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
//catch (...) {return ERR;} //catch (...) {return ERR;}
@ -1116,7 +1164,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1137,7 +1186,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1162,7 +1212,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1176,7 +1227,8 @@ extern "C" {
copy(r.c_str(), r.c_str() + lout, buf); copy(r.c_str(), r.c_str() + lout, buf);
buf[lout] = '\0'; buf[lout] = '\0';
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1190,7 +1242,8 @@ extern "C" {
} else { } else {
return ERR; return ERR;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1206,7 +1259,8 @@ extern "C" {
"wrong kinetics manager type"); "wrong kinetics manager type");
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1221,7 +1275,8 @@ extern "C" {
try { try {
Transport* tr = newTransportMgr(mstr, &t, loglevel); Transport* tr = newTransportMgr(mstr, &t, loglevel);
return TransportCabinet::add(tr); return TransportCabinet::add(tr);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1230,7 +1285,8 @@ extern "C" {
{ {
try { try {
return TransportCabinet::item(n).viscosity(); return TransportCabinet::item(n).viscosity();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1.0; return -1.0;
} }
} }
@ -1239,7 +1295,8 @@ extern "C" {
{ {
try { try {
return TransportCabinet::item(n).thermalConductivity(); return TransportCabinet::item(n).thermalConductivity();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1.0; return -1.0;
} }
} }
@ -1249,7 +1306,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).getThermalDiffCoeffs(dt); TransportCabinet::item(n).getThermalDiffCoeffs(dt);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1259,7 +1317,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).getMixDiffCoeffs(d); TransportCabinet::item(n).getMixDiffCoeffs(d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1269,7 +1328,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).getBinaryDiffCoeffs(ld,d); TransportCabinet::item(n).getBinaryDiffCoeffs(ld,d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1279,7 +1339,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).getMultiDiffCoeffs(ld,d); TransportCabinet::item(n).getMultiDiffCoeffs(ld,d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1289,7 +1350,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).setParameters(type, k, d); TransportCabinet::item(n).setParameters(type, k, d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1300,7 +1362,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).getMolarFluxes(state1, state2, delta, fluxes); TransportCabinet::item(n).getMolarFluxes(state1, state2, delta, fluxes);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1311,7 +1374,8 @@ extern "C" {
try { try {
TransportCabinet::item(n).getMassFluxes(state1, state2, delta, fluxes); TransportCabinet::item(n).getMassFluxes(state1, state2, delta, fluxes);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1326,7 +1390,8 @@ extern "C" {
try { try {
importPhase(node, &thrm); importPhase(node, &thrm);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1344,7 +1409,8 @@ extern "C" {
try { try {
importKinetics(node, phases, &k); importKinetics(node, phases, &k);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1363,7 +1429,8 @@ extern "C" {
buf[s.size() - 1] = '\0'; buf[s.size() - 1] = '\0';
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1374,7 +1441,8 @@ extern "C" {
bool stherm = (show_thermo != 0); bool stherm = (show_thermo != 0);
writephase(ThermoCabinet::item(nth), stherm); writephase(ThermoCabinet::item(nth), stherm);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1440,7 +1508,8 @@ extern "C" {
KineticsCabinet::clear(); KineticsCabinet::clear();
TransportCabinet::clear(); TransportCabinet::clear();
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -1450,7 +1519,8 @@ extern "C" {
try { try {
ThermoCabinet::del(n); ThermoCabinet::del(n);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }

21
src/clib/ctbdry.cpp
View file

@ -56,7 +56,8 @@ extern "C" {
{ {
try { try {
BoundaryCabinet::item(i).setTemperature(t); BoundaryCabinet::item(i).setTemperature(t);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -66,7 +67,8 @@ extern "C" {
{ {
try { try {
return dynamic_cast<Inlet1D*>(&BoundaryCabinet::item(i))->spreadRate(); return dynamic_cast<Inlet1D*>(&BoundaryCabinet::item(i))->spreadRate();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -76,7 +78,8 @@ extern "C" {
{ {
try { try {
dynamic_cast<Inlet1D*>(&BoundaryCabinet::item(i))->setSpreadRate(v); dynamic_cast<Inlet1D*>(&BoundaryCabinet::item(i))->setSpreadRate(v);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -86,7 +89,8 @@ extern "C" {
{ {
try { try {
BoundaryCabinet::item(i).setMdot(mdot); BoundaryCabinet::item(i).setMdot(mdot);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -102,7 +106,8 @@ extern "C" {
{ {
try { try {
BoundaryCabinet::item(i).setMoleFractions(xin); BoundaryCabinet::item(i).setMoleFractions(xin);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -112,7 +117,8 @@ extern "C" {
{ {
try { try {
BoundaryCabinet::item(i).setMoleFractions(string(xin)); BoundaryCabinet::item(i).setMoleFractions(string(xin));
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -126,7 +132,8 @@ extern "C" {
InterfaceKinetics* k = InterfaceKinetics* k =
dynamic_cast<InterfaceKinetics*>(&Cabinet<Kinetics>::item(j)); dynamic_cast<InterfaceKinetics*>(&Cabinet<Kinetics>::item(j));
srf->setKineticsMgr(k); srf->setKineticsMgr(k);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;

6
src/clib/ctfunc.cpp
View file

@ -87,7 +87,8 @@ extern "C" {
r = new Func1(); r = new Func1();
} }
return FuncCabinet::add(r); return FuncCabinet::add(r);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -138,7 +139,8 @@ extern "C" {
std::copy(w.c_str(), w.c_str() + lout, nm); std::copy(w.c_str(), w.c_str() + lout, nm);
nm[lout] = '\0'; nm[lout] = '\0';
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }

27
src/clib/ctmultiphase.cpp
View file

@ -24,7 +24,8 @@ static bool checkSpecies(int i, size_t k)
throw CanteraError("checkSpecies", throw CanteraError("checkSpecies",
"illegal species index ("+int2str(k)+") "); "illegal species index ("+int2str(k)+") ");
return true; return true;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return false; return false;
} }
} }
@ -36,7 +37,8 @@ static bool checkElement(int i, size_t m)
throw CanteraError("checkElement", throw CanteraError("checkElement",
"illegal element index ("+int2str(m)+") "); "illegal element index ("+int2str(m)+") ");
return true; return true;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return false; return false;
} }
} }
@ -48,7 +50,8 @@ static bool checkPhase(int i, int n)
throw CanteraError("checkPhase", throw CanteraError("checkPhase",
"illegal phase index ("+int2str(n)+") "); "illegal phase index ("+int2str(n)+") ");
return true; return true;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return false; return false;
} }
} }
@ -157,7 +160,8 @@ extern "C" {
} }
mixCabinet::item(i).setMoles(n); mixCabinet::item(i).setMoles(n);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return ERR; return ERR;
} }
} }
@ -168,7 +172,8 @@ extern "C" {
try { try {
mixCabinet::item(i).setMolesByName(string(n)); mixCabinet::item(i).setMolesByName(string(n));
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -248,7 +253,8 @@ extern "C" {
try { try {
return equilibrate(mixCabinet::item(i), XY, return equilibrate(mixCabinet::item(i), XY,
rtol, maxsteps, maxiter, loglevel); rtol, maxsteps, maxiter, loglevel);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -270,7 +276,8 @@ extern "C" {
" To use this feature add export WITH_VCS_NONIDEAL='y' to the preconfig file"); " To use this feature add export WITH_VCS_NONIDEAL='y' to the preconfig file");
#endif #endif
return (double) retn; return (double) retn;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -283,7 +290,8 @@ extern "C" {
} }
mixCabinet::item(i).getChemPotentials(mu); mixCabinet::item(i).getChemPotentials(mu);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -298,7 +306,8 @@ extern "C" {
} }
mixCabinet::item(i).getValidChemPotentials(bad_mu, mu, st); mixCabinet::item(i).getValidChemPotentials(bad_mu, mu, st);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }

177
src/clib/ctonedim.cpp
View file

@ -52,7 +52,8 @@ extern "C" {
try { try {
DomainCabinet::clear(); DomainCabinet::clear();
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -91,7 +92,8 @@ extern "C" {
copy(nm.c_str(), nm.c_str() + lout, buf); copy(nm.c_str(), nm.c_str() + lout, buf);
buf[lout] = '\0'; buf[lout] = '\0';
return static_cast<int>(nm.size()); return static_cast<int>(nm.size());
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -101,7 +103,8 @@ extern "C" {
try { try {
size_t n = DomainCabinet::item(i).componentIndex(string(name)); size_t n = DomainCabinet::item(i).componentIndex(string(name));
return n; return n;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -110,7 +113,8 @@ extern "C" {
{ {
try { try {
return DomainCabinet::item(i).grid(n); return DomainCabinet::item(i).grid(n);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -120,7 +124,8 @@ extern "C" {
try { try {
DomainCabinet::item(i).setBounds(n, lower, upper); DomainCabinet::item(i).setBounds(n, lower, upper);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -129,7 +134,8 @@ extern "C" {
{ {
try { try {
return DomainCabinet::item(i).upperBound(n); return DomainCabinet::item(i).upperBound(n);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -138,7 +144,8 @@ extern "C" {
{ {
try { try {
return DomainCabinet::item(i).lowerBound(n); return DomainCabinet::item(i).lowerBound(n);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -149,7 +156,8 @@ extern "C" {
try { try {
DomainCabinet::item(i).setTolerances(n, rtol, atol, itime); DomainCabinet::item(i).setTolerances(n, rtol, atol, itime);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -158,7 +166,8 @@ extern "C" {
{ {
try { try {
return DomainCabinet::item(i).rtol(n); return DomainCabinet::item(i).rtol(n);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -167,7 +176,8 @@ extern "C" {
{ {
try { try {
return DomainCabinet::item(i).atol(n); return DomainCabinet::item(i).atol(n);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -177,7 +187,8 @@ extern "C" {
try { try {
DomainCabinet::item(i).setupGrid(npts, grid); DomainCabinet::item(i).setupGrid(npts, grid);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -188,7 +199,8 @@ extern "C" {
string s = string(id); string s = string(id);
DomainCabinet::item(i).setID(s); DomainCabinet::item(i).setID(s);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -200,7 +212,8 @@ extern "C" {
string s = string(desc); string s = string(desc);
DomainCabinet::item(i).setDesc(s); DomainCabinet::item(i).setDesc(s);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -211,7 +224,8 @@ extern "C" {
try { try {
Inlet1D* i = new Inlet1D(); Inlet1D* i = new Inlet1D();
return DomainCabinet::add(i); return DomainCabinet::add(i);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -221,7 +235,8 @@ extern "C" {
try { try {
Surf1D* i = new Surf1D(); Surf1D* i = new Surf1D();
return DomainCabinet::add(i); return DomainCabinet::add(i);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -232,7 +247,8 @@ extern "C" {
//writelog("in reactingsurf_new\n"); //writelog("in reactingsurf_new\n");
Domain1D* i = new ReactingSurf1D(); Domain1D* i = new ReactingSurf1D();
return DomainCabinet::add(i); return DomainCabinet::add(i);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
writelog("error"); writelog("error");
return -1; return -1;
} }
@ -243,7 +259,8 @@ extern "C" {
try { try {
Symm1D* i = new Symm1D(); Symm1D* i = new Symm1D();
return DomainCabinet::add(i); return DomainCabinet::add(i);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -253,7 +270,8 @@ extern "C" {
try { try {
Outlet1D* i = new Outlet1D(); Outlet1D* i = new Outlet1D();
return DomainCabinet::add(i); return DomainCabinet::add(i);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -263,7 +281,8 @@ extern "C" {
try { try {
OutletRes1D* i = new OutletRes1D(); OutletRes1D* i = new OutletRes1D();
return DomainCabinet::add(i); return DomainCabinet::add(i);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -273,7 +292,8 @@ extern "C" {
try { try {
_bdry(i)->setMdot(mdot); _bdry(i)->setMdot(mdot);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -283,7 +303,8 @@ extern "C" {
try { try {
_bdry(i)->setTemperature(t); _bdry(i)->setTemperature(t);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -293,7 +314,8 @@ extern "C" {
try { try {
_bdry(i)->setMoleFractions(string(x)); _bdry(i)->setMoleFractions(string(x));
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -302,7 +324,8 @@ extern "C" {
{ {
try { try {
return _bdry(i)->temperature(); return _bdry(i)->temperature();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -311,7 +334,8 @@ extern "C" {
{ {
try { try {
return _bdry(i)->massFraction(k); return _bdry(i)->massFraction(k);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -320,7 +344,8 @@ extern "C" {
{ {
try { try {
return _bdry(i)->mdot(); return _bdry(i)->mdot();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -333,7 +358,8 @@ extern "C" {
dynamic_cast<InterfaceKinetics*>(&Cabinet<Kinetics>::item(j)); dynamic_cast<InterfaceKinetics*>(&Cabinet<Kinetics>::item(j));
srf->setKineticsMgr(k); srf->setKineticsMgr(k);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -346,7 +372,8 @@ extern "C" {
return 0; return 0;
} }
catch (CanteraError) { catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -359,7 +386,8 @@ extern "C" {
return 0; return 0;
} }
catch (CanteraError) { catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -383,7 +411,8 @@ extern "C" {
} else { } else {
return -2; return -2;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -398,7 +427,8 @@ extern "C" {
try { try {
_stflow(i)->setTransport(TransportCabinet::item(itr), withSoret); _stflow(i)->setTransport(TransportCabinet::item(itr), withSoret);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -412,7 +442,8 @@ extern "C" {
try { try {
_stflow(i)->enableSoret(withSoret); _stflow(i)->enableSoret(withSoret);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -422,7 +453,8 @@ extern "C" {
try { try {
_stflow(i)->setPressure(p); _stflow(i)->setPressure(p);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -438,7 +470,8 @@ extern "C" {
} }
_stflow(i)->setFixedTempProfile(vpos, vtemp); _stflow(i)->setFixedTempProfile(vpos, vtemp);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -453,7 +486,8 @@ extern "C" {
_stflow(i)->fixSpecies(-1); _stflow(i)->fixSpecies(-1);
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -468,7 +502,8 @@ extern "C" {
_stflow(i)->fixTemperature(-1); _stflow(i)->fixTemperature(-1);
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -490,7 +525,8 @@ extern "C" {
Sim1D* s = new Sim1D(d); Sim1D* s = new Sim1D(d);
//writelog("in sim1D_new, ret Sim1D\n"); //writelog("in sim1D_new, ret Sim1D\n");
return SimCabinet::add(s); return SimCabinet::add(s);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -500,7 +536,8 @@ extern "C" {
try { try {
SimCabinet::clear(); SimCabinet::clear();
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -517,7 +554,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setValue(dom, comp, localPoint, value); SimCabinet::item(i).setValue(dom, comp, localPoint, value);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -533,7 +571,8 @@ extern "C" {
} }
SimCabinet::item(i).setProfile(dom, comp, pv, vv); SimCabinet::item(i).setProfile(dom, comp, pv, vv);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -543,7 +582,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setFlatProfile(dom, comp, v); SimCabinet::item(i).setFlatProfile(dom, comp, v);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -566,7 +606,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setTimeStep(stepsize, ns, nsteps); SimCabinet::item(i).setTimeStep(stepsize, ns, nsteps);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -576,7 +617,8 @@ extern "C" {
try { try {
SimCabinet::item(i).getInitialSoln(); SimCabinet::item(i).getInitialSoln();
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -587,7 +629,8 @@ extern "C" {
bool r = (refine_grid == 0 ? false : true); bool r = (refine_grid == 0 ? false : true);
SimCabinet::item(i).solve(loglevel, r); SimCabinet::item(i).solve(loglevel, r);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -597,7 +640,8 @@ extern "C" {
try { try {
SimCabinet::item(i).refine(loglevel); SimCabinet::item(i).refine(loglevel);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -608,7 +652,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setRefineCriteria(dom, ratio, slope, curve, prune); SimCabinet::item(i).setRefineCriteria(dom, ratio, slope, curve, prune);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -622,7 +667,8 @@ extern "C" {
string sdesc = string(desc); string sdesc = string(desc);
SimCabinet::item(i).save(sname, sid, sdesc); SimCabinet::item(i).save(sname, sid, sdesc);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -634,7 +680,8 @@ extern "C" {
string sid = string(id); string sid = string(id);
SimCabinet::item(i).restore(sname, sid); SimCabinet::item(i).restore(sname, sid);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -644,7 +691,8 @@ extern "C" {
try { try {
SimCabinet::item(i).writeStats(printTime); SimCabinet::item(i).writeStats(printTime);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -653,7 +701,8 @@ extern "C" {
{ {
try { try {
return (int) SimCabinet::item(i).domainIndex(string(name)); return (int) SimCabinet::item(i).domainIndex(string(name));
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -662,7 +711,8 @@ extern "C" {
{ {
try { try {
return SimCabinet::item(i).value(idom, icomp, localPoint); return SimCabinet::item(i).value(idom, icomp, localPoint);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -671,7 +721,8 @@ extern "C" {
{ {
try { try {
return SimCabinet::item(i).workValue(idom, icomp, localPoint); return SimCabinet::item(i).workValue(idom, icomp, localPoint);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -681,7 +732,8 @@ extern "C" {
try { try {
SimCabinet::item(i).eval(rdt, count); SimCabinet::item(i).eval(rdt, count);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -691,7 +743,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setJacAge(ss_age, ts_age); SimCabinet::item(i).setJacAge(ss_age, ts_age);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -701,7 +754,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setTimeStepFactor(tfactor); SimCabinet::item(i).setTimeStepFactor(tfactor);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -716,7 +770,8 @@ extern "C" {
SimCabinet::item(i).setMaxTimeStep(tsmax); SimCabinet::item(i).setMaxTimeStep(tsmax);
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -726,7 +781,8 @@ extern "C" {
try { try {
SimCabinet::item(i).setFixedTemperature(temp); SimCabinet::item(i).setFixedTemperature(temp);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -736,7 +792,8 @@ extern "C" {
try { try {
SimCabinet::item(i).evalSSJacobian(); SimCabinet::item(i).evalSSJacobian();
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -745,7 +802,8 @@ extern "C" {
{ {
try { try {
return SimCabinet::item(i).jacobian(m,n); return SimCabinet::item(i).jacobian(m,n);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return DERR; return DERR;
} }
} }
@ -754,7 +812,8 @@ extern "C" {
{ {
try { try {
return SimCabinet::item(i).size(); return SimCabinet::item(i).size();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }

9
src/clib/ctreactor.cpp
View file

@ -99,7 +99,8 @@ extern "C" {
try { try {
ReactorCabinet::item(i).advance(t); ReactorCabinet::item(i).advance(t);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -248,7 +249,8 @@ extern "C" {
try { try {
NetworkCabinet::item(i).addReactor(&ReactorCabinet::item(n)); NetworkCabinet::item(i).addReactor(&ReactorCabinet::item(n));
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -329,7 +331,8 @@ extern "C" {
throw CanteraError("install","Could not install flow device."); throw CanteraError("install","Could not install flow device.");
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }

55
src/clib/ctxml.cpp
View file

@ -35,7 +35,8 @@ extern "C" {
try { try {
XML_Node* x = get_XML_File(std::string(file), debug); XML_Node* x = get_XML_File(std::string(file), debug);
return XmlCabinet::add(x); return XmlCabinet::add(x);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -46,7 +47,8 @@ extern "C" {
XmlCabinet::clear(); XmlCabinet::clear();
close_XML_File("all"); close_XML_File("all");
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -86,7 +88,8 @@ extern "C" {
XmlCabinet::item(i).build(f); XmlCabinet::item(i).build(f);
f.close(); f.close();
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -96,7 +99,8 @@ extern "C" {
try { try {
get_CTML_Tree(&XmlCabinet::item(i), string(file), debug); get_CTML_Tree(&XmlCabinet::item(i), string(file), debug);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -114,7 +118,8 @@ extern "C" {
} else } else
throw CanteraError("xml_attrib","node " throw CanteraError("xml_attrib","node "
" has no attribute '"+ky+"'"); " has no attribute '"+ky+"'");
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -127,7 +132,8 @@ extern "C" {
string val = string(value); string val = string(value);
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
node.addAttribute(ky, val); node.addAttribute(ky, val);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -139,7 +145,8 @@ extern "C" {
string c = string(comment); string c = string(comment);
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
node.addComment(c); node.addComment(c);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -151,7 +158,8 @@ extern "C" {
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
const string v = node.name(); const string v = node.name();
strncpy(tag, v.c_str(), 80); strncpy(tag, v.c_str(), 80);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -163,7 +171,8 @@ extern "C" {
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
const string v = node.value(); const string v = node.value();
strncpy(value, v.c_str(), 80); strncpy(value, v.c_str(), 80);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -175,7 +184,8 @@ extern "C" {
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
XML_Node& c = node.child(string(loc)); XML_Node& c = node.child(string(loc));
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -187,7 +197,8 @@ extern "C" {
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
XML_Node& c = node.child(m); XML_Node& c = node.child(m);
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -203,7 +214,8 @@ extern "C" {
} else { } else {
throw CanteraError("xml_find_id","id not found: "+string(id)); throw CanteraError("xml_find_id","id not found: "+string(id));
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -219,7 +231,8 @@ extern "C" {
} else } else
throw CanteraError("xml_findByName","name "+string(nm) throw CanteraError("xml_findByName","name "+string(nm)
+" not found"); +" not found");
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -230,7 +243,8 @@ extern "C" {
try { try {
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
return (int) node.nChildren(); return (int) node.nChildren();
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
} }
@ -241,8 +255,8 @@ extern "C" {
XML_Node& node = XmlCabinet::item(i); XML_Node& node = XmlCabinet::item(i);
XML_Node& c = node.addChild(string(name),string(value)); XML_Node& c = node.addChild(string(name),string(value));
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); cout << err.what() << endl;
return -1; return -1;
} }
return 0; return 0;
@ -255,7 +269,8 @@ extern "C" {
XML_Node& chld = XmlCabinet::item(j); XML_Node& chld = XmlCabinet::item(j);
XML_Node& c = node.addChild(chld); XML_Node& c = node.addChild(chld);
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -273,7 +288,8 @@ extern "C" {
"file "+string(file)+" not found."); "file "+string(file)+" not found.");
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;
@ -300,7 +316,8 @@ extern "C" {
for (size_t i = 0; i < nv; i++) { for (size_t i = 0; i < nv; i++) {
data[i] = v[i]; data[i] = v[i];
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
return -1; return -1;
} }
return 0; return 0;

3
src/converters/ck2ct.cpp
View file

@ -660,7 +660,8 @@ int convert_ck(const char* in_file, const char* db_file,
} }
bool hastransport = (trfile != ""); bool hastransport = (trfile != "");
ck2ct(f, idtag, r, hastransport); ck2ct(f, idtag, r, hastransport);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
fclose(f); fclose(f);
return -1; return -1;
} }

12
src/equil/ChemEquil.cpp
View file

@ -309,7 +309,8 @@ int ChemEquil::setInitialMoles(thermo_t& s, vector_fp& elMoleGoal,
delete e; delete e;
delete mp; delete mp;
iok = 0; iok = 0;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
delete e; delete e;
delete mp; delete mp;
iok = -1; iok = -1;
@ -416,7 +417,8 @@ int ChemEquil::estimateElementPotentials(thermo_t& s, vector_fp& lambda_RT,
int info; int info;
try { try {
info = solve(aa, DATA_PTR(b)); info = solve(aa, DATA_PTR(b));
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("failed to estimate initial element potentials."); addLogEntry("failed to estimate initial element potentials.");
} }
@ -912,7 +914,8 @@ next:
*/ */
try { try {
info = solve(jac, DATA_PTR(res_trial)); info = solve(jac, DATA_PTR(res_trial));
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
addLogEntry("Jacobian is singular."); addLogEntry("Jacobian is singular.");
endLogGroup(); // iteration endLogGroup(); // iteration
endLogGroup(); // equilibrate endLogGroup(); // equilibrate
@ -1855,7 +1858,8 @@ int ChemEquil::estimateEP_Brinkley(thermo_t& s, vector_fp& x,
try { try {
solve(a1, DATA_PTR(resid)); solve(a1, DATA_PTR(resid));
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
addLogEntry("estimateEP_Brinkley:Jacobian is singular."); addLogEntry("estimateEP_Brinkley:Jacobian is singular.");
#ifdef DEBUG_MODE #ifdef DEBUG_MODE
if (ChemEquil_print_lvl > 0) { if (ChemEquil_print_lvl > 0) {

7
src/equil/MultiPhase.cpp
View file

@ -694,6 +694,7 @@ doublereal MultiPhase::equilibrate(int XY, doublereal err,
try { try {
e->equilibrate(XY, err, maxsteps, loglevel); e->equilibrate(XY, err, maxsteps, loglevel);
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
endLogGroup(); endLogGroup();
} }
@ -795,7 +796,8 @@ doublereal MultiPhase::equilibrate(int XY, doublereal err,
} }
catch (CanteraError&) { catch (CanteraError& err) {
err.save();
if (!strt) { if (!strt) {
if (loglevel > 0) if (loglevel > 0)
addLogEntry("no convergence", addLogEntry("no convergence",
@ -887,7 +889,8 @@ doublereal MultiPhase::equilibrate(int XY, doublereal err,
} }
} }
catch (CanteraError&) { catch (CanteraError& err) {
err.save();
if (!strt) { if (!strt) {
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("no convergence", addLogEntry("no convergence",

4
src/equil/equilibrate.cpp
View file

@ -50,6 +50,7 @@ doublereal equilibrate(MultiPhase& s, const char* XY,
} }
return err; return err;
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("Failure.",lastErrorMessage()); addLogEntry("Failure.",lastErrorMessage());
endLogGroup("equilibrate"); endLogGroup("equilibrate");
@ -143,6 +144,7 @@ int equilibrate(thermo_t& s, const char* XY, int solver,
delete m; delete m;
retn = nAttempts; retn = nAttempts;
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("VCSnonideal solver failed."); addLogEntry("VCSnonideal solver failed.");
} }
@ -177,6 +179,7 @@ int equilibrate(thermo_t& s, const char* XY, int solver,
delete m; delete m;
retn = nAttempts; retn = nAttempts;
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("MultiPhaseEquil solver failed."); addLogEntry("MultiPhaseEquil solver failed.");
} }
@ -229,6 +232,7 @@ int equilibrate(thermo_t& s, const char* XY, int solver,
} }
catch (CanteraError& err) { catch (CanteraError& err) {
err.save();
delete e; delete e;
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("ChemEquil solver failed."); addLogEntry("ChemEquil solver failed.");

6
src/equil/vcs_equilibrate.cpp
View file

@ -129,6 +129,7 @@ int vcs_equilibrate(thermo_t& s, const char* XY,
} }
delete m; delete m;
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
addLogEntry("MultiPhaseEquil solver failed."); addLogEntry("MultiPhaseEquil solver failed.");
delete m; delete m;
throw err; throw err;
@ -145,6 +146,7 @@ int vcs_equilibrate(thermo_t& s, const char* XY,
delete m; delete m;
retn = 1; retn = 1;
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("MultiPhaseEquil solver failed."); addLogEntry("MultiPhaseEquil solver failed.");
} }
@ -177,6 +179,7 @@ int vcs_equilibrate(thermo_t& s, const char* XY,
addLogEntry("ChemEquil solver succeeded."); addLogEntry("ChemEquil solver succeeded.");
} }
} catch (CanteraError& err) { } catch (CanteraError& err) {
err.save();
if (loglevel > 0) { if (loglevel > 0) {
addLogEntry("ChemEquil solver failed."); addLogEntry("ChemEquil solver failed.");
} }
@ -344,6 +347,7 @@ int vcs_equilibrate_1(MultiPhase& s, int ixy,
} }
delete eqsolve; delete eqsolve;
} catch (CanteraError& e) { } catch (CanteraError& e) {
e.save();
retn = -1; retn = -1;
addLogEntry("Failure.", lastErrorMessage()); addLogEntry("Failure.", lastErrorMessage());
endLogGroup("equilibrate"); endLogGroup("equilibrate");
@ -359,7 +363,7 @@ int vcs_equilibrate_1(MultiPhase& s, int ixy,
return 0; return 0;
} catch (CanteraError& e) { } catch (CanteraError& e) {
e.save();
addLogEntry("Failure.",lastErrorMessage()); addLogEntry("Failure.",lastErrorMessage());
endLogGroup("equilibrate"); endLogGroup("equilibrate");

191
src/fortran/fct.cpp
View file

@ -71,8 +71,9 @@ std::string f2string(const char* s, ftnlen n)
return ss; return ss;
} }
static void handleError() static void handleError(CanteraError& err)
{ {
err.save();
error(lastErrorMessage()); error(lastErrorMessage());
} }
@ -88,8 +89,8 @@ extern "C" {
std::string sproc = f2string(proc, proclen); std::string sproc = f2string(proc, proclen);
std::string smsg = f2string(msg, msglen); std::string smsg = f2string(msg, msglen);
throw CanteraError(sproc, smsg); throw CanteraError(sproc, smsg);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
return -1; return -1;
@ -108,8 +109,8 @@ extern "C" {
nm[nn] = ' '; nm[nn] = ' ';
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -214,8 +215,8 @@ extern "C" {
parseCompString(f2string(x, lx), xx); parseCompString(f2string(x, lx), xx);
p->setMoleFractionsByName(xx); p->setMoleFractionsByName(xx);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -243,8 +244,8 @@ extern "C" {
parseCompString(f2string(y, leny), yy); parseCompString(f2string(y, leny), yy);
p->setMassFractionsByName(yy); p->setMassFractionsByName(yy);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -276,8 +277,8 @@ extern "C" {
nm[nn] = ' '; nm[nn] = ' ';
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -292,8 +293,8 @@ extern "C" {
nm[nn] = ' '; nm[nn] = ' ';
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -303,8 +304,8 @@ extern "C" {
{ {
try { try {
return _fph(n)->nAtoms(*k-1,*m-1); return _fph(n)->nAtoms(*k-1,*m-1);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -320,8 +321,8 @@ extern "C" {
XML_Node* x = _xml(mxml); XML_Node* x = _xml(mxml);
thermo_t* th = newPhase(*x); thermo_t* th = newPhase(*x);
return ThermoCabinet::add(th); return ThermoCabinet::add(th);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -340,8 +341,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->enthalpy_mole(); return _fth(n)->enthalpy_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -350,8 +351,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->intEnergy_mole(); return _fth(n)->intEnergy_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -360,8 +361,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->entropy_mole(); return _fth(n)->entropy_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -370,8 +371,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->gibbs_mole(); return _fth(n)->gibbs_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -380,8 +381,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->cp_mole(); return _fth(n)->cp_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -390,8 +391,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->cv_mole(); return _fth(n)->cv_mole();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -400,8 +401,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->pressure(); return _fth(n)->pressure();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -410,8 +411,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->enthalpy_mass(); return _fth(n)->enthalpy_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -420,8 +421,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->intEnergy_mass(); return _fth(n)->intEnergy_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -430,8 +431,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->entropy_mass(); return _fth(n)->entropy_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -440,8 +441,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->gibbs_mass(); return _fth(n)->gibbs_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -450,8 +451,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->cp_mass(); return _fth(n)->cp_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -460,8 +461,8 @@ extern "C" {
{ {
try { try {
return _fth(n)->cv_mass(); return _fth(n)->cv_mass();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -478,8 +479,8 @@ extern "C" {
try { try {
_fth(n)->setPressure(*p); _fth(n)->setPressure(*p);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -489,8 +490,8 @@ extern "C" {
try { try {
_fth(n)->setState_HP(*v1, *v2); _fth(n)->setState_HP(*v1, *v2);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -500,8 +501,8 @@ extern "C" {
try { try {
_fth(n)->setState_UV(*v1, *v2); _fth(n)->setState_UV(*v1, *v2);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -511,8 +512,8 @@ extern "C" {
try { try {
_fth(n)->setState_SV(*v1, *v2); _fth(n)->setState_SV(*v1, *v2);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -522,8 +523,8 @@ extern "C" {
try { try {
_fth(n)->setState_SP(*v1, *v2); _fth(n)->setState_SP(*v1, *v2);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -533,8 +534,8 @@ extern "C" {
try { try {
equilibrate(*_fth(n), f2string(XY,lenxy).c_str()); equilibrate(*_fth(n), f2string(XY,lenxy).c_str());
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -606,8 +607,8 @@ extern "C" {
} else { } else {
return 0; return 0;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return 999; return 999;
} }
} }
@ -685,8 +686,8 @@ extern "C" {
try { try {
k->getFwdRatesOfProgress(fwdROP); k->getFwdRatesOfProgress(fwdROP);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -697,8 +698,8 @@ extern "C" {
try { try {
k->getRevRatesOfProgress(revROP); k->getRevRatesOfProgress(revROP);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -714,8 +715,8 @@ extern "C" {
Kinetics* k = _fkin(n); Kinetics* k = _fkin(n);
k->getNetRatesOfProgress(netROP); k->getNetRatesOfProgress(netROP);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -726,8 +727,8 @@ extern "C" {
Kinetics* k = _fkin(n); Kinetics* k = _fkin(n);
k->getCreationRates(cdot); k->getCreationRates(cdot);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -738,8 +739,8 @@ extern "C" {
Kinetics* k = _fkin(n); Kinetics* k = _fkin(n);
k->getDestructionRates(ddot); k->getDestructionRates(ddot);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -750,8 +751,8 @@ extern "C" {
Kinetics* k = _fkin(n); Kinetics* k = _fkin(n);
k->getNetProductionRates(wdot); k->getNetProductionRates(wdot);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -767,8 +768,8 @@ extern "C" {
Kinetics* k = _fkin(n); Kinetics* k = _fkin(n);
k->getEquilibriumConstants(kc); k->getEquilibriumConstants(kc);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -784,8 +785,8 @@ extern "C" {
buf[nn] = ' '; buf[nn] = ' ';
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -795,8 +796,8 @@ extern "C" {
try { try {
_fkin(n)->setMultiplier(*i-1,*v); _fkin(n)->setMultiplier(*i-1,*v);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -812,8 +813,8 @@ extern "C" {
"wrong kinetics manager type"); "wrong kinetics manager type");
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -828,8 +829,8 @@ extern "C" {
try { try {
Transport* tr = newTransportMgr(mstr, t, *loglevel); Transport* tr = newTransportMgr(mstr, t, *loglevel);
return TransportCabinet::add(tr); return TransportCabinet::add(tr);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -838,8 +839,8 @@ extern "C" {
{ {
try { try {
return _ftrans(n)->viscosity(); return _ftrans(n)->viscosity();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -848,8 +849,8 @@ extern "C" {
{ {
try { try {
return _ftrans(n)->thermalConductivity(); return _ftrans(n)->thermalConductivity();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return DERR; return DERR;
} }
} }
@ -859,8 +860,8 @@ extern "C" {
try { try {
_ftrans(n)->getThermalDiffCoeffs(dt); _ftrans(n)->getThermalDiffCoeffs(dt);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -870,8 +871,8 @@ extern "C" {
try { try {
_ftrans(n)->getMixDiffCoeffs(d); _ftrans(n)->getMixDiffCoeffs(d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -881,8 +882,8 @@ extern "C" {
try { try {
_ftrans(n)->getBinaryDiffCoeffs(*ld,d); _ftrans(n)->getBinaryDiffCoeffs(*ld,d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -892,8 +893,8 @@ extern "C" {
try { try {
_ftrans(n)->getMultiDiffCoeffs(*ld,d); _ftrans(n)->getMultiDiffCoeffs(*ld,d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -903,8 +904,8 @@ extern "C" {
try { try {
_ftrans(n)->setParameters(*type, *k, d); _ftrans(n)->setParameters(*type, *k, d);
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -954,8 +955,8 @@ extern "C" {
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }

67
src/fortran/fctxml.cpp
View file

@ -27,8 +27,9 @@ inline XML_Node* _xml(const integer* i)
return &XmlCabinet::item(*i); return &XmlCabinet::item(*i);
} }
static void handleError() static void handleError(CanteraError& err)
{ {
err.save();
Cantera::error(Cantera::lastErrorMessage()); Cantera::error(Cantera::lastErrorMessage());
} }
@ -53,8 +54,8 @@ extern "C" {
XML_Node* x = Cantera::get_XML_File(f2string(file, filelen)); XML_Node* x = Cantera::get_XML_File(f2string(file, filelen));
int ix = XmlCabinet::add(x); int ix = XmlCabinet::add(x);
return ix; return ix;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -65,8 +66,8 @@ extern "C" {
XmlCabinet::clear(); XmlCabinet::clear();
Cantera::close_XML_File("all"); Cantera::close_XML_File("all");
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
return -1; return -1;
} }
} }
@ -105,8 +106,8 @@ extern "C" {
} else } else
throw CanteraError("fxml_attrib","node " throw CanteraError("fxml_attrib","node "
" has no attribute '"+ky+"'"); " has no attribute '"+ky+"'");
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -119,8 +120,8 @@ extern "C" {
std::string val = f2string(value, valuelen); std::string val = f2string(value, valuelen);
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
node.addAttribute(ky, val); node.addAttribute(ky, val);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -132,8 +133,8 @@ extern "C" {
std::string c = f2string(comment, commentlen); std::string c = f2string(comment, commentlen);
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
node.addComment(c); node.addComment(c);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -144,8 +145,8 @@ extern "C" {
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
const std::string v = node.name(); const std::string v = node.name();
strncpy(tag, v.c_str(), taglen); strncpy(tag, v.c_str(), taglen);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -156,8 +157,8 @@ extern "C" {
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
const std::string v = node.value(); const std::string v = node.value();
strncpy(value, v.c_str(), valuelen); strncpy(value, v.c_str(), valuelen);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -168,8 +169,8 @@ extern "C" {
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
XML_Node& c = node.child(f2string(loc, loclen)); XML_Node& c = node.child(f2string(loc, loclen));
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -180,8 +181,8 @@ extern "C" {
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
XML_Node& c = node.child(*m); XML_Node& c = node.child(*m);
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -196,8 +197,8 @@ extern "C" {
} else { } else {
throw CanteraError("fxml_find_id","id not found: "+f2string(id, idlen)); throw CanteraError("fxml_find_id","id not found: "+f2string(id, idlen));
} }
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -212,8 +213,8 @@ extern "C" {
} else } else
throw CanteraError("fxml_findByName","name "+f2string(nm, nmlen) throw CanteraError("fxml_findByName","name "+f2string(nm, nmlen)
+" not found"); +" not found");
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -223,8 +224,8 @@ extern "C" {
try { try {
XML_Node& node = *_xml(i); XML_Node& node = *_xml(i);
return node.nChildren(); return node.nChildren();
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -237,8 +238,8 @@ extern "C" {
XML_Node& c = node.addChild(f2string(name, namelen), XML_Node& c = node.addChild(f2string(name, namelen),
f2string(value,valuelen)); f2string(value,valuelen));
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -250,8 +251,8 @@ extern "C" {
XML_Node& chld = *_xml(j); XML_Node& chld = *_xml(j);
XML_Node& c = node.addChild(chld); XML_Node& c = node.addChild(chld);
return XmlCabinet::add(&c); return XmlCabinet::add(&c);
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -269,8 +270,8 @@ extern "C" {
"file "+f2string(file, filelen)+" not found."); "file "+f2string(file, filelen)+" not found.");
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }
@ -298,8 +299,8 @@ extern "C" {
data[i] = v[i]; data[i] = v[i];
} }
//n = nv; //n = nv;
} catch (CanteraError) { } catch (CanteraError& err) {
handleError(); handleError(err);
} }
return 0; return 0;
} }

3
src/kinetics/importKinetics.cpp
View file

@ -1201,7 +1201,8 @@ bool buildSolutionFromXML(XML_Node& root, std::string id, std::string nm,
importKinetics(*x, phases, k); importKinetics(*x, phases, k);
return true; return true;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
throw CanteraError("buildSolutionFromXML","error encountered"); throw CanteraError("buildSolutionFromXML","error encountered");
return false; return false;
} }

4
src/oneD/Sim1D.cpp
View file

@ -304,8 +304,8 @@ void Sim1D::solve(int loglevel, bool refine_grid)
} }
catch (CanteraError) { catch (CanteraError& err) {
err.save();
popError(); popError();
char buf[100]; char buf[100];
if (loglevel > 0) { if (loglevel > 0) {

51
src/thermo/MolalityVPSSTP.cpp
View file

@ -899,7 +899,8 @@ std::string MolalityVPSSTP::report(bool show_thermo) const
sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n", sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n",
cv_mass(), cv_mole()); cv_mass(), cv_mole());
s += p; s += p;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
sprintf(p, " heat capacity c_v <not implemented> \n"); sprintf(p, " heat capacity c_v <not implemented> \n");
s += p; s += p;
} }
@ -940,8 +941,8 @@ std::string MolalityVPSSTP::report(bool show_thermo) const
s += p; s += p;
} }
} }
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
return s; return s;
} }
@ -988,29 +989,29 @@ void MolalityVPSSTP::reportCSV(std::ofstream& csvFile) const
getMolalities(&temp[0]); getMolalities(&temp[0]);
pNames.push_back("Molal"); pNames.push_back("Molal");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getChemPotentials(&temp[0]); getChemPotentials(&temp[0]);
pNames.push_back("Chem. Pot. (J/kmol)"); pNames.push_back("Chem. Pot. (J/kmol)");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getStandardChemPotentials(&temp[0]); getStandardChemPotentials(&temp[0]);
pNames.push_back("Chem. Pot. SS (J/kmol)"); pNames.push_back("Chem. Pot. SS (J/kmol)");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getMolalityActivityCoefficients(&temp[0]); getMolalityActivityCoefficients(&temp[0]);
pNames.push_back("Molal Act. Coeff."); pNames.push_back("Molal Act. Coeff.");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getActivities(&temp[0]); getActivities(&temp[0]);
@ -1021,43 +1022,43 @@ void MolalityVPSSTP::reportCSV(std::ofstream& csvFile) const
double pH = -log(temp[iHp]) / log(10.0); double pH = -log(temp[iHp]) / log(10.0);
csvFile << setw(tabL) << "pH = " << setw(tabS) << pH << endl; csvFile << setw(tabL) << "pH = " << setw(tabS) << pH << endl;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarEnthalpies(&temp[0]); getPartialMolarEnthalpies(&temp[0]);
pNames.push_back("Part. Mol Enthalpy (J/kmol)"); pNames.push_back("Part. Mol Enthalpy (J/kmol)");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarEntropies(&temp[0]); getPartialMolarEntropies(&temp[0]);
pNames.push_back("Part. Mol. Entropy (J/K/kmol)"); pNames.push_back("Part. Mol. Entropy (J/K/kmol)");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarIntEnergies(&temp[0]); getPartialMolarIntEnergies(&temp[0]);
pNames.push_back("Part. Mol. Energy (J/kmol)"); pNames.push_back("Part. Mol. Energy (J/kmol)");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarCp(&temp[0]); getPartialMolarCp(&temp[0]);
pNames.push_back("Part. Mol. Cp (J/K/kmol"); pNames.push_back("Part. Mol. Cp (J/K/kmol");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarVolumes(&temp[0]); getPartialMolarVolumes(&temp[0]);
pNames.push_back("Part. Mol. Cv (J/K/kmol)"); pNames.push_back("Part. Mol. Cv (J/K/kmol)");
data.push_back(temp); data.push_back(temp);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
csvFile << endl << setw(tabS) << "Species,"; csvFile << endl << setw(tabS) << "Species,";
@ -1084,8 +1085,8 @@ void MolalityVPSSTP::reportCSV(std::ofstream& csvFile) const
csvFile << endl; csvFile << endl;
} }
} }
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
} }

7
src/thermo/MolarityIonicVPSSTP.cpp
View file

@ -819,14 +819,15 @@ std::string MolarityIonicVPSSTP::report(bool show_thermo) const
sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n", sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n",
cv_mass(), cv_mole()); cv_mass(), cv_mole());
s += p; s += p;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
sprintf(p, " heat capacity c_v <not implemented> \n"); sprintf(p, " heat capacity c_v <not implemented> \n");
s += p; s += p;
} }
} }
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
return s; return s;
} }

7
src/thermo/PseudoBinaryVPSSTP.cpp
View file

@ -360,14 +360,15 @@ std::string PseudoBinaryVPSSTP::report(bool show_thermo) const
sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n", sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n",
cv_mass(), cv_mole()); cv_mass(), cv_mole());
s += p; s += p;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
sprintf(p, " heat capacity c_v <not implemented> \n"); sprintf(p, " heat capacity c_v <not implemented> \n");
s += p; s += p;
} }
} }
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
return s; return s;
} }

47
src/thermo/PureFluidPhase.cpp
View file

@ -613,7 +613,8 @@ std::string PureFluidPhase::report(bool show_thermo) const
sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n", sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n",
cv_mass(), cv_mole()); cv_mass(), cv_mole());
s += p; s += p;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
sprintf(p, " heat capacity c_v <not implemented> \n"); sprintf(p, " heat capacity c_v <not implemented> \n");
s += p; s += p;
} }
@ -661,8 +662,8 @@ std::string PureFluidPhase::report(bool show_thermo) const
} }
} }
//} //}
catch (CanteraError) { catch (CanteraError& err) {
; err.save();
} }
return s; return s;
} }
@ -723,64 +724,64 @@ void PureFluidPhase::reportCSV(std::ofstream& csvFile) const
getMassFractions(&y[0]); getMassFractions(&y[0]);
pNames.push_back("Y"); pNames.push_back("Y");
data.push_back(y); data.push_back(y);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getChemPotentials(&mu[0]); getChemPotentials(&mu[0]);
pNames.push_back("Chem. Pot (J/kmol)"); pNames.push_back("Chem. Pot (J/kmol)");
data.push_back(mu); data.push_back(mu);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getActivities(&a[0]); getActivities(&a[0]);
pNames.push_back("Activity"); pNames.push_back("Activity");
data.push_back(a); data.push_back(a);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getActivityCoefficients(&ac[0]); getActivityCoefficients(&ac[0]);
pNames.push_back("Act. Coeff."); pNames.push_back("Act. Coeff.");
data.push_back(ac); data.push_back(ac);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarEnthalpies(&hbar[0]); getPartialMolarEnthalpies(&hbar[0]);
pNames.push_back("Part. Mol Enthalpy (J/kmol)"); pNames.push_back("Part. Mol Enthalpy (J/kmol)");
data.push_back(hbar); data.push_back(hbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarEntropies(&sbar[0]); getPartialMolarEntropies(&sbar[0]);
pNames.push_back("Part. Mol. Entropy (J/K/kmol)"); pNames.push_back("Part. Mol. Entropy (J/K/kmol)");
data.push_back(sbar); data.push_back(sbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarIntEnergies(&ubar[0]); getPartialMolarIntEnergies(&ubar[0]);
pNames.push_back("Part. Mol. Energy (J/kmol)"); pNames.push_back("Part. Mol. Energy (J/kmol)");
data.push_back(ubar); data.push_back(ubar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarCp(&cpbar[0]); getPartialMolarCp(&cpbar[0]);
pNames.push_back("Part. Mol. Cp (J/K/kmol"); pNames.push_back("Part. Mol. Cp (J/K/kmol");
data.push_back(cpbar); data.push_back(cpbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarVolumes(&vbar[0]); getPartialMolarVolumes(&vbar[0]);
pNames.push_back("Part. Mol. Cv (J/K/kmol)"); pNames.push_back("Part. Mol. Cv (J/K/kmol)");
data.push_back(vbar); data.push_back(vbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
csvFile << endl << setw(tabS) << "Species,"; csvFile << endl << setw(tabS) << "Species,";
@ -807,8 +808,8 @@ void PureFluidPhase::reportCSV(std::ofstream& csvFile) const
csvFile << endl; csvFile << endl;
} }
} }
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
} }
} }

53
src/thermo/ThermoPhase.cpp
View file

@ -190,7 +190,8 @@ void ThermoPhase::setState_TPX(doublereal t, doublereal p, const std::string& x)
} }
try { try {
parseCompString(x, xx); parseCompString(x, xx);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
throw CanteraError("setState_TPX", throw CanteraError("setState_TPX",
"Unknown species in composition map: "+ x); "Unknown species in composition map: "+ x);
} }
@ -224,7 +225,8 @@ void ThermoPhase::setState_TPY(doublereal t, doublereal p,
} }
try { try {
parseCompString(y, yy); parseCompString(y, yy);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
throw CanteraError("setState_TPY", throw CanteraError("setState_TPY",
"Unknown species in composition map: "+ y); "Unknown species in composition map: "+ y);
} }
@ -1284,7 +1286,8 @@ std::string ThermoPhase::report(bool show_thermo) const
sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n", sprintf(p, " heat capacity c_v %12.6g %12.4g J/K\n",
cv_mass(), cv_mole()); cv_mass(), cv_mole());
s += p; s += p;
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
sprintf(p, " heat capacity c_v <not implemented> \n"); sprintf(p, " heat capacity c_v <not implemented> \n");
s += p; s += p;
} }
@ -1332,8 +1335,8 @@ std::string ThermoPhase::report(bool show_thermo) const
} }
} }
//} //}
catch (CanteraError) { catch (CanteraError& err) {
; err.save();
} }
return s; return s;
} }
@ -1395,64 +1398,64 @@ void ThermoPhase::reportCSV(std::ofstream& csvFile) const
getMassFractions(y); getMassFractions(y);
pNames.push_back("Y"); pNames.push_back("Y");
data.push_back(y); data.push_back(y);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getChemPotentials(mu); getChemPotentials(mu);
pNames.push_back("Chem. Pot (J/kmol)"); pNames.push_back("Chem. Pot (J/kmol)");
data.push_back(mu); data.push_back(mu);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getActivities(a); getActivities(a);
pNames.push_back("Activity"); pNames.push_back("Activity");
data.push_back(a); data.push_back(a);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getActivityCoefficients(ac); getActivityCoefficients(ac);
pNames.push_back("Act. Coeff."); pNames.push_back("Act. Coeff.");
data.push_back(ac); data.push_back(ac);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarEnthalpies(hbar); getPartialMolarEnthalpies(hbar);
pNames.push_back("Part. Mol Enthalpy (J/kmol)"); pNames.push_back("Part. Mol Enthalpy (J/kmol)");
data.push_back(hbar); data.push_back(hbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarEntropies(sbar); getPartialMolarEntropies(sbar);
pNames.push_back("Part. Mol. Entropy (J/K/kmol)"); pNames.push_back("Part. Mol. Entropy (J/K/kmol)");
data.push_back(sbar); data.push_back(sbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarIntEnergies(ubar); getPartialMolarIntEnergies(ubar);
pNames.push_back("Part. Mol. Energy (J/kmol)"); pNames.push_back("Part. Mol. Energy (J/kmol)");
data.push_back(ubar); data.push_back(ubar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarCp(cpbar); getPartialMolarCp(cpbar);
pNames.push_back("Part. Mol. Cp (J/K/kmol"); pNames.push_back("Part. Mol. Cp (J/K/kmol");
data.push_back(cpbar); data.push_back(cpbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
try { try {
getPartialMolarVolumes(vbar); getPartialMolarVolumes(vbar);
pNames.push_back("Part. Mol. Cv (J/K/kmol)"); pNames.push_back("Part. Mol. Cv (J/K/kmol)");
data.push_back(vbar); data.push_back(vbar);
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
csvFile << endl << setw(tabS) << "Species,"; csvFile << endl << setw(tabS) << "Species,";
@ -1490,8 +1493,8 @@ void ThermoPhase::reportCSV(std::ofstream& csvFile) const
delete [] cpbar; delete [] cpbar;
delete [] vbar; delete [] vbar;
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
} }

3
src/transport/MultiTransport.cpp
View file

@ -386,7 +386,8 @@ void MultiTransport::solveLMatrixEquation()
copy(m_b.begin(), m_b.end(), m_a.begin()); copy(m_b.begin(), m_b.end(), m_a.begin());
try { try {
solve(m_Lmatrix, DATA_PTR(m_a)); solve(m_Lmatrix, DATA_PTR(m_a));
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
//if (info != 0) { //if (info != 0) {
throw CanteraError("MultiTransport::solveLMatrixEquation", throw CanteraError("MultiTransport::solveLMatrixEquation",
"error in solving L matrix."); "error in solving L matrix.");

16
src/transport/TransportFactory.cpp
View file

@ -915,8 +915,8 @@ void TransportFactory::getTransportData(const std::vector<const XML_Node*> &xspe
"negative rotation relaxation number"); "negative rotation relaxation number");
datatable[name] = data; datatable[name] = data;
} catch (CanteraError) { } catch (CanteraError& err) {
; err.save();
} }
} }
@ -1078,8 +1078,9 @@ void TransportFactory::getLiquidSpeciesTransportData(const std::vector<const XML
} }
datatable.insert(pair<std::string, LiquidTransportData>(name,data)); datatable.insert(pair<std::string, LiquidTransportData>(name,data));
} }
} catch (CanteraError yy) { } catch (CanteraError& err) {
throw yy; err.save();
throw err;
} }
} }
@ -1218,12 +1219,9 @@ void TransportFactory::getLiquidInteractionsTransportData(const XML_Node& transp
} }
} }
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(std::cout); std::cout << err.what() << std::endl;
} }
//catch(CanteraError) {
// ;
//}
return; return;
} }

24
test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
View file

@ -51,9 +51,9 @@ int main(int argc, char** argv)
<< endl; << endl;
exit(-1); exit(-1);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
cout << g; cout << g;
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: equilibration step failed at " cerr << "ERROR: equilibration step failed at "
<< " T = " << T << " T = " << T
<< " Pres = " << pres << " Pres = " << pres
@ -87,9 +87,9 @@ int main(int argc, char** argv)
<< endl; << endl;
exit(-1); exit(-1);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
cout << g; cout << g;
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: equilibration step failed at " cerr << "ERROR: equilibration step failed at "
<< " T = " << T << " T = " << T
<< " Pres = " << pres << " Pres = " << pres
@ -125,9 +125,9 @@ int main(int argc, char** argv)
<< endl; << endl;
exit(-1); exit(-1);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
cout << g; cout << g;
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: equilibration step failed at " cerr << "ERROR: equilibration step failed at "
<< " T = " << T << " T = " << T
<< " Pres = " << pres << " Pres = " << pres
@ -163,9 +163,9 @@ int main(int argc, char** argv)
<< endl; << endl;
exit(-1); exit(-1);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
cout << g; cout << g;
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: equilibration step failed at " cerr << "ERROR: equilibration step failed at "
<< " T = " << T << " T = " << T
<< " Pres = " << pres << " Pres = " << pres
@ -207,8 +207,8 @@ int main(int argc, char** argv)
<< " Pres = " << pres << " Pres = " << pres
<< endl; << endl;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: equilibration step failed at " cerr << "ERROR: equilibration step failed at "
<< " T = " << T << " T = " << T
<< " Pres = " << pres << " Pres = " << pres
@ -235,8 +235,8 @@ int main(int argc, char** argv)
cout << "NUMBER OF FAILURES = " << numFail << endl; cout << "NUMBER OF FAILURES = " << numFail << endl;
return numFail; return numFail;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: program terminating due to unforeseen circumstances." << endl; cerr << "ERROR: program terminating due to unforeseen circumstances." << endl;
return -1; return -1;
} }

4
test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
View file

@ -61,8 +61,8 @@ int main(int argc, char** argv)
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

5
test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
View file

@ -81,8 +81,9 @@ int main(int argc, char** argv)
fclose(FF); fclose(FF);
} }
catch (CanteraError) { catch (CanteraError& err) {
showErrors(); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;
} }

4
test_problems/ChemEquil_red1/basopt_red1.cpp
View file

@ -47,8 +47,8 @@ int main(int argc, char** argv)
cout << g; cout << g;
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

4
test_problems/CpJump/CpJump.cpp
View file

@ -29,8 +29,8 @@ int main(int argc, char** argv)
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

7
test_problems/NASA9poly_test/NASA9poly_test.cpp
View file

@ -35,7 +35,7 @@ int main(int argc, char** argv)
_set_output_format(_TWO_DIGIT_EXPONENT); _set_output_format(_TWO_DIGIT_EXPONENT);
#endif #endif
try { try {
//throw ArraySizeError("MadeUpFunction", 12, 22);
IdealGasMix g("gasNASA9.xml", "gri30_mix"); IdealGasMix g("gasNASA9.xml", "gri30_mix");
int nsp = g.nSpecies(); int nsp = g.nSpecies();
@ -84,8 +84,11 @@ int main(int argc, char** argv)
printf(" %13g %13.5g %13.5g\n", T1, visc, cond); printf(" %13g %13.5g %13.5g\n", T1, visc, cond);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
// cout << err.what() << endl;
showErrors(cout); showErrors(cout);
return 1;
} }
return 0; return 0;

8
test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
View file

@ -142,9 +142,9 @@ int main(int argc, char** argv)
exit(-1); exit(-1);
} }
numSucc++; numSucc++;
} catch (CanteraError) { } catch (CanteraError& err) {
cout << *mp; cout << *mp;
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: MultiEquil equilibration step failed at " cerr << "ERROR: MultiEquil equilibration step failed at "
<< " T = " << T << " T = " << T
<< " Pres = " << pres << " Pres = " << pres
@ -160,8 +160,8 @@ int main(int argc, char** argv)
cout << "NUMBER OF FAILURES = " << numFail << endl; cout << "NUMBER OF FAILURES = " << numFail << endl;
return numFail; return numFail;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "ERROR: program terminating due to unforeseen circumstances." << endl; cerr << "ERROR: program terminating due to unforeseen circumstances." << endl;
return -1; return -1;
} }

4
test_problems/VPsilane_test/silane_equil.cpp
View file

@ -29,8 +29,8 @@ int main(int argc, char** argv)
cout << r; cout << r;
cout << endl; cout << endl;
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

4
test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
View file

@ -85,8 +85,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(); std::cout << err.what() << std::endl;
if (fl) { if (fl) {
delete fl; delete fl;
} }

5
test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
View file

@ -307,9 +307,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
printf("caught error\n"); std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
View file

@ -283,9 +283,8 @@ int main(int argc, char** argv)
#endif #endif
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
printf("caught error\n"); std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
View file

@ -119,9 +119,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
return -1; return -1;
} }
} }

5
test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
View file

@ -249,9 +249,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
View file

@ -272,9 +272,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
printf("caught error\n"); std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
View file

@ -283,9 +283,8 @@ int main(int argc, char** argv)
#endif #endif
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
printf("caught error\n"); std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
View file

@ -153,9 +153,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
return -1; return -1;
} }
} }

5
test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
View file

@ -146,9 +146,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
return -1; return -1;
} }
} }

5
test_problems/cathermo/VPissp/ISSPTester.cpp
View file

@ -144,8 +144,9 @@ int main(int argc, char** argv)
printf(" %15s %12.5g %12.5g %12.5g %12.5g %12.5g\n", sn.c_str(), mui[i], printf(" %15s %12.5g %12.5g %12.5g %12.5g %12.5g\n", sn.c_str(), mui[i],
HiPM[i], SiPM[i], CpiPM[i], VoliPM[i]); HiPM[i], SiPM[i], CpiPM[i], VoliPM[i]);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

5
test_problems/cathermo/ims/IMSTester.cpp
View file

@ -142,8 +142,9 @@ int main(int argc, char** argv)
printf(" %15s %12.5g %12.5g %12.5g %12.5g %12.5g\n", sn.c_str(), mui[i], printf(" %15s %12.5g %12.5g %12.5g %12.5g %12.5g\n", sn.c_str(), mui[i],
HiPM[i], SiPM[i], CpiPM[i], VoliPM[i]); HiPM[i], SiPM[i], CpiPM[i], VoliPM[i]);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

5
test_problems/cathermo/issp/ISSPTester.cpp
View file

@ -144,8 +144,9 @@ int main(int argc, char** argv)
printf(" %15s %12.5g %12.5g %12.5g %12.5g %12.5g\n", sn.c_str(), mui[i], printf(" %15s %12.5g %12.5g %12.5g %12.5g %12.5g\n", sn.c_str(), mui[i],
HiPM[i], SiPM[i], CpiPM[i], VoliPM[i]); HiPM[i], SiPM[i], CpiPM[i], VoliPM[i]);
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

5
test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
View file

@ -156,9 +156,8 @@ int main(int argc, char** argv)
return retn; return retn;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
View file

@ -151,9 +151,8 @@ int main()
delete w; delete w;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

8
test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
View file

@ -304,7 +304,8 @@ int main()
Hset += deltaH; Hset += deltaH;
try { try {
w->setState_HP(Hset, OneAtm); w->setState_HP(Hset, OneAtm);
} catch (CanteraError) { } catch (CanteraError& err) {
err.save();
printf(" %10g, -> Failed to converge, beyond the spinodal probably \n\n", Hset); printf(" %10g, -> Failed to converge, beyond the spinodal probably \n\n", Hset);
popError(); popError();
break; break;
@ -324,9 +325,8 @@ int main()
printf("Critical Dens = %10.3g kg/m3\n", w->critDensity()); printf("Critical Dens = %10.3g kg/m3\n", w->critDensity());
delete w; delete w;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

5
test_problems/cathermo/wtWater/wtWater.cpp
View file

@ -102,9 +102,8 @@ int main()
printf("---------------------------------------------------------------------------------\n"); printf("---------------------------------------------------------------------------------\n");
delete w; delete w;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

4
test_problems/cxx_ex/examples.cpp
View file

@ -76,8 +76,8 @@ int main(int argc, char** argv)
} }
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

4
test_problems/cxx_ex/kinetics_example1.cpp
View file

@ -109,8 +109,8 @@ int kinetics_example1(int job)
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
cout << " terminating... " << endl; cout << " terminating... " << endl;
appdelete(); appdelete();
return -1; return -1;

4
test_problems/cxx_ex/kinetics_example2.cpp
View file

@ -100,8 +100,8 @@ int kinetics_example2(int job)
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(std::cout); std::cout << err.what() << std::endl;
std::cout << " terminating... " << std::endl; std::cout << " terminating... " << std::endl;
appdelete(); appdelete();
return -1; return -1;

4
test_problems/cxx_ex/kinetics_example3.cpp
View file

@ -108,8 +108,8 @@ int kinetics_example3(int job)
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
cout << " terminating... " << endl; cout << " terminating... " << endl;
appdelete(); appdelete();
return -1; return -1;

4
test_problems/cxx_ex/rxnpath_example1.cpp
View file

@ -150,8 +150,8 @@ int rxnpath_example1(int job)
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
cout << " terminating... " << endl; cout << " terminating... " << endl;
appdelete(); appdelete();
return -1; return -1;

4
test_problems/cxx_ex/transport_example1.cpp
View file

@ -97,8 +97,8 @@ int transport_example1(int job)
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
cout << " terminating... " << endl; cout << " terminating... " << endl;
appdelete(); appdelete();
return -1; return -1;

4
test_problems/cxx_ex/transport_example2.cpp
View file

@ -99,8 +99,8 @@ int transport_example2(int job)
} }
// handle exceptions thrown by Cantera // handle exceptions thrown by Cantera
catch (CanteraError) { catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
cout << " terminating... " << endl; cout << " terminating... " << endl;
appdelete(); appdelete();
return -1; return -1;

4
test_problems/diamondSurf/runDiamond.cpp
View file

@ -147,8 +147,8 @@ int main(int argc, char** argv)
<< " " << " "
<< x[k] << endl; << x[k] << endl;
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
return 0; return 0;

5
test_problems/diamondSurf_dupl/runDiamondDupl.cpp
View file

@ -237,8 +237,9 @@ int main(int argc, char** argv)
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

5
test_problems/fracCoeff/fracCoeff.cpp
View file

@ -163,8 +163,9 @@ int main(int argc, char** argv)
appdelete(); appdelete();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

5
test_problems/mixGasTransport/mixGasTransport.cpp
View file

@ -241,8 +241,9 @@ int main(int argc, char** argv)
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

5
test_problems/multiGasTransport/multiGasTransport.cpp
View file

@ -262,8 +262,9 @@ int main(int argc, char** argv)
} }
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1;
} }
return 0; return 0;

4
test_problems/negATest/negATest.cpp
View file

@ -91,8 +91,8 @@ int main(int argc, char** argv)
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

5
test_problems/pureFluidTest/testPureWater.cpp
View file

@ -184,9 +184,8 @@ int main()
printf("Critical Dens = %10.3g kg/m3\n", w->critDensity()); printf("Critical Dens = %10.3g kg/m3\n", w->critDensity());
delete w; delete w;
} catch (CanteraError) { } catch (CanteraError& err) {
std::cout << err.what() << std::endl;
showErrors();
Cantera::appdelete(); Cantera::appdelete();
return -1; return -1;
} }

4
test_problems/rankine_democxx/rankine.cpp
View file

@ -86,8 +86,8 @@ int main()
#endif #endif
try { try {
return openRankine(0, 0); return openRankine(0, 0);
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
return -1; return -1;
} }
} }

4
test_problems/silane_equil/silane_equil.cpp
View file

@ -20,8 +20,8 @@ int main(int argc, char** argv)
equilibrate(g, "TP"); equilibrate(g, "TP");
cout << g; cout << g;
return 0; return 0;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cerr); std::cerr << err.what() << std::endl;
cerr << "program terminating." << endl; cerr << "program terminating." << endl;
return -1; return -1;
} }

4
test_problems/surfSolverTest/surfaceSolver.cpp
View file

@ -450,8 +450,8 @@ int main(int argc, char** argv)
surfPhaseTP = 0; surfPhaseTP = 0;
delete xc; delete xc;
appdelete(); appdelete();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
return 0; return 0;

4
test_problems/surfSolverTest/surfaceSolver2.cpp
View file

@ -487,8 +487,8 @@ int main(int argc, char** argv)
surfPhaseTP2 = 0; surfPhaseTP2 = 0;
delete xc; delete xc;
appdelete(); appdelete();
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
return 0; return 0;

4
test_problems/surfkin/surfdemo.cpp
View file

@ -36,8 +36,8 @@ int main()
cout << surf.speciesName(k) << " " cout << surf.speciesName(k) << " "
<< wdot[k+gas.nSpecies()] << endl; << wdot[k+gas.nSpecies()] << endl;
} catch (CanteraError) { } catch (CanteraError& err) {
showErrors(cout); std::cout << err.what() << std::endl;
} }
return 0; return 0;
} }