Changeset 1545 for XIOS/dev/branch_openmp/src/parse_expr/operator_expr.hpp

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

• XIOS/dev/branch_openmp/src/parse_expr/operator_expr.hpp (modified) (3 diffs)

XIOS/dev/branch_openmp/src/parse_expr/operator_expr.hpp

@@ -254 +254 @@
     static inline double div_ss(double x, double y)   { return x / y; }
     static inline double pow_ss(double x, double y)   { return std::pow(x,y); }
+
     static inline double eq_ss(double x, double y) // specific check for NaN
     {
@@ -350 +351 @@
       else return Array<double,1>(x == y); 
     }
-
     static inline CArray<double,1> lt_sf(double x, const CArray<double,1>& y)    { return Array<double,1>(x < y); }
     static inline CArray<double,1> gt_sf(double x, const CArray<double,1>& y)    { return Array<double,1>(x > y); }
@@ -367 +367 @@
       else return Array<double,1>(x != y);
     }
-
-
-
     static inline double cond_sss(double x, double y, double z)   { return (x==0) ? z : y ; }