--- trunk/libf/dyn3d/inidissip.f90	2011/02/22 13:49:36	40
+++ trunk/Sources/dyn3d/Dissipation/inidissip.f	2015/05/06 15:51:03	137
@@ -6,9 +6,9 @@
 
   private llm
 
-  REAL dtdiss
-  integer idissip ! période de la dissipation (en pas)
-  real tetaudiv(llm), tetaurot(llm), tetah(llm) 
+  REAL dtdiss ! in s
+  integer idissip ! période de la dissipation (en pas de temps)
+  real tetaudiv(llm), tetaurot(llm), tetah(llm) ! in s-1
   real cdivu, crot, cdivh
 
 contains
@@ -16,125 +16,88 @@
   SUBROUTINE inidissip
 
     ! From dyn3d/inidissip.F, version 1.1.1.1 2004/05/19 12:53:06
-    ! Initialisation de la dissipation horizontale 
 
-    USE comconst, ONLY : dtvr
-    use comdissnew, only: lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
-         tetagrot, tetatemp
-    USE comvert, ONLY : preff, presnivs
-    USE conf_gcm_m, ONLY : iperiod
-    USE dimens_m, ONLY : jjm, llm
-    USE paramet_m, ONLY : iip1, ip1jm, ip1jmp1, jjp1
-    use new_unit_m, only: new_unit
-    use filtreg_m, only: filtreg
+    ! Initialisation de la dissipation horizontale. Calcul des valeurs
+    ! propres des opérateurs par méthode itérative.
+
+    USE comconst, ONLY: dtvr
+    use comdissnew, only: nitergdiv, nitergrot, niterh, tetagdiv, tetagrot, &
+         tetatemp
+    USE disvert_m, ONLY: preff, presnivs
+    USE conf_gcm_m, ONLY: iperiod
+    USE dimens_m, ONLY: iim, jjm
+    use divgrad2_m, only: divgrad2
+    use filtreg_scal_m, only: filtreg_scal
+    use filtreg_v_m, only: filtreg_v
+    use gradiv2_m, only: gradiv2
+    use jumble, only: new_unit
+    use nxgraro2_m, only: nxgraro2
+    USE paramet_m, ONLY: jjp1
 
     ! Variables local to the procedure:
-    REAL zvert(llm), max_zvert
-    REAL zh(ip1jmp1), zu(ip1jmp1), zv(ip1jm), deltap(ip1jmp1, llm)
-    REAL zhmin, zhmax
+    REAL zvert(llm), max_zvert ! no dimension
+    REAL, dimension(iim + 1, jjm + 1, 1):: zh, zu, gx, divgra, deltap
+    real zv(iim + 1, jjm, 1), gy(iim + 1, jjm, 1)
     REAL zllm
-    INTEGER l, ij, idum, ii, unit
+    INTEGER l, seed_size, ii, unit
     REAL tetamin ! in s
-    REAL ran1
 
     !-----------------------------------------------------------------------
 
     PRINT *, 'Call sequence information: inidissip'
+    call random_seed(size=seed_size)
+    call random_seed(put=(/(1, ii = 1, seed_size)/))
 
-    ! Calcul des valeurs propres des opérateurs par méthode itérative :
-
-    crot = -1.
-    cdivu = -1.
-    cdivh = -1.
-
-    ! Calcul de la valeur propre de divgrad :
-
+    PRINT *, 'Calcul des valeurs propres de divgrad'
     deltap = 1.
-    idum = -1
-    zh(1) = ran1(idum) - 0.5
-    idum = 0
-    DO ij = 2, ip1jmp1
-       zh(ij) = ran1(idum) - 0.5
+    call random_number(zh)
+    zh = zh - 0.5
+    CALL filtreg_scal(zh, direct = .true., intensive = .true.)
+
+    DO l = 1, 50
+       CALL divgrad2(1, zh, deltap, niterh, divgra, -1.)
+       zllm = abs(maxval(divgra))
+       zh = divgra / zllm
     END DO
 
-    CALL filtreg(zh, jjp1, 1, 2, 1, .TRUE., 1)
+    cdivh = 1. / zllm
+    PRINT *, 'cdivh = ', cdivh
 
-    CALL minmax(iip1*jjp1, zh, zhmin, zhmax)
-    IF (zhmin >= zhmax) THEN
-       PRINT *, 'zhmin zhmax', zhmin, zhmax
-       print *, 'Problème générateur aléatoire dans inidissip'
-       STOP 1
-    END IF
+    PRINT *, 'Calcul des valeurs propres de gradiv'
+    call random_number(zu)
+    zu = zu - 0.5
+    CALL filtreg_scal(zu, direct = .true., intensive = .true.)
+    call random_number(zv)
+    zv = zv - 0.5
+    CALL filtreg_v(zv, intensive = .true.)
 
     DO l = 1, 50
-       IF (lstardis) THEN
-          CALL divgrad2(1, zh, deltap, niterh, zh)
-       ELSE
-          CALL divgrad(1, zh, niterh, zh)
-       END IF
+       CALL gradiv2(zu, zv, nitergdiv, gx, gy, -1.)
+       zllm = max(abs(maxval(gx)), abs(maxval(gy)))
+       zu = gx / zllm
+       zv = gy / zllm
+    end DO
 
