diff options
Diffstat (limited to 'externals/grill/vasp/source/ops_arith.h')
| -rw-r--r-- | externals/grill/vasp/source/ops_arith.h | 50 |
1 files changed, 14 insertions, 36 deletions
diff --git a/externals/grill/vasp/source/ops_arith.h b/externals/grill/vasp/source/ops_arith.h index d4fcd470..7f22b3f6 100644 --- a/externals/grill/vasp/source/ops_arith.h +++ b/externals/grill/vasp/source/ops_arith.h @@ -11,34 +11,24 @@ WARRANTIES, see the file, "license.txt," in this distribution. #ifndef __VASP_OPS_ARITH_H #define __VASP_OPS_ARITH_H -#include "opbase.h" +#include "opfuns.h" // Arithmetic math functions namespace VecOp { - BL d_add(OpParam &p); - BL d_sub(OpParam &p); - BL d_subr(OpParam &p); - BL d_mul(OpParam &p); - BL d_div(OpParam &p); - BL d_divr(OpParam &p); - BL d_mod(OpParam &p); - - BL d_cadd(OpParam &p); - BL d_csub(OpParam &p); - BL d_csubr(OpParam &p); - BL d_cmul(OpParam &p); - BL d_cdiv(OpParam &p); - BL d_cdivr(OpParam &p); - - BL d_sqr(OpParam &p); - BL d_ssqr(OpParam &p); - BL d_csqr(OpParam &p); - BL d_cpowi(OpParam &p); - - BL d_sign(OpParam &p); - BL d_abs(OpParam &p); - BL d_cabs(OpParam &p); + inline BL d_add(OpParam &p) { return D__rbin<S,f_add<S> >(p); } + inline BL d_sub(OpParam &p) { return D__rbin<S,f_sub<S> >(p); } + inline BL d_subr(OpParam &p) { return D__rbin<S,f_subr<S> >(p); } + inline BL d_mul(OpParam &p) { return D__rbin<S,f_mul<S> >(p); } + inline BL d_div(OpParam &p) { return D__rbin<S,f_div<S> >(p); } + inline BL d_divr(OpParam &p) { return D__rbin<S,f_divr<S> >(p); } + inline BL d_mod(OpParam &p) { return D__rbin<S,f_mod<S> >(p); } + + inline BL d_sqr(OpParam &p) { return D__run<S,f_sqr<S> >(p); } + inline BL d_ssqr(OpParam &p) { return d__run<S,f_ssqr<S> >(p); } + + inline BL d_sign(OpParam &p) { return D__run<S,f_sign<S> >(p); } + inline BL d_abs(OpParam &p) { return D__run<S,f_abs<S> >(p); } } namespace VaspOp { @@ -50,23 +40,11 @@ namespace VaspOp { inline Vasp *m_divr(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_rbin(p,src,arg,dst,VecOp::d_divr); } // reverse div by (one vec or real) inline Vasp *m_mod(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_rbin(p,src,arg,dst,VecOp::d_mod); } // modulo by (one vec or real) - inline Vasp *m_cadd(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_cbin(p,src,arg,dst,VecOp::d_cadd); } // complex add (pairs of vecs or complex) - inline Vasp *m_csub(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_cbin(p,src,arg,dst,VecOp::d_csub); } // complex sub (pairs of vecs or complex) - inline Vasp *m_csubr(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_cbin(p,src,arg,dst,VecOp::d_csubr); } // reverse complex sub (pairs of vecs or complex) - inline Vasp *m_cmul(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_cbin(p,src,arg,dst,VecOp::d_cmul); } // complex mul (pairs of vecs or complex) - inline Vasp *m_cdiv(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_cbin(p,src,arg,dst,VecOp::d_cdiv); } // complex div (pairs of vecs or complex) - inline Vasp *m_cdivr(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL) { return m_cbin(p,src,arg,dst,VecOp::d_cdivr); } // complex reverse div (pairs of vecs or complex) - inline Vasp *m_sqr(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_run(p,src,dst,VecOp::d_sqr); } // unsigned square inline Vasp *m_ssqr(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_run(p,src,dst,VecOp::d_ssqr); } // signed square - inline Vasp *m_csqr(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_cun(p,src,dst,VecOp::d_csqr); } // complex square (with each two channels) -// inline Vasp *m_csqrt(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_cun(p,src,dst,VecOp::d_csqrt); } // complex square root (how about branches?) - - Vasp *m_cpowi(OpParam &p,CVasp &src,const Argument &arg,CVasp *dst = NULL); // complex integer power (with each two channels) inline Vasp *m_sign(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_run(p,src,dst,VecOp::d_sign); } // sign function inline Vasp *m_abs(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_run(p,src,dst,VecOp::d_abs); } // absolute values - inline Vasp *m_cabs(OpParam &p,CVasp &src,CVasp *dst = NULL) { return m_cun(p,src,dst,VecOp::d_cabs); } // absolute values } #endif |