Changeset 1149

Timestamp:

Jun 30, 2004, 10:06:41 AM (22 years ago)

Author:

harman

Message:

Added more error checks

File:

• trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (modified) (5 diffs)

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c

@@ -29 +29 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-30 01:31:15 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-30 20:06:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -88 +88 @@
     complex double out = 0+0i;
     out = a/b;
-    if(isnan(creal(out))) {
-        psError(__func__, ": NAN encountered in real portion of division");
-    } else if(isnan(cimag(out))) {
-        psError(__func__, ": NAN encountered in imaginary portion of division");
+    if(isnan(creal(out)) || isnan(cimag(out))) {
+        psError(__func__, ": Divide by zero");
     }
 
@@ -387 +385 @@
     }                                                                                                        \
 } else {                                                                                                     \
-    psError(__func__, ": Invalid binary operator: %s", #OP);                                                 \
+    psError(__func__, ": Invalid operation: %s", OP);                                                        \
 }
 
@@ -695 +693 @@
     }                                                                                                        \
 } else {                                                                                                     \
-    psError(__func__, ": Line %d - Invalid operator: %s", __LINE__, #OP);                                    \
+    psError(__func__, ": Invalid operation: %s", OP);                                                        \
 }
 
@@ -735 +733 @@
     }
 
+    if(dimIn!=dimOut) {
+        psError(__func__, ": Line %d - Dimensionality for arguments inconsistent: (%d, %d)", __LINE__,
+                dimIn, dimOut);
+        return out;
+    }
+
     if(dimIn==PS_DIMEN_OTHER || dimOut==PS_DIMEN_OTHER) {
         psError(__func__, ": Line %d - PS_DIMEN_OTHER not allowed for arguments: (%d, %d)", __LINE__,