diff --git a/Cantera/src/BandMatrix.cpp b/Cantera/src/BandMatrix.cpp index eec89be35..4c9cf3287 100755 --- a/Cantera/src/BandMatrix.cpp +++ b/Cantera/src/BandMatrix.cpp @@ -20,7 +20,8 @@ #include "ctlapack.h" #include "utilities.h" #include "ctexceptions.h" - +#include "stringUtils.h" +#include "global.h" namespace Cantera { @@ -136,12 +137,14 @@ namespace Cantera { } else { m_factored = false; - ofstream fout("bandmatrix.csv"); - fout << *this << endl; - fout.close(); - //throw CanteraError("BandMatrix::factor", - // "DGBTRF returned info = "+int2str(info)+".\n" - // +"Matrix written to file bandmatrix.csv\n"); + ofstream fout("bandmatrix.csv"); + fout << *this << endl; + fout.close(); + error("DGBTRF returned info = "+int2str(info)+".\n" + +"Matrix written to file bandmatrix.csv\n"); + //throw CanteraError("BandMatrix::factor", + // "DGBTRF returned info = "+int2str(info)+".\n" + // +"Matrix written to file bandmatrix.csv\n"); } return info; } @@ -192,9 +195,9 @@ namespace Cantera { ofstream fout("bandmatrix.csv"); fout << *this << endl; fout.close(); - // throw CanteraError("BandMatrix::solve", - // "DGBTRS returned info = "+int2str(info)+".\n" - // +"Matrix written to file bandmatrix.csv\n"); + throw CanteraError("BandMatrix::solve", + "DGBTRS returned info = "+int2str(info)+".\n" + +"Matrix written to file bandmatrix.csv\n"); } return info; } @@ -204,11 +207,11 @@ namespace Cantera { int nc = m.columns(); int i,j; for (i = 0; i < nr; i++) { - s << "Row " << i+1 << ": "; + //s << "Row " << i+1 << ": "; for (j = 0; j < nc; j++) { s << m(i,j) << ", "; } - s << endl << endl; + s << endl; } return s; } diff --git a/ext/f2c_libs/arith.h b/ext/f2c_libs/arith.h index 995e5b254..508eb414f 100644 --- a/ext/f2c_libs/arith.h +++ b/ext/f2c_libs/arith.h @@ -1,3 +1,4 @@ -#define IEEE_8087 -#define Arith_Kind_ASL 1 +#define IEEE_MC68k +#define Arith_Kind_ASL 2 #define Double_Align +#define NANCHECK