Changeset 1246

Timestamp:

Jul 20, 2004, 2:09:11 PM (22 years ago)

Author:

harman

Message:

Updated for Macintosh compatibility

Location:

trunk/psLib

Files:

• src/dataManip/psMatrixVectorArithmetic.c (modified) (2 diffs)
• test/dataManip/verified/tst_psMatrixVectorArithmetic02.stdout (modified) (2 diffs)
• test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr (modified) (1 diff)

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c

@@ -29 +29 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-20 20:57:30 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-21 00:09:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -615 +615 @@
 } else if(!strncmp(OP, "log", 3)) {                                                                          \
     if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) {                                                                 \
-        UNARY_TYPE(DIM,OUT,IN,log10(cabs(*i1)+carg(*i1)*I));                                                 \
+        UNARY_TYPE(DIM,OUT,IN,clog(*i1)/log(10.0));                                                 \
     } else {                                                                                                 \
         UNARY_TYPE(DIM,OUT,IN,log10(*i1));                                                                   \

trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic02.stdout

@@ -1552 +1552 @@
 
 Output:
-44 44 
-44 44 
-44 44 
+45 45 
+45 45 
+45 45 
 
 
@@ -3184 +3184 @@
 
 Output:
-44
-44
-44
+45
+45
+45
 
 

trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr

@@ -1 @@
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 404 - Null out argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 410 - Null in1 argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 416 - Null in2 argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 421 - Null op argument
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 709 - Null out argument
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 715 - Null in argument
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 720 - Null op argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 433 - Element types for arguments inconsistent: (1028, 1032, 1032)
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 730 - Element types for arguments inconsistent: (1028, 1032)
+ <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 403 - Null out argument
+ <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 409 - Null in1 argument
+ <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 415 - Null in2 argument
+ <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 420 - Null op argument
+ <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 708 - Null out argument
+ <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 714 - Null in argument
+ <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 719 - Null op argument
+ <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 432 - Element types for arguments inconsistent: (1028, 1032, 1032)
+ <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 729 - Element types for arguments inconsistent: (1028, 1032)
  <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
  <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
  <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
  <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 736 - Dimensionality for arguments inconsistent: (1, 3)
+ <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 735 - Dimensionality for arguments inconsistent: (1, 3)
  <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
  <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero