Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c
===================================================================
--- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c	(revision 1058)
+++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c	(revision 1059)
@@ -29,6 +29,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-18 00:54:43 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-18 23:34:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -118,63 +118,63 @@
 #define LEVEL1(DIM1,DIM2,OUT,IN1,OP,IN2)                                                                     \
 switch (IN1->type) {                                                                                         \
-case PS_TYPE_S8:                                                                                          \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S8);                                                                       \
-    break;                                                                                                  \
-case PS_TYPE_U8:                                                                                          \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U8);                                                                       \
-    break;                                                                                                  \
-case PS_TYPE_S16:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S16);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_U16:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U16);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_S32:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S32);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_U32:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U32);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_S64:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,S64);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_U64:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,U64);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_F32:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,F32);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_F64:                                                                                         \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,F64);                                                                      \
-    break;                                                                                                  \
-case PS_TYPE_C32:                                                                                         \
-    psError(__func__, ": Line %d - C32 support not implemented", __LINE__);                               \
+case PS_TYPE_S8:                                                                                             \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,S8);                                                                        \
+    break;                                                                                                   \
+case PS_TYPE_U8:                                                                                             \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,U8);                                                                        \
+    break;                                                                                                   \
+case PS_TYPE_S16:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,S16);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_U16:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,U16);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_S32:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,S32);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_U32:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,U32);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_S64:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,S64);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_U64:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,U64);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_F32:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,F32);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_F64:                                                                                            \
+    DIM1##_##DIM2(OUT,IN1,OP,IN2,F64);                                                                       \
+    break;                                                                                                   \
+case PS_TYPE_C32:                                                                                            \
+    psError(__func__, ": Line %d - C32 support not implemented", __LINE__);                                  \
     /*DIM1##_##DIM2(OUT,IN1,OP,IN2,C32);       */                                                            \
-    break;                                                                                                  \
-case PS_TYPE_C64:                                                                                         \
-    psError(__func__, ": Line %d - C64 support not implemented", __LINE__);                               \
-    /*DIM1##_##DIM2(OUT,IN1,OP,IN2,C64);         */                                                         \
-    break;                                                                                                 \
-default:                                                                                                  \
-    psError(__func__, ": Line %d - Invalid PS_TYPE: %d", __LINE__, IN1->type);                           \
+    break;                                                                                                   \
+case PS_TYPE_C64:                                                                                            \
+    psError(__func__, ": Line %d - C64 support not implemented", __LINE__);                                  \
+    /*DIM1##_##DIM2(OUT,IN1,OP,IN2,C64);         */                                                          \
+    break;                                                                                                   \
+default:                                                                                                     \
+    psError(__func__, ": Line %d - Invalid PS_TYPE: %d", __LINE__, IN1->type);                               \
 }
 
 #define LEVEL2(DIM1,DIM2,OUT,IN1,OP,IN2)                                                                     \
-if(!strncmp(OP, "+", 1)) {                                                                               \
-    LEVEL1(DIM1,DIM2,OUT,IN1,*i1 + *i2,IN2);                                                             \
-} else if(!strncmp(OP, "-", 1)) {                                                                         \
-    LEVEL1(DIM1, DIM2,OUT,IN1,*i1 - *i2,IN2);                                                            \
-} else if(!strncmp(OP, "*", 1)) {                                                                         \
-    LEVEL1(DIM1,DIM2,OUT,IN1,*i1 * *i2,IN2);                                                             \
-} else if(!strncmp(OP, "/", 1)) {                                                                         \
-    LEVEL1(DIM1,DIM2,OUT,IN1,*i1 / *i2,IN2);                                                             \
-} else if(!strncmp(OP, "^", 1)) {                                                                         \
-    LEVEL1(DIM1,DIM2,OUT,IN1,pow(*i1,*i2),IN2);                                                          \
-} else if(!strncmp(OP, "min", 3)) {                                                                       \
-    LEVEL1(DIM1,DIM2,OUT,IN1,MIN(*i1,*i2),IN2);                                                          \
-} else if(!strncmp(OP, "max", 3)) {                                                                       \
-    LEVEL1(DIM1,DIM2,OUT,IN1,MAX(*i1,*i2),IN2);                                                          \
-} else {                                                                                                  \
-    psError(__func__, ": Line %d - Invalid operator: %s", __LINE__, #OP);                                \
+if(!strncmp(OP, "+", 1)) {                                                                                   \
+    LEVEL1(DIM1,DIM2,OUT,IN1,*i1 + *i2,IN2);                                                                 \
+} else if(!strncmp(OP, "-", 1)) {                                                                            \
+    LEVEL1(DIM1, DIM2,OUT,IN1,*i1 - *i2,IN2);                                                                \
+} else if(!strncmp(OP, "*", 1)) {                                                                            \
+    LEVEL1(DIM1,DIM2,OUT,IN1,*i1 * *i2,IN2);                                                                 \
+} else if(!strncmp(OP, "/", 1)) {                                                                            \
+    LEVEL1(DIM1,DIM2,OUT,IN1,*i1 / *i2,IN2);                                                                 \
+} else if(!strncmp(OP, "^", 1)) {                                                                            \
+    LEVEL1(DIM1,DIM2,OUT,IN1,pow(*i1,*i2),IN2);                                                              \
+} else if(!strncmp(OP, "min", 3)) {                                                                          \
+    LEVEL1(DIM1,DIM2,OUT,IN1,MIN(*i1,*i2),IN2);                                                              \
+} else if(!strncmp(OP, "max", 3)) {                                                                          \
+    LEVEL1(DIM1,DIM2,OUT,IN1,MAX(*i1,*i2),IN2);                                                              \
+} else {                                                                                                     \
+    psError(__func__, ": Line %d - Invalid operator: %s", __LINE__, #OP);                                    \
 }