Index: trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c =================================================================== --- trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1124) +++ trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1125) @@ -29,6 +29,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-29 20:16:16 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-29 20:28:47 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -580,97 +580,97 @@ } else if(!strncmp(OP, "exp", 3)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,cexp(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,exp(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,cexp(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,exp(*i1)); \ } \ } else if(!strncmp(OP, "ln", 2)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,clog(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,log(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,clog(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,log(*i1)); \ } \ } else if(!strncmp(OP, "ten", 3)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,cpow(*i1,10.0)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,exp10(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,cpow(*i1,10.0)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,exp10(*i1)); \ } \ } else if(!strncmp(OP, "log", 3)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,clog10(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,log10(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,clog10(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,log10(*i1)); \ } \ } else if(!strncmp(OP, "sin", 3)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,csin(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,sin(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,csin(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,sin(*i1)); \ } \ } else if(!strncmp(OP, "dsin", 4)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,csin(*i1*D2R)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,sin(*i1*D2R)); \ + UNARY_TYPE(DIM,OUT,IN,csin(*i1*D2R)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,sin(*i1*D2R)); \ } \ } else if(!strncmp(OP, "cos", 3)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,ccos(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,cos(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,ccos(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,cos(*i1)); \ } \ } else if(!strncmp(OP, "dcos", 4)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,ccos(*i1*D2R)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,cos(*i1*D2R)); \ + UNARY_TYPE(DIM,OUT,IN,ccos(*i1*D2R)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,cos(*i1*D2R)); \ } \ } else if(!strncmp(OP, "tan", 3)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,ctan(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,tan(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,ctan(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,tan(*i1)); \ } \ } else if(!strncmp(OP, "dtan", 4)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,ctan(*i1*D2R)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,tan(*i1*D2R)); \ + UNARY_TYPE(DIM,OUT,IN,ctan(*i1*D2R)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,tan(*i1*D2R)); \ } \ } else if(!strncmp(OP, "asin", 4)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,casin(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,asin(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,casin(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,asin(*i1)); \ } \ } else if(!strncmp(OP, "dasin", 5)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,R2D*casin(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,R2D*asin(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,R2D*casin(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,R2D*asin(*i1)); \ } \ } else if(!strncmp(OP, "acos", 4)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,cacos(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,acos(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,cacos(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,acos(*i1)); \ } \ } else if(!strncmp(OP, "dacos", 5)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,R2D*cacos(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,R2D*acos(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,R2D*cacos(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,R2D*acos(*i1)); \ } \ } else if(!strncmp(OP, "atan", 4)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,catan(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,atan(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,catan(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,atan(*i1)); \ } \ } else if(!strncmp(OP, "datan", 5)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ - UNARY_TYPE(DIM,OUT,IN,R2D*catan(*i1)); \ - } else { \ - UNARY_TYPE(DIM,OUT,IN,R2D*atan(*i1)); \ + UNARY_TYPE(DIM,OUT,IN,R2D*catan(*i1)); \ + } else { \ + UNARY_TYPE(DIM,OUT,IN,R2D*atan(*i1)); \ } \ } else { \