--- trunk/dyn3d/comgeom.f90	2014/02/28 17:52:47	79
+++ trunk/dyn3d/comgeom.f	2014/09/18 13:36:51	112
@@ -166,15 +166,14 @@
     use conf_gcm_m, ONLY : fxyhypb, ysinus
     use fxy_m, only: fxy
     use fxyhyper_m, only: fxyhyper
+    use fxysinus_m, only: fxysinus
     use jumble, only: new_unit
     use nr_util, only: pi
     USE paramet_m, ONLY : iip1, jjp1
-    USE serre, ONLY : alphax, alphay, clat, clon, dzoomx, dzoomy, grossismx, &
-         grossismy, pxo, pyo, taux, tauy, transx, transy
-    ! Modifies pxo, pyo, transx, transy
-
-    ! Variables locales
+    USE serre, ONLY : alphax, alphay, clat, clon, pxo, pyo, transx, transy
+    ! Modifiés pxo, pyo, transx, transy
 
+    ! Local:
     INTEGER i, j, itmax, itmay, iter, unit
     REAL cvu(iip1, jjp1), cuv(iip1, jjm)
     REAL ai14, ai23, airez, un4rad2
@@ -216,10 +215,15 @@
     print *, "gamdi_grot = ", gamdi_grot
     print *, "gamdi_h = ", gamdi_h
 
-    IF (.NOT. fxyhypb) THEN
+    IF (fxyhypb) THEN
+       print *, 'inigeom: Y = latitude, dérivée tangente hyperbolique'
+       CALL fxyhyper(rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, rlatu2, &
+            yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, &
+            rlonp025, xprimp025)
+    ELSE
        IF (ysinus) THEN
-          print *, ' Inigeom, Y = Sinus (Latitude) '
-          ! utilisation de f(x, y) avec y = sinus de la latitude 
+          print *, 'inigeom: Y = sin(latitude)'
+          ! Utilisation de f(x, y) avec y = sinus de la latitude 
           CALL fxysinus(rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, &
                rlatu2, yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, &
                xprimm025, rlonp025, xprimp025)
@@ -268,13 +272,6 @@
                yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, &
                rlonp025, xprimp025)
        END IF
-    ELSE
-       ! Utilisation de fxyhyper, f(x, y) à dérivée tangente hyperbolique
-       print *, 'Inigeom, Y = Latitude, dérivée tangente hyperbolique'
-       CALL fxyhyper(clat, grossismy, dzoomy, tauy, clon, grossismx, dzoomx, &
-            taux, rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, rlatu2, &
-            yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, &
-            rlonp025, xprimp025)
     END IF
 
     rlatu(1) = pi / 2.