Commit: da0cf79a76371e372912d79ed834632590ed30e8 - MolDS (git)

Commit MetaInfo

• Revisión: da0cf79a76371e372912d79ed834632590ed30e8 (tree)
• Tiempo: 2013-07-12 13:15:23
• Autor: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Add LapackInfo key value pair into Exception. #31712

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1385 1136aad2-a195-0410-b898-f5ea1d11b9d8

Cambiar Resumen

• modified: src/base/Enums.h
• modified: src/wrappers/Lapack.cpp

Diferencia incremental

--- a/src/base/Enums.h
+++ b/src/base/Enums.h
@@ -152,6 +152,11 @@ RENUMSTR_BEGIN( MultipoleType, MultipoleTypeStr )
    RENUMSTR( MultipoleType_end,  "MultipoleType_end" )
 RENUMSTR_END()
 
+RENUMSTR_BEGIN( ExceptionKey, ExceptionKeyStr )
+   RENUMSTR( LapackInfo, "LapackInfo" )
+   RENUMSTR( ExceptionKey_end,  "ExceptionKey_end" )
+RENUMSTR_END()
+
 }
 #endif
 

--- a/src/wrappers/Lapack.cpp
+++ b/src/wrappers/Lapack.cpp
@@ -37,6 +37,7 @@
 #include"../base/PrintController.h"
 #include"../base/MolDSException.h"
 #include"../base/Uncopyable.h"
+#include"../base/Enums.h"
 #include"Lapack.h"
 
 #ifdef __INTEL_COMPILER
@@ -116,7 +117,9 @@ molds_lapack_int Lapack::Dsyevd(double** matrix, double* eigenValues, molds_lapa
    if(size < 1 ){
       stringstream ss;
       ss << errorMessageDsyevdSize;
-      throw MolDSException(ss.str());
+      MolDSException ex(ss.str());
+      ex.SetKeyValue<int>(LapackInfo, info);
+      throw ex;
    }
    else if(size == 1){
       lwork = 1;
@@ -192,7 +195,9 @@ molds_lapack_int Lapack::Dsyevd(double** matrix, double* eigenValues, molds_lapa
       stringstream ss;
       ss << errorMessageDsyevdInfo;
       ss << info << endl;
-      throw MolDSException(ss.str());
+      MolDSException ex(ss.str());
+      ex.SetKeyValue<int>(LapackInfo, info);
+      throw ex;
    }
    return info;
 }
@@ -272,7 +277,9 @@ molds_lapack_int Lapack::Dsysv(double const* const* matrix, double* b, molds_lap
       stringstream ss;
       ss << errorMessageDsysvInfo;
       ss << info << endl;
-      throw MolDSException(ss.str());
+      MolDSException ex(ss.str());
+      ex.SetKeyValue<int>(LapackInfo, info);
+      throw ex;
    }
    return info;
 }
@@ -392,7 +399,9 @@ molds_lapack_int Lapack::Dgetrf(double* matrix, molds_lapack_int* ipiv, molds_la
       stringstream ss;
       ss << errorMessageDgetrfInfo;
       ss << info << endl;
-      throw MolDSException(ss.str());
+      MolDSException ex(ss.str());
+      ex.SetKeyValue<int>(LapackInfo, info);
+      throw ex;
    }
    return info;
 }