atan_2 changed to atan2

ufl/__init__.py

@@ -185,7 +185,7 @@
     - sqrt
     - exp, ln, erf
     - cos, sin, tan
-    - acos, asin, atan, atan_2
+    - acos, asin, atan, atan2
     - cosh, sinh, tanh
     - bessel_J, bessel_Y, bessel_I, bessel_K
 
@@ -320,7 +320,7 @@
 from ufl.operators import (
     rank, shape, conj, real, imag, outer, inner, dot, cross, perp,
     det, inv, cofac, transpose, tr, diag, diag_vector, dev, skew, sym,
-    sqrt, exp, ln, erf, cos, sin, tan, acos, asin, atan, atan_2, cosh, sinh, tanh,
+    sqrt, exp, ln, erf, cos, sin, tan, acos, asin, atan, atan2, cosh, sinh, tanh,
     bessel_J, bessel_Y, bessel_I, bessel_K, eq, ne, le, ge, lt, gt, And, Or, Not,
     conditional, sign, max_value, min_value, variable, diff,
     Dx, grad, div, curl, rot, nabla_grad, nabla_div, Dn, exterior_derivative,
@@ -385,7 +385,7 @@
     'transpose', 'tr', 'diag', 'diag_vector', 'dev', 'skew', 'sym',
     'sqrt', 'exp', 'ln', 'erf',
     'cos', 'sin', 'tan',
-    'acos', 'asin', 'atan', 'atan_2',
+    'acos', 'asin', 'atan', 'atan2',
     'cosh', 'sinh', 'tanh',
     'bessel_J', 'bessel_Y', 'bessel_I', 'bessel_K',
     'eq', 'ne', 'le', 'ge', 'lt', 'gt', 'And', 'Or', 'Not',

ufl/algorithms/apply_derivatives.py

@@ -354,7 +354,7 @@ def atan(self, o, fp):
         f, = o.ufl_operands
         return fp / (1.0 + f**2)
 
-    def atan_2(self, o, fp, gp):
+    def atan2(self, o, fp, gp):
         f, g = o.ufl_operands
         return (g * fp - f * gp) / (f**2 + g**2)
 

ufl/algorithms/estimate_degrees.py

@@ -242,7 +242,7 @@ def power(self, v, a, b):
         # negative integer, Coefficient, etc.
         return self._add_degrees(v, a, 2)
 
-    def atan_2(self, v, a, b):
+    def atan2(self, v, a, b):
         """Using the heuristic
         degree(atan2(const,const)) == 0
         degree(atan2(a,b)) == max(degree(a),degree(b))+2

ufl/mathfunctions.py

@@ -290,12 +290,12 @@ def evaluate(self, x, mapping, component, index_values):
         except TypeError:
             raise ValueError('Atan2 does not support complex numbers.')
         except ValueError:
-            warnings.warn('Value error in evaluation of function atan_2 with arguments %s, %s.' % (a, b))
+            warnings.warn('Value error in evaluation of function atan2 with arguments %s, %s.' % (a, b))
             raise
         return res
 
     def __str__(self):
-        return "atan_2(%s,%s)" % (self.ufl_operands[0], self.ufl_operands[1])
+        return "atan2(%s,%s)" % (self.ufl_operands[0], self.ufl_operands[1])
 
 
 @ufl_type()

ufl/operators.py

@@ -605,12 +605,12 @@ def atan(f):
     return _mathfunction(f, Atan)
 
 
-def atan_2(f1, f2):
+def atan2(f1, f2):
     "UFL operator: Take the inverse tangent with two the arguments *f1* and *f2*."
     f1 = as_ufl(f1)
     f2 = as_ufl(f2)
     if isinstance(f1, (ComplexValue, complex)) or isinstance(f2, (ComplexValue, complex)):
-        raise TypeError('atan_2 is incompatible with complex numbers.')
+        raise TypeError('atan2 is incompatible with complex numbers.')
     r = Atan2(f1, f2)
     if isinstance(r, (RealValue, Zero, int, float)):
         return float(r)