rm uv_to_Rz function from actionAngleStaeckel.c which was only used o…

…nce and conflicts with a function in KuzminKutuzovOblateStaeckelWrapperPotential.c
jobovy · Jan 22, 2018 · 8407d4f · 8407d4f
1 parent 23bad52
commit 8407d4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/galpy/actionAngle_src/actionAngle_c_ext/actionAngleStaeckel.c b/galpy/actionAngle_src/actionAngle_c_ext/actionAngleStaeckel.c
@@ -166,10 +166,6 @@ double evaluatePotentialsUV(double,double,double,int,struct potentialArg *);
 /*
   Actual functions, inlines first
 */
-inline void uv_to_Rz(double u, double v, double * R, double *z,double delta){
-  *R= delta * sinh(u) * sin(v);
-  *z= delta * cosh(u) * cos(v);
-}
 inline void Rz_to_uv_vec(int ndata,
 			 double *R,
 			 double *z,
@@ -1968,6 +1964,7 @@ double evaluatePotentialsUV(double u, double v, double delta,
 			    int nargs, 
 			    struct potentialArg * actionAngleArgs){
   double R,z;
-  uv_to_Rz(u,v,&R,&z,delta);
+  R= delta * sinh(u) * sin(v);
+  z= delta * cosh(u) * cos(v);
   return evaluatePotentials(R,z,nargs,actionAngleArgs);
 }
diff --git a/tests/test_orbit.py b/tests/test_orbit.py
@@ -160,7 +160,6 @@ def test_energy_jacobi_conservation():
             tclass= getattr(sys.modules[__name__],p)
         tp= tclass()
         if not hasattr(tp,'normalize'): continue #skip these
-        print(p)
         tp.normalize(1.)
         if hasattr(tp,'toPlanar'):
             ptp= tp.toPlanar()