--- trunk/libf/dyn3d/etat0.f90	2013/07/08 18:12:18	71
+++ trunk/libf/dyn3d/etat0.f90	2013/11/15 17:48:30	73
@@ -61,7 +61,7 @@
     ! (latitude and longitude of a point of the scalar grid identified
     ! by a simple index, in °)
 
-    REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, tpot
+    REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, teta
     REAL vcov(iim + 1, jjm, llm)
 
     REAL q(iim + 1, jjm + 1, llm, nqmx)
@@ -84,7 +84,7 @@
     REAL rugmer(klon)
     real, dimension(iim + 1, jjm + 1):: relief, zstd_2d, zsig_2d, zgam_2d
     real, dimension(iim + 1, jjm + 1):: zthe_2d, zpic_2d, zval_2d
-    real, dimension(iim + 1, jjm + 1):: tsol_2d, qsol_2d, psol
+    real, dimension(iim + 1, jjm + 1):: tsol_2d, qsol_2d, ps
     REAL zmea(klon), zstd(klon)
     REAL zsig(klon), zgam(klon)
     REAL zthe(klon)
@@ -111,6 +111,9 @@
     REAL w(ip1jmp1, llm)
     REAL phystep
 
+    real sig1(klon, llm) ! section adiabatic updraft
+    real w01(klon, llm) ! vertical velocity within adiabatic updraft
+
     !---------------------------------
 
     print *, "Call sequence information: etat0"
@@ -142,11 +145,11 @@
     PRINT *, 'Masque construit'
 
     call start_init_phys(tsol_2d, qsol_2d)
-    CALL start_init_dyn(tsol_2d, psol)
+    CALL start_init_dyn(tsol_2d, ps)
 
     ! Compute pressure on intermediate levels:
-    forall(l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * psol
-    CALL exner_hyb(psol, p3d, pks, pk)
+    forall(l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
+    CALL exner_hyb(ps, p3d, pks, pk)
     IF (MINVAL(pk) == MAXVAL(pk)) then
        print *, '"pk" should not be constant'
        stop 1
@@ -168,11 +171,11 @@
     PRINT *,  'minval(t3d) = ', minval(t3d)
     print *, "maxval(t3d) = ", maxval(t3d)
 
-    tpot(:iim, :, :) = t3d(:iim, :, :) * cpp / pk(:iim, :, :)
-    tpot(iim + 1, :, :) = tpot(1, :, :)
-    DO l=1, llm
-       tpot(:, 1, l) = SUM(aire_2d(:, 1) * tpot(:, 1, l)) / apoln
-       tpot(:, jjm + 1, l) = SUM(aire_2d(:, jjm + 1) * tpot(:, jjm + 1, l)) &
+    teta(:iim, :, :) = t3d(:iim, :, :) * cpp / pk(:iim, :, :)
+    teta(iim + 1, :, :) = teta(1, :, :)
+    DO l = 1, llm
+       teta(:, 1, l) = SUM(aire_2d(:, 1) * teta(:, 1, l)) / apoln
+       teta(:, jjm + 1, l) = SUM(aire_2d(:, jjm + 1) * teta(:, jjm + 1, l)) &
             / apols
     ENDDO
 
@@ -243,10 +246,10 @@
     print *, "jml_lic = ", jml_lic
 
     ! Si les coordonnées sont en degrés, on les transforme :
-    IF (MAXVAL( dlon_lic ) > pi)  THEN
+    IF (MAXVAL(dlon_lic) > pi)  THEN
        dlon_lic = dlon_lic * pi / 180.
     ENDIF
-    IF (maxval( dlat_lic ) > pi) THEN 
+    IF (maxval(dlat_lic) > pi) THEN 
        dlat_lic = dlat_lic * pi/ 180.
     ENDIF
 
@@ -260,7 +263,7 @@
     pctsrf = 0.
     pctsrf(:, is_lic) = pack(flic_tmp, dyn_phy)
     ! Adéquation avec le maque terre/mer
-    WHERE (pctsrf(:, is_lic) < EPSFRA ) pctsrf(:, is_lic) = 0.
+    WHERE (pctsrf(:, is_lic) < EPSFRA) pctsrf(:, is_lic) = 0.
     WHERE (zmasq < EPSFRA) pctsrf(:, is_lic) = 0.
     pctsrf(:, is_ter) = zmasq
     where (zmasq > EPSFRA)
@@ -281,13 +284,13 @@
     pctsrf(:, is_oce) = 1. - zmasq
     WHERE (pctsrf(:, is_oce) < EPSFRA) pctsrf(:, is_oce) = 0.
 
-    ! Vérification que somme des sous-surfaces vaut 1:
+    ! Vérification que somme des sous-surfaces vaut 1 :
     ji = count(abs(sum(pctsrf, dim = 2) - 1.) > EPSFRA)
     IF (ji /= 0) then
        PRINT *, 'Problème répartition sous maille pour ', ji, 'points'
     end IF
 
-    ! Calcul intermédiaire:
+    ! Calcul intermédiaire :
     CALL massdair(p3d, masse)
 
     print *, 'ALPHAX = ', alphax
@@ -304,11 +307,11 @@
     day_ref = dayref
     annee_ref = anneeref
 
-    CALL geopot(tpot, pk , pks,  phis, phi)
-    CALL caldyn0(ucov, vcov, tpot, psol, masse, pk, phis, phi, w, pbaru, &
+    CALL geopot(teta, pk , pks,  phis, phi)
+    CALL caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, pbaru, &
          pbarv)
     CALL dynredem0("start.nc", dayref, phis)
-    CALL dynredem1("start.nc", vcov, ucov, tpot, q, masse, psol, itau=0)
+    CALL dynredem1("start.nc", vcov, ucov, teta, q, masse, ps, itau=0)
 
     ! Ecriture état initial physique:
     print *, "iphysiq = ", iphysiq
@@ -355,12 +358,14 @@
     rnebcon = 0.
     ratqs = 0.
     run_off_lic_0 = 0.
+    sig1 = 0.
+    w01 = 0.
 
     call phyredem("startphy.nc", latfi, lonfi, pctsrf, &
          tsolsrf, tsoil, tslab, seaice, qsolsrf, qsol, snsrf, albe, alblw, &
          evap, rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, &
          agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, &
-         t_ancien, q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0)
+         t_ancien, q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01)
     CALL histclo
 
   END SUBROUTINE etat0