Changeset 2680

Timestamp:

Dec 9, 2004, 1:31:14 PM (22 years ago)

Author:

evanalst

Message:

Add macro for check if arguments are not of dimension PS_DIMEN_OTHER.

Location:

trunk/psLib/src

Files:

• dataManip/psConstants.h (modified) (2 diffs)
• dataManip/psMatrixVectorArithmetic.c (modified) (2 diffs)
• math/psConstants.h (modified) (2 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-06 19:49:36 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-09 23:31:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -117 +117 @@
 #define PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, CLEANUP) \
 if (NAME->type.dimen != DIMEN) { \
+    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
+            "Unallowable operation: %s has incorrect dimensionality.", \
+            #NAME); \
+    CLEANUP; \
+}
+
+#define PS_PTR_CHECK_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \
+if (NAME->type.dimen == DIMEN) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
             "Unallowable operation: %s has incorrect dimensionality.", \

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c

@@ -29 +29 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:04:59 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-09 23:31:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -442 +442 @@
     PS_PTR_CHECK_TYPE_EQUAL_GENERAL(input1,input2, psBinaryOp_EXIT);
 
-    PS_PTR_CHECK_DIMEN_GENERAL(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT);
-    PS_PTR_CHECK_DIMEN_GENERAL(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT);
+    PS_PTR_CHECK_DIMEN_GENERAL_NOT(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT);
+    PS_PTR_CHECK_DIMEN_GENERAL_NOT(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT);
 
     psType* psType1 = (psType*)in1;

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-06 19:49:36 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-09 23:31:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -117 +117 @@
 #define PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, CLEANUP) \
 if (NAME->type.dimen != DIMEN) { \
+    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
+            "Unallowable operation: %s has incorrect dimensionality.", \
+            #NAME); \
+    CLEANUP; \
+}
+
+#define PS_PTR_CHECK_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \
+if (NAME->type.dimen == DIMEN) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
             "Unallowable operation: %s has incorrect dimensionality.", \