Changeset 9388

Timestamp:

08/23/11 11:46:03 (14 years ago)

Author:

Mathieu Morlighem

Message:

Formatted Error exceptions for matlab

Location:

issm/trunk/src/c

Files:

• objects/IoModel.cpp (modified) (1 diff)
• shared/Exceptions/Exceptions.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/IoModel.cpp

@@ -508 +508 @@
                 /*}}}*/
 
+                /*Add to this->data: */
                 this->FetchData(&matrix,&M,&N,dataenum);
-                if(M*N==0){
-                        _error_("Cannot add %s to Iomodel->data because the matrix found is empty",EnumToStringx(dataenum));
-                }
-
-                /*Add to this->data: */
                 this->data[dataenum]=matrix;
         }

issm/trunk/src/c/shared/Exceptions/Exceptions.cpp

@@ -10 +10 @@
 #include "../shared.h"
 #include "../../include/include.h"
+#ifdef _SERIAL_
+#include "mex.h"
+#endif
 
 ErrorException::ErrorException(const string &what_arg){
@@ -45 +48 @@
                         printf("[%i] %s error message: %s\n\n",my_rank,function_name.c_str(),what());
                 #else
-                        printf("\n??? Error using ==> %s at %i\n",file_name.c_str(),file_line);
-                        printf("%s error message: %s\n\n",function_name.c_str(),what());
+                        mexErrMsgTxt(exprintf("\n??? Error using ==> %s at %i\n%s error message: %s\n",
+                                                        file_name.c_str(),file_line,function_name.c_str(),what()));
                 #endif
         }