--- trunk/dyn3d/fxhyp_loop_ik.f	2015/01/28 16:10:02	121
+++ trunk/dyn3d/fxhyp_loop_ik.f	2015/02/05 12:41:08	123
@@ -26,16 +26,14 @@
 
     ! Local:
 
-    DOUBLE PRECISION xo1, Xfi, xi, a0, a1, a2, a3, Xf1, Xprimin, xi2
+    DOUBLE PRECISION xo1, Xfi, xi, a0, a1, a2, a3, Xf1, Xprimin
     integer ii1, ii2, i, it, iter, idif, ii
-    DOUBLE PRECISION, parameter:: my_eps = 1e-3
+    DOUBLE PRECISION, parameter:: my_eps = 1e-6
     DOUBLE PRECISION xxprim(iim + 1), xvrai(iim + 1)
     INTEGER:: is2 = 0
 
     !------------------------------------------------------------------
 
-    xo1 = 0.
-
     IF (ik == 1 .and. grossismx == 1.) THEN
        ii1 = 2 
        ii2 = iim + 1
@@ -60,25 +58,19 @@
           it = 2 * nmax -1
        END IF
 
-       ! Appel de la routine qui calcule les coefficients a0, a1,
-       ! a2, a3 d'un polynome de degre 3 qui passe par les points
-       ! (Xf(it), xtild(it)) et (Xf(it + 1), xtild(it + 1))
-
        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 + 2. * a2 * xi + 3. * a3 * xi**2
-
+       Xprimin = a1 + xi * (2d0 * a2 + xi * 3d0 * a3)
+       xo1 = xi
        iter = 1
 
        do
           xi = xi - (Xf1 - Xfi) / Xprimin
           IF (ABS(xi - xo1) <= my_eps .or. iter == 300) exit
           xo1 = xi
-          xi2 = xi * xi
-          Xf1 = a0 + a1 * xi + a2 * xi2 + a3 * xi2 * xi
-          Xprimin = a1 + 2. * a2 * xi + 3. * a3 * xi2
+          Xf1 = a0 + xi * (a1 + xi * (a2 + xi * a3))
+          Xprimin = a1 + xi * (2d0 * a2 + xi * 3d0 * a3)
        end DO
 
        if (ABS(xi - xo1) > my_eps) then
@@ -109,24 +101,39 @@
        END IF
     END DO
 
-    IF (.not. (MINval(xvrai(:iim)) >= - pi_d - 1d-5 &
-         .and. MAXval(xvrai(:iim)) <= pi_d + 1d-5)) THEN
+    IF (ik == 1 .and. (MINval(xvrai(:iim)) < - pi_d - 0.1d0 &
+         .or. MAXval(xvrai(:iim)) > pi_d + 0.1d0)) THEN
        IF (xzoom <= 0.) THEN
-          IF (ik == 1) THEN
-             i = 1
+          i = 1
 
-             do while (xvrai(i) < - pi_d .and. i < iim)
-                i = i + 1
-             end do
-
-             if (xvrai(i) < - pi_d) then
-                print *, 'Xvrai plus petit que - pi !'
-                STOP 1
-             end if
+          do while (xvrai(i) < - pi_d .and. i < iim)
+             i = i + 1
+          end do
+
+          if (xvrai(i) < - pi_d) then
+             print *, 'Xvrai plus petit que - pi !'
+             STOP 1
+          end if
 
-             is2 = i
-          END IF
+          is2 = i
+       ELSE
+          i = iim
+
+          do while (xvrai(i) > pi_d .and. i > 1)
+             i = i - 1
+          end do
+
+          if (xvrai(i) > pi_d) then
+             print *, 'Xvrai plus grand que pi !'
+             STOP 1
+          end if
+
+          is2 = i
+       END IF
+    END IF
 
+    if (is2 /= 0) then
+       IF (xzoom <= 0.) THEN
           IF (is2 /= 1) THEN
              DO ii = is2, iim
                 xlon(ii-is2 + 1) = xvrai(ii)
@@ -137,22 +144,7 @@
                 xprimm(ii + iim-is2 + 1) = xxprim(ii) 
              END DO
           END IF
-       ELSE
-          IF (ik == 1) THEN
-             i = iim
-
-             do while (xvrai(i) > pi_d .and. i > 1)
-                i = i - 1
-             end do
-
-             if (xvrai(i) > pi_d) then
-                print *, 'Xvrai plus grand que pi !'
-                STOP 1
-             end if
-
-             is2 = i
-          END IF
-
+       else
           idif = iim -is2
 
           DO ii = 1, is2
@@ -164,8 +156,8 @@
              xlon(ii) = xvrai(ii + is2) - twopi_d
              xprimm(ii) = xxprim(ii + is2) 
           END DO
-       END IF
-    END IF
+       end IF
+    end if
 
     xlon(iim + 1) = xlon(1) + twopi
     xprimm(iim + 1) = xprimm(1)