--- trunk/dyn3d/invert_zoom_x.f	2015/02/27 16:44:07	131
+++ trunk/Sources/dyn3d/invert_zoom_x.f	2015/06/16 17:27:33	146
@@ -6,22 +6,25 @@
 
 contains
 
-  subroutine invert_zoom_x(xf, xtild, Xprimt, xlon, xprimm, xuv)
+  subroutine invert_zoom_x(xf, xtild, G, xlon, xprimm, xuv)
 
     use coefpoly_m, only: coefpoly
     USE dimens_m, ONLY: iim
+    use dynetat0_m, only: clon
     use nr_util, only: pi_d, twopi_d
-    use serre, only: clon
+    use numer_rec_95, only: hunt
+
+    DOUBLE PRECISION, intent(in):: Xf(0:), xtild(0:), G(0:) ! (0:nmax)
 
-    DOUBLE PRECISION, intent(in):: Xf(0:), xtild(0:), Xprimt(0:) ! (0:2 * nmax)
     real, intent(out):: xlon(:), xprimm(:) ! (iim)
 
     DOUBLE PRECISION, intent(in):: xuv
+    ! between - 0.25 and 0.5
     ! 0. si calcul aux points scalaires 
-    ! 0.5 si calcul aux points U 
+    ! 0.5 si calcul aux points U
 
     ! Local:
-    DOUBLE PRECISION xo1, Xfi, a0, a1, a2, a3, Xf1, Xprimin
+    DOUBLE PRECISION xo1, Xfi, abs_xfi, a0, a1, a2, a3, Xf1, Xprimin
     integer i, it, iter
     DOUBLE PRECISION, parameter:: my_eps = 1d-6
 
@@ -30,31 +33,28 @@
 
     !------------------------------------------------------------------
 
+    it = 0 ! initial guess
+
     DO i = 1, iim
        Xfi = - pi_d + (i + xuv - 0.75d0) * twopi_d / iim
+       ! - pi <= xfi < pi
+       abs_xfi = abs(xfi)
 
-       it = 2 * nmax
-       do while (xfi < xf(it) .and. it >= 1)
-          it = it - 1
-       end do
+       call hunt(xf, abs_xfi, it, my_lbound = 0)
+       ! {0 <= it <= nmax - 1}
 
-       ! Calcul de Xf(xvrai(i)) 
+       ! Calcul de xvrai(i) et xxprim(i)
 
+       CALL coefpoly(Xf(it), Xf(it + 1), G(it), G(it + 1), xtild(it), &
+            xtild(it + 1), a0, a1, a2, a3)
        xvrai(i) = xtild(it)
-
-       IF (it == 2 * nmax) THEN
-          it = 2 * nmax -1
-       END IF
-
-       CALL coefpoly(Xf(it), Xf(it + 1), Xprimt(it), Xprimt(it + 1), &
-            xtild(it), xtild(it + 1), a0, a1, a2, a3)
        Xf1 = Xf(it)
-       Xprimin = a1 + xvrai(i) * (2d0 * a2 + xvrai(i) * 3d0 * a3)
+       Xprimin = G(it)
        xo1 = xvrai(i)
        iter = 1
 
        do
-          xvrai(i) = xvrai(i) - (Xf1 - Xfi) / Xprimin
+          xvrai(i) = xvrai(i) - (Xf1 - abs_xfi) / Xprimin
           IF (ABS(xvrai(i) - xo1) <= my_eps .or. iter == 300) exit
           xo1 = xvrai(i)
           Xf1 = a0 + xvrai(i) * (a1 + xvrai(i) * (a2 + xvrai(i) * a3))
@@ -64,10 +64,11 @@
        if (ABS(xvrai(i) - xo1) > my_eps) then
           ! iter == 300
           print *, 'Pas de solution.'
-          print *, i, xfi
+          print *, i, abs_xfi
           STOP 1
        end if
 
+       if (xfi < 0) xvrai(i) = - xvrai(i)
        xxprim(i) = twopi_d / (iim * Xprimin)
     end DO