-       zllm = abs(maxval(zh))
-       zh = zh / zllm
-    END DO
+    cdivu = 1. / zllm
+    PRINT *, 'cdivu = ', cdivu
 
-    IF (lstardis) THEN
-       cdivh = 1. / zllm
-    ELSE
-       cdivh = zllm**(- 1. / niterh)
-    END IF
-
-    ! Calcul des valeurs propres de gradiv (ii = 1) et nxgrarot (ii = 2) 
-
-    PRINT *, 'Calcul des valeurs propres'
-
-    DO ii = 1, 2
-       DO ij = 1, ip1jmp1
-          zu(ij) = ran1(idum) - 0.5
-       END DO
-       CALL filtreg(zu, jjp1, 1, 2, 1, .TRUE., 1)
-       DO ij = 1, ip1jm
-          zv(ij) = ran1(idum) - 0.5
-       END DO
-       CALL filtreg(zv, jjm, 1, 2, 1, .FALSE., 1)
-
-       DO l = 1, 50
-          IF (ii==1) THEN
-             IF (lstardis) THEN
-                CALL gradiv2(1, zu, zv, nitergdiv, zu, zv)
-             ELSE
-                CALL gradiv(1, zu, zv, nitergdiv, zu, zv)
-             END IF
-          ELSE
-             IF (lstardis) THEN
-                CALL nxgraro2(1, zu, zv, nitergrot, zu, zv)
-             ELSE
-                CALL nxgrarot(1, zu, zv, nitergrot, zu, zv)
-             END IF
-          END IF
-
-          zllm = max(abs(maxval(zu)), abs(maxval(zv)))
-          zu = zu / zllm
-          zv = zv / zllm
-       end DO
-
-       IF (ii==1) THEN
-          IF (lstardis) THEN
-             cdivu = 1. / zllm
-          ELSE
-             cdivu = zllm**(- 1. / nitergdiv)
-          END IF
-       ELSE
-          IF (lstardis) THEN
-             crot = 1./zllm
-          ELSE
-             crot = zllm**(-1. / nitergrot)
-          END IF
-       END IF
-    END DO
+    PRINT *, 'Calcul des valeurs propres de nxgrarot'
+    call random_number(zu)
+    zu = zu - 0.5
+    CALL filtreg_scal(zu, direct = .true., intensive = .true.)
+    call random_number(zv)
+    zv = zv - 0.5
+    CALL filtreg_v(zv, intensive = .true.)
 
-    PRINT *, 'cdivu = ', cdivu
+    DO l = 1, 50
+       CALL nxgraro2(zu, zv, nitergrot, gx, gy, -1.)
+       zllm = max(abs(maxval(gx)), abs(maxval(gy)))
+       zu = gx / zllm
+       zv = gy / zllm
+    end DO
+
+    crot = 1. / zllm
     PRINT *, 'crot = ', crot
-    PRINT *, 'cdivh = ', cdivh
 
     ! Variation verticale du coefficient de dissipation :
     zvert = 2. - 1. / (1. + (preff / presnivs - 1.)**2)
@@ -143,23 +106,29 @@
     tetaudiv = zvert / tetagdiv
     tetaurot = zvert / tetagrot
     tetah = zvert / tetatemp
-    call new_unit(unit)
-    open(unit, file="inidissip.csv", status="replace", action="write")
-    write(unit, fmt=*) "tetaudiv tetaurot tetah" ! title line
-    do l = 1, llm
-       write(unit, fmt=*) tetaudiv(l), tetaurot(l), tetah(l)
-    end do
-    close(unit)
-    print *, 'Created file "inidissip.csv".'
 
     max_zvert = maxval(zvert)
-    tetamin = min(1E6, tetagdiv / max_zvert, tetagrot / max_zvert, &
+    tetamin = min(1e6, tetagdiv / max_zvert, tetagrot / max_zvert, &
          tetatemp / max_zvert)
     PRINT *, 'tetamin = ', tetamin
     idissip = max(1, int(tetamin / (2 * dtvr * iperiod))) * iperiod
     PRINT *, 'idissip = ', idissip
     dtdiss = idissip * dtvr
-    PRINT *, 'dtdiss = ', dtdiss
+    PRINT *, 'dtdiss = ', dtdiss, "s"
+
+    call new_unit(unit)
+    open(unit, file="inidissip.csv", status="replace", action="write")
+
+    ! Title line:
+    write(unit, fmt=*) '"presnivs (hPa)" "dtdiss * tetaudiv" ' &
+         // '"dtdiss * tetaurot" "dtdiss * tetah"'
+
+    do l = 1, llm
+       write(unit, fmt=*) presnivs(l) / 100., dtdiss * tetaudiv(l), &
+            dtdiss * tetaurot(l), dtdiss * tetah(l)
+    end do
+    close(unit)
+    print *, 'Created file "inidissip.csv".'
 
   END SUBROUTINE inidissip