New iRel interface has more consistent error handling

jedbrown · Mar 21, 2011 · 9ac26b1 · 9ac26b1
1 parent 9c1be41
commit 9ac26b1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/include/dohpmesh.h b/include/dohpmesh.h
@@ -34,10 +34,14 @@ extern const char *const iBase_TagValueTypeName[];
       dERROR(PETSC_COMM_SELF,1,"iGeom(%d) %s: %s",_l_ret,iBase_ErrorString[_l_ret],_l_desc); \
     }                                                                   \
   } while (0)
-
-#define dIRCHK(assoc,err)                                               \
-  if (PetscUnlikely(err))                                               \
-    dERROR(PETSC_COMM_SELF,1,"iRel(%d) %s: %s",err,iBase_ErrorString[iRel_LAST_ERROR.error_type],iRel_LAST_ERROR.description)
+#define dIRCHK(rel,err) do {                                           \
+    if (PetscUnlikely(err)) {                                           \
+      dErr _l_ret = err;                                                \
+      char _l_desc[512] = "Description not available";                  \
+      iRel_getDescription(rel,_l_desc,&err,sizeof(_l_desc));          \
+      dERROR(PETSC_COMM_SELF,1,"iRel(%d) %s: %s",_l_ret,iBase_ErrorString[_l_ret],_l_desc); \
+    }                                                                   \
+  } while (0)
 
 
 typedef struct {