Changeset 5283 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 28, 2024, 1:47:34 PM (3 months ago)

Author:

abarral

Message:

Turn tracstoke.h conema3.h cv30_routines.f90 cv30param.h into modules

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• concvl.F90 (modified) (2 diffs)
• conema3_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/conema3.h) (1 diff)
• cv30_routines_mod.F90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90) (189 diffs)
• cv30param.h (deleted)
• cv3_routines.F90 (modified) (8 diffs)
• cv_driver.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmdiso/concvl.F90

@@ -76 +76 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+  USE conema3_mod_h
   IMPLICIT NONE
 ! ======================================================================
@@ -310 +311 @@
   include "YOETHF.h"
   include "FCTTRE.h"
-!jyg<
-  include "conema3.h"
-!>jyg
 
   IF (first) THEN

LMDZ6/trunk/libf/phylmdiso/conema3_mod_h.f90

@@ -1 @@
-link ../phylmd/conema3.h
+link ../phylmd/conema3_mod_h.f90

LMDZ6/trunk/libf/phylmdiso/cv30_routines_mod.F90

@@ -1 @@
-
-! $Id$
-
+MODULE cv30_routines_mod
+  !------------------------------------------------------------
+  ! Parameters for convectL, iflag_con=30:
+  ! (includes - microphysical parameters,
+  !            - parameters that control the rate of approach
+  !               to quasi-equilibrium)
+  !            - noff & minorig (previously in input of convect1)
+  !------------------------------------------------------------
+
+  IMPLICIT NONE; PRIVATE
+  PUBLIC sigd, spfac, pbcrit, ptcrit, omtrain, dtovsh, dpbase, dttrig, dtcrit, &
+          tau, beta, alpha, delta, betad, noff, minorig, nl, nlp, nlm, &
+          cv30_param, cv30_prelim, cv30_feed, cv30_undilute1, cv30_trigger, &
+          cv30_compress, cv30_undilute2, cv30_closure, cv30_mixing, cv30_unsat, &
+          cv30_yield, cv30_tracer, cv30_uncompress, cv30_epmax_fn_cape
+
+  INTEGER noff, minorig, nl, nlp, nlm
+  REAL sigd, spfac
+  REAL pbcrit, ptcrit
+  REAL omtrain
+  REAL dtovsh, dpbase, dttrig
+  REAL dtcrit, tau, beta, alpha
+  REAL delta
+  REAL betad
+
+  !$OMP THREADPRIVATE(sigd, spfac, pbcrit, ptcrit, omtrain, dtovsh, dpbase, dttrig, dtcrit, &
+  !$OMP      tau, beta, alpha, delta, betad, noff, minorig, nl, nlp, nlm)
+CONTAINS
 
 
 SUBROUTINE cv30_param(nd, delt)
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+  USE conema3_mod_h
+
   IMPLICIT NONE
 
@@ -32 +57 @@
   ! ***                     IT MUST BE LESS THAN 0              ***
 
-  include "cv30param.h"
-  include "conema3.h"
-
   INTEGER nd
   REAL delt ! timestep (seconds)
@@ -82 +104 @@
   betad = 10.0 ! original value (from convect 4.3)
 
-  RETURN
+
 END SUBROUTINE cv30_param
 
 SUBROUTINE cv30_prelim(len, nd, ndp1, t, q, p, ph, lv, cpn, tv, gz, h, hm, &
     th)
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+
+  USE cvthermo_mod_h
   IMPLICIT NONE
 
@@ -111 +133 @@
   REAL tvx, tvy ! convect3
   REAL cpx(len, nd)
-
-  include "cv30param.h"
 
 
@@ -158 +178 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_prelim
 
@@ -164 +184 @@
     iflag, tnk, qnk, gznk, plcl &
 #ifdef ISO
-    ,xt,xtnk  &  
+    ,xt,xtnk  &
 #endif
     )
@@ -186 +206 @@
   ! ================================================================
 
-  include "cv30param.h"
+
 
   ! inputs:
@@ -194 +214 @@
   REAL ph(len, nd+1)
 #ifdef ISO
-  real xt(ntraciso,len,nd)      
+  REAL xt(ntraciso,len,nd)
 #endif
 
@@ -201 +221 @@
   REAL tnk(len), qnk(len), gznk(len), plcl(len)
 #ifdef ISO
-  real xtnk(ntraciso,len)      
+  REAL xtnk(ntraciso,len)
 #endif
 
@@ -207 +227 @@
   INTEGER i, k
 #ifdef ISO
-        integer ixt
+        INTEGER ixt
 #endif
   INTEGER ihmin(len)
@@ -228 +248 @@
   ! @       do 200 k=2,nlp
   ! @         do 190 i=1,len
-  ! @          if((hm(i,k).lt.work(i)).and.
-  ! @      &      (hm(i,k).lt.hm(i,k-1)))then
+  ! @          if((hm(i,k).lt.work(i)).AND.
+  ! @      &      (hm(i,k).lt.hm(i,k-1)))THEN
   ! @            work(i)=hm(i,k)
   ! @            ihmin(i)=k
@@ -237 +257 @@
   ! @       do 210 i=1,len
   ! @         ihmin(i)=min(ihmin(i),nlm)
-  ! @         if(ihmin(i).le.minorig)then
+  ! @         IF(ihmin(i).le.minorig)THEN
   ! @           iflag(i)=6
   ! @         endif
@@ -253 +273 @@
   ! @       do 240 k=minorig+1,nl
   ! @         do 230 i=1,len
-  ! @          if((hm(i,k).gt.work(i)).and.(k.le.ihmin(i)))then
+  ! @          if((hm(i,k).gt.work(i)).AND.(k.le.ihmin(i)))THEN
   ! @            work(i)=hm(i,k)
   ! @            nk(i)=k
@@ -273 +293 @@
   ! -------------------------------------------------------------------
   DO i = 1, len
-    IF (((t(i,nk(i))<250.0) .OR. (q(i,nk(i))<=0.0)) & ! @      &       .or.(
+    IF (((t(i,nk(i))<250.0) .OR. (q(i,nk(i))<=0.0)) & ! @      &       .OR.(
                                                       ! p(i,ihmin(i)).lt.400.0
                                                       ! )  )
@@ -296 +316 @@
       qsnk(i) = qs(i, nk(i))
 #ifdef ISO
-      do ixt=1,ntraciso
+      DO ixt=1,ntraciso
         xtnk(ixt,i) = xt(ixt,i, nk(i))
       enddo
@@ -323 +343 @@
   ! @      do 290 k=minorig,nl
   ! @        do 280 i=1,len
-  ! @          if((k.ge.(nk(i)+1)).and.(p(i,k).lt.plcl(i)))
+  ! @          if((k.ge.(nk(i)+1)).AND.(p(i,k).lt.plcl(i)))
   ! @     &    icb(i)=min(icb(i),k)
   ! @ 280    continue
@@ -329 +349 @@
   ! @c
   ! @      do 300 i=1,len
-  ! @        if((icb(i).ge.nlm).and.(iflag(i).eq.0))iflag(i)=9
+  ! @        if((icb(i).ge.nlm).AND.(iflag(i).EQ.0))iflag(i)=9
   ! @ 300  continue
 
@@ -346 +366 @@
 
   DO i = 1, len
-    ! @        if((icb(i).ge.nlm).and.(iflag(i).eq.0))iflag(i)=9
+    ! @        if((icb(i).ge.nlm).AND.(iflag(i).EQ.0))iflag(i)=9
     IF ((icb(i)==nlm) .AND. (iflag(i)==0)) iflag(i) = 9
   END DO
@@ -358 +378 @@
   icbmax = 2
   DO i = 1, len
-    ! !        icbmax=max(icbmax,icb(i))
+    !        icbmax=max(icbmax,icb(i))
     IF (iflag(i)<7) icbmax = max(icbmax, icb(i)) ! sb Jun7th02
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_feed
 
@@ -368 +388 @@
     clw, icbs &
 #ifdef ISO
-     &                       ,xt,xtclw &
-#endif
-     &                       )
+                             ,xt,xtclw &
+#endif
+                             )
 
 #ifdef ISO
@@ -380 +400 @@
 USE isotopes_routines_mod, ONLY: condiso_liq_ice_vectall_trac
 #ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: iso_verif_traceur
-#endif
-#endif
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif, &
+    USE isotopes_verif_mod, ONLY: iso_verif_traceur
+#endif
+#endif
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif, &
         iso_verif_egalite_choix, iso_verif_noNaN,iso_verif_aberrant, &
         iso_verif_egalite,iso_verif_egalite_choix_nostop,iso_verif_positif_nostop, &
@@ -391 +411 @@
 #endif
 #endif
-
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+USE cvthermo_mod_h
+
   IMPLICIT NONE
 
@@ -409 +428 @@
   ! ----------------------------------------------------------------
 
-  include "cv30param.h"
 
   ! inputs:
@@ -418 +436 @@
   REAL plcl(len) ! convect3
 #ifdef ISO
-      real xt(ntraciso,len,nd)
+      REAL xt(ntraciso,len,nd)
 #endif
 
@@ -424 +442 @@
   REAL tp(len, nd), tvp(len, nd), clw(len, nd)
 #ifdef ISO
-      real xtclw(ntraciso,len,nd) 
-      real tg_save(len,nd) 
+      REAL xtclw(ntraciso,len,nd)
+      REAL tg_save(len,nd)
 #endif
 
@@ -437 +455 @@
   REAL cpinv(len) ! convect3
 #ifdef ISO
-      integer ixt
-      real zfice(len),zxtliq(ntraciso,len),zxtice(ntraciso,len)
-      real q_k(len),clw_k(len),tg_k(len),xt_k(ntraciso,len)
-!#ifdef ISOVERIF      
+      INTEGER ixt
+      REAL zfice(len),zxtliq(ntraciso,len),zxtice(ntraciso,len)
+      REAL q_k(len),clw_k(len),tg_k(len),xt_k(ntraciso,len)
+!#ifdef ISOVERIF
 !      integer iso_verif_positif_nostop
 !#endif
@@ -453 +471 @@
 
 #ifdef ISOVERIF
-        write(*,*) 'cv30_routine undilute 1 413: entree'
+        WRITE(*,*) 'cv30_routine undilute 1 413: entree'
 #endif
 
@@ -493 +511 @@
 
   ! Re-compute icbsmax (icbsmax2):        !convect3
-  ! !convect3
+  !convect3
   icbsmax2 = 2 !convect3
   DO i = 1, len !convect3
@@ -507 +525 @@
       clw(i, k) = 0.0 ! convect3
 #ifdef ISO
-        do ixt=1,ntraciso
+        DO ixt=1,ntraciso
          xtclw(ixt,i,k) = 0.0
         enddo
-        
+
 #endif
     END DO ! convect3
@@ -548 +566 @@
     denom = 243.5 + tc
     denom = max(denom, 1.0) ! convect3
-    ! ori          if(tc.ge.0.0)then
+    ! ori          IF(tc.ge.0.0)THEN
     es = 6.112*exp(17.67*tc/denom)
     ! ori          else
@@ -570 +588 @@
     denom = 243.5 + tc
     denom = max(denom, 1.0) ! convect3
-    ! ori          if(tc.ge.0.0)then
+    ! ori          IF(tc.ge.0.0)THEN
     es = 6.112*exp(17.67*tc/denom)
     ! ori          else
@@ -602 +620 @@
 #ifdef ISO
        ! calcul de zfice
-       do i=1,len
+       DO i=1,len
           zfice(i) = 1.0-(t(i,icbs(i))-pxtice)/(pxtmelt-pxtice)
-          zfice(i) = MIN(MAX(zfice(i),0.0),1.0)          
+          zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
        enddo
        ! calcul de la composition du condensat glace et liquide
 
-       do i=1,len
+       DO i=1,len
          clw_k(i)=clw(i,icbs(i))
-         tg_k(i)=t(i,icbs(i)) 
-         do ixt=1,ntraciso
-            xt_k(ixt,i)=xt(ixt,i,nk(i)) 
-          enddo         
+         tg_k(i)=t(i,icbs(i))
+         DO ixt=1,ntraciso
+            xt_k(ixt,i)=xt(ixt,i,nk(i))
+          enddo
        enddo
 #ifdef ISOVERIF
-        write(*,*) 'cv30_routine undilute1 573: avant condiso' 
-        write(*,*) 't(1,1)=',t(1,1)                 
-        do i=1,len
-           call iso_verif_positif(t(i,icbs(i))-Tmin_verif, &
-     &        'cv30_routines 654')
+        WRITE(*,*) 'cv30_routine undilute1 573: avant condiso'
+        WRITE(*,*) 't(1,1)=',t(1,1)
+        DO i=1,len
+           CALL iso_verif_positif(t(i,icbs(i))-Tmin_verif, &
+              'cv30_routines 654')
         enddo
-        if (iso_HDO.gt.0) then            
-         do i=1,len
-          if (qnk(i).gt.ridicule) then
-           call iso_verif_aberrant(xt_k(iso_hdo,i)/qnk(i), &
-     &            'cv30_routines 576')
-           endif  !if (qnk(i).gt.ridicule) then
-         enddo        
-        endif !if (iso_HDO.gt.0) then 
-!        write(*,*) 'i=1, clw_k,qnk=',clw_k(1),qnk(1)
-#endif
-       call condiso_liq_ice_vectall(xt_k(1,1),qnk(1), &
-     &        clw_k(1),tg_k(1), &
-     &        zfice(1),zxtice(1,1),zxtliq(1,1),len) 
+        IF (iso_HDO.gt.0) THEN
+         DO i=1,len
+          IF (qnk(i).gt.ridicule) THEN
+           CALL iso_verif_aberrant(xt_k(iso_hdo,i)/qnk(i), &
+                  'cv30_routines 576')
+           endif  !if (qnk(i).gt.ridicule) THEN
+         enddo
+        endif !if (iso_HDO.gt.0) THEN
+!        WRITE(*,*) 'i=1, clw_k,qnk=',clw_k(1),qnk(1)
+#endif
+       CALL condiso_liq_ice_vectall(xt_k(1,1),qnk(1), &
+              clw_k(1),tg_k(1), &
+              zfice(1),zxtice(1,1),zxtliq(1,1),len)
 #ifdef ISOTRAC
 #ifdef ISOVERIF
-        write(*,*) 'cv30_routines 658: call condiso_liq_ice_vectall_trac'
-#endif
-        call condiso_liq_ice_vectall_trac(xt_k(1,1),qnk(1), &
-     &        clw_k(1),tg_k(1), &
-     &        zfice(1),zxtice(1,1),zxtliq(1,1),len)
-#endif
-       do i=1,len
-         do ixt = 1, ntraciso   
-           xtclw(ixt,i,icbs(i))=  zxtice(ixt,i)+zxtliq(ixt,i)   
+        WRITE(*,*) 'cv30_routines 658: CALL condiso_liq_ice_vectall_trac'
+#endif
+        CALL condiso_liq_ice_vectall_trac(xt_k(1,1),qnk(1), &
+              clw_k(1),tg_k(1), &
+              zfice(1),zxtice(1,1),zxtliq(1,1),len)
+#endif
+       DO i=1,len
+         DO ixt = 1, ntraciso
+           xtclw(ixt,i,icbs(i))=  zxtice(ixt,i)+zxtliq(ixt,i)
            xtclw(ixt,i,icbs(i))=max(0.0,xtclw(ixt,i,icbs(i)))
-         enddo !do ixt=1,niso    
-       enddo  !do i=1,len        
-
-#ifdef ISOVERIF
-            write(*,*) 'cv30_routine undilute 1 598: apres condiso'
-          
-          if (iso_eau.gt.0) then
-            do i=1,len
-              call iso_verif_egalite_choix(xtclw(iso_eau,i,icbs(i)), &
-     &         clw(i,icbs(i)),'cv30_routines 577',errmax,errmaxrel)
+         enddo !do ixt=1,niso
+       enddo  !do i=1,len
+
+#ifdef ISOVERIF
+            WRITE(*,*) 'cv30_routine undilute 1 598: apres condiso'
+
+          IF (iso_eau.gt.0) THEN
+            DO i=1,len
+              CALL iso_verif_egalite_choix(xtclw(iso_eau,i,icbs(i)), &
+               clw(i,icbs(i)),'cv30_routines 577',errmax,errmaxrel)
             enddo !do i=1,len
-          endif !if (iso_eau.gt.0) then 
-#ifdef ISOTRAC   
-        do i=1,len
-           call iso_verif_traceur(xtclw(1,i,k),'cv30_routines 603')
+          endif !if (iso_eau.gt.0) THEN
+#ifdef ISOTRAC
+        DO i=1,len
+           CALL iso_verif_traceur(xtclw(1,i,k),'cv30_routines 603')
         enddo
 #endif
-          
+
 #endif
 #endif
@@ -716 +734 @@
     denom = 243.5 + tc
     denom = max(denom, 1.0) ! convect3
-    ! ori          if(tc.ge.0.0)then
+    ! ori          IF(tc.ge.0.0)THEN
     es = 6.112*exp(17.67*tc/denom)
     ! ori          else
@@ -738 +756 @@
     denom = 243.5 + tc
     denom = max(denom, 1.0) ! convect3
-    ! ori          if(tc.ge.0.0)then
+    ! ori          IF(tc.ge.0.0)THEN
     es = 6.112*exp(17.67*tc/denom)
     ! ori          else
@@ -772 +790 @@
 
 #ifdef ISO
-        do i=1,len
+        DO i=1,len
          zfice(i) = 1.0-(t(i,icb(i)+1)-pxtice)/(pxtmelt-pxtice)
          zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
-!         call calcul_zfice(tp(i,icb(i)+1),zfice)
+!         CALL calcul_zfice(tp(i,icb(i)+1),zfice)
         enddo !do i=1,len
-        do i=1,len
+        DO i=1,len
          clw_k(i)=clw(i,icb(i)+1)
          tg_k(i)=t(i,icb(i)+1)
 #ifdef ISOVERIF
-        call iso_verif_positif(tg_k(i)-Tmin_verif,'cv30_routines 750')   
-#endif         
-         do ixt=1,ntraciso
-            xt_k(ixt,i)=xt(ixt,i,nk(i)) 
-          enddo   
+        CALL iso_verif_positif(tg_k(i)-Tmin_verif,'cv30_routines 750')
+#endif
+         DO ixt=1,ntraciso
+            xt_k(ixt,i)=xt(ixt,i,nk(i))
+          enddo
         enddo !do i=1,len
-#ifdef ISOVERIF 
-        write(*,*) 'cv30_routines 739: avant condiso'
-        if (iso_HDO.gt.0) then            
-         do i=1,len
-           call iso_verif_aberrant(xt_k(iso_hdo,i)/qnk(i), &
-     &            'cv30_routines 725')
-         enddo        
-        endif !if (iso_HDO.gt.0) then 
-#ifdef ISOTRAC   
-        do i=1,len
-           call iso_verif_traceur(xtclw(1,i,k),'cv30_routines 738')
+#ifdef ISOVERIF
+        WRITE(*,*) 'cv30_routines 739: avant condiso'
+        IF (iso_HDO.gt.0) THEN
+         DO i=1,len
+           CALL iso_verif_aberrant(xt_k(iso_hdo,i)/qnk(i), &
+                  'cv30_routines 725')
+         enddo
+        endif !if (iso_HDO.gt.0) THEN
+#ifdef ISOTRAC
+        DO i=1,len
+           CALL iso_verif_traceur(xtclw(1,i,k),'cv30_routines 738')
         enddo
-#endif        
-#endif        
-        call condiso_liq_ice_vectall(xt_k(1,1),qnk(1), &
-     &        clw_k(1),tg_k(1), &
-     &        zfice(1),zxtice(1,1),zxtliq(1,1),len) 
+#endif
+#endif
+        CALL condiso_liq_ice_vectall(xt_k(1,1),qnk(1), &
+              clw_k(1),tg_k(1), &
+              zfice(1),zxtice(1,1),zxtliq(1,1),len)
 #ifdef ISOTRAC
-        call condiso_liq_ice_vectall_trac(xt_k(1,1),qnk(1), &
-     &        clw_k(1),tg_k(1), &
-     &        zfice(1),zxtice(1,1),zxtliq(1,1),len) 
-#endif
-        do i=1,len
-         do ixt = 1, ntraciso
-          xtclw(ixt,i,icb(i)+1)=zxtice(ixt,i)+zxtliq(ixt,i)         
+        CALL condiso_liq_ice_vectall_trac(xt_k(1,1),qnk(1), &
+              clw_k(1),tg_k(1), &
+              zfice(1),zxtice(1,1),zxtliq(1,1),len)
+#endif
+        DO i=1,len
+         DO ixt = 1, ntraciso
+          xtclw(ixt,i,icb(i)+1)=zxtice(ixt,i)+zxtliq(ixt,i)
           xtclw(ixt,i,icb(i)+1)=max(0.0,xtclw(ixt,i,icb(i)+1))
          enddo !do ixt = 1, niso
         enddo !do i=1,len
 
-#ifdef ISOVERIF            
-!write(*,*) 'DEBUG ISO B'
-          do i=1,len
-            if (iso_eau.gt.0) then 
-             call iso_verif_egalite_choix(xtclw(iso_eau,i,icb(i)+1), &
-     &           clw(i,icb(i)+1),'cv30_routines 708',errmax,errmaxrel) 
-            endif ! if (iso_eau.gt.0) then 
-#ifdef ISOTRAC   
-           call iso_verif_traceur(xtclw(1,i,icb(i)+1), &
-     &           'cv30_routines 760')
-#endif            
+#ifdef ISOVERIF
+!WRITE(*,*) 'DEBUG ISO B'
+          DO i=1,len
+            IF (iso_eau.gt.0) THEN
+             CALL iso_verif_egalite_choix(xtclw(iso_eau,i,icb(i)+1), &
+                 clw(i,icb(i)+1),'cv30_routines 708',errmax,errmaxrel)
+            endif ! if (iso_eau.gt.0) THEN
+#ifdef ISOTRAC
+           CALL iso_verif_traceur(xtclw(1,i,icb(i)+1), &
+                 'cv30_routines 760')
+#endif
           enddo !do i=1,len
-            !write(*,*) 'FIN DEBUG ISO B'
-#endif  
-#endif
-
-  RETURN
+            !WRITE(*,*) 'FIN DEBUG ISO B'
+#endif
+#endif
+
+
 END SUBROUTINE cv30_undilute1
 
@@ -854 +872 @@
   ! -------------------------------------------------------------------
 
-  include "cv30param.h"
+
 
   ! input:
@@ -901 +919 @@
   ! oct3       ath  = th(i,icb(i)-1) - dttrig
   ! oct3
-  ! oct3       if (tdif.lt.dtcrit .or. ath.gt.ath1) then
+  ! oct3       if (tdif.lt.dtcrit .OR. ath.gt.ath1) THEN
   ! oct3         do 60 k=1,nl
   ! oct3            sig(i,k) = beta*sig(i,k) - 2.*alpha*tdif*tdif
@@ -909 +927 @@
   ! oct3         iflag(i)=4 ! pour version vectorisee
   ! oct3c convect3         iflag(i)=0
-  ! oct3cccc         return
+  ! oct3cccc         RETURN
   ! oct3       endif
   ! oct3
@@ -936 +954 @@
   ! fin oct3 --
 
-  RETURN
+
 END SUBROUTINE cv30_trigger
 
@@ -943 +961 @@
     th1, tra1, h1, lv1, cpn1, p1, ph1, tv1, tp1, tvp1, clw1, sig1, w01, &
     iflag, nk, icb, icbs, plcl, tnk, qnk, gznk, pbase, buoybase, t, q, qs, u, &
-    v, gz, th, tra, h, lv, cpn, p, ph, tv, tp, tvp, clw, sig, w0 & 
-#ifdef ISO
-     &    ,xtnk1,xt1,xtclw1 &
-     &    ,xtnk,xt,xtclw &
-#endif
-     &    )
+    v, gz, th, tra, h, lv, cpn, p, ph, tv, tp, tvp, clw, sig, w0 &
+#ifdef ISO
+          ,xtnk1,xt1,xtclw1 &
+          ,xtnk,xt,xtclw &
+#endif
+          )
   USE print_control_mod, ONLY: lunout
 #ifdef ISO
-    use infotrac_phy, ONLY: ntraciso=>ntiso
-    use isotopes_mod, ONLY: essai_convergence, iso_eau,iso_HDO
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif, &
+    USE infotrac_phy, ONLY: ntraciso=>ntiso
+    USE isotopes_mod, ONLY: essai_convergence, iso_eau,iso_HDO
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif, &
         iso_verif_egalite_choix, iso_verif_noNaN,iso_verif_aberrant, &
         iso_verif_egalite,iso_verif_egalite_choix_nostop,iso_verif_positif_nostop, &
@@ -963 +981 @@
   IMPLICIT NONE
 
-  include "cv30param.h"
+
 
   ! inputs:
@@ -979 +997 @@
 #ifdef ISO
       !integer niso
-      real xt1(ntraciso,len,nd), xtclw1(ntraciso,len,nd)
-      real xtnk1(ntraciso,len)
+      REAL xt1(ntraciso,len,nd), xtclw1(ntraciso,len,nd)
+      REAL xtnk1(ntraciso,len)
 #endif
 
@@ -996 +1014 @@
   REAL tra(nloc, nd, ntra)
 #ifdef ISO
-      real xt(ntraciso,nloc,nd), xtclw(ntraciso,nloc,nd)
-      real xtnk(ntraciso,nloc)
+      REAL xt(ntraciso,nloc,nd), xtclw(ntraciso,nloc,nd)
+      REAL xtnk(ntraciso,nloc)
 #endif
 
@@ -1003 +1021 @@
   INTEGER i, k, nn, j
 #ifdef ISO
-      integer ixt
+      INTEGER ixt
 #endif
 
@@ -1011 +1029 @@
 #ifdef ISO
         ! initialisation des champs compresses:
-        do k=1,nd
-          do i=1,nloc
-            if (essai_convergence) then
+        DO k=1,nd
+          DO i=1,nloc
+            IF (essai_convergence) THEN
             else
               q(i,k)=0.0
               clw(i,k)=0.0 ! mise en commentaire le 5 avril pour verif
 !            convergence
-            endif  !f (negation(essai_convergence)) then
-            do ixt=1,ntraciso
+            endif  !f (negation(essai_convergence)) THEN
+            DO ixt=1,ntraciso
               xt(ixt,i,k)=0.0
               xtclw(ixt,i,k)=0.0
-            enddo !do ixt=1,niso         
+            enddo !do ixt=1,niso
           enddo !do i=1,len
         enddo !do k=1,nd
-!        write(*,*) 'q(1,1),xt(iso_eau,1,1)=',q(1,1),xt(iso_eau,1,1)
+!        WRITE(*,*) 'q(1,1),xt(iso_eau,1,1)=',q(1,1),xt(iso_eau,1,1)
 #endif
 
@@ -1052 +1070 @@
         th(nn, k) = th1(i, k)
 #ifdef ISO
-        do ixt = 1, ntraciso
+        DO ixt = 1, ntraciso
            xt(ixt,nn,k)=xt1(ixt,i,k)
            xtclw(ixt,nn,k)=xtclw1(ixt,i,k)
         enddo
-!        write(*,*) 'nn,i,k,q(nn,k),xt(iso_eau,nn,k)=', &
+!        WRITE(*,*) 'nn,i,k,q(nn,k),xt(iso_eau,nn,k)=', &
 !                & nn,i,k,q(nn, k),xt(ixt,nn,k)
 #endif
@@ -1067 +1085 @@
   ! nn=0
   ! do 101 i=1,len
-  ! if(iflag1(i).eq.0)then
+  ! IF(iflag1(i).EQ.0)THEN
   ! nn=nn+1
   ! tra(nn,k,j)=tra1(i,k,j)
-  ! endif
+  ! END IF
   ! 101  continue
   ! 111  continue
@@ -1096 +1114 @@
       iflag(nn) = iflag1(i)
 #ifdef ISO
-      do ixt=1,ntraciso
+      DO ixt=1,ntraciso
         xtnk(ixt,nn) = xtnk1(ixt,i)
       enddo
@@ -1105 +1123 @@
 #ifdef ISO
 #ifdef ISOVERIF
-       if (iso_eau.gt.0) then
-        do k = 1, nd
-         do i = 1, nloc  
-        !write(*,*) 'i,k=',i,k                 
-        call iso_verif_egalite_choix(xtclw(iso_eau,i,k),clw(i,k), &
-     &            'compress 973',errmax,errmaxrel)
-        call iso_verif_egalite_choix(xt(iso_eau,i,k),q(i,k), &
-     &            'compress 975',errmax,errmaxrel)
+       IF (iso_eau.gt.0) THEN
+        DO k = 1, nd
+         DO i = 1, nloc
+        !WRITE(*,*) 'i,k=',i,k
+        CALL iso_verif_egalite_choix(xtclw(iso_eau,i,k),clw(i,k), &
+                  'compress 973',errmax,errmaxrel)
+        CALL iso_verif_egalite_choix(xt(iso_eau,i,k),q(i,k), &
+                  'compress 975',errmax,errmaxrel)
          enddo
         enddo
-       endif !if (iso_eau.gt.0) then
-       do k = 1, nd
-         do i = 1, nn
-           call iso_verif_positif(q(i,k),'compress 1004')          
+       endif !if (iso_eau.gt.0) THEN
+       DO k = 1, nd
+         DO i = 1, nn
+           CALL iso_verif_positif(q(i,k),'compress 1004')
          enddo
-       enddo 
-#endif
-#endif
-
-
-  RETURN
+       enddo
+#endif
+#endif
+
+
+
 END SUBROUTINE cv30_compress
 
@@ -1132 +1150 @@
     ep, sigp, buoy &
 #ifdef ISO
-     &   ,xtnk,xt,xtclw &
-#endif
-     &   )
+         ,xtnk,xt,xtclw &
+#endif
+         )
     ! epmax_cape: ajout arguments
-#ifdef ISO
-use infotrac_phy, ONLY: ntraciso=>ntiso
+USE conema3_mod_h
+#ifdef ISO
+USE infotrac_phy, ONLY: ntraciso=>ntiso
 USE isotopes_mod, ONLY: pxtmelt,pxtice,pxtmin,pxtmax,cond_temp_env, iso_eau,iso_HDO
 USE isotopes_routines_mod, ONLY: condiso_liq_ice_vectall
@@ -1147 +1166 @@
 #endif
 #ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif,Tmax_verif, &
+    USE isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif,Tmax_verif, &
         iso_verif_egalite_choix, iso_verif_noNaN,iso_verif_aberrant, &
         iso_verif_egalite,iso_verif_egalite_choix_nostop,iso_verif_positif_nostop, &
@@ -1154 +1173 @@
 #endif
 #endif
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+USE cvthermo_mod_h
   IMPLICIT NONE
 
@@ -1173 +1191 @@
   ! - vertical profile of buoyancy computed here (use of buoybase)
   ! - the determination of inb is different
-  ! - no inb1, only inb in output
+  ! - no inb1, ONLY inb in output
   ! ---------------------------------------------------------------------
-
-  include "cv30param.h"
-  include "conema3.h"
 
   ! inputs:
@@ -1202 +1217 @@
 
 #ifdef ISO
-      real xt(ntraciso,nloc,nd), xtclw(ntraciso,nloc,nd)
-      real xtnk(ntraciso,nloc)
+      REAL xt(ntraciso,nloc,nd), xtclw(ntraciso,nloc,nd)
+      REAL xtnk(ntraciso,nloc)
 !      real xtep(ntraciso,nloc,nd) ! le 7 mai: on supprime xtep, car pas besoin
 !      la chute de precip ne fractionne pas.
-      integer ixt
-      real zfice(nloc),zxtliq(ntraciso,nloc),zxtice(ntraciso,nloc)
-      real clw_k(nloc),tg_k(nloc)
-#ifdef ISOVERIF      
-      real qg_save(nloc,nd) ! inout
+      INTEGER ixt
+      REAL zfice(nloc),zxtliq(ntraciso,nloc),zxtice(ntraciso,nloc)
+      REAL clw_k(nloc),tg_k(nloc)
+#ifdef ISOVERIF
+      REAL qg_save(nloc,nd) ! inout
       !integer iso_verif_positif_nostop
-#endif      
+#endif
 #endif
 
@@ -1249 +1264 @@
   DO k = minorig + 1, nl
     DO i = 1, ncum
-      ! ori         if(k.ge.(icb(i)+1))then
+      ! ori        IF(k.ge.(icb(i)+1))THEN
       IF (k>=(icbs(i)+1)) THEN ! convect3
         tg = t(i, k)
         qg = qs(i, k)
-        ! debug       alv=lv0-clmcpv*(t(i,k)-t0)
+        ! debug          alv=lv0-clmcpv*(t(i,k)-t0)
         alv = lv0 - clmcpv*(t(i,k)-273.15)
 
         ! First iteration.
 
-        ! ori          s=cpd+alv*alv*qg/(rrv*t(i,k)*t(i,k))
+        ! ori           s=cpd+alv*alv*qg/(rrv*t(i,k)*t(i,k))
         s = cpd*(1.-qnk(i)) + cl*qnk(i) & ! convect3
           +alv*alv*qg/(rrv*t(i,k)*t(i,k)) ! convect3
         s = 1./s
-        ! ori          ahg=cpd*tg+(cl-cpd)*qnk(i)*t(i,k)+alv*qg+gz(i,k)
+        ! ori           ahg=cpd*tg+(cl-cpd)*qnk(i)*t(i,k)+alv*qg+gz(i,k)
         ahg = cpd*tg + (cl-cpd)*qnk(i)*tg + alv*qg + gz(i, k) ! convect3
         tg = tg + s*(ah0(i)-ahg)
-        ! ori          tg=max(tg,35.0)
-        ! debug        tc=tg-t0
+        ! ori           tg=max(tg,35.0)
+        ! debug           tc=tg-t0
         tc = tg - 273.15
         denom = 243.5 + tc
         denom = max(denom, 1.0) ! convect3
-        ! ori          if(tc.ge.0.0)then
+        ! ori           IF(tc.ge.0.0)THEN
         es = 6.112*exp(17.67*tc/denom)
-        ! ori          else
-        ! ori                   es=exp(23.33086-6111.72784/tg+0.15215*log(tg))
-        ! ori          endif
+        ! ori           else
+        ! ori            es=exp(23.33086-6111.72784/tg+0.15215*log(tg))
+        ! ori           endif
         qg = eps*es/(p(i,k)-es*(1.-eps))
 !        qg=max(0.0,qg) ! C Risi
@@ -1280 +1295 @@
         ! Second iteration.
 
-        ! ori          s=cpd+alv*alv*qg/(rrv*t(i,k)*t(i,k))
-        ! ori          s=1./s
-        ! ori          ahg=cpd*tg+(cl-cpd)*qnk(i)*t(i,k)+alv*qg+gz(i,k)
+        ! ori           s=cpd+alv*alv*qg/(rrv*t(i,k)*t(i,k))
+        ! ori           s=1./s
+        ! ori           ahg=cpd*tg+(cl-cpd)*qnk(i)*t(i,k)+alv*qg+gz(i,k)
         ahg = cpd*tg + (cl-cpd)*qnk(i)*tg + alv*qg + gz(i, k) ! convect3
         tg = tg + s*(ah0(i)-ahg)
-        ! ori          tg=max(tg,35.0)
-        ! debug        tc=tg-t0
+        ! ori           tg=max(tg,35.0)
+        ! debug           tc=tg-t0
         tc = tg - 273.15
         denom = 243.5 + tc
         denom = max(denom, 1.0) ! convect3
-        ! ori          if(tc.ge.0.0)then
+        ! ori           IF(tc.ge.0.0)THEN
         es = 6.112*exp(17.67*tc/denom)
-        ! ori          else
-        ! ori                   es=exp(23.33086-6111.72784/tg+0.15215*log(tg))
-        ! ori          endif
+        ! ori           else
+        ! ori            es=exp(23.33086-6111.72784/tg+0.15215*log(tg))
+        ! ori           endif
         qg = eps*es/(p(i,k)-es*(1.-eps))
 !        qg=max(0.0,qg) ! C Risi
 
-        ! debug        alv=lv0-clmcpv*(t(i,k)-t0)
+        ! debug           alv=lv0-clmcpv*(t(i,k)-t0)
         alv = lv0 - clmcpv*(t(i,k)-273.15)
-        ! print*,'cpd dans convect2 ',cpd
-        ! print*,'tp(i,k),ah0(i),cl,cpd,qnk(i),t(i,k),gz(i,k),alv,qg,cpd'
-        ! print*,tp(i,k),ah0(i),cl,cpd,qnk(i),t(i,k),gz(i,k),alv,qg,cpd
+        ! PRINT*,'cpd dans convect2 ',cpd
+        ! PRINT*,'tp(i,k),ah0(i),cl,cpd,qnk(i),t(i,k),gz(i,k),alv,qg,cpd'
+        ! PRINT*,tp(i,k),ah0(i),cl,cpd,qnk(i),t(i,k),gz(i,k),alv,qg,cpd
 
         ! ori c approximation here:
@@ -1322 +1337 @@
 #ifdef ISO
        ! calcul de zfice
-       do i=1,ncum
+       DO i=1,ncum
           zfice(i) = 1.0-(t(i,k)-pxtice)/(pxtmelt-pxtice)
-          zfice(i) = MIN(MAX(zfice(i),0.0),1.0)          
+          zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
        enddo
-       do i=1,ncum
+       DO i=1,ncum
          clw_k(i)=clw(i,k)
          tg_k(i)=t(i,k)
        enddo !do i=1,ncum
 #ifdef ISOVERIF
-        !write(*,*) 'cv30_routine 1259: avant condiso'
-        if (iso_HDO.gt.0) then            
-         do i=1,ncum
-           call iso_verif_aberrant(xtnk(iso_hdo,i)/qnk(i), &
-     &            'cv30_routines 1231')
-         enddo        
-        endif !if (iso_HDO.gt.0) then 
-        if (iso_eau.gt.0) then            
-         do i=1,ncum
-           call iso_verif_egalite(xtnk(iso_eau,i),qnk(i), &
-     &            'cv30_routines 1373')
-         enddo        
-        endif !if (iso_HDO.gt.0) then
-        do i=1,ncum
-         if ((iso_verif_positif_nostop(qnk(i)-clw_k(i), &
-     &       'cv30_routines 1275').eq.1).or. &
-     &       (iso_verif_positif_nostop(tg_k(i)-Tmin_verif, &
-     &       'cv30_routines 1297a').eq.1).or.  &
-     &       (iso_verif_positif_nostop(Tmax_verif-tg_k(i), &
-     &       'cv30_routines 1297b').eq.1)) then
-          write(*,*) 'i,k,qnk,clw_k=',i,k,qnk(i),clw_k(i)
-          write(*,*) 'tg,t,qg=',tg_k(i),t(i,k),qg_save(i,k)
-          write(*,*) 'icbs(i)=',icbs(i)
+        !WRITE(*,*) 'cv30_routine 1259: avant condiso'
+        IF (iso_HDO.gt.0) THEN
+         DO i=1,ncum
+           CALL iso_verif_aberrant(xtnk(iso_hdo,i)/qnk(i), &
+                  'cv30_routines 1231')
+         enddo
+        endif !if (iso_HDO.gt.0) THEN
+        IF (iso_eau.gt.0) THEN
+         DO i=1,ncum
+           CALL iso_verif_egalite(xtnk(iso_eau,i),qnk(i), &
+                  'cv30_routines 1373')
+         enddo
+        endif !if (iso_HDO.gt.0) THEN
+        DO i=1,ncum
+         IF ((iso_verif_positif_nostop(qnk(i)-clw_k(i), &
+             'cv30_routines 1275').EQ.1).OR. &
+             (iso_verif_positif_nostop(tg_k(i)-Tmin_verif, &
+             'cv30_routines 1297a').EQ.1).OR.  &
+             (iso_verif_positif_nostop(Tmax_verif-tg_k(i), &
+             'cv30_routines 1297b').EQ.1)) THEN
+          WRITE(*,*) 'i,k,qnk,clw_k=',i,k,qnk(i),clw_k(i)
+          WRITE(*,*) 'tg,t,qg=',tg_k(i),t(i,k),qg_save(i,k)
+          WRITE(*,*) 'icbs(i)=',icbs(i)
           stop
          endif ! if ((iso_verif_positif_nostop
-        enddo !do i=1,ncum   
-#ifdef ISOTRAC   
-        do i=1,ncum
-           call iso_verif_traceur(xtnk(1,i),'cv30_routines 1251')  
         enddo !do i=1,ncum
-#endif        
-#endif        
-        call condiso_liq_ice_vectall(xtnk(1,1),qnk(1), &
-     &        clw_k(1),tg_k(1), &
-     &        zfice(1),zxtice(1,1),zxtliq(1,1),ncum) 
 #ifdef ISOTRAC
-#ifdef ISOVERIF
-        write(*,*) 'cv30_routines 1283: condiso pour traceurs'
-#endif
-        call condiso_liq_ice_vectall_trac(xtnk(1,1),qnk(1), &
-     &        clw_k(1),tg_k(1), &
-     &        zfice(1),zxtice(1,1),zxtliq(1,1),ncum)        
-#endif
-        do i=1,ncum
-         do ixt=1,ntraciso
+        DO i=1,ncum
+           CALL iso_verif_traceur(xtnk(1,i),'cv30_routines 1251')
+        enddo !do i=1,ncum
+#endif
+#endif
+        CALL condiso_liq_ice_vectall(xtnk(1,1),qnk(1), &
+              clw_k(1),tg_k(1), &
+              zfice(1),zxtice(1,1),zxtliq(1,1),ncum)
+#ifdef ISOTRAC
+#ifdef ISOVERIF
+        WRITE(*,*) 'cv30_routines 1283: condiso pour traceurs'
+#endif
+        CALL condiso_liq_ice_vectall_trac(xtnk(1,1),qnk(1), &
+              clw_k(1),tg_k(1), &
+              zfice(1),zxtice(1,1),zxtliq(1,1),ncum)
+#endif
+        DO i=1,ncum
+         DO ixt=1,ntraciso
           xtclw(ixt,i,k)=zxtice(ixt,i)+zxtliq(ixt,i)
           xtclw(ixt,i,k)=max(0.0,xtclw(ixt,i,k))
@@ -1381 +1396 @@
         enddo !do i=1,ncum
 #ifdef ISOVERIF
-        if (iso_eau.gt.0) then
-          do i=1,ncum        
-           call iso_verif_egalite_choix(xtclw(iso_eau,i,k), &
-     &          clw(i,k),'cv30_routines 1223',errmax,errmaxrel)
+        IF (iso_eau.gt.0) THEN
+          DO i=1,ncum
+           CALL iso_verif_egalite_choix(xtclw(iso_eau,i,k), &
+                clw(i,k),'cv30_routines 1223',errmax,errmaxrel)
           enddo
-        endif !if (iso_eau.gt.0) then
-#ifdef ISOTRAC   
-        do i=1,ncum
-           call iso_verif_traceur(xtclw(1,i,k),'cv30_routines 1275')
+        endif !if (iso_eau.gt.0) THEN
+#ifdef ISOTRAC
+        DO i=1,ncum
+           CALL iso_verif_traceur(xtclw(1,i,k),'cv30_routines 1275')
         enddo
-#endif        
-#endif        
+#endif
+#endif
 #endif
   END DO
@@ -1410 +1425 @@
       ep(i, k) = amin1(ep(i,k), epmax)
       sigp(i, k) = spfac
-      ! ori          if(k.ge.(nk(i)+1))then
+      ! ori          IF(k.ge.(nk(i)+1))THEN
       ! ori            tca=tp(i,k)-t0
-      ! ori            if(tca.ge.0.0)then
+      ! ori            IF(tca.ge.0.0)THEN
       ! ori              elacrit=elcrit
       ! ori            else
@@ -1436 +1451 @@
   ! ori      do 340 k=minorig+1,nl
   ! ori        do 330 i=1,ncum
-  ! ori        if(k.ge.(icb(i)+1))then
+  ! ori        IF(k.ge.(icb(i)+1))THEN
   ! ori          tvp(i,k)=tvp(i,k)*(1.0-qnk(i)+ep(i,k)*clw(i,k))
-  ! oric         print*,'i,k,tvp(i,k),qnk(i),ep(i,k),clw(i,k)'
-  ! oric         print*, i,k,tvp(i,k),qnk(i),ep(i,k),clw(i,k)
+  ! oric         PRINT*,'i,k,tvp(i,k),qnk(i),ep(i,k),clw(i,k)'
+  ! oric         PRINT*, i,k,tvp(i,k),qnk(i),ep(i,k),clw(i,k)
   ! ori        endif
   ! ori 330    continue
@@ -1513 +1528 @@
   ! do 530 k=minorig+1,nl-1
   ! do 520 i=1,ncum
-  ! if(k.ge.(icb(i)+1))then
+  ! IF(k.ge.(icb(i)+1))THEN
   ! by=(tvp(i,k)-tv(i,k))*dph(i,k)/p(i,k)
   ! byp=(tvp(i,k+1)-tv(i,k+1))*dph(i,k+1)/p(i,k+1)
   ! cape(i)=cape(i)+by
-  ! if(by.ge.0.0)inb1(i)=k+1
-  ! if(cape(i).gt.0.0)then
+  ! IF(by.ge.0.0)inb1(i)=k+1
+  ! IF(cape(i).gt.0.0)THEN
   ! inb(i)=k+1
   ! capem(i)=cape(i)
-  ! endif
-  ! endif
+  ! END IF
+  ! END IF
   ! 520    continue
   ! 530  continue
@@ -1537 +1552 @@
   ! K Emanuel fix
 
-  ! call zilch(byp,ncum)
+  ! CALL zilch(byp,ncum)
   ! do 530 k=minorig+1,nl-1
   ! do 520 i=1,ncum
-  ! if(k.ge.(icb(i)+1))then
+  ! IF(k.ge.(icb(i)+1))THEN
   ! by=(tvp(i,k)-tv(i,k))*dph(i,k)/p(i,k)
   ! cape(i)=cape(i)+by
-  ! if(by.ge.0.0)inb1(i)=k+1
-  ! if(cape(i).gt.0.0)then
+  ! IF(by.ge.0.0)inb1(i)=k+1
+  ! IF(cape(i).gt.0.0)THEN
   ! inb(i)=k+1
   ! capem(i)=cape(i)
   ! byp(i)=(tvp(i,k+1)-tv(i,k+1))*dph(i,k+1)/p(i,k+1)
-  ! endif
-  ! endif
+  ! END IF
+  ! END IF
   ! 520    continue
   ! 530  continue
@@ -1564 +1579 @@
   ! J Teixeira fix
 
-  ! ori      call zilch(byp,ncum)
+  ! ori      CALL zilch(byp,ncum)
   ! ori      do 515 i=1,ncum
-  ! ori        lcape(i)=.true.
+  ! ori        lcape(i)=.TRUE.
   ! ori 515  continue
   ! ori      do 530 k=minorig+1,nl-1
   ! ori        do 520 i=1,ncum
-  ! ori          if(cape(i).lt.0.0)lcape(i)=.false.
-  ! ori          if((k.ge.(icb(i)+1)).and.lcape(i))then
+  ! ori          IF(cape(i).lt.0.0)lcape(i)=.FALSE.
+  ! ori          if((k.ge.(icb(i)+1)).AND.lcape(i))THEN
   ! ori            by=(tvp(i,k)-tv(i,k))*dph(i,k)/p(i,k)
   ! ori            byp(i)=(tvp(i,k+1)-tv(i,k+1))*dph(i,k+1)/p(i,k+1)
   ! ori            cape(i)=cape(i)+by
-  ! ori            if(by.ge.0.0)inb1(i)=k+1
-  ! ori            if(cape(i).gt.0.0)then
+  ! ori            IF(by.ge.0.0)inb1(i)=k+1
+  ! ori            IF(cape(i).gt.0.0)THEN
   ! ori              inb(i)=k+1
   ! ori              capem(i)=cape(i)
@@ -1615 +1630 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_undilute2
 
 SUBROUTINE cv30_closure(nloc, ncum, nd, icb, inb, pbase, p, ph, tv, buoy, &
     sig, w0, cape, m)
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+  USE cvthermo_mod_h
+
   IMPLICIT NONE
 
@@ -1629 +1644 @@
   ! vectorization: S. Bony
   ! ===================================================================
-
-  include "cv30param.h"
 
   ! input:
@@ -1697 +1710 @@
   END DO
 
-  ! !      if(inb.lt.(nl-1))then
-  ! !         do 85 i=inb+1,nl-1
-  ! !            sig(i)=beta*sig(i)+2.*alpha*buoy(inb)*
-  ! !     1              abs(buoy(inb))
-  ! !            sig(i)=amax1(sig(i),0.0)
-  ! !            w0(i)=beta*w0(i)
-  ! !   85    continue
-  ! !      end if
-
-  ! !      do 87 i=1,icb
-  ! !         sig(i)=beta*sig(i)-2.*alpha*buoy(icb)*buoy(icb)
-  ! !         sig(i)=amax1(sig(i),0.0)
-  ! !         w0(i)=beta*w0(i)
-  ! !   87 continue
+  !      IF(inb.lt.(nl-1))THEN
+  !         do 85 i=inb+1,nl-1
+  !            sig(i)=beta*sig(i)+2.*alpha*buoy(inb)*
+  !     1              abs(buoy(inb))
+  !            sig(i)=amax1(sig(i),0.0)
+  !            w0(i)=beta*w0(i)
+  !   85    continue
+  !      end if
+
+  !      do 87 i=1,icb
+  !         sig(i)=beta*sig(i)-2.*alpha*buoy(icb)*buoy(icb)
+  !         sig(i)=amax1(sig(i),0.0)
+  !         w0(i)=beta*w0(i)
+  !   87 continue
 
   ! -------------------------------------------------------------
@@ -1793 +1806 @@
 
 
-  ! !      cape=0.0
-  ! !      do 98 i=icb+1,inb
-  ! !         deltap = min(pbase,ph(i-1))-min(pbase,ph(i))
-  ! !         cape=cape+rrd*buoy(i-1)*deltap/p(i-1)
-  ! !         dcape=rrd*buoy(i-1)*deltap/p(i-1)
-  ! !         dlnp=deltap/p(i-1)
-  ! !         cape=amax1(0.0,cape)
-  ! !         sigold=sig(i)
-
-  ! !         dtmin=100.0
-  ! !         do 97 j=icb,i-1
-  ! !            dtmin=amin1(dtmin,buoy(j))
-  ! !   97    continue
-
-  ! !         sig(i)=beta*sig(i)+alpha*dtmin*abs(dtmin)
-  ! !         sig(i)=amax1(sig(i),0.0)
-  ! !         sig(i)=amin1(sig(i),0.01)
-  ! !         fac=amin1(((dtcrit-dtmin)/dtcrit),1.0)
-  ! !         w=(1.-beta)*fac*sqrt(cape)+beta*w0(i)
-  ! !         amu=0.5*(sig(i)+sigold)*w
-  ! !         m(i)=amu*0.007*p(i)*(ph(i)-ph(i+1))/tv(i)
-  ! !         w0(i)=w
-  ! !   98 continue
-  ! !      w0(icb)=0.5*w0(icb+1)
-  ! !      m(icb)=0.5*m(icb+1)*(ph(icb)-ph(icb+1))/(ph(icb+1)-ph(icb+2))
-  ! !      sig(icb)=sig(icb+1)
-  ! !      sig(icb-1)=sig(icb)
-
-  RETURN
+  !      cape=0.0
+  !      do 98 i=icb+1,inb
+  !         deltap = min(pbase,ph(i-1))-min(pbase,ph(i))
+  !         cape=cape+rrd*buoy(i-1)*deltap/p(i-1)
+  !         dcape=rrd*buoy(i-1)*deltap/p(i-1)
+  !         dlnp=deltap/p(i-1)
+  !         cape=amax1(0.0,cape)
+  !         sigold=sig(i)
+
+  !         dtmin=100.0
+  !         do 97 j=icb,i-1
+  !            dtmin=amin1(dtmin,buoy(j))
+  !   97    continue
+
+  !         sig(i)=beta*sig(i)+alpha*dtmin*abs(dtmin)
+  !         sig(i)=amax1(sig(i),0.0)
+  !         sig(i)=amin1(sig(i),0.01)
+  !         fac=amin1(((dtcrit-dtmin)/dtcrit),1.0)
+  !         w=(1.-beta)*fac*sqrt(cape)+beta*w0(i)
+  !         amu=0.5*(sig(i)+sigold)*w
+  !         m(i)=amu*0.007*p(i)*(ph(i)-ph(i+1))/tv(i)
+  !         w0(i)=w
+  !   98 continue
+  !      w0(icb)=0.5*w0(icb+1)
+  !      m(icb)=0.5*m(icb+1)*(ph(icb)-ph(icb+1))/(ph(icb+1)-ph(icb+2))
+  !      sig(icb)=sig(icb+1)
+  !      sig(icb-1)=sig(icb)
+
+
 END SUBROUTINE cv30_closure
 
@@ -1828 +1841 @@
     vent, sij, elij, ments, qents, traent &
 #ifdef ISO
-     &                     ,xt,xtnk,xtclw &
-     &                     ,xtent,xtelij &
-#endif
-     &     )
-
-#ifdef ISO
-use infotrac_phy, ONLY: ntraciso=>ntiso,niso,itZonIso
+                           ,xt,xtnk,xtclw &
+                           ,xtent,xtelij &
+#endif
+           )
+
+#ifdef ISO
+USE infotrac_phy, ONLY: ntraciso=>ntiso,niso,itZonIso
 USE isotopes_mod, ONLY: pxtmelt,pxtice,pxtmin,pxtmax, iso_eau,iso_HDO, &
         ridicule
 USE isotopes_routines_mod, ONLY: condiso_liq_ice_vectall
 #ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif,deltalim, &
+    USE isotopes_verif_mod, ONLY: errmax,errmaxrel,Tmin_verif,deltalim, &
         iso_verif_egalite_choix,iso_verif_aberrant_choix, iso_verif_noNaN, &
         iso_verif_aberrant, &
@@ -1847 +1860 @@
 #endif
 #ifdef ISOTRAC
-    use isotrac_mod, only: option_tmin,option_traceurs,seuil_tag_tmin, &
+    USE isotrac_mod, ONLY: option_tmin,option_traceurs,seuil_tag_tmin, &
 &       option_cond,index_zone,izone_cond,index_iso
-    use isotrac_routines_mod, only: iso_recolorise_condensation
-    use isotopes_routines_mod, only: condiso_liq_ice_vectall_trac
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: iso_verif_trac17_q_deltad,iso_verif_traceur, &
+    USE isotrac_routines_mod, ONLY: iso_recolorise_condensation
+    USE isotopes_routines_mod, ONLY: condiso_liq_ice_vectall_trac
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: iso_verif_trac17_q_deltad,iso_verif_traceur, &
 &       iso_verif_traceur_justmass
 #endif
 #endif
 #endif
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
+USE cvthermo_mod_h
+
   IMPLICIT NONE
 
@@ -1866 +1879 @@
   ! - vectorisation de la partie normalisation des flux (do 789...)
   ! ---------------------------------------------------------------------
-
-  include "cv30param.h"
 
   ! inputs:
@@ -1882 +1893 @@
   REAL m(nloc, na) ! input of convect3
 #ifdef ISO
-      real xt(ntraciso,nloc,na), xtclw(ntraciso,nloc,na)
-      real tg_save(nloc,nd)
-      real xtnk(ntraciso,nloc)
+      REAL xt(ntraciso,nloc,na), xtclw(ntraciso,nloc,na)
+      REAL tg_save(nloc,nd)
+      REAL xtnk(ntraciso,nloc)
 !      real xtep(ntraciso,nloc,na)
 #endif
@@ -1896 +1907 @@
   REAL sigij(nloc, nd, nd)
 #ifdef ISO
-      real xtent(ntraciso,nloc,nd,nd)
-      real xtelij(ntraciso,nloc,nd,nd)      
+      REAL xtent(ntraciso,nloc,nd,nd)
+      REAL xtelij(ntraciso,nloc,nd,nd)
 #endif
 
@@ -1912 +1923 @@
   LOGICAL lwork(nloc)
 #ifdef ISO
-      integer ixt
-      real xtrti(ntraciso,nloc)
-      real xtres(ntraciso)
+      INTEGER ixt
+      REAL xtrti(ntraciso,nloc)
+      REAL xtres(ntraciso)
       ! on ajoute la dimension nloc a xtrti pour verifs dans les tags: 5 fev
       ! 2010
-      real zfice(nloc),zxtliq(ntraciso,nloc),zxtice(ntraciso,nloc)
+      REAL zfice(nloc),zxtliq(ntraciso,nloc),zxtice(ntraciso,nloc)
 !      real xt_reduit(ntraciso)
-!      logical negation
+!      LOGICAL negation
 !#ifdef ISOVERIF
 !       integer iso_verif_positif_nostop
@@ -1930 +1941 @@
 #ifdef ISO
 #ifdef ISOVERIF
-      write(*,*) 'cv30_routines 1820: entree dans cv3_mixing'
-      if (iso_eau.gt.0) then
-      call iso_verif_egalite_vect2D( &
-     &           xtclw,clw, &
-     &           'cv30_mixing 1841',ntraciso,nloc,na)
+      WRITE(*,*) 'cv30_routines 1820: entree dans cv3_mixing'
+      IF (iso_eau.gt.0) THEN
+      CALL iso_verif_egalite_vect2D( &
+                 xtclw,clw, &
+                 'cv30_mixing 1841',ntraciso,nloc,na)
       endif
 #endif
@@ -1965 +1976 @@
 
 #ifdef ISO
-      do j=1,nd
-       do k=1,nd
-          do i=1,ncum
-            do ixt =1,ntraciso
+      DO j=1,nd
+       DO k=1,nd
+          DO i=1,ncum
+            DO ixt =1,ntraciso
              xtent(ixt,i,k,j)=xt(ixt,i,j)
              xtelij(ixt,i,k,j)=0.0
@@ -1975 +1986 @@
             ! valeurs en nd=nl+1 ne sont pas utilisees
             qent(i,k,j)=rr(i,j)
-            elij(i,k,j)=0.0    
+            elij(i,k,j)=0.0
          enddo !do i=1,ncum
        enddo !do k=1,nl
-      enddo   !do j=1,nl  
+      enddo   !do j=1,nl
 #endif
 
@@ -2039 +2050 @@
             ! !!!      traent(il,i,j,k)=sij(il,i,j)*tra(il,i,k)
             ! !!!     :      +(1.-sij(il,i,j))*tra(il,nk(il),k)
-            ! !!!      end do
+            ! !!!      END DO
             elij(il, i, j) = altem
             elij(il, i, j) = amax1(0.0, elij(il,i,j))
@@ -2053 +2064 @@
 #ifdef ISO
 #ifdef ISOVERIF
-        !write(*,*) 'cv30_routines tmp 2078'
-#endif
-       do il=1,ncum
+        !WRITE(*,*) 'cv30_routines tmp 2078'
+#endif
+       DO il=1,ncum
          zfice(il) = 1.0-(t(il,j)-pxtice)/(pxtmelt-pxtice)
-         zfice(il) = MIN(MAX(zfice(il),0.0),1.0)        
-         if( (i.ge.icb(il)).and.(i.le.inb(il)).and. &
-     &      (j.ge.(icb(il)-1)).and.(j.le.inb(il)))then
-          do ixt=1,ntraciso
+         zfice(il) = MIN(MAX(zfice(il),0.0),1.0)
+         IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND. &
+            (j.ge.(icb(il)-1)).AND.(j.le.inb(il)))THEN
+          DO ixt=1,ntraciso
 !           xtrti(ixt)=xt(ixt,il,1)-xtep(ixt,il,i)*xtclw(ixt,il,i) ! le 7 mai: on supprime xtep
-           xtrti(ixt,il)=xt(ixt,il,1)-ep(il,i)*xtclw(ixt,il,i)      
+           xtrti(ixt,il)=xt(ixt,il,1)-ep(il,i)*xtclw(ixt,il,i)
           enddo
-          if(sij(il,i,j).gt.0.0.and.sij(il,i,j).lt.0.95)then    
+          IF(sij(il,i,j).gt.0.0.AND.sij(il,i,j).lt.0.95)THEN
 ! temperature of condensation (within mixtures):
-!          tcond(il)=t(il,j)  
-!     :     + ( sij(il,i,j)*rr(il,i)+(1.-sij(il,i,j))*rti 
+!          tcond(il)=t(il,j)
+!     :     + ( sij(il,i,j)*rr(il,i)+(1.-sij(il,i,j))*rti
 !     :             - elij(il,i,j) - rs(il,j) )
 !     :        / ( cpd*(bf2-1.0)/lv(il,j) )
-                   
-          do ixt = 1, ntraciso
+
+          DO ixt = 1, ntraciso
 ! total mixing ratio in the mixtures before precipitation:
            xtent(ixt,il,i,j)=sij(il,i,j)*xt(ixt,il,i) &
-     &                       +(1.-sij(il,i,j))*xtrti(ixt,il)
+                             +(1.-sij(il,i,j))*xtrti(ixt,il)
           enddo !do ixt = 1, ntraciso
-         endif  !if(sij(il,i,j).gt.0.0.and.sij(il,i,j).lt.0.95)then  
-        endif !if( (i.ge.icb(il)).and.(i.le.inb(il)).and.
-       enddo  !do il=1,ncum 
-
-       call condiso_liq_ice_vectall(xtent(1,1,i,j),qent(1,i,j), &
-     &           elij(1,i,j), &
-     &           t(1,j),zfice(1),zxtice(1,1),zxtliq(1,1),ncum)
+         endif  !IF(sij(il,i,j).gt.0.0.AND.sij(il,i,j).lt.0.95)THEN
+        endif !IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND.
+       enddo  !do il=1,ncum
+
+       CALL condiso_liq_ice_vectall(xtent(1,1,i,j),qent(1,i,j), &
+                 elij(1,i,j), &
+                 t(1,j),zfice(1),zxtice(1,1),zxtliq(1,1),ncum)
 #ifdef ISOTRAC
-        call condiso_liq_ice_vectall_trac(xtent(1,1,i,j),qent(1,i,j), &
-     &           elij(1,i,j), &
-     &           t(1,j),zfice(1),zxtice(1,1),zxtliq(1,1),ncum)  
-#ifdef ISOVERIF
-        do il=1,ncum
-          call iso_verif_traceur(xt(1,il,i),'cv30_routines 1967')
-          if( (i.ge.icb(il)).and.(i.le.inb(il)).and. &
-     &      (j.ge.(icb(il)-1)).and.(j.le.inb(il)))then
-          call iso_verif_traceur(xtrti(1,il),'cv30_routines 1968')
-          endif !if( (i.ge.icb(il)).and.(i.le.inb(il)).and.
-          call iso_verif_traceur(xtent(1,il,i,j),'cv30_routines 1969')
-          
+        CALL condiso_liq_ice_vectall_trac(xtent(1,1,i,j),qent(1,i,j), &
+                 elij(1,i,j), &
+                 t(1,j),zfice(1),zxtice(1,1),zxtliq(1,1),ncum)
+#ifdef ISOVERIF
+        DO il=1,ncum
+          CALL iso_verif_traceur(xt(1,il,i),'cv30_routines 1967')
+          IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND. &
+            (j.ge.(icb(il)-1)).AND.(j.le.inb(il)))THEN
+          CALL iso_verif_traceur(xtrti(1,il),'cv30_routines 1968')
+          endif !IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND.
+          CALL iso_verif_traceur(xtent(1,il,i,j),'cv30_routines 1969')
+
         enddo !do il=1,ncum
-#endif     
-#endif     
-        do il=1,ncum
-         do ixt = 1, ntraciso
+#endif
+#endif
+        DO il=1,ncum
+         DO ixt = 1, ntraciso
           xtelij(ixt,il,i,j)=zxtice(ixt,il)+zxtliq(ixt,il)
          enddo !do ixt = 1, ntraciso
@@ -2106 +2117 @@
 
 #ifdef ISOVERIF
-        if ((j.eq.15).and.(i.eq.15)) then
+        IF ((j.EQ.15).AND.(i.EQ.15)) THEN
         il=2722
-        if (il.le.ncum) then
-                write(*,*) 'cv30_routines tmp 2194, il,i,j=',il,i,j
-                write(*,*) 'qent,elij=',qent(il,i,j),elij(il,i,j)
-                write(*,*) 'tgsave,zfice=',t(il,j),zfice(il)
-                write(*,*) 'deltaDqent=',deltaD(xtent(iso_HDO,il,i,j)/qent(il,i,j))
-                write(*,*) 'deltaDelij=',deltaD(xtelij(iso_HDO,il,i,j)/elij(il,i,j))
-                write(*,*) 'deltaDice=',deltaD(zxtice(iso_HDO,il)/(zfice(il)*elij(il,i,j)))
-                write(*,*) 'deltaDliq=',deltaD(zxtliq(iso_HDO,il)/(1.0-zfice(il)*elij(il,i,j)))
+        IF (il.le.ncum) THEN
+                WRITE(*,*) 'cv30_routines tmp 2194, il,i,j=',il,i,j
+                WRITE(*,*) 'qent,elij=',qent(il,i,j),elij(il,i,j)
+                WRITE(*,*) 'tgsave,zfice=',t(il,j),zfice(il)
+                WRITE(*,*) 'deltaDqent=',deltaD(xtent(iso_HDO,il,i,j)/qent(il,i,j))
+                WRITE(*,*) 'deltaDelij=',deltaD(xtelij(iso_HDO,il,i,j)/elij(il,i,j))
+                WRITE(*,*) 'deltaDice=',deltaD(zxtice(iso_HDO,il)/(zfice(il)*elij(il,i,j)))
+                WRITE(*,*) 'deltaDliq=',deltaD(zxtliq(iso_HDO,il)/(1.0-zfice(il)*elij(il,i,j)))
         endif
         endif
 #endif
 
-#ifdef ISOTRAC    
-!        write(*,*) 'cv30_routines tmp 1987,option_traceurs=',
+#ifdef ISOTRAC
+!        WRITE(*,*) 'cv30_routines tmp 1987,option_traceurs=',
 !     :           option_traceurs
-        if (option_tmin.ge.1) then
-        do il=1,ncum    
-!        write(*,*) 'cv3 tmp 1991 il,i,j,xtent(:,il,i,j),',
+        IF (option_tmin.ge.1) THEN
+        DO il=1,ncum
+!        WRITE(*,*) 'cv3 tmp 1991 il,i,j,xtent(:,il,i,j),',
 !     :           'tcond(il),rs(il,j)=',
 !     :            il,i,j,xtent(:,il,i,j),tcond(il),rs(il,j)
         ! colorier la vapeur residuelle selon temperature de
         ! condensation, et le condensat en un tag spEcifique
-          if ((elij(il,i,j).gt.0.0).and.(qent(il,i,j).gt.0.0)) then  
-            if (option_traceurs.eq.17) then        
-             call iso_recolorise_condensation(qent(il,i,j),elij(il,i,j), &
-     &           xtent(1,il,i,j),xtelij(1,il,i,j),t(1,j), &
-     &           0.0,xtres, &
-     &           seuil_tag_tmin)
-            else !if (option_traceurs.eq.17) then
-!             write(*,*) 'cv3 2002: il,i,j  =',il,i,j   
-             call iso_recolorise_condensation(qent(il,i,j),elij(il,i,j), &
-     &           xtent(1,il,i,j),xtelij(1,il,i,j),rs(il,j),0.0,xtres, &
-     &           seuil_tag_tmin)
-            endif !if (option_traceurs.eq.17) then
-            do ixt=1+niso,ntraciso
+          IF ((elij(il,i,j).gt.0.0).AND.(qent(il,i,j).gt.0.0)) THEN
+            IF (option_traceurs.EQ.17) THEN
+             CALL iso_recolorise_condensation(qent(il,i,j),elij(il,i,j), &
+                 xtent(1,il,i,j),xtelij(1,il,i,j),t(1,j), &
+                 0.0,xtres, &
+                 seuil_tag_tmin)
+            else !if (option_traceurs.EQ.17) THEN
+!             WRITE(*,*) 'cv3 2002: il,i,j  =',il,i,j
+             CALL iso_recolorise_condensation(qent(il,i,j),elij(il,i,j), &
+                 xtent(1,il,i,j),xtelij(1,il,i,j),rs(il,j),0.0,xtres, &
+                 seuil_tag_tmin)
+            endif !if (option_traceurs.EQ.17) THEN
+            DO ixt=1+niso,ntraciso
                xtent(ixt,il,i,j)=xtres(ixt)
-            enddo     
-          endif !if (cond.gt.0.0) then
+            enddo
+          endif !if (cond.gt.0.0) THEN
         enddo !do il=1,ncum
 #ifdef ISOVERIF
-        do il=1,ncum 
-          call iso_verif_traceur(xtent(1,il,i,j),'cv30_routines 1996')
-          call iso_verif_traceur(xtelij(1,il,i,j),'cv30_routines 1997')
-          call iso_verif_trac17_q_deltaD(xtent(1,il,i,j), &
-     &           'cv30_routines 2042')
-        enddo !do il=1,ncum 
-#endif        
-        endif !if (option_tmin.ge.1) then       
+        DO il=1,ncum
+          CALL iso_verif_traceur(xtent(1,il,i,j),'cv30_routines 1996')
+          CALL iso_verif_traceur(xtelij(1,il,i,j),'cv30_routines 1997')
+          CALL iso_verif_trac17_q_deltaD(xtent(1,il,i,j), &
+                 'cv30_routines 2042')
+        enddo !do il=1,ncum
+#endif
+        endif !if (option_tmin.ge.1) THEN
 #endif
 
 ! fractionation:
-#ifdef ISOVERIF 
-!        write(*,*) 'cv30_routines 2050: avant condiso'
-        do il=1,ncum
-        if ((i.ge.icb(il)).and.(i.le.inb(il)).and. &
-     &      (j.ge.(icb(il)-1)).and.(j.le.inb(il))) then
-        if (sij(il,i,j).gt.0.0.and.sij(il,i,j).lt.0.95) then  
-        if (iso_eau.gt.0) then
-          call iso_verif_egalite_choix(xtent(iso_eau,il,i,j), &
-     &        qent(il,i,j),'cv30_routines 1889',errmax,errmaxrel)   
-          call iso_verif_egalite_choix(xtelij(iso_eau,il,i,j), &
-     &        elij(il,i,j),'cv30_routines 1890',errmax,errmaxrel) 
+#ifdef ISOVERIF
+!        WRITE(*,*) 'cv30_routines 2050: avant condiso'
+        DO il=1,ncum
+        IF ((i.ge.icb(il)).AND.(i.le.inb(il)).AND. &
+            (j.ge.(icb(il)-1)).AND.(j.le.inb(il))) THEN
+        IF (sij(il,i,j).gt.0.0.AND.sij(il,i,j).lt.0.95) THEN
+        IF (iso_eau.gt.0) THEN
+          CALL iso_verif_egalite_choix(xtent(iso_eau,il,i,j), &
+              qent(il,i,j),'cv30_routines 1889',errmax,errmaxrel)
+          CALL iso_verif_egalite_choix(xtelij(iso_eau,il,i,j), &
+              elij(il,i,j),'cv30_routines 1890',errmax,errmaxrel)
         endif
-        if (iso_HDO.gt.0) then    
-          call iso_verif_aberrant_choix(xt(iso_HDO,il,i),rr(il,i), &
-     &            ridicule,deltalim,'cv30_routines 1997')         
-          call iso_verif_aberrant_choix( &
-     &            xtent(iso_HDO,il,i,j),qent(il,i,j), &
-     &            ridicule,deltalim,'cv30_routines 1931')
-          call iso_verif_aberrant_choix( &
-     &            xtelij(iso_HDO,il,i,j),elij(il,i,j), &
-     &            ridicule,deltalim,'cv30_routines 1993')
-        endif !if (iso_HDO.gt.0) then
-#ifdef ISOTRAC  
-!        write(*,*) 'cv30_routines tmp 2039 il=',il
-           call iso_verif_traceur(xtent(1,il,i,j), &
-     &                   'cv30_routines 2031')
-           call iso_verif_traceur(xtelij(1,il,i,j), &
-     &                   'cv30_routines 2033')
-#endif        
-
-        endif !if(sij(il,i,j).gt.0.0.and.sij(il,i,j).lt.0.95)then  
-        endif !if( (i.ge.icb(il)).and.(i.le.inb(il)).and.
+        IF (iso_HDO.gt.0) THEN
+          CALL iso_verif_aberrant_choix(xt(iso_HDO,il,i),rr(il,i), &
+                  ridicule,deltalim,'cv30_routines 1997')
+          CALL iso_verif_aberrant_choix( &
+                  xtent(iso_HDO,il,i,j),qent(il,i,j), &
+                  ridicule,deltalim,'cv30_routines 1931')
+          CALL iso_verif_aberrant_choix( &
+                  xtelij(iso_HDO,il,i,j),elij(il,i,j), &
+                  ridicule,deltalim,'cv30_routines 1993')
+        endif !if (iso_HDO.gt.0) THEN
+#ifdef ISOTRAC
+!        WRITE(*,*) 'cv30_routines tmp 2039 il=',il
+           CALL iso_verif_traceur(xtent(1,il,i,j), &
+                         'cv30_routines 2031')
+           CALL iso_verif_traceur(xtelij(1,il,i,j), &
+                         'cv30_routines 2033')
+#endif
+
+        endif !IF(sij(il,i,j).gt.0.0.AND.sij(il,i,j).lt.0.95)THEN
+        endif !IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND.
         enddo !do il=1,ncum
 #endif
-!        write(*,*) 'cv30_routine tmp 1984: cond=',elij(il,i,j)
-         
-        
+!        WRITE(*,*) 'cv30_routine tmp 1984: cond=',elij(il,i,j)
+
+
 #endif
 
@@ -2203 +2214 @@
     ! do j=minorig,nl
     ! do il=1,ncum
-    ! if( (i.ge.icb(il)).and.(i.le.inb(il)).and.
-    ! :       (j.ge.(icb(il)-1)).and.(j.le.inb(il)))then
+    ! IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND.
+    ! :       (j.ge.(icb(il)-1)).AND.(j.le.inb(il)))THEN
     ! traent(il,i,j,k)=sij(il,i,j)*tra(il,i,k)
     ! :            +(1.-sij(il,i,j))*tra(il,nk(il),k)
-    ! endif
+    ! END IF
     ! enddo
     ! enddo
@@ -2223 +2234 @@
     DO il = 1, ncum
       IF ((i>=icb(il)) .AND. (i<=inb(il)) .AND. (nent(il,i)==0)) THEN
-        ! @      if(nent(il,i).eq.0)then
+        ! @      IF(nent(il,i).EQ.0)THEN
         ment(il, i, i) = m(il, i)
         qent(il, i, i) = rr(il, nk(il)) - ep(il, i)*clw(il, i)
@@ -2232 +2243 @@
         sij(il, i, i) = 0.0
 #ifdef ISO
-      do ixt = 1, ntraciso
+      DO ixt = 1, ntraciso
        xtent(ixt,il,i,i)=xt(ixt,il,nk(il))-ep(il,i)*xtclw(ixt,il,i)
-!      xtent(ixt,il,i,i)=xt(ixt,il,nk(il))-xtep(ixt,il,i)*xtclw(ixt,il,i) 
+!      xtent(ixt,il,i,i)=xt(ixt,il,nk(il))-xtep(ixt,il,i)*xtclw(ixt,il,i)
         ! le 7 mai: on supprime xtep
         xtelij(ixt,il,i,i)=xtclw(ixt,il,i) ! rq: ne sera pas utilise ensuite
@@ -2240 +2251 @@
 
 #ifdef ISOVERIF
-       if (iso_eau.gt.0) then
-         call iso_verif_egalite_choix(xtelij(iso_eau,il,i,i), &
-     &         elij(il,i,i),'cv30_mixing 2117',errmax,errmaxrel) 
-       endif !if (iso_eau.gt.0) then 
-#endif
-
-#ifdef ISOTRAC          
-        if (option_tmin.ge.1) then
+       IF (iso_eau.gt.0) THEN
+         CALL iso_verif_egalite_choix(xtelij(iso_eau,il,i,i), &
+               elij(il,i,i),'cv30_mixing 2117',errmax,errmaxrel)
+       endif !if (iso_eau.gt.0) THEN
+#endif
+
+#ifdef ISOTRAC
+        IF (option_tmin.ge.1) THEN
         ! colorier la vapeur residuelle selon temperature de
         ! condensation, et le condensat en un tag specifique
-!        write(*,*) 'cv3 tmp 2095 il,i,j,xtent(:,il,i,j)=',
+!        WRITE(*,*) 'cv3 tmp 2095 il,i,j,xtent(:,il,i,j)=',
 !     :            il,i,j,xtent(:,il,i,j)
-          if ((elij(il,i,i).gt.0.0).and.(qent(il,i,i).gt.0.0)) then 
-            if (option_traceurs.eq.17) then
-             call iso_recolorise_condensation(qent(il,i,i), &
-     &           elij(il,i,i), &
-     &           xt(1,il,nk(il)),xtclw(1,il,i),t(il,i),ep(il,i), &
-     &           xtres, &
-     &           seuil_tag_tmin)
-            else !if (option_traceurs.eq.17) then
-             call iso_recolorise_condensation(qent(il,i,i), &
-     &           elij(il,i,i), &
-     &           xt(1,il,nk(il)),xtclw(1,il,i),rs(il,i),ep(il,i), &
-     &           xtres, &
-     &           seuil_tag_tmin)
-            endif !if (option_traceurs.eq.17) then
-            do ixt=1+niso,ntraciso
+          IF ((elij(il,i,i).gt.0.0).AND.(qent(il,i,i).gt.0.0)) THEN
+            IF (option_traceurs.EQ.17) THEN
+             CALL iso_recolorise_condensation(qent(il,i,i), &
+                 elij(il,i,i), &
+                 xt(1,il,nk(il)),xtclw(1,il,i),t(il,i),ep(il,i), &
+                 xtres, &
+                 seuil_tag_tmin)
+            else !if (option_traceurs.EQ.17) THEN
+             CALL iso_recolorise_condensation(qent(il,i,i), &
+                 elij(il,i,i), &
+                 xt(1,il,nk(il)),xtclw(1,il,i),rs(il,i),ep(il,i), &
+                 xtres, &
+                 seuil_tag_tmin)
+            endif !if (option_traceurs.EQ.17) THEN
+            DO ixt=1+niso,ntraciso
               xtent(ixt,il,i,i)=xtres(ixt)
             enddo
-#ifdef ISOVERIF            
-            do ixt=1,niso
-            call iso_verif_egalite_choix(xtres(ixt),xtent(ixt,il,i,i), &
-     &           'cv30_routines 2102',errmax,errmaxrel)
-            call iso_verif_trac17_q_deltaD(xtent(1,il,i,j), &
-     &           'cv30_routines 2154')
+#ifdef ISOVERIF
+            DO ixt=1,niso
+            CALL iso_verif_egalite_choix(xtres(ixt),xtent(ixt,il,i,i), &
+                 'cv30_routines 2102',errmax,errmaxrel)
+            CALL iso_verif_trac17_q_deltaD(xtent(1,il,i,j), &
+                 'cv30_routines 2154')
             enddo
-#endif            
-          endif !if (cond.gt.0.0) then
-          
-#ifdef ISOVERIF          
-          call iso_verif_egalite_choix(xtent(iso_eau,il,i,i), &
-     &           qent(il,i,i),'cv30_routines 2103',errmax,errmaxrel)
-          call iso_verif_traceur(xtent(1,il,i,i),'cv30_routines 2095')
-          call iso_verif_traceur(xtelij(1,il,i,i),'cv30_routines 2096')
-#endif        
-        endif !if (option_tmin.ge.1) then    
+#endif
+          endif !if (cond.gt.0.0) THEN
+#ifdef ISOVERIF
+          CALL iso_verif_egalite_choix(xtent(iso_eau,il,i,i), &
+                 qent(il,i,i),'cv30_routines 2103',errmax,errmaxrel)
+          CALL iso_verif_traceur(xtent(1,il,i,i),'cv30_routines 2095')
+          CALL iso_verif_traceur(xtelij(1,il,i,i),'cv30_routines 2096')
+#endif
+        endif !if (option_tmin.ge.1) THEN
 #endif
 
@@ -2296 +2306 @@
   ! do i=minorig+1,nl
   ! do il=1,ncum
-  ! if (i.ge.icb(il) .and. i.le.inb(il) .and. nent(il,i).eq.0) then
+  ! if (i.ge.icb(il) .AND. i.le.inb(il) .AND. nent(il,i).EQ.0) THEN
   ! traent(il,i,i,j)=tra(il,nk(il),j)
-  ! endif
+  ! END IF
   ! enddo
   ! enddo
@@ -2322 +2332 @@
   ! =====================================================================
 
-  ! ym      call zilch(asum,ncum*nd)
-  ! ym      call zilch(bsum,ncum*nd)
-  ! ym      call zilch(csum,ncum*nd)
+  ! ym      CALL zilch(asum,ncum*nd)
+  ! ym      CALL zilch(bsum,ncum*nd)
+  ! ym      CALL zilch(csum,ncum*nd)
   CALL zilch(asum, nloc*nd)
   CALL zilch(csum, nloc*nd)
@@ -2466 +2476 @@
         sij(il, i, i) = 0.0
 #ifdef ISO
-      do ixt = 1, ntraciso
+      DO ixt = 1, ntraciso
 !      xtent(ixt,il,i,i)=xt(ixt,il,1)-xtep(ixt,il,i)*xtclw(ixt,il,i)
         xtent(ixt,il,i,i)=xt(ixt,il,1)-ep(il,i)*xtclw(ixt,il,i)
@@ -2474 +2484 @@
 
 #ifdef ISOVERIF
-      if (iso_eau.gt.0) then
-        call iso_verif_egalite_choix(xtelij(iso_eau,il,i,i), &
-     &         elij(il,i,i),'cv30_mixing 2354',errmax,errmaxrel) 
-      endif  !if (iso_eau.gt.0) then
-#endif
-
-#ifdef ISOTRAC          
-        if (option_tmin.ge.1) then
+      IF (iso_eau.gt.0) THEN
+        CALL iso_verif_egalite_choix(xtelij(iso_eau,il,i,i), &
+               elij(il,i,i),'cv30_mixing 2354',errmax,errmaxrel)
+      endif  !if (iso_eau.gt.0) THEN
+#endif
+
+#ifdef ISOTRAC
+        IF (option_tmin.ge.1) THEN
         ! colorier la vapeur residuelle selon temperature de
         ! condensation, et le condensat en un tag specifique
-!        write(*,*) 'cv3 tmp 2314 il,i,j,xtent(:,il,i,j)=',
+!        WRITE(*,*) 'cv3 tmp 2314 il,i,j,xtent(:,il,i,j)=',
 !     :            il,i,j,xtent(:,il,i,j)
-          if ((elij(il,i,i).gt.0.0).and.(qent(il,i,i).gt.0.0)) then 
-            if (option_traceurs.eq.17) then          
-              call iso_recolorise_condensation(qent(il,i,i), &
-     &           elij(il,i,i), &
-     &           xt(1,il,1),xtclw(1,il,i),t(il,i),ep(il,i), &
-     &           xtres, &
-     &           seuil_tag_tmin)
-            else !if (option_traceurs.eq.17) then
-              call iso_recolorise_condensation(qent(il,i,i), &
-     &           elij(il,i,i), &
-     &           xt(1,il,1),xtclw(1,il,i),rs(il,i),ep(il,i), &
-     &           xtres, &
-     &           seuil_tag_tmin)
-            endif ! if (option_traceurs.eq.17) then
-            do ixt=1+niso,ntraciso
+          IF ((elij(il,i,i).gt.0.0).AND.(qent(il,i,i).gt.0.0)) THEN
+            IF (option_traceurs.EQ.17) THEN
+              CALL iso_recolorise_condensation(qent(il,i,i), &
+                 elij(il,i,i), &
+                 xt(1,il,1),xtclw(1,il,i),t(il,i),ep(il,i), &
+                 xtres, &
+                 seuil_tag_tmin)
+            else !if (option_traceurs.EQ.17) THEN
+              CALL iso_recolorise_condensation(qent(il,i,i), &
+                 elij(il,i,i), &
+                 xt(1,il,1),xtclw(1,il,i),rs(il,i),ep(il,i), &
+                 xtres, &
+                 seuil_tag_tmin)
+            endif ! if (option_traceurs.EQ.17) THEN
+            DO ixt=1+niso,ntraciso
               xtent(ixt,il,i,i)=xtres(ixt)
-            enddo  
-#ifdef ISOVERIF               
-            do ixt=1,niso
-              call iso_verif_egalite_choix(xtres(ixt),xtent(ixt,il,i,i), &
-     &           'cv30_routines 2318',errmax,errmaxrel)
-              call iso_verif_trac17_q_deltaD(xtent(1,il,i,j), &
-     &           'cv30_routines 2383')
             enddo
-#endif               
-          endif !if (cond.gt.0.0) then
-#ifdef ISOVERIF          
-          call iso_verif_egalite_choix(xtent(iso_eau,il,i,i), &
-     &           qent(il,i,i),'cv30_routines 2321',errmax,errmaxrel)
-          call iso_verif_traceur(xtent(1,il,i,i),'cv30_routines 2322')
-          call iso_verif_traceur(xtelij(1,il,i,i),'cv30_routines 2323')
-#endif        
-        endif !if (option_tmin.ge.1) then
+#ifdef ISOVERIF
+            DO ixt=1,niso
+              CALL iso_verif_egalite_choix(xtres(ixt),xtent(ixt,il,i,i), &
+                 'cv30_routines 2318',errmax,errmaxrel)
+              CALL iso_verif_trac17_q_deltaD(xtent(1,il,i,j), &
+                 'cv30_routines 2383')
+            enddo
+#endif
+          endif !if (cond.gt.0.0) THEN
+#ifdef ISOVERIF
+          CALL iso_verif_egalite_choix(xtent(iso_eau,il,i,i), &
+                 qent(il,i,i),'cv30_routines 2321',errmax,errmaxrel)
+          CALL iso_verif_traceur(xtent(1,il,i,i),'cv30_routines 2322')
+          CALL iso_verif_traceur(xtelij(1,il,i,i),'cv30_routines 2323')
+#endif
+        endif !if (option_tmin.ge.1) THEN
 #endif
       END IF
@@ -2525 +2535 @@
     ! do j=1,ntra
     ! do il=1,ncum
-    ! if ( i.ge.icb(il) .and. i.le.inb(il) .and. lwork(il)
-    ! :     .and. csum(il,i).lt.m(il,i) ) then
+    ! if ( i.ge.icb(il) .AND. i.le.inb(il) .AND. lwork(il)
+    ! :     .AND. csum(il,i).lt.m(il,i) ) THEN
     ! traent(il,i,i,j)=tra(il,nk(il),j)
-    ! endif
+    ! END IF
     ! enddo
     ! enddo
@@ -2565 +2575 @@
 !c--debug
 #ifdef ISOVERIF
-       do im = 1, nd
-       do jm = 1, nd
-        do il = 1, ncum
-          if (iso_eau.gt.0) then
-            call iso_verif_egalite_choix(xtelij(iso_eau,il,im,jm), &
-     &         elij(il,im,jm),'cv30_mixing 2110',errmax,errmaxrel)
-            call iso_verif_egalite_choix(xtent(iso_eau,il,im,jm),  &                  
-     &         qent(il,im,jm),'cv30_mixing 2112',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
+       DO im = 1, nd
+       DO jm = 1, nd
+        DO il = 1, ncum
+          IF (iso_eau.gt.0) THEN
+            CALL iso_verif_egalite_choix(xtelij(iso_eau,il,im,jm), &
+               elij(il,im,jm),'cv30_mixing 2110',errmax,errmaxrel)
+            CALL iso_verif_egalite_choix(xtent(iso_eau,il,im,jm),  &
+               qent(il,im,jm),'cv30_mixing 2112',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(xtelij(1,il,im,jm), &     
-     &                  'cv30_routine 2250')
-#endif            
+        CALL iso_verif_traceur_justmass(xtelij(1,il,im,jm), &
+                        'cv30_routine 2250')
+#endif
         enddo !do il = 1, nloc
        enddo !do jm = 1, klev
        enddo !do im = 1, klev
 #endif
-#endif  
+#endif
 
 #ifdef ISO
 #ifdef ISOTRAC
         ! seulement a la fin on taggue le condensat
-        if (option_cond.ge.1) then
-         do im = 1, nd
-         do jm = 1, nd
-         do il = 1, ncum    
+        IF (option_cond.ge.1) THEN
+         DO im = 1, nd
+         DO jm = 1, nd
+         DO il = 1, ncum
            ! colorier le condensat en un tag specifique
-           do ixt=niso+1,ntraciso
-             if (index_zone(ixt).eq.izone_cond) then
+           DO ixt=niso+1,ntraciso
+             IF (index_zone(ixt).EQ.izone_cond) THEN
                 xtelij(ixt,il,im,jm)=xtelij(index_iso(ixt),il,im,jm)
-             else !if (index_zone(ixt).eq.izone_cond) then
+             else !if (index_zone(ixt).EQ.izone_cond) THEN
                 xtelij(ixt,il,im,jm)=0.0
-             endif !if (index_zone(ixt).eq.izone_cond) then
-           enddo !do ixt=1,ntraciso      
-#ifdef ISOVERIF
-        call iso_verif_egalite_choix(xtelij(iso_eau,il,im,jm), &
-     &           elij(il,im,jm),'cv30_routines 2408',errmax,errmaxrel)
-        call iso_verif_traceur(xtelij(1,il,im,jm), &
-     &          'condiso_liq_ice_vectiso_trac 358')
-#endif     
-         enddo !do il = 1, ncum   
+             endif !if (index_zone(ixt).EQ.izone_cond) THEN
+           enddo !do ixt=1,ntraciso
+#ifdef ISOVERIF
+        CALL iso_verif_egalite_choix(xtelij(iso_eau,il,im,jm), &
+                 elij(il,im,jm),'cv30_routines 2408',errmax,errmaxrel)
+        CALL iso_verif_traceur(xtelij(1,il,im,jm), &
+                'condiso_liq_ice_vectiso_trac 358')
+#endif
+         enddo !do il = 1, ncum
          enddo !do jm = 1, nd
          enddo !do im = 1, nd
-         do im = 1, nd
-         do il = 1, ncum    
+         DO im = 1, nd
+         DO il = 1, ncum
            ! colorier le condensat en un tag specifique
-           do ixt=niso+1,ntraciso
-             if (index_zone(ixt).eq.izone_cond) then
+           DO ixt=niso+1,ntraciso
+             IF (index_zone(ixt).EQ.izone_cond) THEN
                 xtclw(ixt,il,im)=xtclw(index_iso(ixt),il,im)
-             else !if (index_zone(ixt).eq.izone_cond) then
+             else !if (index_zone(ixt).EQ.izone_cond) THEN
                 xtclw(ixt,il,im)=0.0
-             endif !if (index_zone(ixt).eq.izone_cond) then
-           enddo !do ixt=1,ntraciso      
-#ifdef ISOVERIF
-        call iso_verif_egalite_choix(xtclw(iso_eau,il,im), &
-     &           clw(il,im),'cv30_routines 2427',errmax,errmaxrel)
-        call iso_verif_traceur(xtclw(1,il,im), &
-     &          'condiso_liq_ice_vectiso_trac 358')
-        if (iso_verif_positif_nostop(xtclw(itZonIso( &
-     &           izone_cond,iso_eau),i,k)-xtclw(iso_eau,i,k) &
-     &           ,'cv30_routines 909').eq.1) then
-               write(*,*) 'i,k=',i,k
-               write(*,*) 'xtclw=',xtclw(:,i,k)
-               write(*,*) 'niso,ntraciso,index_zone,izone_cond=', &
-     &             niso,ntraciso,index_zone,izone_cond       
+             endif !if (index_zone(ixt).EQ.izone_cond) THEN
+           enddo !do ixt=1,ntraciso
+#ifdef ISOVERIF
+        CALL iso_verif_egalite_choix(xtclw(iso_eau,il,im), &
+                 clw(il,im),'cv30_routines 2427',errmax,errmaxrel)
+        CALL iso_verif_traceur(xtclw(1,il,im), &
+                'condiso_liq_ice_vectiso_trac 358')
+        IF (iso_verif_positif_nostop(xtclw(itZonIso( &
+                 izone_cond,iso_eau),i,k)-xtclw(iso_eau,i,k) &
+                 ,'cv30_routines 909').EQ.1) THEN
+               WRITE(*,*) 'i,k=',i,k
+               WRITE(*,*) 'xtclw=',xtclw(:,i,k)
+               WRITE(*,*) 'niso,ntraciso,index_zone,izone_cond=', &
+                   niso,ntraciso,index_zone,izone_cond
                stop
          endif !if (iso_verif_positif_nostop(xtclw(itZonIso(
-#endif             
-         enddo !do il = 1, ncum   
+#endif
+         enddo !do il = 1, ncum
          enddo !do im = 1, nd
-!         write(*,*) 'xtclw(:,1,2)=',xtclw(:,1,2)
-        endif !if (option_tmin.eq.1) then
-#endif
-#endif
-
-  RETURN
+!         WRITE(*,*) 'xtclw(:,1,2)=',xtclw(:,1,2)
+        endif !if (option_tmin.EQ.1) THEN
+#endif
+#endif
+
+
 END SUBROUTINE cv30_mixing
 
@@ -2649 +2659 @@
     , wdtraina, wdtrainm & ! 26/08/10  RomP-jyg
 #ifdef ISO
-     &              ,xt,xtclw,xtelij &
-     &              ,xtp,xtwater,xtevap,xtwdtraina &
-#endif
-     &          )
-#ifdef ISO
-    use infotrac_phy, ONLY: ntraciso=>ntiso, niso
-    use isotopes_mod, ONLY: essai_convergence, iso_eau,iso_HDO,ridicule
-    use isotopes_routines_mod, ONLY: appel_stewart_vectall,appel_stewart_debug
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: errmax,errmaxrel, &
+                    ,xt,xtclw,xtelij &
+                    ,xtp,xtwater,xtevap,xtwdtraina &
+#endif
+                )
+#ifdef ISO
+    USE infotrac_phy, ONLY: ntraciso=>ntiso, niso
+    USE isotopes_mod, ONLY: essai_convergence, iso_eau,iso_HDO,ridicule
+    USE isotopes_routines_mod, ONLY: appel_stewart_vectall,appel_stewart_debug
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: errmax,errmaxrel, &
         iso_verif_egalite_choix, iso_verif_noNaN,iso_verif_aberrant, &
         iso_verif_egalite,iso_verif_egalite_choix_nostop,iso_verif_positif_nostop, &
@@ -2665 +2675 @@
 #endif
 #ifdef ISOTRAC
-    use isotrac_mod, only: option_cond,izone_cond
-    use infotrac_phy, ONLY: itZonIso
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: iso_verif_traceur_justmass, &
+    USE isotrac_mod, ONLY: option_cond,izone_cond
+    USE infotrac_phy, ONLY: itZonIso
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: iso_verif_traceur_justmass, &
 &       iso_verif_traceur
-    use isotrac_routines_mod, ONLY: iso_verif_traceur_pbidouille
-#endif
-#endif
-#endif
-
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
-  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
-          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
+    USE isotrac_routines_mod, ONLY: iso_verif_traceur_pbidouille
+#endif
+#endif
+#endif
+USE cvflag_mod_h
+USE cvthermo_mod_h
+
   IMPLICIT NONE
-
-
-  include "cv30param.h"
 
   ! inputs:
@@ -2697 +2702 @@
   REAL m(nloc, na), ment(nloc, na, na), elij(nloc, na, na)
 #ifdef ISO
-      real xt(ntraciso,nloc,nd), xtclw(ntraciso,nloc,na)
-      real xtelij(ntraciso,nloc,na,na)
+      REAL xt(ntraciso,nloc,nd), xtclw(ntraciso,nloc,na)
+      REAL xtelij(ntraciso,nloc,na,na)
 !      real xtep(ntraciso,nloc,na) ! le 7 mai: on supprime xtep
 #endif
@@ -2714 +2719 @@
 
 #ifdef ISO
-      real xtp(ntraciso,nloc,na)
-      real xtwater(ntraciso,nloc,na), xtevap(ntraciso,nloc,na)
-      real xtwdtraina(ntraciso,nloc,na)
+      REAL xtp(ntraciso,nloc,na)
+      REAL xtwater(ntraciso,nloc,na), xtevap(ntraciso,nloc,na)
+      REAL xtwdtraina(ntraciso,nloc,na)
 #endif
 
@@ -2731 +2736 @@
 
 #ifdef ISO
-      integer ixt
-      real xtawat(ntraciso)
+      INTEGER ixt
+      REAL xtawat(ntraciso)
   REAL xtwdtrain(ntraciso,nloc)
-!      logical negation
-      real rpprec(nloc,na)
+!      LOGICAL negation
+      REAL rpprec(nloc,na)
 !#ifdef ISOVERIF
 !      integer iso_verif_aberrant_nostop
-!#ifdef ISOTRAC      
+!#ifdef ISOTRAC
 !      integer iso_verif_traceur_choix_nostop
 !      integer iso_verif_positif_nostop
-!#endif      
-!#endif  
+!#endif
+!#endif
 #endif
 
@@ -2748 +2753 @@
   ! ------------------------------------------------------
 !#ifdef ISOVERIF
-!        write(*,*) 'cv30_routines 2382: entree dans cv3_unsat'
+!        WRITE(*,*) 'cv30_routines 2382: entree dans cv3_unsat'
 !#endif
 
@@ -2777 +2782 @@
 #ifdef ISO
           rpprec(il,i)=rp(il,i)
-          do ixt=1,ntraciso
+          DO ixt=1,ntraciso
            xtp(ixt,il,i)=xt(ixt,il,i)
            xtwater(ixt,il,i)=0.0
@@ -2784 +2789 @@
 !-- debug
 #ifdef ISOVERIF
-            if(iso_eau.gt.0) then
-              call iso_verif_egalite_choix(xt(iso_eau,il,i),rr(il,i), &
-     &                  'cv30_unsat 2245 ',errmax,errmaxrel)
-             call iso_verif_egalite_choix(xtp(iso_eau,il,i),rp(il,i), &
-     &                   'cv30_unsat 2247 ',errmax,errmaxrel)
-            endif !if(iso_eau.gt.0) then
+            IF(iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(xt(iso_eau,il,i),rr(il,i), &
+                        'cv30_unsat 2245 ',errmax,errmaxrel)
+             CALL iso_verif_egalite_choix(xtp(iso_eau,il,i),rp(il,i), &
+                         'cv30_unsat 2247 ',errmax,errmaxrel)
+            endif !IF(iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur(xt(1,il,i),'cv30_routine 2410')
-        call iso_verif_traceur(xtp(1,il,i),'cv30_routine 2411')
-#endif             
+        CALL iso_verif_traceur(xt(1,il,i),'cv30_routine 2410')
+        CALL iso_verif_traceur(xtp(1,il,i),'cv30_routine 2411')
+#endif
 #endif
 #endif
@@ -2807 +2812 @@
   ! enddo
   ! enddo
-  ! ! RomP >>>
+  ! RomP >>>
   DO i = 1, nd
     DO il = 1, ncum
@@ -2814 +2819 @@
     END DO
   END DO
-  ! ! RomP <<<
+  ! RomP <<<
 
   ! ***  check whether ep(inb)=0, if so, skip precipitating    ***
@@ -2827 +2832 @@
   CALL zilch(wdtrain, ncum)
 #ifdef ISO
-        call zilch(xtwdtrain,ncum*ntraciso)
+        CALL zilch(xtwdtrain,ncum*ntraciso)
 #endif
 
@@ -2856 +2861 @@
           wdtraina(il, i) = wdtrain(il)/grav !   Pa  26/08/10   RomP
 #ifdef ISO
-          do ixt=1,ntraciso
+          DO ixt=1,ntraciso
 !           xtwdtrain(ixt,il)=grav*xtep(ixt,il,i)*m(il,i)*xtclw(ixt,il,i)
            xtwdtrain(ixt,il)=grav*ep(il,i)*m(il,i)*xtclw(ixt,il,i)
@@ -2862 +2867 @@
 !--debug:
 #ifdef ISOVERIF
-            if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(xtwdtrain(iso_eau,il), &
-     &           wdtrain(il),'cv30_routines 2313',errmax,errmaxrel)
-             endif !if (iso_eau.gt.0) then
+            IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(xtwdtrain(iso_eau,il), &
+                 wdtrain(il),'cv30_routines 2313',errmax,errmaxrel)
+             endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur(xtwdtrain(1,il),'cv30_routine 2480')        
-#endif              
+        CALL iso_verif_traceur(xtwdtrain(1,il),'cv30_routine 2480')
+#endif
 #endif
 !--end debug
@@ -2877 +2882 @@
           wdtraina(il, i) = wdtrain(il)/10. !   Pa  26/08/10   RomP
 #ifdef ISO
-          do ixt=1,ntraciso
+          DO ixt=1,ntraciso
 !           xtwdtrain(ixt,il)=10.0*xtep(ixt,il,i)*m(il,i)*xtclw(ixt,il,i)
             xtwdtrain(ixt,il)=10.0*ep(il,i)*m(il,i)*xtclw(ixt,il,i)
-            xtwdtraina(ixt,il, i) = xtwdtrain(ixt,il)/10. 
+            xtwdtraina(ixt,il, i) = xtwdtrain(ixt,il)/10.
           enddo
 #endif
@@ -2895 +2900 @@
             awat = amax1(awat, 0.0)
 #ifdef ISO
-! precip mixed drafts computed from: xtawat/xtelij = awat/elij           
-            if (elij(il,j,i).ne.0.0) then
-             do ixt=1,ntraciso
+! precip mixed drafts computed from: xtawat/xtelij = awat/elij
+            IF (elij(il,j,i).NE.0.0) THEN
+             DO ixt=1,ntraciso
                xtawat(ixt)=xtelij(ixt,il,j,i)*(awat/elij(il,j,i))
                xtawat(ixt)=amax1(xtawat(ixt),0.0)
@@ -2903 +2908 @@
 !!             xtawat(ixt)=amin1(xtawat(ixt),xtelij(ixt,il,j,i)) !security..
             else
-             do ixt=1,ntraciso
+             DO ixt=1,ntraciso
                xtawat(ixt)=0.0
              enddo !do ixt=1,niso
-            endif                                   
-
-#ifdef ISOVERIF
-              if (iso_eau.gt.0) then
-                  call iso_verif_egalite_choix(xtawat(iso_eau), &
-     &           awat,'cv30_routines 2391',errmax,errmaxrel)
-              endif !if (iso_eau.gt.0) then
+            endif
+
+#ifdef ISOVERIF
+              IF (iso_eau.gt.0) THEN
+                  CALL iso_verif_egalite_choix(xtawat(iso_eau), &
+                 awat,'cv30_routines 2391',errmax,errmaxrel)
+              endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur(xtawat(1),'cv30_routine 2522')
-#endif               
+        CALL iso_verif_traceur(xtawat(1),'cv30_routine 2522')
+#endif
 #endif
 #endif
@@ -2921 +2926 @@
               wdtrain(il) = wdtrain(il) + grav*awat*ment(il, j, i)
 #ifdef ISO
-           do ixt=1,ntraciso
+           DO ixt=1,ntraciso
              xtwdtrain(ixt,il)=xtwdtrain(ixt,il) &
-     &                         +grav*xtawat(ixt)*ment(il,j,i)
+                               +grav*xtawat(ixt)*ment(il,j,i)
            enddo !do ixt=1,ntraciso
 #endif
             ELSE
               wdtrain(il) = wdtrain(il) + 10.0*awat*ment(il, j, i)
-#ifdef ISO            
-           do ixt=1,ntraciso
+#ifdef ISO
+           DO ixt=1,ntraciso
              xtwdtrain(ixt,il)=xtwdtrain(ixt,il) &
-     &                         +10.0*xtawat(ixt)*ment(il,j,i)
+                               +10.0*xtawat(ixt)*ment(il,j,i)
            enddo !!do ixt=1,ntraciso
 #endif
-            END IF !if (cvflag_grav) then
+            END IF !if (cvflag_grav) THEN
 #ifdef ISO
 !--debug:
 #ifdef ISOVERIF
-              if (iso_eau.gt.0) then
-                  call iso_verif_egalite_choix(xtwdtrain(iso_eau,il), &
-     &           wdtrain(il),'cv30_routines 2366',errmax,errmaxrel)
-              endif !if (iso_eau.gt.0) then
+              IF (iso_eau.gt.0) THEN
+                  CALL iso_verif_egalite_choix(xtwdtrain(iso_eau,il), &
+                 wdtrain(il),'cv30_routines 2366',errmax,errmaxrel)
+              endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur(xtwdtrain(1,il),'cv30_routine 2540')
-        if (option_cond.ge.1) then
+        CALL iso_verif_traceur(xtwdtrain(1,il),'cv30_routine 2540')
+        IF (option_cond.ge.1) THEN
            ! on verifie que tout le detrainement est tagge condensat
-           if (iso_verif_positif_nostop( &
-     &          xtwdtrain(itZonIso(izone_cond,iso_eau),il) &
-     &          -xtwdtrain(iso_eau,il), &
-     &          'cv30_routines 2795').eq.1) then
-          write(*,*) 'xtwdtrain(:,il)=',xtwdtrain(:,il)
-          write(*,*) 'xtelij(:,il,j,i)=',xtelij(:,il,j,i)
-          write(*,*) 'xtclw(:,il,i)=',xtclw(:,il,i)
+           IF (iso_verif_positif_nostop( &
+                xtwdtrain(itZonIso(izone_cond,iso_eau),il) &
+                -xtwdtrain(iso_eau,il), &
+                'cv30_routines 2795').EQ.1) THEN
+          WRITE(*,*) 'xtwdtrain(:,il)=',xtwdtrain(:,il)
+          WRITE(*,*) 'xtelij(:,il,j,i)=',xtelij(:,il,j,i)
+          WRITE(*,*) 'xtclw(:,il,i)=',xtclw(:,il,i)
           stop
           endif !if (iso_verif_positif_nostop(Pxtisup(iso_eau,il)-
-        endif !if (option_cond.ge.1) then
-#endif              
+        endif !if (option_cond.ge.1) THEN
+#endif
 #endif
 #endif
@@ -3013 +3018 @@
         ! jyg1
         ! cc        sigt=1.0
-        ! cc        if(i.ge.icb)sigt=sigp(i)
+        ! cc        IF(i.ge.icb)sigt=sigp(i)
         ! prise en compte de la variation progressive de sigt dans
         ! les couches icb et icb-1:
@@ -3044 +3049 @@
 !      water(il,i)=max(0.0,water(il,i)) ! ceci est toujours verifie
 #ifdef ISOVERIF
-          call iso_verif_positif(water(il,i),'cv30_unsat 2376')
+          CALL iso_verif_positif(water(il,i),'cv30_unsat 2376')
 #endif
 !      evap(il,i)=max(0.0,evap(il,i)) ! evap<0 permet la conservation de
@@ -3131 +3136 @@
           END IF
 
-        END IF ! i.eq.1
+        END IF ! i.EQ.1
 
         ! ***       find mixing ratio of precipitating downdraft     ***
@@ -3164 +3169 @@
             ! :            +tra(il,i,j)*(mp(il,i)-mp(il,i+1))
             ! trap(il,i,j)=trap(il,i,j)/mp(il,i)
-            ! end do
+            ! END DO
 
           ELSE
@@ -3181 +3186 @@
               ! do j=1,ntra
               ! trap(il,i,j)=trap(il,i+1,j)
-              ! end do
+              ! END DO
 
             END IF
           END IF
-#ifdef ISO 
-        rpprec(il,i)=max(rp(il,i),0.0) 
+#ifdef ISO
+        rpprec(il,i)=max(rp(il,i),0.0)
 #endif
           rp(il, i) = amin1(rp(il,i), rs(il,i))
@@ -3199 +3204 @@
 #ifdef ISOVERIF
 ! verif des inputs a appel stewart
-!        write(*,*) 'cv30_routines 2842 tmp: appel de appel_stewart'
-      do il=1,ncum 
-       if (i.le.inb(il) .and. lwork(il)) then
-         if (iso_eau.gt.0) then
-            call iso_verif_egalite_choix(xt(iso_eau,il,i), &
-     &        rr(il,i),'appel_stewart 262, cas 1.1',errmax,errmaxrel)
-         endif !if (iso_eau.gt.0) then
+!        WRITE(*,*) 'cv30_routines 2842 tmp: appel de appel_stewart'
+      DO il=1,ncum
+       IF (i.le.inb(il) .AND. lwork(il)) THEN
+         IF (iso_eau.gt.0) THEN
+            CALL iso_verif_egalite_choix(xt(iso_eau,il,i), &
+              rr(il,i),'appel_stewart 262, cas 1.1',errmax,errmaxrel)
+         endif !if (iso_eau.gt.0) THEN
 !#ifdef ISOTRAC
-!        if (option_tmin.ge.1) then
-!           call iso_verif_positif(xtwater(
+!        if (option_tmin.ge.1) THEN
+!           CALL iso_verif_positif(xtwater(
 !     :           itZonIso(izone_cond,iso_eau),il,i+1)
 !     :           -xtwater(iso_eau,il,i+1),
 !     :          'cv30_routines 3083')
-!        endif !if (option_tmin.ge.1) then
+!        endif !if (option_tmin.ge.1) THEN
 !#endif
         endif
@@ -3218 +3223 @@
 #endif
 
-        if (1.eq.0) then
+        IF (1.EQ.0) THEN
         ! appel de appel_stewart_vectorise
-        call appel_stewart_vectall(lwork,ncum, &
-     &                   ph,t,evap,xtwdtrain, &
-     &                   wdtrain, &
-     &            water,rr,xt,rs,rpprec,mp,wt, & ! inputs physiques
-     &            xtwater,xtp, &   ! outputs indispensables
-     &           xtevap, &    ! diagnostiques
-     &          sigd, & ! inputs tunables
-     &          i,inb, & ! altitude: car cas particulier en INB 
-     &          na,nd,nloc,cvflag_grav,ginv,1e-16)
-
-        else !if (1.eq.0) then
+        CALL appel_stewart_vectall(lwork,ncum, &
+                         ph,t,evap,xtwdtrain, &
+                         wdtrain, &
+                  water,rr,xt,rs,rpprec,mp,wt, & ! inputs physiques
+                  xtwater,xtp, &   ! outputs indispensables
+                 xtevap, &    ! diagnostiques
+                sigd, & ! inputs tunables
+                i,inb, & ! altitude: car cas particulier en INB
+                na,nd,nloc,cvflag_grav,ginv,1e-16)
+
+        else !if (1.EQ.0) THEN
           ! truc simple sans fractionnement
           ! juste pour debuggage
-          call appel_stewart_debug(lwork,nloc,inb,na,i, &
+          CALL appel_stewart_debug(lwork,nloc,inb,na,i, &
                 evap,water,rpprec,rr,wdtrain, &
                 xtevap,xtwater,xtp,xt,xtwdtrain)
-        endif ! if (1.eq.0) then
-
-
-#ifdef ISOVERIF
-!        write(*,*) 'cv30_routines 2864 tmp: sortie de appel_stewart'
+        endif ! if (1.EQ.0) THEN
+#ifdef ISOVERIF
+!        WRITE(*,*) 'cv30_routines 2864 tmp: sortie de appel_stewart'
 ! verif des outputs de appel stewart
-       do il=1,ncum
-        if (i.le.inb(il) .and. lwork(il)) then
-         do ixt=1,ntraciso        
-          call iso_verif_noNAN(xtp(ixt,il,i),'cv30_unsat 3382')
-          call iso_verif_noNAN(xtwater(ixt,il,i),'cv30_unsat 3381')
-          call iso_verif_noNAN(xtevap(ixt,il,i),'cv30_unsat 2661')
-         enddo  
-         if (iso_eau.gt.0) then 
-          call iso_verif_egalite_choix(xtp(iso_eau,il,i), &
-     &           rpprec(il,i),'cv30_unsat 2736',errmax,errmaxrel)  
-          call iso_verif_egalite_choix(xtwater(iso_eau,il,i), &
-     &           water(il,i),'cv30_unsat 2747',errmax,errmaxrel)   
-!         write(*,*) 'xtwater(4,il,i)=',xtwater(4,il,i)
-!         write(*,*) 'water(il,i)=',water(il,i)
-          call iso_verif_egalite_choix(xtevap(iso_eau,il,i), &
-     &           evap(il,i),'cv30_unsat 2751',errmax,errmaxrel)
-         endif !if (iso_eau.gt.0) then
-         if ((iso_HDO.gt.0).and. &
-     &           (rp(il,i).gt.ridicule)) then
-           call iso_verif_aberrant(xtp(iso_HDO,il,i)/rpprec(il,i), &
-     &                  'cv3unsat 2756')
-           endif !if ((iso_HDO.gt.0).and.
+       DO il=1,ncum
+        IF (i.le.inb(il) .AND. lwork(il)) THEN
+         DO ixt=1,ntraciso
+          CALL iso_verif_noNAN(xtp(ixt,il,i),'cv30_unsat 3382')
+          CALL iso_verif_noNAN(xtwater(ixt,il,i),'cv30_unsat 3381')
+          CALL iso_verif_noNAN(xtevap(ixt,il,i),'cv30_unsat 2661')
+         enddo
+         IF (iso_eau.gt.0) THEN
+          CALL iso_verif_egalite_choix(xtp(iso_eau,il,i), &
+                 rpprec(il,i),'cv30_unsat 2736',errmax,errmaxrel)
+          CALL iso_verif_egalite_choix(xtwater(iso_eau,il,i), &
+                 water(il,i),'cv30_unsat 2747',errmax,errmaxrel)
+!         WRITE(*,*) 'xtwater(4,il,i)=',xtwater(4,il,i)
+!         WRITE(*,*) 'water(il,i)=',water(il,i)
+          CALL iso_verif_egalite_choix(xtevap(iso_eau,il,i), &
+                 evap(il,i),'cv30_unsat 2751',errmax,errmaxrel)
+         endif !if (iso_eau.gt.0) THEN
+         IF ((iso_HDO.gt.0).AND. &
+                 (rp(il,i).gt.ridicule)) THEN
+           CALL iso_verif_aberrant(xtp(iso_HDO,il,i)/rpprec(il,i), &
+                        'cv3unsat 2756')
+           endif !if ((iso_HDO.gt.0).AND.
 #ifdef ISOTRAC
-!        if (il.eq.602) then
-!        write(*,*) 'cv30_routine tmp: il,i=',il,i
-!        write(*,*) 'xtp(iso_eau:ntraciso:3,il,i)=',
+!        if (il.EQ.602) THEN
+!        WRITE(*,*) 'cv30_routine tmp: il,i=',il,i
+!        WRITE(*,*) 'xtp(iso_eau:ntraciso:3,il,i)=',
 !     :          xtp(iso_eau:ntraciso:3,il,i)
 !        endif
-        call iso_verif_traceur(xtp(1,il,i),'cv30_routine 2852')
-        call iso_verif_traceur(xtwater(1,il,1), &
-     &       'cv30_routine 2853 unsat apres appel')
-        call iso_verif_traceur_pbidouille(xtwater(1,il,i), &
-     &           'cv30_routine 2853b')
-        call iso_verif_traceur_justmass(xtevap(1,il,i), &
-     &                    'cv30_routine 2854')
-!        if (option_tmin.ge.1) then
-!         call iso_verif_positif(xtwater(
+        CALL iso_verif_traceur(xtp(1,il,i),'cv30_routine 2852')
+        CALL iso_verif_traceur(xtwater(1,il,1), &
+             'cv30_routine 2853 unsat apres appel')
+        CALL iso_verif_traceur_pbidouille(xtwater(1,il,i), &
+                 'cv30_routine 2853b')
+        CALL iso_verif_traceur_justmass(xtevap(1,il,i), &
+                          'cv30_routine 2854')
+!        if (option_tmin.ge.1) THEN
+!         CALL iso_verif_positif(xtwater(
 !     :           itZonIso(izone_cond,iso_eau),il,i)
 !     :           -xtwater(iso_eau,il,i),
 !     :          'cv30_routines 3143')
-!        endif !if (option_tmin.ge.1) then
-#endif              
-        endif !if (i.le.inb(il) .and. lwork(il)) then        
+!        endif !if (option_tmin.ge.1) THEN
+#endif
+        endif !if (i.le.inb(il) .AND. lwork(il)) THEN
        enddo !do il=1,ncum
 #endif
-        
+
 ! equivalent isotopique de rp(il,i)=amin1(rp(il,i),rs(il,i))
-       do il=1,ncum
-        if (i.lt.inb(il) .and. lwork(il)) then
-
-         if (rpprec(il,i).gt.rs(il,i)) then
-            if (rs(il,i).le.0) then
-                write(*,*) 'cv3unsat 2640'
+       DO il=1,ncum
+        IF (i.lt.inb(il) .AND. lwork(il)) THEN
+         IF (rpprec(il,i).gt.rs(il,i)) THEN
+            IF (rs(il,i).le.0) THEN
+                WRITE(*,*) 'cv3unsat 2640'
                 stop
             endif
-            do ixt=1,ntraciso
+            DO ixt=1,ntraciso
               xtp(ixt,il,i)=xtp(ixt,il,i)/rpprec(il,i)*rs(il,i)
               xtp(ixt,il,i)=max(0.0,xtp(ixt,il,i))
-            enddo !do ixt=1,niso 
-#ifdef ISOVERIF
-           do ixt=1,ntraciso       
-           call iso_verif_noNaN(xtp(ixt,il,i),'cv3unsat 2641')                
+            enddo !do ixt=1,niso
+#ifdef ISOVERIF
+           DO ixt=1,ntraciso
+           CALL iso_verif_noNaN(xtp(ixt,il,i),'cv3unsat 2641')
            enddo !do ixt=1,niso
-           if (iso_eau.gt.0) then
-!             write(*,*) 'xtp(iso_eau,il,i)=',xtp(iso_eau,il,i)  
-             call iso_verif_egalite_choix(xtp(iso_eau,il,i),rp(il,i), &
-     &                  'cv3unsat 2653',errmax,errmaxrel)
-             call iso_verif_egalite_choix(xtp(iso_eau,il,i), &
-     &            rs(il,i),'cv3unsat 2654',errmax,errmaxrel)   
-           endif  
-           if ((iso_HDO.gt.0).and. &
-     &           (rp(il,i).gt.ridicule)) then
-             if (iso_verif_aberrant_nostop(xtp(iso_HDO,il,i)/rp(il,i), &
-     &                  'cv3unsat 2658').eq.1) then
-                write(*,*) 'rpprec(il,i),rs(il,i),rp(il,i)=', &
-     &                   rpprec(il,i),rs(il,i),rp(il,i)
+           IF (iso_eau.gt.0) THEN
+!             WRITE(*,*) 'xtp(iso_eau,il,i)=',xtp(iso_eau,il,i)
+             CALL iso_verif_egalite_choix(xtp(iso_eau,il,i),rp(il,i), &
+                        'cv3unsat 2653',errmax,errmaxrel)
+             CALL iso_verif_egalite_choix(xtp(iso_eau,il,i), &
+                  rs(il,i),'cv3unsat 2654',errmax,errmaxrel)
+           endif
+           IF ((iso_HDO.gt.0).AND. &
+                 (rp(il,i).gt.ridicule)) THEN
+             IF (iso_verif_aberrant_nostop(xtp(iso_HDO,il,i)/rp(il,i), &
+                        'cv3unsat 2658').EQ.1) THEN
+                WRITE(*,*) 'rpprec(il,i),rs(il,i),rp(il,i)=', &
+                         rpprec(il,i),rs(il,i),rp(il,i)
                 stop
              endif
            endif
 #ifdef ISOTRAC
-        call iso_verif_traceur(xtp(1,il,i),'cv30_routine 2893')
-#endif            
-#endif
-          rpprec(il,i)=rs(il,i)            
-         endif !if (rp(il,i).gt.rs(il,i)) then           
+        CALL iso_verif_traceur(xtp(1,il,i),'cv30_routine 2893')
+#endif
+#endif
+          rpprec(il,i)=rs(il,i)
+         endif !if (rp(il,i).gt.rs(il,i)) THEN
          endif !if (i.lt.INB et lwork)
         enddo ! il=1,ncum
@@ -3335 +3337 @@
 
 ! fin de la boucle en i (altitude)
-#ifdef ISO   
-      write(*,*) 'nl=',nl,'nd=',nd,'; ncum=',ncum  
-#ifdef ISOVERIF
-      do i=1,nl !nl
-        do il=1,ncum
-        if (iso_eau.gt.0) then
-!            write(*,*) 'cv30_routines 2767:i,il,lwork(il),inb(il)=',
+#ifdef ISO
+      WRITE(*,*) 'nl=',nl,'nd=',nd,'; ncum=',ncum
+#ifdef ISOVERIF
+      DO i=1,nl !nl
+        DO il=1,ncum
+        IF (iso_eau.gt.0) THEN
+!            WRITE(*,*) 'cv30_routines 2767:i,il,lwork(il),inb(il)=',
 !     :           i,il,lwork(il),inb(il)
-!            write(*,*) 'rp(il,i),xtp(iso_eau,il,i)=',
-!     :           rp(il,i),xtp(iso_eau,il,i)  
-            call iso_verif_egalite_choix(xt(iso_eau,il,i), &
-     &           rr(il,i),'cv30_unsat 2668',errmax,errmaxrel)
-            call iso_verif_egalite_choix(xtp(iso_eau,il,i), &
-     &           rp(il,i),'cv30_unsat 2670',errmax,errmaxrel)
-           call iso_verif_egalite_choix(xtwater(iso_eau,il,i), &
-     &           water(il,i),'cv30_unsat 2672',errmax,errmaxrel)
-        endif !if (iso_eau.gt.0) then
+!            WRITE(*,*) 'rp(il,i),xtp(iso_eau,il,i)=',
+!     :           rp(il,i),xtp(iso_eau,il,i)
+            CALL iso_verif_egalite_choix(xt(iso_eau,il,i), &
+                 rr(il,i),'cv30_unsat 2668',errmax,errmaxrel)
+            CALL iso_verif_egalite_choix(xtp(iso_eau,il,i), &
+                 rp(il,i),'cv30_unsat 2670',errmax,errmaxrel)
+           CALL iso_verif_egalite_choix(xtwater(iso_eau,il,i), &
+                 water(il,i),'cv30_unsat 2672',errmax,errmaxrel)
+        endif !if (iso_eau.gt.0) THEN
 !#ifdef ISOTRAC
 !        if (iso_verif_traceur_choix_nostop(xtwater(1,il,i),
 !     :       'cv30_routine 2982 unsat',errmax,
-!     :       errmaxrel,ridicule_trac,deltalimtrac).eq.1) then
-!              write(*,*) 'il,i,inb(il),lwork(il)=',
+!     :       errmaxrel,ridicule_trac,deltalimtrac).EQ.1) THEN
+!              WRITE(*,*) 'il,i,inb(il),lwork(il)=',
 !     :           il,i,inb(il),lwork(il)
-!              write(*,*) 'xtwater(:,il,i)=',xtwater(:,il,i)
+!              WRITE(*,*) 'xtwater(:,il,i)=',xtwater(:,il,i)
 !              stop
 !        endif
-!#endif        
+!#endif
         enddo !do il=1,nloc!ncum
       enddo !do i=1,nl!nl
       il=5
-      i=39 
-      write(*,*) 'cv30_unsat 2780: il,water(il,i),xtwater(iso_eau,il,i)=' &
+      i=39
+      WRITE(*,*) 'cv30_unsat 2780: il,water(il,i),xtwater(iso_eau,il,i)=' &
                ,il,water(il,i),xtwater(iso_eau,il,i)
 #endif
 #endif
-  RETURN
+
 END SUBROUTINE cv30_unsat
 
@@ -3379 +3381 @@
     mike, tls, tps, qcondc, wd &
 #ifdef ISO
-     &                    ,xt,xtclw,xtp,xtwater,xtevap &
-     &                    ,xtent,xtelij,xtprecip,fxt,xtVprecip &
+                          ,xt,xtclw,xtp,xtwater,xtevap &
+                          ,xtent,xtelij,xtprecip,fxt,xtVprecip &
 #ifdef DIAGISO
-     &          ,fq_detrainement,fq_ddft,fq_fluxmasse,fq_evapprecip &
-     &          ,fxt_detrainement,fxt_ddft,fxt_fluxmasse,fxt_evapprecip &
-     &         ,f_detrainement,q_detrainement,xt_detrainement  &
-#endif     
-#endif
-     &                    )
-#ifdef ISO
-    use infotrac_phy, ONLY: ntraciso=>ntiso, niso, nzone, itZonIso
-    use isotopes_mod, ONLY: essai_convergence,ridicule,iso_eau,iso_HDO,iso_O18
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: errmax,errmaxrel, &
+                ,fq_detrainement,fq_ddft,fq_fluxmasse,fq_evapprecip &
+                ,fxt_detrainement,fxt_ddft,fxt_fluxmasse,fxt_evapprecip &
+               ,f_detrainement,q_detrainement,xt_detrainement  &
+#endif
+#endif
+                          )
+        USE conema3_mod_h
+#ifdef ISO
+    USE infotrac_phy, ONLY: ntraciso=>ntiso, niso, nzone, itZonIso
+    USE isotopes_mod, ONLY: essai_convergence,ridicule,iso_eau,iso_HDO,iso_O18
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: errmax,errmaxrel, &
         iso_verif_egalite_choix, iso_verif_noNaN,iso_verif_aberrant, &
         iso_verif_egalite,iso_verif_egalite_choix_nostop,iso_verif_positif_nostop, &
@@ -3401 +3404 @@
 #endif
 #ifdef ISOTRAC
-        use isotrac_mod, only: option_traceurs, &
+        USE isotrac_mod, ONLY: option_traceurs, &
         izone_revap,izone_poubelle,izone_ddft
 #ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: iso_verif_traceur_choix_nostop,deltalimtrac, &
+    USE isotopes_verif_mod, ONLY: iso_verif_traceur_choix_nostop,deltalimtrac, &
 &       iso_verif_tracpos_choix_nostop,iso_verif_traceur,iso_verif_traceur_justmass
-    use isotrac_mod, only: ridicule_trac
-#endif
-#endif
-#endif
-
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
-  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
-          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
+    USE isotrac_mod, ONLY: ridicule_trac
+#endif
+#endif
+#endif
+USE cvflag_mod_h
+USE cvthermo_mod_h
+
   IMPLICIT NONE
-
-  include "cv30param.h"
-  include "conema3.h"
-
   ! inputs:
   INTEGER ncum, nd, na, ntra, nloc
@@ -3439 +3436 @@
   REAL tv(nloc, nd), tvp(nloc, nd)
 #ifdef ISO
-      real xt(ntraciso,nloc,nd)
+      REAL xt(ntraciso,nloc,nd)
 !      real xtep(ntraciso,nloc,na) ! le 7 mai: on supprime xtep
-      real xtclw(ntraciso,nloc,na), xtp(ntraciso,nloc,na)
-      real xtwater(ntraciso,nloc,na), xtevap(ntraciso,nloc,na)
-      real xtent(ntraciso,nloc,na,na), xtelij(ntraciso,nloc,na,na)
-#ifdef ISOVERIF      
+      REAL xtclw(ntraciso,nloc,na), xtp(ntraciso,nloc,na)
+      REAL xtwater(ntraciso,nloc,na), xtevap(ntraciso,nloc,na)
+      REAL xtent(ntraciso,nloc,na,na), xtelij(ntraciso,nloc,na,na)
+#ifdef ISOVERIF
       CHARACTER (LEN=20) :: modname='cv30_compress'
       CHARACTER (LEN=80) :: abort_message
@@ -3464 +3461 @@
   REAL wd(nloc) ! gust
 #ifdef ISO
-      real xtprecip(ntraciso,nloc), fxt(ntraciso,nloc,nd)
-      real xtVprecip(ntraciso,nloc,nd+1)
+      REAL xtprecip(ntraciso,nloc), fxt(ntraciso,nloc,nd)
+      REAL xtVprecip(ntraciso,nloc,nd+1)
 #endif
 
@@ -3481 +3478 @@
   REAL siga(nloc, nd), sax(nloc, nd), mac(nloc, nd) ! cld
 #ifdef ISO
-      integer ixt
-      real xtbx(ntraciso), xtawat(ntraciso)
+      INTEGER ixt
+      REAL xtbx(ntraciso), xtawat(ntraciso)
       ! cam debug
       ! pour l'homogeneisation sous le nuage:
-      real frsum(nloc), bxtsum(ntraciso,nloc), fxtsum(ntraciso,nloc)
+      REAL frsum(nloc), bxtsum(ntraciso,nloc), fxtsum(ntraciso,nloc)
       ! correction dans calcul tendance liee a Am:
-      real dq_tmp,k_tmp,dx_tmp,R_tmp,dqreste_tmp,dxreste_tmp,kad_tmp
-      logical correction_excess_aberrant
-      parameter (correction_excess_aberrant=.false.)
+      REAL dq_tmp,k_tmp,dx_tmp,R_tmp,dqreste_tmp,dxreste_tmp,kad_tmp
+      LOGICAL correction_excess_aberrant
+      parameter (correction_excess_aberrant=.FALSE.)
         ! correction qui permettait d'eviter deltas et dexcess aberrants. Mais
         ! pb: ne conserve pas la masse d'isotopes!
 #ifdef DIAGISO
         ! diagnostiques juste: tendance des differents processus
-      real fxt_detrainement(ntraciso,nloc,nd)
-      real fxt_fluxmasse(ntraciso,nloc,nd)
-      real fxt_evapprecip(ntraciso,nloc,nd)
-      real fxt_ddft(ntraciso,nloc,nd)
-      real fq_detrainement(nloc,nd)
-      real q_detrainement(nloc,nd)
-      real xt_detrainement(ntraciso,nloc,nd)
-      real f_detrainement(nloc,nd)
-      real fq_fluxmasse(nloc,nd)
-      real fq_evapprecip(nloc,nd)
-      real fq_ddft(nloc,nd)
-#endif      
+      REAL fxt_detrainement(ntraciso,nloc,nd)
+      REAL fxt_fluxmasse(ntraciso,nloc,nd)
+      REAL fxt_evapprecip(ntraciso,nloc,nd)
+      REAL fxt_ddft(ntraciso,nloc,nd)
+      REAL fq_detrainement(nloc,nd)
+      REAL q_detrainement(nloc,nd)
+      REAL xt_detrainement(ntraciso,nloc,nd)
+      REAL f_detrainement(nloc,nd)
+      REAL fq_fluxmasse(nloc,nd)
+      REAL fq_evapprecip(nloc,nd)
+      REAL fq_ddft(nloc,nd)
+#endif
 !#ifdef ISOVERIF
 !      integer iso_verif_aberrant_nostop
 !      real deltaD
-!#endif      
-#ifdef ISOTRAC      
+!#endif
+#ifdef ISOTRAC
 !      integer iso_verif_traceur_choix_nostop
 !      integer iso_verif_tracpos_choix_nostop
-      real xtnew(ntraciso)
+      REAL xtnew(ntraciso)
 !      real conversion(niso)
-      real fxtYe(niso)
-      real fxtqe(niso)
-      real fxtXe(niso)
-      real fxt_revap(niso)
-      real Xe(niso)
-      integer ixt_revap,izone
-      integer ixt_poubelle, ixt_ddft,iiso 
+      REAL fxtYe(niso)
+      REAL fxtqe(niso)
+      REAL fxtXe(niso)
+      REAL fxt_revap(niso)
+      REAL Xe(niso)
+      INTEGER ixt_revap,izone
+      INTEGER ixt_poubelle, ixt_ddft,iiso
 #endif
 #endif
@@ -3538 +3535 @@
 #ifdef ISO
        ! cam debug
-!       write(*,*) 'cv30_routines 3082: entree dans cv3_yield'
+!       WRITE(*,*) 'cv30_routines 3082: entree dans cv3_yield'
        ! en cam debug
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
         xtprecip(ixt,il)=0.0
         xtVprecip(ixt,il,nd+1)=0.0
@@ -3558 +3555 @@
       nqcond(il, i) = 0.0 ! cld
 #ifdef ISO
-         do ixt = 1, ntraciso
+         DO ixt = 1, ntraciso
           fxt(ixt,il,i)=0.0
           xtVprecip(ixt,il,i)=0.0
@@ -3569 +3566 @@
         fq_evapprecip(il,i)=0.0
         fq_ddft(il,i)=0.0
-        do ixt = 1, niso
+        DO ixt = 1, niso
           fxt_fluxmasse(ixt,il,i)=0.0
           fxt_detrainement(ixt,il,i)=0.0
@@ -3575 +3572 @@
           fxt_evapprecip(ixt,il,i)=0.0
           fxt_ddft(ixt,il,i)=0.0
-        enddo  
-#endif                     
+        enddo
+#endif
 #endif
     END DO
@@ -3605 +3602 @@
 
 #ifdef ISO
-         do ixt = 1, ntraciso
+         DO ixt = 1, ntraciso
           xtprecip(ixt,il)=wt(il,1)*sigd*xtwater(ixt,il,1) &
-     &                      *86400.*1000./(rowl*grav) ! en mm/jour
+                            *86400.*1000./(rowl*grav) ! en mm/jour
          enddo
          ! cam verif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-!              write(*,*) 'cv30_yield 2952: '//
+          IF (iso_eau.gt.0) THEN
+!              WRITE(*,*) 'cv30_yield 2952: '//
 !     :           'il,water(il,1),xtwater(iso_eau,il,1)='
 !     :           ,il,water(il,1),xtwater(iso_eau,il,1)
-              call iso_verif_egalite_choix(xtwater(iso_eau,il,1), &
-     &           water(il,1),'cv30_routines 2959', &
-     &           errmax,errmaxrel)
+              CALL iso_verif_egalite_choix(xtwater(iso_eau,il,1), &
+                 water(il,1),'cv30_routines 2959', &
+                 errmax,errmaxrel)
                 !Rq: wt(il,1)*sigd*86400.*1000./(rowl*grav)=3964.6565
                 ! -> on auatorise 3e3 fois plus d'erreur dans precip
-              call iso_verif_egalite_choix(xtprecip(iso_eau,il), &
-     &           precip(il),'cv30_routines 3138', &
-     &           errmax*4e3,errmaxrel)
-          endif !if (iso_eau.gt.0) then
+              CALL iso_verif_egalite_choix(xtprecip(iso_eau,il), &
+                 precip(il),'cv30_routines 3138', &
+                 errmax*4e3,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur(xtwater(1,il,1), &
-     &       'cv30_routine 3146')
-        if (iso_verif_traceur_choix_nostop(xtprecip(1,il), &
-     &           'cv30_routine 3147',errmax*1e2, &
-     &       errmaxrel,ridicule_trac,deltalimtrac).eq.1) then
-          write(*,*) 'il,inb(il)=',il,inb(il)
-          write(*,*) 'xtwater(:,il,1)=',xtwater(:,il,1)
-          write(*,*) 'xtprecip(:,il)=',xtprecip(:,il)
-          write(*,*) 'fac=',wt(il,1)*sigd*86400.*1000./(rowl*grav)
+        CALL iso_verif_traceur(xtwater(1,il,1), &
+             'cv30_routine 3146')
+        IF (iso_verif_traceur_choix_nostop(xtprecip(1,il), &
+                 'cv30_routine 3147',errmax*1e2, &
+             errmaxrel,ridicule_trac,deltalimtrac).EQ.1) THEN
+          WRITE(*,*) 'il,inb(il)=',il,inb(il)
+          WRITE(*,*) 'xtwater(:,il,1)=',xtwater(:,il,1)
+          WRITE(*,*) 'xtprecip(:,il)=',xtprecip(:,il)
+          WRITE(*,*) 'fac=',wt(il,1)*sigd*86400.*1000./(rowl*grav)
           stop
         endif
-#endif           
+#endif
 #endif
           ! end cam verif
@@ -3643 +3640 @@
         precip(il) = wt(il, 1)*sigd*water(il, 1)*8640.
 #ifdef ISO
-         do ixt = 1, ntraciso
+         DO ixt = 1, ntraciso
           xtprecip(ixt,il)=wt(il,1)*sigd*xtwater(ixt,il,1)*8640.
          enddo
          ! cam verif
-#ifdef ISOVERIF          
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(xtprecip(iso_eau,il), &
-     &           precip(il),'cv30_routines 3139', &
-     &           errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
+#ifdef ISOVERIF
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(xtprecip(iso_eau,il), &
+                 precip(il),'cv30_routines 3139', &
+                 errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur(xtprecip(1,il),'cv30_routine 3166')
-#endif          
+        CALL iso_verif_traceur(xtprecip(1,il),'cv30_routine 3166')
+#endif
 #endif
          ! end cam verif
@@ -3672 +3669 @@
           vprecip(il, k) = wt(il, k)*sigd*water(il, k)/grav
 #ifdef ISO
-             do ixt=1,ntraciso
+             DO ixt=1,ntraciso
                xtVPrecip(ixt,il,k) = wt(il,k)*sigd &
-     &          *xtwater(ixt,il,k)/grav
+                *xtwater(ixt,il,k)/grav
              enddo
 #endif
@@ -3680 +3677 @@
           vprecip(il, k) = wt(il, k)*sigd*water(il, k)/10.
 #ifdef ISO
-             do ixt=1,ntraciso
+             DO ixt=1,ntraciso
                xtVPrecip(ixt,il,k) = wt(il,k)*sigd &
-     &          *xtwater(ixt,il,k)/10.0
+                *xtwater(ixt,il,k)/10.0
              enddo
 #endif
@@ -3694 +3691 @@
   ! ***  NE PAS UTILISER POUR L'INSTANT ***
 
-  ! !      do il=1,ncum
-  ! !        wd(il)=betad*abs(mp(il,icb(il)))*0.01*rrd*t(il,icb(il))
-  ! !     :                                  /(sigd*p(il,icb(il)))
-  ! !      enddo
+  !      do il=1,ncum
+  !        wd(il)=betad*abs(mp(il,icb(il)))*0.01*rrd*t(il,icb(il))
+  !     :                                  /(sigd*p(il,icb(il)))
+  !      enddo
 
 
@@ -3752 +3749 @@
       fr(il, 1) = fr(il, 1) + 0.01*grav*am(il)*(rr(il,2)-rr(il,1))*work(il)
 
-#ifdef ISO    
+#ifdef ISO
         ! juste Mp et evap pour l'instant, voir plus bas pour am
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
         fxt(ixt,il,1)= &
-     &         0.01*grav*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il) &
-     &       +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
-!c+tard     :          +sigd*xtevap(ixt,il,1)     
+               0.01*grav*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il) &
+             +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
+!c+tard     :          +sigd*xtevap(ixt,il,1)
        enddo !do ixt = 1, ntraciso       ! pour water tagging option 6: pas besoin ici de faire de conversion.
 
 #ifdef DIAGISO
         fq_ddft(il,1)=fq_ddft(il,1) &
-     &           +0.01*grav*mp(il,2)*(rp(il,2)-rr(il,1))*work(il)
+                 +0.01*grav*mp(il,2)*(rp(il,2)-rr(il,1))*work(il)
         fq_evapprecip(il,1)=fq_evapprecip(il,1) &
-     &          +sigd*0.5*(evap(il,1)+evap(il,2))
+                +sigd*0.5*(evap(il,1)+evap(il,2))
         fq_fluxmasse(il,1)=fq_fluxmasse(il,1) &
-     &           +0.01*grav*am(il)*(rr(il,2)-rr(il,1))*work(il)
-        do ixt = 1, ntraciso
+                 +0.01*grav*am(il)*(rr(il,2)-rr(il,1))*work(il)
+        DO ixt = 1, ntraciso
 !        fxt_fluxmasse(ixt,il,1)=fxt_fluxmasse(ixt,il,1) &
 !     &      +0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il) ! deplace
 !     plus haut car il existe differents cas
         fxt_ddft(ixt,il,1)=fxt_ddft(ixt,il,1) &
-     &      +0.01*grav*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il)
+            +0.01*grav*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il)
         fxt_evapprecip(ixt,il,1)=fxt_evapprecip(ixt,il,1) &
-     &           +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
+                 +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
         enddo
-#endif     
+#endif
 
 
@@ -3787 +3784 @@
         ! Mais on plante dans un cas pathologique en decembre 2017 lors du test
         ! d'un cas d'Anne Cozic: les isotopes deviennent negatifs.
-        ! C'est un cas pas physique: on perd 99% de la masse de vapeur d'eau! 
+        ! C'est un cas pas physique: on perd 99% de la masse de vapeur d'eau!
         ! q2=1.01e-3 et q1=1.25e-3 kg/kg
         ! et dq=-1.24e-3: comment est-ce possible qu'un flux venant d'un air a
@@ -3797 +3794 @@
         ! sortant.
         ! Ainsi, le flux de masse sortant ne modifie pas la composition
-        ! isotopique de la vapeur d'eau q1. 
+        ! isotopique de la vapeur d'eau q1.
         ! A la fin, on a R=(x1+dx)/(q1+dq)=(x1+k*x2)/(q1+k*q2)
         ! On verifie que quand k est petit, on tend vers la formulation
@@ -3810 +3807 @@
         ! calcule R_tmp.
         dq_tmp=0.01*grav*am(il)*(rr(il,2)-rr(il,1))*work(il)*delt ! utile ci-dessous
-        if ((dq_tmp/rr(il,1).lt.-0.9).and.correction_excess_aberrant) then
+        IF ((dq_tmp/rr(il,1).lt.-0.9).AND.correction_excess_aberrant) THEN
                 ! nouvelle formulation ou on fait d'abord entrer k*q2 et ensuite
                 ! seulement on fait sortir k*q1 sans changement de composition
@@ -3816 +3813 @@
              k_tmp=0.01*grav*am(il)*work(il)*delt
              dqreste_tmp= 0.01*grav*mp(il, 2)*(rp(il,2)-rr(il,1))*work(il)*delt + &
-     &                   sigd*0.5*(evap(il,1)+evap(il,2))*delt
-             do ixt = 1, ntraciso
+                         sigd*0.5*(evap(il,1)+evap(il,2))*delt
+             DO ixt = 1, ntraciso
                 dxreste_tmp= 0.01*grav*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il)*delt &
-     &                  +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))*delt
+                        +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))*delt
                 R_tmp=(xt(ixt,il,1)+dxreste_tmp+k_tmp*xt(ixt,il,2))/(rr(il,1)+dqreste_tmp+k_tmp*rr(il,2))
                 dx_tmp=R_tmp*(rr(il,1)+dqreste_tmp+dq_tmp)-(xt(ixt,il,1)+dxreste_tmp)
                 fxt(ixt,il,1)=fxt(ixt,il,1) &
-     &                 + dx_tmp/delt 
-#ifdef ISOVERIF
-                if (ixt.eq.iso_HDO) then
-                write(*,*) 'cv30_routines 3888: il=',il
-                write(*,*) 'dq_tmp,rr(il,1)=',dq_tmp,rr(il,1)
-                write(*,*) 'R_tmp,dx_tmp,delt=',R_tmp,dx_tmp,delt
-                write(*,*) 'xt(ixt,il,1:2)=',xt(ixt,il,1:2)
-                write(*,*) 'rr(il,1:2)=',rr(il,1:2)
-                write(*,*) 'fxt=',dx_tmp/delt
-                write(*,*) 'rr(il,1)+dq_tmp=',rr(il,1)+dq_tmp
-                write(*,*) 'xt(ixt,il,1)+dx_tmp=',xt(ixt,il,1)+dx_tmp
-                write(*,*) 'xt(ixt,il,1)+fxt(ixt,il,1)*delt=', &
-     &                   xt(ixt,il,1)+fxt(ixt,il,1)*delt
-                write(*,*) 'dqreste_tmp,dxreste_tmp=',dqreste_tmp,dxreste_tmp
-                write(*,*) 'formule classique: fxt_Am=',0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
-                write(*,*) 'donnerait dxt=',0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)*delt
-                endif !if (ixt.eq.iso_HDO) then
+                       + dx_tmp/delt
+#ifdef ISOVERIF
+                IF (ixt.EQ.iso_HDO) THEN
+                WRITE(*,*) 'cv30_routines 3888: il=',il
+                WRITE(*,*) 'dq_tmp,rr(il,1)=',dq_tmp,rr(il,1)
+                WRITE(*,*) 'R_tmp,dx_tmp,delt=',R_tmp,dx_tmp,delt
+                WRITE(*,*) 'xt(ixt,il,1:2)=',xt(ixt,il,1:2)
+                WRITE(*,*) 'rr(il,1:2)=',rr(il,1:2)
+                WRITE(*,*) 'fxt=',dx_tmp/delt
+                WRITE(*,*) 'rr(il,1)+dq_tmp=',rr(il,1)+dq_tmp
+                WRITE(*,*) 'xt(ixt,il,1)+dx_tmp=',xt(ixt,il,1)+dx_tmp
+                WRITE(*,*) 'xt(ixt,il,1)+fxt(ixt,il,1)*delt=', &
+                         xt(ixt,il,1)+fxt(ixt,il,1)*delt
+                WRITE(*,*) 'dqreste_tmp,dxreste_tmp=',dqreste_tmp,dxreste_tmp
+                WRITE(*,*) 'formule classique: fxt_Am=',0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
+                WRITE(*,*) 'donnerait dxt=',0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)*delt
+                endif !if (ixt.EQ.iso_HDO) THEN
 #endif
 #ifdef DIAGISO
-                if (ixt.le.niso) then
+                IF (ixt.le.niso) THEN
                         fxt_fluxmasse(ixt,il,1)=fxt_fluxmasse(ixt,il,1) &
-     &                 + dx_tmp/delt 
+                       + dx_tmp/delt
                 endif
 #endif
            enddo ! do ixt = 1, ntraciso
-        else !if (dq_tmp/rr(il,1).lt.-0.9) then
+        else !if (dq_tmp/rr(il,1).lt.-0.9) THEN
                 ! formulation habituelle qui avait toujours marche de 2006 a
                 ! decembre 2017.
-           do ixt = 1, ntraciso     
+           DO ixt = 1, ntraciso
                 fxt(ixt,il,1)=fxt(ixt,il,1) &
-     &       +0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
+             +0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
 #ifdef DIAGISO
-                if (ixt.le.niso) then
+                IF (ixt.le.niso) THEN
                 fxt_fluxmasse(ixt,il,1)=fxt_fluxmasse(ixt,il,1) &
-     &      +0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
+            +0.01*grav*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
                 endif
 #endif
            enddo !do ixt = 1, ntraciso
-        endif !if (dq_tmp/rr(il,1).lt.-0.9) then
-
+        endif !if (dq_tmp/rr(il,1).lt.-0.9) THEN
        ! cam verif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,1), &
-     &           fr(il,1),'cv30_routines 3251', &
-     &           errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          !write(*,*) 'il,am(il)=',il,am(il)
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,1)+delt*fr(il,1).gt.ridicule)) then
-            if (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,1) &
-     &        +delt*fxt(iso_HDO,il,1))/(rr(il,1)+delt*fr(il,1)), &
-     &           'cv30_yield 3125, ddft en 1').eq.1) then
-                write(*,*) 'il,rr(il,1),delt=',il,rr(il,1),delt
-                write(*,*) 'deltaDxt=',deltaD(xt(iso_HDO,il,1)/rr(il,1))
-                write(*,*) 'delt*fr(il,1),fr(il,1)=',delt*fr(il,1),fr(il,1)
-                write(*,*) 'fxt=',fxt(iso_HDO,il,1)
-                write(*,*) 'fq_ddft(il,1)=',0.01*grav*mp(il,2)*(rp(il,2)-rr(il,1))*work(il)
-                write(*,*) 'fq_evapprecip(il,1)=',sigd*0.5*(evap(il,1)+evap(il,2))
-                write(*,*) 'fq_fluxmasse(il,1)=', 0.01*grav*am(il)*(rr(il,2)-rr(il,1))*work(il)
-                write(*,*) 'deltaDfq_ddft=',deltaD((xtp(iso_HDO,il,2)-xt(iso_HDO,il,1))/(rp(il,2)-rr(il,1)))
-                write(*,*) 'deltaDfq_evapprecip=',deltaD((xtevap(iso_HDO,il,1)+xtevap(iso_HDO,il,2))/(evap(il,1)+evap(il,2)))
-                write(*,*) 'deltaDfq_fluxmasse=',deltaD((xt(iso_HDO,il,2)-xt(iso_HDO,il,1))/(rr(il,2)-rr(il,1)))
-                write(*,*) 'rr(il,2),rr(il,1)=',rr(il,2),rr(il,1)
-                write(*,*) 'xt(iso_HDO,il,2),xt(iso_HDO,il,1)',xt(iso_HDO,il,2),xt(iso_HDO,il,1)
-                write(*,*) 'dq_tmp=',dq_tmp
-                call abort_physic('cv30_routines','cv30_yield',1)
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,1), &
+                 fr(il,1),'cv30_routines 3251', &
+                 errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          !WRITE(*,*) 'il,am(il)=',il,am(il)
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,1)+delt*fr(il,1).gt.ridicule)) THEN
+            IF (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,1) &
+              +delt*fxt(iso_HDO,il,1))/(rr(il,1)+delt*fr(il,1)), &
+                 'cv30_yield 3125, ddft en 1').EQ.1) THEN
+                WRITE(*,*) 'il,rr(il,1),delt=',il,rr(il,1),delt
+                WRITE(*,*) 'deltaDxt=',deltaD(xt(iso_HDO,il,1)/rr(il,1))
+                WRITE(*,*) 'delt*fr(il,1),fr(il,1)=',delt*fr(il,1),fr(il,1)
+                WRITE(*,*) 'fxt=',fxt(iso_HDO,il,1)
+                WRITE(*,*) 'fq_ddft(il,1)=',0.01*grav*mp(il,2)*(rp(il,2)-rr(il,1))*work(il)
+                WRITE(*,*) 'fq_evapprecip(il,1)=',sigd*0.5*(evap(il,1)+evap(il,2))
+                WRITE(*,*) 'fq_fluxmasse(il,1)=', 0.01*grav*am(il)*(rr(il,2)-rr(il,1))*work(il)
+                WRITE(*,*) 'deltaDfq_ddft=',deltaD((xtp(iso_HDO,il,2)-xt(iso_HDO,il,1))/(rp(il,2)-rr(il,1)))
+                WRITE(*,*) 'deltaDfq_evapprecip=',deltaD((xtevap(iso_HDO,il,1)+xtevap(iso_HDO,il,2))/(evap(il,1)+evap(il,2)))
+                WRITE(*,*) 'deltaDfq_fluxmasse=',deltaD((xt(iso_HDO,il,2)-xt(iso_HDO,il,1))/(rr(il,2)-rr(il,1)))
+                WRITE(*,*) 'rr(il,2),rr(il,1)=',rr(il,2),rr(il,1)
+                WRITE(*,*) 'xt(iso_HDO,il,2),xt(iso_HDO,il,1)',xt(iso_HDO,il,2),xt(iso_HDO,il,1)
+                WRITE(*,*) 'dq_tmp=',dq_tmp
+                CALL abort_physic('cv30_routines','cv30_yield',1)
             endif ! iso_verif_aberrant_enc_nostop
-          endif !if (iso_HDO.gt.0) then
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3417')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3417')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,1)+delt*fxt(ixt,il,1)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3395',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il=',il  
-              write(*,*) 'delt,fxt(:,il,1)=',delt,fxt(:,il,1)
-              write(*,*) 'xt(:,il,1)=' ,xt(:,il,1)
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3395',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il=',il
+              WRITE(*,*) 'delt,fxt(:,il,1)=',delt,fxt(:,il,1)
+              WRITE(*,*) 'xt(:,il,1)=' ,xt(:,il,1)
 #ifdef DIAGISO
-              write(*,*) 'fxt_fluxmasse(:,il,1)=',fxt_fluxmasse(:,il,1)
-              write(*,*) 'fxt_ddft(:,il,1)=',fxt_ddft(:,il,1)
-              write(*,*) 'fxt_evapprecip(:,il,1)=', &
-     &                   fxt_evapprecip(:,il,1)
-              write(*,*) 'xt(:,il,2)=',xt(:,il,2)
-              write(*,*) 'xtp(:,il,2)=',xtp(:,il,2)
-              write(*,*) 'xtevap(:,il,1)=',xtevap(:,il,1)
-              write(*,*) 'xtevap(:,il,2)=',xtevap(:,il,2)
-              write(*,*) 'facam,facmp,facev=',0.01*grav*am(il)*work(il), &
-     &          0.01*grav*mp(il,2)*work(il),sigd*0.5
-#endif                            
+              WRITE(*,*) 'fxt_fluxmasse(:,il,1)=',fxt_fluxmasse(:,il,1)
+              WRITE(*,*) 'fxt_ddft(:,il,1)=',fxt_ddft(:,il,1)
+              WRITE(*,*) 'fxt_evapprecip(:,il,1)=', &
+                         fxt_evapprecip(:,il,1)
+              WRITE(*,*) 'xt(:,il,2)=',xt(:,il,2)
+              WRITE(*,*) 'xtp(:,il,2)=',xtp(:,il,2)
+              WRITE(*,*) 'xtevap(:,il,1)=',xtevap(:,il,1)
+              WRITE(*,*) 'xtevap(:,il,2)=',xtevap(:,il,2)
+              WRITE(*,*) 'facam,facmp,facev=',0.01*grav*am(il)*work(il), &
+                0.01*grav*mp(il,2)*work(il),sigd*0.5
+#endif
 !              stop
         endif
-#endif           
+#endif
 #endif
        ! end cam verif
@@ -3932 +3928 @@
 
 #ifdef ISO
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
        fxt(ixt,il,1)=0.1*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il) &
-     &          +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
+                +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
        fxt(ixt,il,1)=fxt(ixt,il,1) &
-     &          +0.1*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
+                +0.1*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
        enddo
 
 #ifdef DIAGISO
        fq_ddft(il,1)=fq_ddft(il,1) &
-     &          +0.1*mp(il,2)*(rp(il,2)-rr(il,1))*work(il)
+                +0.1*mp(il,2)*(rp(il,2)-rr(il,1))*work(il)
        fq_evapprecip(il,1)=fq_evapprecip(il,1)   &
-     &          +sigd*0.5*(evap(il,1)+evap(il,2))
+                +sigd*0.5*(evap(il,1)+evap(il,2))
        fq_fluxmasse(il,1)=fq_fluxmasse(il,1) &
-     &           +0.1*am(il)*(rr(il,2)-rr(il,1))*work(il)
-       do ixt = 1, niso
+                 +0.1*am(il)*(rr(il,2)-rr(il,1))*work(il)
+       DO ixt = 1, niso
         fxt_fluxmasse(ixt,il,1)=fxt(ixt,il,1) &
-     &          +0.1*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
+                +0.1*am(il)*(xt(ixt,il,2)-xt(ixt,il,1))*work(il)
         fxt_ddft(ixt,il,1)=fxt(ixt,il,1) &
-     &           +0.1*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il)
+                 +0.1*mp(il,2)*(xtp(ixt,il,2)-xt(ixt,il,1))*work(il)
         fxt_evapprecip(ixt,il,1)=fxt(ixt,il,1) &
-     &          +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
+                +sigd*0.5*(xtevap(ixt,il,1)+xtevap(ixt,il,2))
        enddo
 #endif
-       
-       
+
+
        ! cam verif
-#ifdef ISOVERIF         
-         if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,1), &
-     &           fr(il,1),'cv30_routines 3023', &
-     &           errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,1)+delt*fr(il,1).gt.ridicule)) then
-           call iso_verif_aberrant_encadre((xt(iso_HDO,il,1) &
-     &           +delt*fxt(iso_HDO,il,1)) &
-     &           /(rr(il,1)+delt*fr(il,1)), &
-     &           'cv30_yield 3125b, ddft en 1')
-          endif !if (iso_HDO.gt.0) then
+#ifdef ISOVERIF
+         IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,1), &
+                 fr(il,1),'cv30_routines 3023', &
+                 errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,1)+delt*fr(il,1).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,1) &
+                 +delt*fxt(iso_HDO,il,1)) &
+                 /(rr(il,1)+delt*fr(il,1)), &
+                 'cv30_yield 3125b, ddft en 1')
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,1), &
-     &           'cv30_routine 3417')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,1), &
+                 'cv30_routine 3417')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,1)+delt*fxt(ixt,il,1)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew, &
-     &           'cv30_yield 3449',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il=',il   
-              write(*,*) 'delt,fxt(:,il,1)=',delt,fxt(:,il,1)
-              write(*,*) 'xt(:,il,1)=' ,xt(:,il,1)
+        IF (iso_verif_tracpos_choix_nostop(xtnew, &
+                 'cv30_yield 3449',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il=',il
+              WRITE(*,*) 'delt,fxt(:,il,1)=',delt,fxt(:,il,1)
+              WRITE(*,*) 'xt(:,il,1)=' ,xt(:,il,1)
 !              stop
         endif
-#endif           
+#endif
 #endif
        ! end cam verif
@@ -3999 +3995 @@
   ! do j=1,ntra
   ! do il=1,ncum
-  ! if (cvflag_grav) then
+  ! if (cvflag_grav) THEN
   ! ftra(il,1,j)=ftra(il,1,j)+0.01*grav*work(il)
   ! :                     *(mp(il,2)*(trap(il,2,j)-tra(il,1,j))
@@ -4007 +4003 @@
   ! :                     *(mp(il,2)*(trap(il,2,j)-tra(il,1,j))
   ! :             +am(il)*(tra(il,2,j)-tra(il,1,j)))
-  ! endif
+  ! END IF
   ! enddo
   ! enddo
@@ -4023 +4019 @@
 
 #ifdef ISO
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
        fxt(ixt,il,1)=fxt(ixt,il,1) &
-     &          +0.01*grav*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
+                +0.01*grav*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
        enddo
 
 #ifdef DIAGISO
         fq_detrainement(il,1)=fq_detrainement(il,1) &
-     &       +0.01*grav*work(il)*ment(il,j,1)*(qent(il,j,1)-rr(il,1))
+             +0.01*grav*work(il)*ment(il,j,1)*(qent(il,j,1)-rr(il,1))
         f_detrainement(il,1)=f_detrainement(il,1) &
-     &          +0.01*grav*work(il)*ment(il,j,1)
+                +0.01*grav*work(il)*ment(il,j,1)
         q_detrainement(il,1)=q_detrainement(il,1) &
-     &          +0.01*grav*work(il)*ment(il,j,1)*qent(il,j,1)
-        do ixt = 1, niso
+                +0.01*grav*work(il)*ment(il,j,1)*qent(il,j,1)
+        DO ixt = 1, niso
           fxt_detrainement(ixt,il,1)=fxt_detrainement(ixt,il,1) &
-     &          +0.01*grav*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
+                +0.01*grav*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
           xt_detrainement(ixt,il,1)=xt_detrainement(ixt,il,1) &
-     &          +0.01*grav*work(il)*ment(il,j,1)*xtent(ixt,il,j,1)
+                +0.01*grav*work(il)*ment(il,j,1)*xtent(ixt,il,j,1)
         enddo
 #endif
@@ -4045 +4041 @@
        ! cam verif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,1), &
-     &           fr(il,1),'cv30_routines 3251',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,1)+delt*fr(il,1).gt.ridicule)) then
-           call iso_verif_aberrant_encadre((xt(iso_HDO,il,1) &
-     &         +delt*fxt(iso_HDO,il,1))/(rr(il,1)+delt*fr(il,1)), &
-     &         'cv30_yield 3127, dtr melanges')
-          endif !if (iso_HDO.gt.0) then
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,1), &
+                 fr(il,1),'cv30_routines 3251',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,1)+delt*fr(il,1).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,1) &
+               +delt*fxt(iso_HDO,il,1))/(rr(il,1)+delt*fr(il,1)), &
+               'cv30_yield 3127, dtr melanges')
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3417')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3417')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,1)+delt*fxt(ixt,il,1)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3525',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il=',il   
-              write(*,*) 'delt,fxt(:,il,1)=',delt,fxt(:,il,1)
-              write(*,*) 'fac=', 0.01*grav*work(il)*ment(il,j,1)
-              write(*,*) 'xt(:,il,1)=' ,xt(:,il,1)
-              write(*,*) 'xtent(:,il,j,1)=' ,xtent(:,il,j,1) 
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3525',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il=',il
+              WRITE(*,*) 'delt,fxt(:,il,1)=',delt,fxt(:,il,1)
+              WRITE(*,*) 'fac=', 0.01*grav*work(il)*ment(il,j,1)
+              WRITE(*,*) 'xt(:,il,1)=' ,xt(:,il,1)
+              WRITE(*,*) 'xtent(:,il,j,1)=' ,xtent(:,il,j,1)
 !              stop
         endif
-#endif           
+#endif
 #endif
        ! end cam verif
@@ -4083 +4079 @@
 
 #ifdef ISO
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
        fxt(ixt,il,1)=fxt(ixt,il,1) &
-     & +0.1*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
+       +0.1*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
        enddo
 
 #ifdef DIAGISO
         fq_detrainement(il,1)=fq_detrainement(il,1) &
-     &         +0.1*work(il)*ment(il,j,1)*(qent(il,j,1)-rr(il,1))
+               +0.1*work(il)*ment(il,j,1)*(qent(il,j,1)-rr(il,1))
         f_detrainement(il,1)=f_detrainement(il,1) &
-     &         +0.1*work(il)*ment(il,j,1)
+               +0.1*work(il)*ment(il,j,1)
         q_detrainement(il,1)=q_detrainement(il,1) &
-     &         +0.1*work(il)*ment(il,j,1)*qent(il,j,1)
-        do ixt = 1, niso
+               +0.1*work(il)*ment(il,j,1)*qent(il,j,1)
+        DO ixt = 1, niso
           fxt_detrainement(ixt,il,1)=fxt_detrainement(ixt,il,1) &
-     &          +0.1*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
+                +0.1*work(il)*ment(il,j,1)*(xtent(ixt,il,j,1)-xt(ixt,il,1))
                 xt_detrainement(ixt,il,1)=xt_detrainement(ixt,il,1) &
-     &          +0.1*work(il)*ment(il,j,1)*xtent(ixt,il,j,1)
+                +0.1*work(il)*ment(il,j,1)*xtent(ixt,il,j,1)
         enddo
 #endif
@@ -4105 +4101 @@
        ! cam verif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,1), &
-     &           fr(il,1),'cv30_routines 3092',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,1)+delt*fr(il,1).gt.ridicule)) then
-           call iso_verif_aberrant_encadre((xt(iso_HDO,il,1) &
-     &        +delt*fxt(iso_HDO,il,1))/(rr(il,1)+delt*fr(il,1)), &
-     &        'cv30_yield 3127b, dtr melanges')
-          endif !if (iso_HDO.gt.0) then
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,1), &
+                 fr(il,1),'cv30_routines 3092',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,1)+delt*fr(il,1).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,1) &
+              +delt*fxt(iso_HDO,il,1))/(rr(il,1)+delt*fr(il,1)), &
+              'cv30_yield 3127b, dtr melanges')
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3462')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3462')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,1)+delt*fxt(ixt,il,1)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3753',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il=',il   
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3753',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il=',il
         endif
-#endif            
+#endif
 #endif
        ! end cam verif
@@ -4137 +4133 @@
   ! do j=2,nl
   ! do il=1,ncum
-  ! if (j.le.inb(il)) then
-
-  ! if (cvflag_grav) then
+  ! if (j.le.inb(il)) THEN
+  ! if (cvflag_grav) THEN
   ! ftra(il,1,k)=ftra(il,1,k)+0.01*grav*work(il)*ment(il,j,1)
   ! :                *(traent(il,j,1,k)-tra(il,1,k))
@@ -4145 +4140 @@
   ! ftra(il,1,k)=ftra(il,1,k)+0.1*work(il)*ment(il,j,1)
   ! :                *(traent(il,j,1,k)-tra(il,1,k))
-  ! endif
-
-  ! endif
+  ! END IF
+
+  ! END IF
   ! enddo
   ! enddo
@@ -4248 +4243 @@
 #ifdef DIAGISO
         fq_fluxmasse(il,i)=fq_fluxmasse(il,i) &
-     &           +0.01*grav*dpinv*(amp1(il)*(rr(il,i+1)-rr(il,i)) &
-     &           -ad(il)*(rr(il,i)-rr(il,i-1)))
+                 +0.01*grav*dpinv*(amp1(il)*(rr(il,i+1)-rr(il,i)) &
+                 -ad(il)*(rr(il,i)-rr(il,i-1)))
         ! modif 2 fev: pour avoir subsidence compensatoire totale, on retranche
         ! ad.
@@ -4260 +4255 @@
        ! meme temps.
        dq_tmp= 0.01*grav*dpinv*(amp1(il)*(rr(il,i+1)-rr(il,i)) &
-    &            -ad(il)*(rr(il,i)-rr(il,i-1)))*delt
+                 -ad(il)*(rr(il,i)-rr(il,i-1)))*delt
        ! c'est equivalent a dqi= kamp1*qip1+kad*qim1-(kamp1+kad)*qi
-       if ((dq_tmp/rr(il,i).lt.-0.9).and.correction_excess_aberrant) then 
+       IF ((dq_tmp/rr(il,i).lt.-0.9).AND.correction_excess_aberrant) THEN
         ! nouvelle formulation
         k_tmp=0.01*grav*dpinv*amp1(il)*delt
         kad_tmp=0.01*grav*dpinv*ad(il)*delt
-        do ixt = 1, ntraciso
+        DO ixt = 1, ntraciso
             R_tmp=(xt(ixt,il,i)+k_tmp*xt(ixt,il,i+1)+kad_tmp*xt(ixt,il,i-1)) &
-                & /(rr(il,i)+k_tmp*rr(il,i+1)+kad_tmp*rr(il,i-1))
+                  /(rr(il,i)+k_tmp*rr(il,i+1)+kad_tmp*rr(il,i-1))
             dx_tmp=  R_tmp*( rr(il,i)+ dq_tmp)-xt(ixt,il,i)
             fxt(ixt,il,i)= dx_tmp/delt
 #ifdef ISOVERIF
-                if ((ixt.eq.iso_HDO).or.(ixt.eq.iso_eau)) then
-                write(*,*) 'cv30_routines 4367: il,i,ixt=',il,i,ixt
-                write(*,*) 'dq_tmp,rr(il,i)=',dq_tmp,rr(il,i)
-                write(*,*) 'R_tmp,dx_tmp,delt=',R_tmp,dx_tmp,delt
-                write(*,*) 'amp1(il),ad(il)=',amp1(il),ad(il)
-                write(*,*) 'xt(ixt,il,i-1:i+1)=',xt(ixt,il,i-1:i+1)
-                write(*,*) 'rr(il,i-1:i+1)=',rr(il,i-1:i+1)
-                write(*,*) 'fxt=',dx_tmp/delt
-                write(*,*) 'rr(il,i)+dq_tmp=',rr(il,1)+dq_tmp
-                write(*,*) 'xt(ixt,il,i)+dx_tmp=',xt(ixt,il,i)+dx_tmp
-                write(*,*) 'xt(ixt,il,i)+fxt(ixt,il,i)*delt=', &
-     &                   xt(ixt,il,i)+fxt(ixt,il,i)*delt
-                write(*,*) 'fxt(:,il,i)=',fxt(:,il,i)
-                endif !if (ixt.eq.iso_HDO) then  
-#endif 
-        enddo ! do ixt = 1, ntraciso  
+                IF ((ixt.EQ.iso_HDO).OR.(ixt.EQ.iso_eau)) THEN
+                WRITE(*,*) 'cv30_routines 4367: il,i,ixt=',il,i,ixt
+                WRITE(*,*) 'dq_tmp,rr(il,i)=',dq_tmp,rr(il,i)
+                WRITE(*,*) 'R_tmp,dx_tmp,delt=',R_tmp,dx_tmp,delt
+                WRITE(*,*) 'amp1(il),ad(il)=',amp1(il),ad(il)
+                WRITE(*,*) 'xt(ixt,il,i-1:i+1)=',xt(ixt,il,i-1:i+1)
+                WRITE(*,*) 'rr(il,i-1:i+1)=',rr(il,i-1:i+1)
+                WRITE(*,*) 'fxt=',dx_tmp/delt
+                WRITE(*,*) 'rr(il,i)+dq_tmp=',rr(il,1)+dq_tmp
+                WRITE(*,*) 'xt(ixt,il,i)+dx_tmp=',xt(ixt,il,i)+dx_tmp
+                WRITE(*,*) 'xt(ixt,il,i)+fxt(ixt,il,i)*delt=', &
+                         xt(ixt,il,i)+fxt(ixt,il,i)*delt
+                WRITE(*,*) 'fxt(:,il,i)=',fxt(:,il,i)
+                endif !if (ixt.EQ.iso_HDO) THEN
+#endif
+        enddo ! do ixt = 1, ntraciso
 #ifdef DIAGISO
-        do ixt = 1, niso
+        DO ixt = 1, niso
                 fxt_fluxmasse(ixt,il,i)=fxt(ixt,il,i)
         enddo
-#endif  
-       else !if (dq_tmp/rr(il,i).lt.-0.9) then
+#endif
+       else !if (dq_tmp/rr(il,i).lt.-0.9) THEN
         ! ancienne formulation
-         do ixt = 1, ntraciso
+         DO ixt = 1, ntraciso
          fxt(ixt,il,i)= &
-     &          0.01*grav*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
-     &           -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
+                0.01*grav*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
+                 -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
          enddo
 #ifdef DIAGISO
-        do ixt = 1, niso
+        DO ixt = 1, niso
            fxt_fluxmasse(ixt,il,i)=fxt_fluxmasse(ixt,il,i)+ &
-     &          0.01*grav*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
-     &           -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
+                0.01*grav*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
+                 -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
         enddo
-#endif  
-       endif !if (dq_tmp/rr(il,i).lt.-0.9) then
-          
-       
+#endif
+       endif !if (dq_tmp/rr(il,i).lt.-0.9) THEN
        ! cam verif
 #ifdef ISOVERIF
-        if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3226',errmax,errmaxrel)
-        endif !if (iso_eau.gt.0) then
-        do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3229')
+        IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3226',errmax,errmaxrel)
+        endif !if (iso_eau.gt.0) THEN
+        DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3229')
         enddo
-        if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &                   +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3384, flux masse')
-        endif !if (iso_HDO.gt.0) then
-        if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3384,O18, flux masse')
-        endif !if (iso_HDO.gt.0) then
+        IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+                         +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3384, flux masse')
+        endif !if (iso_HDO.gt.0) THEN
+        IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3384,O18, flux masse')
+        endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3626')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3626')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3727',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i   
-              write(*,*) 'fxt(:,il,i)=',fxt(:,il,i)
-              write(*,*) 'amp1(il),ad(il),fac=',  &
-     &              amp1(il),ad(il),0.01*grav*dpinv
-              write(*,*) 'xt(:,il,i+1)=' ,xt(:,il,i+1)
-              write(*,*) 'xt(:,il,i)=' ,xt(:,il,i) 
-              write(*,*) 'xt(:,il,i-1)=' ,xt(:,il,i-1)
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3727',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
+              WRITE(*,*) 'fxt(:,il,i)=',fxt(:,il,i)
+              WRITE(*,*) 'amp1(il),ad(il),fac=',  &
+                    amp1(il),ad(il),0.01*grav*dpinv
+              WRITE(*,*) 'xt(:,il,i+1)=' ,xt(:,il,i+1)
+              WRITE(*,*) 'xt(:,il,i)=' ,xt(:,il,i)
+              WRITE(*,*) 'xt(:,il,i-1)=' ,xt(:,il,i-1)
 !              stop
         endif
-#endif          
-#endif
-       ! end cam verif 
+#endif
+#endif
+       ! end cam verif
 #endif
         ELSE ! cvflag_grav
@@ -4362 +4355 @@
 
 #ifdef ISO
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
        fxt(ixt,il,i)= &
-     &   0.1*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
-     &           -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
+         0.1*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
+                 -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
        enddo
 
 #ifdef DIAGISO
         fq_fluxmasse(il,i)=fq_fluxmasse(il,i) &
-     &           +0.1*dpinv*(amp1(il)*(rr(il,i+1)-rr(il,i)) &
-     &           -ad(il)*(rr(il,i)-rr(il,i-1)))
-        do ixt = 1, niso
+                 +0.1*dpinv*(amp1(il)*(rr(il,i+1)-rr(il,i)) &
+                 -ad(il)*(rr(il,i)-rr(il,i-1)))
+        DO ixt = 1, niso
         fxt_fluxmasse(ixt,il,i)=fxt_fluxmasse(ixt,il,i)+ &
-     &   0.1*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
-     &           -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
+         0.1*dpinv*(amp1(il)*(xt(ixt,il,i+1)-xt(ixt,il,i)) &
+                 -ad(il)*(xt(ixt,il,i)-xt(ixt,il,i-1)))
         enddo
-#endif     
+#endif
 
        ! cam verif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3252',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3229')
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3252',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3229')
           enddo
           ! correction 21 oct 2008
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &       +delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &       'cv30_yield 3384b flux masse')
-        if (iso_O18.gt.0) then
-          call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3384bO18 flux masse')
-        endif !if (iso_O18.gt.0) then
-        endif !if (iso_HDO.gt.0) then
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+             +delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+             'cv30_yield 3384b flux masse')
+        IF (iso_O18.gt.0) THEN
+          CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3384bO18 flux masse')
+        endif !if (iso_O18.gt.0) THEN
+        endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3674')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,1),'cv30_routine 3674')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3775',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3775',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
         endif
-#endif          
-#endif
-       ! end cam verif 
+#endif
+#endif
+       ! end cam verif
 #endif
         END IF ! cvflag_grav
@@ -4423 +4416 @@
     ! do k=1,ntra
     ! do il=1,ncum
-    ! if (i.le.inb(il)) then
+    ! if (i.le.inb(il)) THEN
     ! dpinv=1.0/(ph(il,i)-ph(il,i+1))
     ! cpinv=1.0/cpn(il,i)
-    ! if (cvflag_grav) then
+    ! if (cvflag_grav) THEN
     ! ftra(il,i,k)=ftra(il,i,k)+0.01*grav*dpinv
     ! :         *(amp1(il)*(tra(il,i+1,k)-tra(il,i,k))
@@ -4434 +4427 @@
     ! :         *(amp1(il)*(tra(il,i+1,k)-tra(il,i,k))
     ! :           -ad(il)*(tra(il,i,k)-tra(il,i-1,k)))
-    ! endif
-    ! endif
+    ! END IF
+    ! END IF
     ! enddo
     ! enddo
@@ -4458 +4451 @@
         ! ce surplus a la meme compo que le elij, sans fractionnement.
         ! d'ou le nouveau traitement ci-dessous.
-      if (elij(il,k,i).gt.0.0) then
-        do ixt = 1, ntraciso
+      IF (elij(il,k,i).gt.0.0) THEN
+        DO ixt = 1, ntraciso
           xtawat(ixt)=awat*(xtelij(ixt,il,k,i)/elij(il,k,i))
 !          xtawat(ixt)=amax1(xtawat(ixt),0.0) ! pas necessaire
         enddo
-      else !if (elij(il,k,i).gt.0.0) then
+      else !if (elij(il,k,i).gt.0.0) THEN
           ! normalement, si elij(il,k,i)<=0, alors awat=0
           ! on le verifie. Si c'est vrai -> xtawat=0 aussi
 #ifdef ISOVERIF
-        call iso_verif_egalite(awat,0.0,'cv30_yield 3779')
-#endif
-        do ixt = 1, ntraciso
+        CALL iso_verif_egalite(awat,0.0,'cv30_yield 3779')
+#endif
+        DO ixt = 1, ntraciso
           xtawat(ixt)=0.0
-        enddo        
+        enddo
       endif
 
       ! cam verif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(xtawat(iso_eau), &
-     &           awat,'cv30_routines 3301',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(xtawat(iso_eau), &
+                 awat,'cv30_routines 3301',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(xtawat(1),'cv30_routine 3729')
-#endif            
-#endif
-       ! end cam verif 
+        CALL iso_verif_traceur_justmass(xtawat(1),'cv30_routine 3729')
+#endif
+#endif
+       ! end cam verif
 #endif
 
@@ -4496 +4489 @@
 
 #ifdef ISO
-      do ixt = 1, ntraciso
+      DO ixt = 1, ntraciso
       fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &      +0.01*grav*dpinv*ment(il,k,i) &
-     &           *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))   
+            +0.01*grav*dpinv*ment(il,k,i) &
+                 *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
       enddo
 
 #ifdef DIAGISO
         fq_detrainement(il,i)=fq_detrainement(il,i) &
-     &          +0.01*grav*dpinv*ment(il,k,i) &
-     &          *(qent(il,k,i)-awat-rr(il,i))
-        f_detrainement(il,i)=f_detrainement(il,i)& 
-     &          +0.01*grav*dpinv*ment(il,k,i)
+                +0.01*grav*dpinv*ment(il,k,i) &
+                *(qent(il,k,i)-awat-rr(il,i))
+        f_detrainement(il,i)=f_detrainement(il,i)&
+                +0.01*grav*dpinv*ment(il,k,i)
         q_detrainement(il,i)=q_detrainement(il,i) &
-     &          +0.01*grav*dpinv*ment(il,k,i)*qent(il,k,i)
-        do ixt = 1, niso
+                +0.01*grav*dpinv*ment(il,k,i)*qent(il,k,i)
+        DO ixt = 1, niso
         fxt_detrainement(ixt,il,i)=fxt_detrainement(ixt,il,i) &
-     &          +0.01*grav*dpinv*ment(il,k,i) &
-     &           *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
+                +0.01*grav*dpinv*ment(il,k,i) &
+                 *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
         xt_detrainement(ixt,il,i)=xt_detrainement(ixt,il,i) &
-     &      +0.01*grav*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
+            +0.01*grav*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
         enddo
-#endif  
+#endif
       ! cam verif
 #ifdef ISOVERIF
-        if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3325',errmax,errmaxrel)
-        endif !if (iso_eau.gt.0) then
-        do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3328')
+        IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3325',errmax,errmaxrel)
+        endif !if (iso_eau.gt.0) THEN
+        DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3328')
         enddo
-        if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-        if (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,i) &
-     &           +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3396a, dtr mels') &
-     &           .eq.1) then
-           write(*,*) 'il,k,i=',il,k,i
-           write(*,*) 'rr,delt,fr=',rr(il,i),delt,fr(il,i)
-           write(*,*) 'frnew=',0.01*grav*dpinv*ment(il, k, i)*(qent(il,k,i)-awat-rr(il,i))
-           write(*,*) 'frold=',fr(il,i)-0.01*grav*dpinv*ment(il, k, i)*(qent(il,k,i)-awat-rr(il,i))
-           write(*,*) 'deltaDfrnew=',deltaD((xtent(iso_HDO,il,k,i)-xtawat(iso_HDO)-xt(iso_HDO,il,i)) &
+        IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+        IF (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,i) &
+                 +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3396a, dtr mels') &
+                 .EQ.1) THEN
+           WRITE(*,*) 'il,k,i=',il,k,i
+           WRITE(*,*) 'rr,delt,fr=',rr(il,i),delt,fr(il,i)
+           WRITE(*,*) 'frnew=',0.01*grav*dpinv*ment(il, k, i)*(qent(il,k,i)-awat-rr(il,i))
+           WRITE(*,*) 'frold=',fr(il,i)-0.01*grav*dpinv*ment(il, k, i)*(qent(il,k,i)-awat-rr(il,i))
+           WRITE(*,*) 'deltaDfrnew=',deltaD((xtent(iso_HDO,il,k,i)-xtawat(iso_HDO)-xt(iso_HDO,il,i)) &
                 /(qent(il,k,i)-awat-rr(il,i)))
-           write(*,*) 'deltaDfrold=',deltaD((fxt(iso_HDO,il,i) &
+           WRITE(*,*) 'deltaDfrold=',deltaD((fxt(iso_HDO,il,i) &
                 -0.01*grav*dpinv*ment(il, k, i)*(xtent(iso_HDO,il,k,i)-xtawat(iso_HDO)-xt(iso_HDO,il,i))) &
                 /(fr(il,i)-0.01*grav*dpinv*ment(il, k, i)*(qent(il,k,i)-awat-rr(il,i))))
-           write(*,*) 'q+=',rr(il,i)+delt*fr(il,i)
-           write(*,*) 'qent,awat=',qent(il,k,i),awat
-           write(*,*) 'elij,clw,ep=',elij(il,k,i),clw(il,i),ep(il,i)
-           write(*,*) 'deltaDfr=',deltaD(fxt(iso_hdo,il,i)/fr(il,i))
-           write(*,*) 'deltaDrr=',deltaD(xt(iso_hdo,il,i)/rr(il,i))
-           write(*,*) 'deltaDqent=',deltaD(xtent(iso_hdo,il,k,i) &
-     &                  /qent(il,k,i))
-           write(*,*) 'deltaDqent-awat=',deltaD((xtent(iso_hdo,il,k,i)-xtawat(iso_HDO)) &
-     &                  /(qent(il,k,i)-awat))
-           write(*,*) 'deltaDawat=',deltaD(xtawat(iso_hdo)/awat) 
-           write(*,*) 'deltaDclw=',deltaD(xtclw(iso_hdo,il,i)/clw(il,i))          
+           WRITE(*,*) 'q+=',rr(il,i)+delt*fr(il,i)
+           WRITE(*,*) 'qent,awat=',qent(il,k,i),awat
+           WRITE(*,*) 'elij,clw,ep=',elij(il,k,i),clw(il,i),ep(il,i)
+           WRITE(*,*) 'deltaDfr=',deltaD(fxt(iso_hdo,il,i)/fr(il,i))
+           WRITE(*,*) 'deltaDrr=',deltaD(xt(iso_hdo,il,i)/rr(il,i))
+           WRITE(*,*) 'deltaDqent=',deltaD(xtent(iso_hdo,il,k,i) &
+                        /qent(il,k,i))
+           WRITE(*,*) 'deltaDqent-awat=',deltaD((xtent(iso_hdo,il,k,i)-xtawat(iso_HDO)) &
+                        /(qent(il,k,i)-awat))
+           WRITE(*,*) 'deltaDawat=',deltaD(xtawat(iso_hdo)/awat)
+           WRITE(*,*) 'deltaDclw=',deltaD(xtclw(iso_hdo,il,i)/clw(il,i))
 !           stop
         endif
-        if (iso_O18.gt.0) then
-          call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3396aO18, dtr mels')
-        endif !if (iso_O18.gt.0) then
-        endif !if (iso_HDO.gt.0) then
+        IF (iso_O18.gt.0) THEN
+          CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3396aO18, dtr mels')
+        endif !if (iso_O18.gt.0) THEN
+        endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3784')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3784')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3905',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3905',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
          endif
-!        call iso_verif_tracpos_choix(xtnew,'cv30_yield 3905',1e-5)
-#endif          
+!        CALL iso_verif_tracpos_choix(xtnew,'cv30_yield 3905',1e-5)
+#endif
 #endif
 #endif
@@ -4586 +4579 @@
 
 #ifdef ISO
-      do ixt = 1, ntraciso
+      DO ixt = 1, ntraciso
       fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &      +0.1*dpinv*ment(il,k,i) &
-     &           *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
+            +0.1*dpinv*ment(il,k,i) &
+                 *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
       enddo
 
 #ifdef DIAGISO
         fq_detrainement(il,i)=fq_detrainement(il,i) &
-     &   +0.1*dpinv*ment(il,k,i)*(qent(il,k,i)-awat-rr(il,i))
+         +0.1*dpinv*ment(il,k,i)*(qent(il,k,i)-awat-rr(il,i))
         f_detrainement(il,i)=f_detrainement(il,i) &
-     &          +0.1*dpinv*ment(il,k,i)
+                +0.1*dpinv*ment(il,k,i)
         q_detrainement(il,i)=q_detrainement(il,i) &
-     &          +0.1*dpinv*ment(il,k,i)*qent(il,k,i)
-       do ixt = 1, niso
+                +0.1*dpinv*ment(il,k,i)*qent(il,k,i)
+       DO ixt = 1, niso
         fxt_detrainement(ixt,il,i)=fxt_detrainement(ixt,il,i) &
-     &      +0.1*dpinv*ment(il,k,i) &
-     &           *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
+            +0.1*dpinv*ment(il,k,i) &
+                 *(xtent(ixt,il,k,i)-xtawat(ixt)-xt(ixt,il,i))
         xt_detrainement(ixt,il,i)=xt_detrainement(ixt,il,i) &
-     &          +0.1*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
+                +0.1*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
        enddo
-#endif     
+#endif
 
       ! cam verif
 #ifdef ISOVERIF
-        if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3350',errmax,errmaxrel)
-        endif !if (iso_eau.gt.0) then
-        do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3353')
+        IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3350',errmax,errmaxrel)
+        endif !if (iso_eau.gt.0) THEN
+        DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3353')
         enddo
-        if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &                   +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3396b, dtr mels')
-        endif !if (iso_HDO.gt.0) then
-        if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3396b,O18, dtr mels')
-        endif !if (iso_HDO.gt.0) then
+        IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+                         +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3396b, dtr mels')
+        endif !if (iso_HDO.gt.0) THEN
+        IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3396b,O18, dtr mels')
+        endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3828')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3828')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3949',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 3949',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
          endif
-!        call iso_verif_tracpos_choix(xtnew,'cv30_yield 3949',1e-5)
-#endif          
-#endif
-       ! end cam verif 
+!        CALL iso_verif_tracpos_choix(xtnew,'cv30_yield 3949',1e-5)
+#endif
+#endif
+       ! end cam verif
 #endif
 
@@ -4657 +4650 @@
     ! do k=1,i-1
     ! do il=1,ncum
-    ! if (i.le.inb(il)) then
+    ! if (i.le.inb(il)) THEN
     ! dpinv=1.0/(ph(il,i)-ph(il,i+1))
     ! cpinv=1.0/cpn(il,i)
-    ! if (cvflag_grav) then
+    ! if (cvflag_grav) THEN
     ! ftra(il,i,j)=ftra(il,i,j)+0.01*grav*dpinv*ment(il,k,i)
     ! :        *(traent(il,k,i,j)-tra(il,i,j))
@@ -4666 +4659 @@
     ! ftra(il,i,j)=ftra(il,i,j)+0.1*dpinv*ment(il,k,i)
     ! :        *(traent(il,k,i,j)-tra(il,i,j))
-    ! endif
-    ! endif
+    ! END IF
+    ! END IF
     ! enddo
     ! enddo
@@ -4686 +4679 @@
               ,i)-v(il,i))
 #ifdef ISO
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
         fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &          +0.01*grav*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
+                +0.01*grav*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
        enddo
 
 #ifdef DIAGISO
        fq_detrainement(il,i)=fq_detrainement(il,i) &
-     &         +0.01*grav*dpinv*ment(il,k,i)*(qent(il,k,i)-rr(il,i)) 
+               +0.01*grav*dpinv*ment(il,k,i)*(qent(il,k,i)-rr(il,i))
        f_detrainement(il,i)=f_detrainement(il,i) &
-     &         +0.01*grav*dpinv*ment(il,k,i)
+               +0.01*grav*dpinv*ment(il,k,i)
        q_detrainement(il,i)=q_detrainement(il,i) &
-     &         +0.01*grav*dpinv*ment(il,k,i)*qent(il,k,i)
-       do ixt = 1, niso
+               +0.01*grav*dpinv*ment(il,k,i)*qent(il,k,i)
+       DO ixt = 1, niso
         fxt_detrainement(ixt,il,i)=fxt_detrainement(ixt,il,i) &
-     &   +0.01*grav*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
+         +0.01*grav*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
         xt_detrainement(ixt,il,i)=xt_detrainement(ixt,il,i) &
-     &          +0.01*grav*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
+                +0.01*grav*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
        enddo
-#endif     
-       
+#endif
+
        ! cam verif
 #ifdef ISOVERIF
-        if ((il.eq.1636).and.(i.eq.9)) then
-                write(*,*) 'cv30 4785: on ajoute le dtr ici:'
-                write(*,*) 'M=',0.01*grav*dpinv*ment(il, k, i)
-                write(*,*) 'q,qe=',rr(il,i),qent(il,k,i)
+        IF ((il.EQ.1636).AND.(i.EQ.9)) THEN
+                WRITE(*,*) 'cv30 4785: on ajoute le dtr ici:'
+                WRITE(*,*) 'M=',0.01*grav*dpinv*ment(il, k, i)
+                WRITE(*,*) 'q,qe=',rr(il,i),qent(il,k,i)
                 bx=0.01*grav*dpinv*ment(il,k,i)*(qent(il,k,i)-rr(il,i))
-                do ixt=1,niso
+                DO ixt=1,niso
                  xtbx(ixt)=0.01*grav*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
                 enddo
         endif
-        do ixt=1,niso
-           call iso_verif_noNaN(fxt(ixt,il,i),'cv30_yield 4351')
-        enddo   
-#endif        
-#ifdef ISOVERIF
-        if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3408',errmax,errmaxrel)
-        endif !if (iso_eau.gt.0) then
-        do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3411')
+        DO ixt=1,niso
+           CALL iso_verif_noNaN(fxt(ixt,il,i),'cv30_yield 4351')
         enddo
-        if (1.eq.0) then
-        if ((iso_HDO.gt.0).and.(delt*fr(il,i).gt.ridicule)) then
-              if (iso_verif_aberrant_enc_nostop( &
-     &           fxt(iso_HDO,il,i)/fr(il,i), &
-     &           'cv30_yield 3572, dtr mels').eq.1) then
-                write(*,*) 'i,icb(il),inb(il)=',i,icb(il),inb(il)
-                write(*,*) 'fr(il,i)=',fr(il,i)
-!                if (fr(il,i).gt.ridicule*1e5) then
+#endif
+#ifdef ISOVERIF
+        IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3408',errmax,errmaxrel)
+        endif !if (iso_eau.gt.0) THEN
+        DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3411')
+        enddo
+        IF (1.EQ.0) THEN
+        IF ((iso_HDO.gt.0).AND.(delt*fr(il,i).gt.ridicule)) THEN
+              IF (iso_verif_aberrant_enc_nostop( &
+                 fxt(iso_HDO,il,i)/fr(il,i), &
+                 'cv30_yield 3572, dtr mels').EQ.1) THEN
+                WRITE(*,*) 'i,icb(il),inb(il)=',i,icb(il),inb(il)
+                WRITE(*,*) 'fr(il,i)=',fr(il,i)
+!                if (fr(il,i).gt.ridicule*1e5) THEN
 !                 stop
 !                endif
                endif
-        endif !if (iso_HDO.gt.0) then
-        endif !if (1.eq.0) then
-        if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &           +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3605, dtr mels')        
-        if (iso_O18.gt.0) then
-          call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3605O18, dtr mels')
-          if ((il.eq.1636).and.(i.eq.9)) then
-          call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*(fxt(iso_HDO,il,i)-xtbx(iso_HDO))) &
-     &           /(rr(il,i)+delt*(fr(il,i)-bx)), &
-     &           (xt(iso_O18,il,i)+delt*(fxt(iso_O18,il,i)-xtbx(iso_O18))) &
-     &           /(rr(il,i)+delt*(fr(il,i)-bx)), &
-     &           'cv30_yield 3605O18_nobx, dtr mels')
-           endif !if ((il.eq.1636).and.(i.eq.9)) then
-        endif !if (iso_O18.gt.0) then
-        endif !if (iso_HDO.gt.0) then
+        endif !if (iso_HDO.gt.0) THEN
+        endif !if (1.EQ.0) THEN
+        IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+                 +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3605, dtr mels')
+        IF (iso_O18.gt.0) THEN
+          CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3605O18, dtr mels')
+          IF ((il.EQ.1636).AND.(i.EQ.9)) THEN
+          CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*(fxt(iso_HDO,il,i)-xtbx(iso_HDO))) &
+                 /(rr(il,i)+delt*(fr(il,i)-bx)), &
+                 (xt(iso_O18,il,i)+delt*(fxt(iso_O18,il,i)-xtbx(iso_O18))) &
+                 /(rr(il,i)+delt*(fr(il,i)-bx)), &
+                 'cv30_yield 3605O18_nobx, dtr mels')
+           endif !if ((il.EQ.1636).AND.(i.EQ.9)) THEN
+        endif !if (iso_O18.gt.0) THEN
+        endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3921')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3921')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4036',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4036',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
          endif
-!        call iso_verif_tracpos_choix(xtnew,'cv30_yield 4036',1e-5)
-#endif          
-#endif
-       ! end cam verif 
+!        CALL iso_verif_tracpos_choix(xtnew,'cv30_yield 4036',1e-5)
+#endif
+#endif
+       ! end cam verif
 #endif
           ELSE ! cvflag_grav
@@ -4787 +4780 @@
 
 #ifdef ISO
-       do ixt = 1, ntraciso
+       DO ixt = 1, ntraciso
         fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &   +0.1*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
+         +0.1*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
        enddo
 
 #ifdef DIAGISO
        fq_detrainement(il,i)=fq_detrainement(il,i) &
-     &         +0.1*dpinv*ment(il,k,i)*(qent(il,k,i)-rr(il,i)) 
+               +0.1*dpinv*ment(il,k,i)*(qent(il,k,i)-rr(il,i))
        f_detrainement(il,i)=f_detrainement(il,i) &
-     &         +0.1*dpinv*ment(il,k,i)
+               +0.1*dpinv*ment(il,k,i)
        q_detrainement(il,i)=q_detrainement(il,i) &
-     &         +0.1*dpinv*ment(il,k,i)*qent(il,k,i)
-       do ixt = 1, niso
+               +0.1*dpinv*ment(il,k,i)*qent(il,k,i)
+       DO ixt = 1, niso
         fxt_detrainement(ixt,il,i)=fxt_detrainement(ixt,il,i) &
-     &   +0.1*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
+         +0.1*dpinv*ment(il,k,i)*(xtent(ixt,il,k,i)-xt(ixt,il,i))
         xt_detrainement(ixt,il,i)=xt_detrainement(ixt,il,i) &
-     &          +0.1*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
+                +0.1*dpinv*ment(il,k,i)*xtent(ixt,il,k,i)
        enddo
-#endif     
-       
+#endif
+
        ! cam verif
 #ifdef ISOVERIF
-          if ((il.eq.1636).and.(i.eq.9)) then
-                write(*,*) 'cv30 4785b: on ajoute le dtr ici:'
-                write(*,*) 'M=',0.1*dpinv*ment(il, k, i)
-                write(*,*) 'q,qe=',rr(il,i),qent(il,k,i)
+          IF ((il.EQ.1636).AND.(i.EQ.9)) THEN
+                WRITE(*,*) 'cv30 4785b: on ajoute le dtr ici:'
+                WRITE(*,*) 'M=',0.1*dpinv*ment(il, k, i)
+                WRITE(*,*) 'q,qe=',rr(il,i),qent(il,k,i)
           endif
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3433',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3436')
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3433',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3436')
           enddo
-          if ((iso_HDO.gt.0).and.(delt*fr(il,i).gt.ridicule)) then
-              if (iso_verif_aberrant_enc_nostop( &
-     &           fxt(iso_HDO,il,i)/fr(il,i), &
-     &           'cv30_yield 3597').eq.1) then
-                write(*,*) 'i,icb(il),inb(il)=',i,icb(il),inb(il)
+          IF ((iso_HDO.gt.0).AND.(delt*fr(il,i).gt.ridicule)) THEN
+              IF (iso_verif_aberrant_enc_nostop( &
+                 fxt(iso_HDO,il,i)/fr(il,i), &
+                 'cv30_yield 3597').EQ.1) THEN
+                WRITE(*,*) 'i,icb(il),inb(il)=',i,icb(il),inb(il)
                 stop
                endif
-          endif !if (iso_HDO.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-           call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &           +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3605b, dtr mels')
-          endif !if (iso_HDO.gt.0) then
+          endif !if (iso_HDO.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+                 +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3605b, dtr mels')
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3972')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 3972')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4091',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4091',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
          endif
-!        call iso_verif_tracpos_choix(xtnew,'cv30_yield 4091',1e-5)
-#endif            
-#endif
-       ! end cam verif 
+!        CALL iso_verif_tracpos_choix(xtnew,'cv30_yield 4091',1e-5)
+#endif
+#endif
+       ! end cam verif
 #endif
           END IF ! cvflag_grav
@@ -4857 +4850 @@
     ! do k=i,nl+1
     ! do il=1,ncum
-    ! if (i.le.inb(il) .and. k.le.inb(il)) then
+    ! if (i.le.inb(il) .AND. k.le.inb(il)) THEN
     ! dpinv=1.0/(ph(il,i)-ph(il,i+1))
     ! cpinv=1.0/cpn(il,i)
-    ! if (cvflag_grav) then
+    ! if (cvflag_grav) THEN
     ! ftra(il,i,j)=ftra(il,i,j)+0.01*grav*dpinv*ment(il,k,i)
     ! :         *(traent(il,k,i,j)-tra(il,i,j))
@@ -4866 +4859 @@
     ! ftra(il,i,j)=ftra(il,i,j)+0.1*dpinv*ment(il,k,i)
     ! :             *(traent(il,k,i,j)-tra(il,i,j))
-    ! endif
-    ! endif ! i and k
+    ! END IF
+    ! END IF ! i and k
     ! enddo
     ! enddo
@@ -4889 +4882 @@
             i))-mp(il,i)*(vp(il,i)-v(il,i-1)))*dpinv
 #ifdef ISO
-        do ixt = 1, niso
+        DO ixt = 1, niso
         fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &          +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
-     &          +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &          -mp(il,i) &
-     &          *(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+                +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
+                +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+                -mp(il,i) &
+                *(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
         enddo
 
 #ifdef DIAGISO
        fq_evapprecip(il,i)=fq_evapprecip(il,i) &
-     &           +0.5*sigd*(evap(il,i)+evap(il,i+1))
+                 +0.5*sigd*(evap(il,i)+evap(il,i+1))
        fq_ddft(il,i)=fq_ddft(il,i)  &
-     &        +0.01*grav*(mp(il,i+1)*(rp(il,i+1)-rr(il,i))-mp(il,i) &
-     &               *(rp(il,i)-rr(il,i-1)))*dpinv 
-       do ixt = 1, niso
+              +0.01*grav*(mp(il,i+1)*(rp(il,i+1)-rr(il,i))-mp(il,i) &
+                     *(rp(il,i)-rr(il,i-1)))*dpinv
+       DO ixt = 1, niso
         fxt_evapprecip(ixt,il,i)=fxt_evapprecip(ixt,il,i) &
-     &   +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
+         +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
         fxt_ddft(ixt,il,i)=fxt_ddft(ixt,il,i) &
-     &   +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &              -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
-       enddo 
-#endif             
-
-#ifdef ISOVERIF
-        do ixt=1,niso
-           call iso_verif_noNaN(xt(ixt,il,i),'cv30_yield 4514')
-           call iso_verif_noNaN(fxt(ixt,il,i),'cv30_yield 4515')
+         +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+                    -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+       enddo
+#endif
+
+#ifdef ISOVERIF
+        DO ixt=1,niso
+           CALL iso_verif_noNaN(xt(ixt,il,i),'cv30_yield 4514')
+           CALL iso_verif_noNaN(fxt(ixt,il,i),'cv30_yield 4515')
         enddo
-        if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-        if (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,i) &
-     &           +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)),'cv30_yield 4175') &
-     &           .eq.1) then
-        write(*,*) 'il,i=',il,i
-        if (rr(il,i).ne.0.0) then
-        write(*,*) 'il,i,rr,deltaD=',il,i,rr(il,i),deltaD &
-     &           (xt(iso_HDO,il,i)/rr(il,i))
+        IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+        IF (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,i) &
+                 +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)),'cv30_yield 4175') &
+                 .EQ.1) THEN
+        WRITE(*,*) 'il,i=',il,i
+        IF (rr(il,i).NE.0.0) THEN
+        WRITE(*,*) 'il,i,rr,deltaD=',il,i,rr(il,i),deltaD &
+                 (xt(iso_HDO,il,i)/rr(il,i))
         endif
-        if (fr(il,i).ne.0.0) then
-        write(*,*) 'fr,fxt,deltaD=',fr(il,i),fxt(iso_HDO,il,i), &
-     &           deltaD(fxt(iso_HDO,il,i)/fr(il,i))
+        IF (fr(il,i).NE.0.0) THEN
+        WRITE(*,*) 'fr,fxt,deltaD=',fr(il,i),fxt(iso_HDO,il,i), &
+                 deltaD(fxt(iso_HDO,il,i)/fr(il,i))
         endif
-#ifdef DIAGISO        
-        if (fq_ddft(il,i).ne.0.0) then
-        write(*,*) 'fq_ddft,deltaD=',fq_ddft(il,i),deltaD( &
-     &           fxt_ddft(iso_HDO,il,i)/fq_ddft(il,i))
+#ifdef DIAGISO
+        IF (fq_ddft(il,i).NE.0.0) THEN
+        WRITE(*,*) 'fq_ddft,deltaD=',fq_ddft(il,i),deltaD( &
+                 fxt_ddft(iso_HDO,il,i)/fq_ddft(il,i))
         endif
-        if (fq_evapprecip(il,i).ne.0.0) then
-        write(*,*) 'fq_evapprecip,deltaD=',fq_evapprecip(il,i),deltaD( &
-     &           fxt_evapprecip(iso_HDO,il,i)/fq_evapprecip(il,i))
+        IF (fq_evapprecip(il,i).NE.0.0) THEN
+        WRITE(*,*) 'fq_evapprecip,deltaD=',fq_evapprecip(il,i),deltaD( &
+                 fxt_evapprecip(iso_HDO,il,i)/fq_evapprecip(il,i))
         endif
-#endif        
-        write(*,*) 'sigd,evap(il,i),evap(il,i+1)=', &
-     &            sigd,evap(il,i),evap(il,i+1)
-        write(*,*) 'xtevap(iso_HDO,il,i),xtevap(iso_HDO,il,i+1)=', &
-     &           xtevap(iso_HDO,il,i),xtevap(iso_HDO,il,i+1)
-        write(*,*) 'grav,mp(il,i+1),mp(il,i),dpinv=', &
-     &           grav,mp(il,i+1),mp(il,i),dpinv
-        write(*,*) 'rp(il,i+1),rr(il,i),rp(il,i),rr(il,i-1)=', &
-     &           rp(il,i+1),rr(il,i),rp(il,i),rr(il,i-1)
-        write(*,*) 'xtp(il,i+1),xt(il,i),xtp(il,i),xt(il,i-1)=', &
-     &           xtp(iso_HDO,il,i+1),xt(iso_HDO,il,i), &
-     &           xtp(iso_HDO,il,i),xt(iso_HDO,il,i-1)
+#endif
+        WRITE(*,*) 'sigd,evap(il,i),evap(il,i+1)=', &
+                  sigd,evap(il,i),evap(il,i+1)
+        WRITE(*,*) 'xtevap(iso_HDO,il,i),xtevap(iso_HDO,il,i+1)=', &
+                 xtevap(iso_HDO,il,i),xtevap(iso_HDO,il,i+1)
+        WRITE(*,*) 'grav,mp(il,i+1),mp(il,i),dpinv=', &
+                 grav,mp(il,i+1),mp(il,i),dpinv
+        WRITE(*,*) 'rp(il,i+1),rr(il,i),rp(il,i),rr(il,i-1)=', &
+                 rp(il,i+1),rr(il,i),rp(il,i),rr(il,i-1)
+        WRITE(*,*) 'xtp(il,i+1),xt(il,i),xtp(il,i),xt(il,i-1)=', &
+                 xtp(iso_HDO,il,i+1),xt(iso_HDO,il,i), &
+                 xtp(iso_HDO,il,i),xt(iso_HDO,il,i-1)
         stop
         endif
-        endif !if (iso_HDO.gt.0) then
-        if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_O18_aberrant( &
-     &       (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &       (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &       'cv30_yield 5029,O18, evap')
-          if ((il.eq.1636).and.(i.eq.9)) then
-            write(*,*) 'cv30_yield 5057: ici, on verifie deltaD_nobx'
-            write(*,*) 'il,i=',il,i
-            write(*,*) 'fr(il,i),bx,fr(il,i)-bx=',fr(il,i),bx,fr(il,i)-bx
-            write(*,*) 'q,q+=',rr(il,i),rr(il,i)+delt*(fr(il,i)-bx)
-            write(*,*) 'deltaD,deltaD+=',deltaD(xt(iso_HDO,il,inb(il))/rr(il,inb(il))), &
-     &          deltaD( (xt(iso_HDO,il,i)+delt*(fxt(iso_HDO,il,i)-xtbx(iso_HDO)))/(rr(il,i)+delt*(fr(il,i)-bx)))
-            write(*,*) 'deltaO18,deltaO18+=',deltaO(xt(iso_O18,il,inb(il))/rr(il,inb(il))), &
-     &          deltaO( (xt(iso_O18,il,i)+delt*(fxt(iso_O18,il,i)-xtbx(iso_O18)))/(rr(il,i)+delt*(fr(il,i)-bx)))
-            call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*(fxt(iso_HDO,il,i)-xtbx(iso_HDO))) &
-     &           /(rr(il,i)+delt*(fr(il,i)-bx)), &
-     &           (xt(iso_O18,il,i)+delt*(fxt(iso_O18,il,i)-xtbx(iso_O18))) &
-     &           /(rr(il,i)+delt*(fr(il,i)-bx)), &
-     &          'cv30_yield 5029_nobx,O18, evap, no bx')
-          endif !if ((il.eq.1636).and.(i.eq.9)) then
-          endif !if (iso_HDO.gt.0) then
+        endif !if (iso_HDO.gt.0) THEN
+        IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_O18_aberrant( &
+             (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+             (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+             'cv30_yield 5029,O18, evap')
+          IF ((il.EQ.1636).AND.(i.EQ.9)) THEN
+            WRITE(*,*) 'cv30_yield 5057: ici, on verifie deltaD_nobx'
+            WRITE(*,*) 'il,i=',il,i
+            WRITE(*,*) 'fr(il,i),bx,fr(il,i)-bx=',fr(il,i),bx,fr(il,i)-bx
+            WRITE(*,*) 'q,q+=',rr(il,i),rr(il,i)+delt*(fr(il,i)-bx)
+            WRITE(*,*) 'deltaD,deltaD+=',deltaD(xt(iso_HDO,il,inb(il))/rr(il,inb(il))), &
+                deltaD( (xt(iso_HDO,il,i)+delt*(fxt(iso_HDO,il,i)-xtbx(iso_HDO)))/(rr(il,i)+delt*(fr(il,i)-bx)))
+            WRITE(*,*) 'deltaO18,deltaO18+=',deltaO(xt(iso_O18,il,inb(il))/rr(il,inb(il))), &
+                deltaO( (xt(iso_O18,il,i)+delt*(fxt(iso_O18,il,i)-xtbx(iso_O18)))/(rr(il,i)+delt*(fr(il,i)-bx)))
+            CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*(fxt(iso_HDO,il,i)-xtbx(iso_HDO))) &
+                 /(rr(il,i)+delt*(fr(il,i)-bx)), &
+                 (xt(iso_O18,il,i)+delt*(fxt(iso_O18,il,i)-xtbx(iso_O18))) &
+                 /(rr(il,i)+delt*(fr(il,i)-bx)), &
+                'cv30_yield 5029_nobx,O18, evap, no bx')
+          endif !if ((il.EQ.1636).AND.(i.EQ.9)) THEN
+          endif !if (iso_HDO.gt.0) THEN
 #endif
 
 #ifdef ISOTRAC
-        if ((option_traceurs.ne.6).and.(option_traceurs.ne.19)) then
-
+        IF ((option_traceurs.NE.6).AND.(option_traceurs.NE.19)) THEN
             ! facile: on fait comme l'eau
-            do ixt = 1+niso,ntraciso
+            DO ixt = 1+niso,ntraciso
              fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &          +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
-     &          +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &              -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
-            enddo !do ixt = 1+niso,ntraciso            
+                +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
+                +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+                    -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+            enddo !do ixt = 1+niso,ntraciso
 
         else ! taggage des ddfts:
@@ -5002 +4994 @@
 !             fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+conversion(iiso)
 !             fxt(ixt_poubelle,il,i)=fxt(ixt_poubelle,il,i)
-!     :           -conversion(iiso)   
+!     :           -conversion(iiso)
 
         ! Pb: quand on discretise, dqp/dt n'est pas verifee numeriquement.
@@ -5010 +5002 @@
         ! Solution alternative: Dans le cas entrainant, Ye ne varie que par
         ! ascendance compensatoire des ddfts et par perte de Ye vers le ddft. On
-        ! calcule donc ce terme directement avec schema amont: 
+        ! calcule donc ce terme directement avec schema amont:
 
         ! ajout deja de l'evap
-        do ixt = 1+niso,ntraciso
+        DO ixt = 1+niso,ntraciso
              fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &          +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
+                +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
         enddo !do ixt = 1+niso,ntraciso
 
         ! ajout du terme des ddfts sensi stricto
-!        write(*,*) 'tmp cv3_yield 4165: i,il=',i,il
-!
-        if (option_traceurs.eq.6) then
-          do iiso = 1, niso
-             
-             ixt_ddft=itZonIso(izone_ddft,iiso)  
-             if (mp(il,i).gt.mp(il,i+1)) then
+!        WRITE(*,*) 'tmp cv3_yield 4165: i,il=',i,il
+
+        IF (option_traceurs.EQ.6) THEN
+          DO iiso = 1, niso
+
+             ixt_ddft=itZonIso(izone_ddft,iiso)
+             IF (mp(il,i).gt.mp(il,i+1)) THEN
                 fxtYe(iiso)=0.01*grav*dpinv*mp(il,i) &
-     &           *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
-             else !if (mp(il,i).gt.mp(il,i+1)) then
+                 *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
+             else !if (mp(il,i).gt.mp(il,i+1)) THEN
                 fxtYe(iiso)=0.01*grav*dpinv*(mp(il,i) &
-     &           *xt(ixt_ddft,il,i-1)-mp(il,i+1)*xt(ixt_ddft,il,i) &
-     &           +(mp(il,i+1)-mp(il,i))*xtp(ixt_ddft,il,i))        
-             endif !if (mp(il,i).gt.mp(il,i+1)) then
+                 *xt(ixt_ddft,il,i-1)-mp(il,i+1)*xt(ixt_ddft,il,i) &
+                 +(mp(il,i+1)-mp(il,i))*xtp(ixt_ddft,il,i))
+             endif !if (mp(il,i).gt.mp(il,i+1)) THEN
              fxtqe(iiso)=0.01*grav*dpinv* &
-     &              (mp(il,i+1)*(xtp(iiso,il,i+1)-xt(iiso,il,i)) &
-     &              -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1))) 
-        
+                    (mp(il,i+1)*(xtp(iiso,il,i+1)-xt(iiso,il,i)) &
+                    -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1)))
+
              ixt_poubelle=itZonIso(izone_poubelle,iiso)
              fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+fxtYe(iiso)
              fxt(ixt_poubelle,il,i)=fxt(ixt_poubelle,il,i) &
-     &           +fxtqe(iiso)-fxtYe(iiso)
+                 +fxtqe(iiso)-fxtYe(iiso)
          enddo !do iiso = 1, niso
 
-         else !if (option_traceurs.eq.6) then
-
-
-            if (mp(il,i).gt.mp(il,i+1)) then
+         else !if (option_traceurs.EQ.6) THEN
+            IF (mp(il,i).gt.mp(il,i+1)) THEN
                 ! cas entrainant: faire attention
-                
-                do iiso = 1, niso
+
+                DO iiso = 1, niso
                 fxtqe(iiso)=0.01*grav*dpinv* &
-     &              (mp(il,i+1)*(xtp(iiso,il,i+1)-xt(iiso,il,i)) &
-     &              -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1)))
-
-                ixt_ddft=itZonIso(izone_ddft,iiso) 
+                    (mp(il,i+1)*(xtp(iiso,il,i+1)-xt(iiso,il,i)) &
+                    -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1)))
+
+                ixt_ddft=itZonIso(izone_ddft,iiso)
                 fxtYe(iiso)=0.01*grav*dpinv*mp(il,i) &
-     &           *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
-                fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+fxtYe(iiso)  
-
-               ixt_revap=itZonIso(izone_revap,iiso)  
+                 *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
+                fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+fxtYe(iiso)
+
+               ixt_revap=itZonIso(izone_revap,iiso)
                fxt_revap(iiso)=0.01*grav*dpinv*(mp(il,i+1)* &
-     &                  (xtp(ixt_revap,il,i+1)-xt(ixt_revap,il,i)) &
-     &                  -mp(il,i)*(xtp(ixt_revap,il,i)-xt(ixt_revap,il,i-1)))     
+                        (xtp(ixt_revap,il,i+1)-xt(ixt_revap,il,i)) &
+                        -mp(il,i)*(xtp(ixt_revap,il,i)-xt(ixt_revap,il,i-1)))
                fxt(ixt_revap,il,i)=fxt(ixt_revap,il,i) &
-     &                  +fxt_revap(iiso)
+                        +fxt_revap(iiso)
 
                 fxtXe(iiso)=fxtqe(iiso)-fxtYe(iiso)-fxt_revap(iiso)
                 Xe(iiso)=xt(iiso,il,i) &
-     &                   -xt(ixt_ddft,il,i)-xt(ixt_revap,il,i)
-                if (Xe(iiso).gt.ridicule) then
-                  do izone=1,nzone
-                   if ((izone.ne.izone_revap).and. &
-     &                   (izone.ne.izone_ddft)) then
-                    ixt=itZonIso(izone,iiso) 
+                         -xt(ixt_ddft,il,i)-xt(ixt_revap,il,i)
+                IF (Xe(iiso).gt.ridicule) THEN
+                  DO izone=1,nzone
+                   IF ((izone.NE.izone_revap).AND. &
+                         (izone.NE.izone_ddft)) THEN
+                    ixt=itZonIso(izone,iiso)
                     fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &                   +xt(ixt,il,i)/Xe(iiso)*fxtXe(iiso)
-                   endif !if ((izone.ne.izone_revap).and.
-                  enddo !do izone=1,nzone   
-#ifdef ISOVERIF
-!                write(*,*) 'iiso=',iiso
-!                write(*,*) 'fxtqe=',fxtqe(iiso)
-!                write(*,*) 'fxtYe=',fxtYe(iiso)
-!                write(*,*) 'fxt_revap=',fxt_revap(iiso)
-!                write(*,*) 'fxtXe=',fxtXe(iiso)
-!                write(*,*) 'Xe=',Xe(iiso)
-!                write(*,*) 'xt=',xt(:,il,i)
-                  call iso_verif_traceur_justmass(fxt(1,il,i), &
-     &                   'cv30_routine 4646') 
-#endif
-                else !if (abs(dXe).gt.ridicule) then
+                         +xt(ixt,il,i)/Xe(iiso)*fxtXe(iiso)
+                   endif !if ((izone.NE.izone_revap).AND.
+                  enddo !do izone=1,nzone
+#ifdef ISOVERIF
+!                WRITE(*,*) 'iiso=',iiso
+!                WRITE(*,*) 'fxtqe=',fxtqe(iiso)
+!                WRITE(*,*) 'fxtYe=',fxtYe(iiso)
+!                WRITE(*,*) 'fxt_revap=',fxt_revap(iiso)
+!                WRITE(*,*) 'fxtXe=',fxtXe(iiso)
+!                WRITE(*,*) 'Xe=',Xe(iiso)
+!                WRITE(*,*) 'xt=',xt(:,il,i)
+                  CALL iso_verif_traceur_justmass(fxt(1,il,i), &
+                         'cv30_routine 4646')
+#endif
+                else !if (abs(dXe).gt.ridicule) THEN
                     ! dans ce cas, fxtXe doit etre faible
-                    
-#ifdef ISOVERIF
-                if (delt*fxtXe(iiso).gt.ridicule) then
-                   write(*,*) 'cv30_routines 6563: delt*fxtXe(iiso)=', &
-     &                          delt*fxtXe(iiso)
+
+#ifdef ISOVERIF
+                IF (delt*fxtXe(iiso).gt.ridicule) THEN
+                   WRITE(*,*) 'cv30_routines 6563: delt*fxtXe(iiso)=', &
+                                delt*fxtXe(iiso)
                    stop
                 endif
-#endif                   
-                do izone=1,nzone
-                   if ((izone.ne.izone_revap).and. &
-     &                   (izone.ne.izone_ddft)) then                    
-                    ixt=itZonIso(izone,iiso) 
-                    if (izone.eq.izone_poubelle) then
+#endif
+                DO izone=1,nzone
+                   IF ((izone.NE.izone_revap).AND. &
+                         (izone.NE.izone_ddft)) THEN
+                    ixt=itZonIso(izone,iiso)
+                    IF (izone.EQ.izone_poubelle) THEN
                       fxt(ixt,il,i)=fxt(ixt,il,i)+fxtXe(iiso)
-                    else !if (izone.eq.izone_poubelle) then
+                    else !if (izone.EQ.izone_poubelle) THEN
                         ! pas de tendance pour ce tag la
-                    endif !if (izone.eq.izone_poubelle) then
-                   endif !if ((izone.ne.izone_revap).and.
+                    endif !if (izone.EQ.izone_poubelle) THEN
+                   endif !if ((izone.NE.izone_revap).AND.
                 enddo !do izone=1,nzone
 #ifdef ISOVERIF
-                  call iso_verif_traceur_justmass(fxt(1,il,i), &
-     &                   'cv30_routine 4671') 
-#endif              
-                                           
-                endif !if (abs(dXe).gt.ridicule) then
-
+                  CALL iso_verif_traceur_justmass(fxt(1,il,i), &
+                         'cv30_routine 4671')
+#endif
+
+                endif !if (abs(dXe).gt.ridicule) THEN
               enddo !do iiso = 1, niso
-               
-            else !if (mp(il,i).gt.mp(il,i+1)) then
+
+            else !if (mp(il,i).gt.mp(il,i+1)) THEN
                 ! cas detrainant: pas de problemes
-                do ixt=1+niso,ntraciso
+                DO ixt=1+niso,ntraciso
                 fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &                  +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &                  -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+                        +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+                        -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
                 enddo !do ixt=1+niso,ntraciso
 #ifdef ISOVERIF
-                  call iso_verif_traceur_justmass(fxt(1,il,i), &
-     &                   'cv30_routine 4685') 
-#endif                
-            endif !if (mp(il,i).gt.mp(il,i+1)) then
-
-          endif !if (option_traceurs.eq.6) then
-
-!          write(*,*) 'delt*conversion=',delt*conversion(iso_eau)
-!           write(*,*) 'delt*fxtYe=',delt*fxtYe(iso_eau) 
-!           write(*,*) 'delt*fxtqe=',delt*fxtqe(iso_eau)                  
-
-        endif ! if ((option_traceurs.ne.6).and.(option_traceurs.ne.19)) then
-#endif
-        
+                  CALL iso_verif_traceur_justmass(fxt(1,il,i), &
+                         'cv30_routine 4685')
+#endif
+            endif !if (mp(il,i).gt.mp(il,i+1)) THEN
+          endif !if (option_traceurs.EQ.6) THEN
+!          WRITE(*,*) 'delt*conversion=',delt*conversion(iso_eau)
+!           WRITE(*,*) 'delt*fxtYe=',delt*fxtYe(iso_eau)
+!           WRITE(*,*) 'delt*fxtqe=',delt*fxtqe(iso_eau)
+
+        endif ! if ((option_traceurs.NE.6).AND.(option_traceurs.NE.19)) THEN
+#endif
+
         ! cam verif
 #ifdef ISOVERIF
-          do ixt=1,niso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3496')
+          DO ixt=1,niso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_routines 3496')
           enddo
 #endif
 #ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3493',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          if (1.eq.0) then
-          if ((iso_HDO.gt.0).and.(delt*fr(il,i).gt.ridicule)) then
-              if (iso_verif_aberrant_enc_nostop( &
-     &           fxt(iso_HDO,il,i)/fr(il,i), &
-     &           'cv30_yield 3662').eq.1) then
-                write(*,*) 'il,i,icb(il),inb(il)=',il,i,icb(il),inb(il)
-                write(*,*) 'fr(il,i),delt=',fr(il,i),delt
-#ifdef DIAGISO                        
-                if (fq_ddft(il,i).ne.0.0) then
-                write(*,*) 'fq_ddft,deltaD=',fq_ddft(il,i),deltaD( &
-     &             fxt_ddft(iso_HDO,il,i)/fq_ddft(il,i))
-                endif !if (fq_ddft(il,i).ne.0.0) then
-                if (fq_evapprecip(il,i).ne.0.0) then
-                write(*,*) 'fq_evapprecip,deltaD=',fq_evapprecip(il,i), &
-     &             deltaD(fxt_evapprecip(iso_HDO,il,i) &
-     &             /fq_evapprecip(il,i))
-                endif !if (fq_evapprecip(il,i).ne.0.0) then
-#endif                
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3493',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          IF (1.EQ.0) THEN
+          IF ((iso_HDO.gt.0).AND.(delt*fr(il,i).gt.ridicule)) THEN
+              IF (iso_verif_aberrant_enc_nostop( &
+                 fxt(iso_HDO,il,i)/fr(il,i), &
+                 'cv30_yield 3662').EQ.1) THEN
+                WRITE(*,*) 'il,i,icb(il),inb(il)=',il,i,icb(il),inb(il)
+                WRITE(*,*) 'fr(il,i),delt=',fr(il,i),delt
+#ifdef DIAGISO
+                IF (fq_ddft(il,i).NE.0.0) THEN
+                WRITE(*,*) 'fq_ddft,deltaD=',fq_ddft(il,i),deltaD( &
+                   fxt_ddft(iso_HDO,il,i)/fq_ddft(il,i))
+                endif !if (fq_ddft(il,i).NE.0.0) THEN
+                IF (fq_evapprecip(il,i).NE.0.0) THEN
+                WRITE(*,*) 'fq_evapprecip,deltaD=',fq_evapprecip(il,i), &
+                   deltaD(fxt_evapprecip(iso_HDO,il,i) &
+                   /fq_evapprecip(il,i))
+                endif !if (fq_evapprecip(il,i).NE.0.0) THEN
+#endif
                endif !if (iso_verif_aberrant_enc_nostop(
-          endif !if (iso_HDO.gt.0) then
-          endif !if (1.eq.0) then
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-           if (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,i) &
-     &           +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3757, ddfts') &
-     &           .eq.1) then
-                write(*,*) 'i,il,q,deltaD=',i,il,rr(il,i),deltaD( &
-     &             xt(iso_HDO,il,i)/rr(il,i))
-                write(*,*) 'i,il,fr,deltaD=',i,il,fr(il,i),deltaD( &
-     &             fxt(iso_HDO,il,i)/fr(il,i))
+          endif !if (iso_HDO.gt.0) THEN
+          endif !if (1.EQ.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+           IF (iso_verif_aberrant_enc_nostop((xt(iso_HDO,il,i) &
+                 +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3757, ddfts') &
+                 .EQ.1) THEN
+                WRITE(*,*) 'i,il,q,deltaD=',i,il,rr(il,i),deltaD( &
+                   xt(iso_HDO,il,i)/rr(il,i))
+                WRITE(*,*) 'i,il,fr,deltaD=',i,il,fr(il,i),deltaD( &
+                   fxt(iso_HDO,il,i)/fr(il,i))
                 stop
             endif ! if (iso_verif_aberrant_enc_nostop
-        endif !if (iso_HDO.gt.0) then
-        
-        if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_O18_aberrant( &
-     &       (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &       (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &       'cv30_yield 5250,O18, ddfts')
-          endif !if (iso_HDO.gt.0) then
-
+        endif !if (iso_HDO.gt.0) THEN
+        IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_O18_aberrant( &
+             (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+             (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+             'cv30_yield 5250,O18, ddfts')
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-!        write(*,*) 'tmp cv3_yield 4224: i,il=',i,il
-        call iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 4107')
-        do ixt=1,ntraciso
+!        WRITE(*,*) 'tmp cv3_yield 4224: i,il=',i,il
+        CALL iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 4107')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,i)+delt*fxt(ixt,il,i)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew, &
-     &                  'cv30_yield 4221',1e-5).eq.1) then
-          write(*,*) 'delt*fxt(,il,i)=',delt*fxt(1:ntraciso:2,il,i)
-          write(*,*) 'delt*fxt(,il,i)=',delt*fxt(:,il,i)
-          write(*,*) 'xt(,il,i)=',xt(:,il,i)
-          write(*,*) 'delt,sigd,grav,dpinv=',delt,sigd,grav,dpinv
-          write(*,*) 'xtevap(,il,i)=',xtevap(:,il,i)
-          write(*,*) 'xtevap(,il,i+1)=',xtevap(:,il,i+1)
-          write(*,*) 'mp(il,i+1),mp(il,i)=',mp(il,i+1),mp(il,i)
-          write(*,*) 'xtp(,il,i)=',xtp(:,il,i)
-          write(*,*) 'xtp(,il,i+1)=',xtp(:,il,i+1)
-          write(*,*) 'xt(,il,i)=',xt(:,il,i)
-          write(*,*) 'xt(,il,i-1)=',xt(:,il,i-1)
+        IF (iso_verif_tracpos_choix_nostop(xtnew, &
+                        'cv30_yield 4221',1e-5).EQ.1) THEN
+          WRITE(*,*) 'delt*fxt(,il,i)=',delt*fxt(1:ntraciso:2,il,i)
+          WRITE(*,*) 'delt*fxt(,il,i)=',delt*fxt(:,il,i)
+          WRITE(*,*) 'xt(,il,i)=',xt(:,il,i)
+          WRITE(*,*) 'delt,sigd,grav,dpinv=',delt,sigd,grav,dpinv
+          WRITE(*,*) 'xtevap(,il,i)=',xtevap(:,il,i)
+          WRITE(*,*) 'xtevap(,il,i+1)=',xtevap(:,il,i+1)
+          WRITE(*,*) 'mp(il,i+1),mp(il,i)=',mp(il,i+1),mp(il,i)
+          WRITE(*,*) 'xtp(,il,i)=',xtp(:,il,i)
+          WRITE(*,*) 'xtp(,il,i+1)=',xtp(:,il,i+1)
+          WRITE(*,*) 'xt(,il,i)=',xt(:,il,i)
+          WRITE(*,*) 'xt(,il,i-1)=',xt(:,il,i-1)
 !         rappel: fxt(ixt,il,i)=fxt(ixt,il,i)
 !          0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
@@ -5220 +5205 @@
 !          stop
         endif
-#endif            
+#endif
 #endif
 #endif
@@ -5232 +5217 @@
             i))-mp(il,i)*(vp(il,i)-v(il,i-1)))*dpinv
 #ifdef ISO
-        do ixt = 1, ntraciso
+        DO ixt = 1, ntraciso
         fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &   +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
-     &   +0.1*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &        -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+         +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
+         +0.1*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+              -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
         enddo ! ixt=1,niso
 
-#ifdef ISOTRAC        
-        if (option_traceurs.ne.6) then
-
+#ifdef ISOTRAC
+        IF (option_traceurs.NE.6) THEN
             ! facile: on fait comme l'eau
-            do ixt = 1+niso,ntraciso
+            DO ixt = 1+niso,ntraciso
              fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &          +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
-     &          +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &              -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+                +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1)) &
+                +0.01*grav*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+                    -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
             enddo !do ixt = 1+niso,ntraciso
 
-        else  !if (option_traceurs.ne.6) then
-
+        else  !if (option_traceurs.NE.6) THEN
             ! taggage des ddfts:  voir blabla + haut
-        do ixt = 1+niso,ntraciso
+        DO ixt = 1+niso,ntraciso
              fxt(ixt,il,i)=fxt(ixt,il,i) &
-     &          +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
+                +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
         enddo !do ixt = 1+niso,ntraciso
-!        write(*,*) 'tmp cv3_yield 4165: i,il=',i,il
+!        WRITE(*,*) 'tmp cv3_yield 4165: i,il=',i,il
 !        ixt_poubelle=itZonIso(izone_poubelle,iso_eau)
 !        ixt_ddft=itZonIso(izone_ddft,iso_eau)
-!        write(*,*) 'delt*fxt(ixt_poubelle,il,i)=',
+!        WRITE(*,*) 'delt*fxt(ixt_poubelle,il,i)=',
 !     :           delt*fxt(ixt_poubelle,il,i)
-!        write(*,*) 'delt*fxt(ixt_ddft,il,i)=',delt*fxt(ixt_ddft,il,i)
-!        write(*,*) 'xt(iso_eau,il,i)=',xt(iso_eau,il,i)
-          do iiso = 1, niso
+!        WRITE(*,*) 'delt*fxt(ixt_ddft,il,i)=',delt*fxt(ixt_ddft,il,i)
+!        WRITE(*,*) 'xt(iso_eau,il,i)=',xt(iso_eau,il,i)
+          DO iiso = 1, niso
              ixt_poubelle=itZonIso(izone_poubelle,iiso)
-             ixt_ddft=itZonIso(izone_ddft,iiso)  
-             if (mp(il,i).gt.mp(il,i+1)) then
+             ixt_ddft=itZonIso(izone_ddft,iiso)
+             IF (mp(il,i).gt.mp(il,i+1)) THEN
                 fxtYe(iiso)=0.01*grav*dpinv*mp(il,i) &
-     &           *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
-             else !if (mp(il,i).gt.mp(il,i+1)) then
+                 *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
+             else !if (mp(il,i).gt.mp(il,i+1)) THEN
                 fxtYe(iiso)=0.01*grav*dpinv*(mp(il,i) &
-     &           *xt(ixt_ddft,il,i-1)-mp(il,i+1)*xt(ixt_ddft,il,i) &
-     &           +(mp(il,i+1)-mp(il,i))*xtp(ixt_ddft,il,i))        
-             endif !if (mp(il,i).gt.mp(il,i+1)) then
+                 *xt(ixt_ddft,il,i-1)-mp(il,i+1)*xt(ixt_ddft,il,i) &
+                 +(mp(il,i+1)-mp(il,i))*xtp(ixt_ddft,il,i))
+             endif !if (mp(il,i).gt.mp(il,i+1)) THEN
              fxtqe(iiso)=0.01*grav*dpinv* &
-     &              (mp(il,i+1)*(xtp(iiso,il,i+1)-xt(iiso,il,i)) &
-     &              -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1)))
+                    (mp(il,i+1)*(xtp(iiso,il,i+1)-xt(iiso,il,i)) &
+                    -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1)))
              fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+fxtYe(iiso)
              fxt(ixt_poubelle,il,i)=fxt(ixt_poubelle,il,i) &
-     &           +fxtqe(iiso)-fxtYe(iiso)
+                 +fxtqe(iiso)-fxtYe(iiso)
           enddo !do iiso = 1, niso
-!          write(*,*) 'delt*conversion=',delt*conversion(iso_eau)
-!           write(*,*) 'delt*fxtYe=',delt*fxtYe(iso_eau) 
-!           write(*,*) 'delt*fxtqe=',delt*fxtqe(iso_eau)  
-        endif !if (option_traceurs.eq.6) then
-#endif       
+!          WRITE(*,*) 'delt*conversion=',delt*conversion(iso_eau)
+!           WRITE(*,*) 'delt*fxtYe=',delt*fxtYe(iso_eau)
+!           WRITE(*,*) 'delt*fxtqe=',delt*fxtqe(iso_eau)
+        endif !if (option_traceurs.EQ.6) THEN
+#endif
 
 #ifdef DIAGISO
         fq_evapprecip(il,i)=fq_evapprecip(il,i) &
-     &           +0.5*sigd*(evap(il,i)+evap(il,i+1))
+                 +0.5*sigd*(evap(il,i)+evap(il,i+1))
         fq_ddft(il,i)=fq_ddft(il,i) &
-     &        +0.1*(mp(il,i+1)*(rp(il,i+1)-rr(il,i))-mp(il,i) &
-     &               *(rp(il,i)-rr(il,i-1)))*dpinv
-       do ixt = 1, niso 
+              +0.1*(mp(il,i+1)*(rp(il,i+1)-rr(il,i))-mp(il,i) &
+                     *(rp(il,i)-rr(il,i-1)))*dpinv
+       DO ixt = 1, niso
         fxt_evapprecip(ixt,il,i)=fxt_evapprecip(ixt,il,i) &
-     &   +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
+         +0.5*sigd*(xtevap(ixt,il,i)+xtevap(ixt,il,i+1))
         fxt_ddft(ixt,il,i)=fxt_ddft(ixt,il,i) &
-     &   +0.1*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
-     &        -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
-       enddo ! ixt=1,niso 
-#endif     
+         +0.1*(mp(il,i+1)*(xtp(ixt,il,i+1)-xt(ixt,il,i)) &
+              -mp(il,i)*(xtp(ixt,il,i)-xt(ixt,il,i-1)))*dpinv
+       enddo ! ixt=1,niso
+#endif
 
         ! cam verif
 
 #ifdef ISOVERIF
-       do ixt=1,niso
-        call iso_verif_noNaN(fxt(ixt,il,i),'cv30_yield 5083')
+       DO ixt=1,niso
+        CALL iso_verif_noNaN(fxt(ixt,il,i),'cv30_yield 5083')
        enddo
-#endif        
-#ifdef ISOVERIF
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &           fr(il,i),'cv30_routines 3522',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          if ((iso_HDO.gt.0).and.(delt*fr(il,i).gt.ridicule)) then
-              if (iso_verif_aberrant_enc_nostop( &
-     &           fxt(iso_HDO,il,i)/fr(il,i), &
-     &           'cv30_yield 3690').eq.1) then
-                write(*,*) 'i,icb(il),inb(il)=',i,icb(il),inb(il)
+#endif
+#ifdef ISOVERIF
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                 fr(il,i),'cv30_routines 3522',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND.(delt*fr(il,i).gt.ridicule)) THEN
+              IF (iso_verif_aberrant_enc_nostop( &
+                 fxt(iso_HDO,il,i)/fr(il,i), &
+                 'cv30_yield 3690').EQ.1) THEN
+                WRITE(*,*) 'i,icb(il),inb(il)=',i,icb(il),inb(il)
                 stop
                endif
-          endif !if (iso_HDO.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-           call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &                   +delt*fxt(iso_HDO,il,i)) &
-     &          /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3757b, ddfts')
-          endif !if (iso_HDO.gt.0) then          
-          if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-           call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3757b,O18, ddfts')
-          endif !if (iso_HDO.gt.0) then      
+          endif !if (iso_HDO.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+                         +delt*fxt(iso_HDO,il,i)) &
+                /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3757b, ddfts')
+          endif !if (iso_HDO.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+           CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3757b,O18, ddfts')
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 4172')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,i),'cv30_routine 4172')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,1)+delt*fxt(ixt,il,1)
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4295',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4295',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
          endif
-!        call iso_verif_tracpos_choix(xtnew,'cv30_yield 4295',1e-5)
-#endif            
-#endif
-       ! end cam verif 
+!        CALL iso_verif_tracpos_choix(xtnew,'cv30_yield 4295',1e-5)
+#endif
+#endif
+       ! end cam verif
 #endif
 
@@ -5384 +5367 @@
     ! do j=1,ntra
     ! do il=1,ncum
-    ! if (i.le.inb(il)) then
+    ! if (i.le.inb(il)) THEN
     ! dpinv=1.0/(ph(il,i)-ph(il,i+1))
     ! cpinv=1.0/cpn(il,i)
 
-    ! if (cvflag_grav) then
+    ! if (cvflag_grav) THEN
     ! ftra(il,i,j)=ftra(il,i,j)+0.01*grav*dpinv
     ! :     *(mp(il,i+1)*(trap(il,i+1,j)-tra(il,i,j))
@@ -5396 +5379 @@
     ! :     *(mp(il,i+1)*(trap(il,i+1,j)-tra(il,i,j))
     ! :     -mp(il,i)*(trap(il,i,j)-tra(il,i-1,j)))
-    ! endif
-    ! endif ! i
+    ! END IF
+    ! END IF ! i
     ! enddo
     ! enddo
@@ -5411 +5394 @@
 
 ! attention, on corrige un probleme C Risi
-      IF (cvflag_grav) then
-
+      IF (cvflag_grav) THEN
        ax = 0.01*grav*ment(il, inb(il), inb(il))*(hp(il,inb(il))-h(il,inb(il))+t(il, &
       inb(il))*(cpv-cpd)*(rr(il,inb(il))-qent(il,inb(il), &
@@ -5439 +5421 @@
       1))/(ph(il,inb(il)-1)-ph(il,inb(il)))
 
-      
-#ifdef ISO
-      do ixt = 1, ntraciso
+
+#ifdef ISO
+      DO ixt = 1, ntraciso
        xtbx(ixt)=0.01*grav*ment(il,inb(il),inb(il)) &
-     &    *(xtent(ixt,il,inb(il),inb(il)) &
-     &    -xt(ixt,il,inb(il)))/(ph(il,inb(il))-ph(il,inb(il)+1))
+          *(xtent(ixt,il,inb(il),inb(il)) &
+          -xt(ixt,il,inb(il)))/(ph(il,inb(il))-ph(il,inb(il)+1))
        fxt(ixt,il,inb(il))=fxt(ixt,il,inb(il))-xtbx(ixt)
        fxt(ixt,il,inb(il)-1)=fxt(ixt,il,inb(il)-1) &
-     &   +xtbx(ixt)*(ph(il,inb(il))-ph(il,inb(il)+1)) &
-     &      /(ph(il,inb(il)-1)-ph(il,inb(il)))
+         +xtbx(ixt)*(ph(il,inb(il))-ph(il,inb(il)+1)) &
+            /(ph(il,inb(il)-1)-ph(il,inb(il)))
       enddo !do ixt = 1, niso
-#endif   
+#endif
 
       else !IF (cvflag_grav)
@@ -5480 +5462 @@
 
 
-      
-#ifdef ISO
-      do ixt = 1, ntraciso
+
+#ifdef ISO
+      DO ixt = 1, ntraciso
        xtbx(ixt)=0.1*ment(il,inb(il),inb(il)) &
-     &    *(xtent(ixt,il,inb(il),inb(il)) &
-     &    -xt(ixt,il,inb(il)))/(ph(il,inb(il))-ph(il,inb(il)+1))
+          *(xtent(ixt,il,inb(il),inb(il)) &
+          -xt(ixt,il,inb(il)))/(ph(il,inb(il))-ph(il,inb(il)+1))
        fxt(ixt,il,inb(il))=fxt(ixt,il,inb(il))-xtbx(ixt)
        fxt(ixt,il,inb(il)-1)=fxt(ixt,il,inb(il)-1) &
-     &   +xtbx(ixt)*(ph(il,inb(il))-ph(il,inb(il)+1)) &
-     &      /(ph(il,inb(il)-1)-ph(il,inb(il)))
+         +xtbx(ixt)*(ph(il,inb(il))-ph(il,inb(il)+1)) &
+            /(ph(il,inb(il)-1)-ph(il,inb(il)))
       enddo !do ixt = 1, niso
-#endif      
+#endif
 
       endif  !IF (cvflag_grav)
@@ -5500 +5482 @@
        fq_detrainement(il,inb(il))=fq_detrainement(il,inb(il))-bx
        fq_detrainement(il,inb(il)-1)=fq_detrainement(il,inb(il)-1) &
-     &   +bx*(ph(il,inb(il))-ph(il,inb(il)+1)) &
-     &      /(ph(il,inb(il)-1)-ph(il,inb(il))) 
-       do ixt = 1, niso
+         +bx*(ph(il,inb(il))-ph(il,inb(il)+1)) &
+            /(ph(il,inb(il)-1)-ph(il,inb(il)))
+       DO ixt = 1, niso
         fxt_detrainement(ixt,il,inb(il))= &
-     &           fxt_detrainement(ixt,il,inb(il))-xtbx(ixt)
+                 fxt_detrainement(ixt,il,inb(il))-xtbx(ixt)
         fxt_detrainement(ixt,il,inb(il)-1)= &
-     &           fxt_detrainement(ixt,il,inb(il)-1) &
-     &           +xtbx(ixt)*(ph(il,inb(il))-ph(il,inb(il)+1)) &
-     &           /(ph(il,inb(il)-1)-ph(il,inb(il))) 
+                 fxt_detrainement(ixt,il,inb(il)-1) &
+                 +xtbx(ixt)*(ph(il,inb(il))-ph(il,inb(il)+1)) &
+                 /(ph(il,inb(il)-1)-ph(il,inb(il)))
        enddo
 #endif
       ! cam verif
 #ifdef ISOVERIF
-       do ixt=1,niso
-        call iso_verif_noNaN(fxt(ixt,il,inb(il)),'cv30_yield 5083')
+       DO ixt=1,niso
+        CALL iso_verif_noNaN(fxt(ixt,il,inb(il)),'cv30_yield 5083')
        enddo
-          if (iso_eau.gt.0) then
-              call iso_verif_egalite_choix(fxt(iso_eau,il,inb(il)), &
-     &           fr(il,inb(il)),'cv30_routines 3638',errmax,errmaxrel)
-              call iso_verif_egalite_choix(fxt(iso_eau,il,inb(il)-1), &
-     &           fr(il,inb(il)-1),'cv30_routines 3640',errmax,errmaxrel)
-          endif !if (iso_eau.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &       (rr(il,inb(il))+delt*fr(il,inb(il)).gt.ridicule)) then
-           call iso_verif_aberrant_encadre( &
-     &           (xt(iso_HDO,il,inb(il))+delt*fxt(iso_HDO,il,inb(il))) &
-     &         /(rr(il,inb(il))+delt*fr(il,inb(il))), &
-     &           'cv30_yield 3921, en inb')
-              if (iso_O18.gt.0) then                
-                if (iso_verif_O18_aberrant_nostop( &
-     &           (xt(iso_HDO,il,inb(il))+delt*fxt(iso_HDO,il,inb(il))) &
-     &           /(rr(il,inb(il))+delt*fr(il,inb(il))), &
-     &           (xt(iso_O18,il,inb(il))+delt*fxt(iso_O18,il,inb(il))) &
-     &           /(rr(il,inb(il))+delt*fr(il,inb(il))), &
-     &           'cv30_yield 3921O18, en inb').eq.1) then
-                        write(*,*) 'il,inb(il)=',il,inb(il)
+          IF (iso_eau.gt.0) THEN
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,inb(il)), &
+                 fr(il,inb(il)),'cv30_routines 3638',errmax,errmaxrel)
+              CALL iso_verif_egalite_choix(fxt(iso_eau,il,inb(il)-1), &
+                 fr(il,inb(il)-1),'cv30_routines 3640',errmax,errmaxrel)
+          endif !if (iso_eau.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+             (rr(il,inb(il))+delt*fr(il,inb(il)).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre( &
+                 (xt(iso_HDO,il,inb(il))+delt*fxt(iso_HDO,il,inb(il))) &
+               /(rr(il,inb(il))+delt*fr(il,inb(il))), &
+                 'cv30_yield 3921, en inb')
+              IF (iso_O18.gt.0) THEN
+                IF (iso_verif_O18_aberrant_nostop( &
+                 (xt(iso_HDO,il,inb(il))+delt*fxt(iso_HDO,il,inb(il))) &
+                 /(rr(il,inb(il))+delt*fr(il,inb(il))), &
+                 (xt(iso_O18,il,inb(il))+delt*fxt(iso_O18,il,inb(il))) &
+                 /(rr(il,inb(il))+delt*fr(il,inb(il))), &
+                 'cv30_yield 3921O18, en inb').EQ.1) THEN
+                        WRITE(*,*) 'il,inb(il)=',il,inb(il)
                         k_tmp=0.1*ment(il,inb(il),inb(il))/(ph(il,inb(il))-ph(il,inb(il)+1))
-                        write(*,*) 'fr,frprec=',fr(il,inb(il)),fr(il,inb(il))+bx
-                        write(*,*) 'M,dt,k_tmp*dt=',k_tmp,delt,k_tmp*delt
-                        write(*,*) 'q,qe=',rr(il,inb(il)),qent(il,inb(il),inb(il))
-                        write(*,*) 'r=',k_tmp*delt*qent(il,inb(il),inb(il))/rr(il,inb(il))
-                        write(*,*) 'deltaDR,Re=',deltaD(xt(iso_HDO,il,inb(il))/rr(il,inb(il))), &
-                        &       deltaD(xtent(iso_HDO,il,inb(il),inb(il))/qent(il,inb(il),inb(il))) 
-                        write(*,*) 'deltaO18R,Re=',deltaO(xt(iso_O18,il,inb(il))/rr(il,inb(il))), &
-                        &       deltaO(xtent(iso_O18,il,inb(il),inb(il))/qent(il,inb(il),inb(il)))       
+                        WRITE(*,*) 'fr,frprec=',fr(il,inb(il)),fr(il,inb(il))+bx
+                        WRITE(*,*) 'M,dt,k_tmp*dt=',k_tmp,delt,k_tmp*delt
+                        WRITE(*,*) 'q,qe=',rr(il,inb(il)),qent(il,inb(il),inb(il))
+                        WRITE(*,*) 'r=',k_tmp*delt*qent(il,inb(il),inb(il))/rr(il,inb(il))
+                        WRITE(*,*) 'deltaDR,Re=',deltaD(xt(iso_HDO,il,inb(il))/rr(il,inb(il))), &
+                                deltaD(xtent(iso_HDO,il,inb(il),inb(il))/qent(il,inb(il),inb(il)))
+                        WRITE(*,*) 'deltaO18R,Re=',deltaO(xt(iso_O18,il,inb(il))/rr(il,inb(il))), &
+                                deltaO(xtent(iso_O18,il,inb(il),inb(il))/qent(il,inb(il),inb(il)))
                 stop
               endif !if (iso_verif_O18_aberrant_nostop
-            endif !if (iso_O18.gt.0) then
-          endif !if (iso_HDO.gt.0) then
-          if ((iso_HDO.gt.0).and. &
-     &       (rr(il,inb(il)-1)+delt*fr(il,inb(il)-1).gt.ridicule)) then
-           call iso_verif_aberrant_encadre( &
-     &           (xt(iso_HDO,il,inb(il)-1) &
-     &           +delt*fxt(iso_HDO,il,inb(il)-1)) &
-     &         /(rr(il,inb(il)-1)+delt*fr(il,inb(il)-1)), &
-     &           'cv30_yield 3921b, en inb-1')
-              if (iso_O18.gt.0) then                
-                call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,inb(il)-1)+delt*fxt(iso_HDO,il,inb(il)-1)) &
-     &           /(rr(il,inb(il)-1)+delt*fr(il,inb(il)-1)), &
-     &           (xt(iso_O18,il,inb(il)-1)+delt*fxt(iso_O18,il,inb(il)-1)) &
-     &           /(rr(il,inb(il)-1)+delt*fr(il,inb(il)-1)), &
-     &           'cv30_yield 3921cO18, en inb-1')
+            endif !if (iso_O18.gt.0) THEN
+          endif !if (iso_HDO.gt.0) THEN
+          IF ((iso_HDO.gt.0).AND. &
+             (rr(il,inb(il)-1)+delt*fr(il,inb(il)-1).gt.ridicule)) THEN
+           CALL iso_verif_aberrant_encadre( &
+                 (xt(iso_HDO,il,inb(il)-1) &
+                 +delt*fxt(iso_HDO,il,inb(il)-1)) &
+               /(rr(il,inb(il)-1)+delt*fr(il,inb(il)-1)), &
+                 'cv30_yield 3921b, en inb-1')
+              IF (iso_O18.gt.0) THEN
+                CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,inb(il)-1)+delt*fxt(iso_HDO,il,inb(il)-1)) &
+                 /(rr(il,inb(il)-1)+delt*fr(il,inb(il)-1)), &
+                 (xt(iso_O18,il,inb(il)-1)+delt*fxt(iso_O18,il,inb(il)-1)) &
+                 /(rr(il,inb(il)-1)+delt*fr(il,inb(il)-1)), &
+                 'cv30_yield 3921cO18, en inb-1')
               endif
-          endif !if (iso_HDO.gt.0) then
+          endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-        call iso_verif_traceur_justmass(fxt(1,il,inb(il)-1), &
-     &           'cv30_routine 4364')
-        call iso_verif_traceur_justmass(fxt(1,il,inb(il)), &
-     &           'cv30_routine 4364b')
-        do ixt=1,ntraciso
+        CALL iso_verif_traceur_justmass(fxt(1,il,inb(il)-1), &
+                 'cv30_routine 4364')
+        CALL iso_verif_traceur_justmass(fxt(1,il,inb(il)), &
+                 'cv30_routine 4364b')
+        DO ixt=1,ntraciso
           xtnew(ixt)=xt(ixt,il,inb(il))+delt*fxt(ixt,il,inb(il))
         enddo
-        if (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4492',1e-5) &
-     &           .eq.1) then
-              write(*,*) 'il,i=',il,i  
+        IF (iso_verif_tracpos_choix_nostop(xtnew,'cv30_yield 4492',1e-5) &
+                 .EQ.1) THEN
+              WRITE(*,*) 'il,i=',il,i
          endif
-!        call iso_verif_tracpos_choix(xtnew,'cv30_yield 4492',1e-5)
-#endif            
-#endif
-      ! end cam verif 
+!        CALL iso_verif_tracpos_choix(xtnew,'cv30_yield 4492',1e-5)
+#endif
+#endif
+      ! end cam verif
 #endif
 
@@ -5608 +5590 @@
 #ifdef ISO
         frsum(il)=0.0
-        do ixt=1,ntraciso
+        DO ixt=1,ntraciso
           fxtsum(ixt,il)=0.0
           bxtsum(ixt,il)=0.0
@@ -5625 +5607 @@
         dsum(il) = dsum(il) + t(il, i)*(ph(il,i)-ph(il,i+1))/th(il, i)
 #ifdef ISO
-        
+
       frsum(il)=frsum(il)+fr(il,i)
-      do ixt=1,ntraciso
+      DO ixt=1,ntraciso
         fxtsum(ixt,il)=fxtsum(ixt,il)+fxt(ixt,il,i)
         bxtsum(ixt,il)=bxtsum(ixt,il)+fxt(ixt,il,i) &
-     &           *(lv(il,i)+(cl-cpd)*(t(il,i)-t(il,1))) &
-     &                  *(ph(il,i)-ph(il,i+1))
-      enddo  
+                 *(lv(il,i)+(cl-cpd)*(t(il,i)-t(il,1))) &
+                        *(ph(il,i)-ph(il,i+1))
+      enddo
 #endif
       END IF
@@ -5645 +5627 @@
         fr(il, i) = bsum(il)/csum(il)
 #ifdef ISO
-        if (abs(csum(il)).gt.0.0) then
-          do ixt=1,ntraciso
-            fxt(ixt,il,i)=bxtsum(ixt,il)/csum(il)            
+        IF (abs(csum(il)).gt.0.0) THEN
+          DO ixt=1,ntraciso
+            fxt(ixt,il,i)=bxtsum(ixt,il)/csum(il)
           enddo
-        else !if (frsum(il).gt.ridicule) then
-           if (abs(frsum(il)).gt.0.0) then
-            do ixt=1,ntraciso
-             fxt(ixt,il,i)=fr(il,i)*fxtsum(ixt,il)/frsum(il)        
-            enddo 
-           else !if (abs(frsum(il)).gt.0.0) then
-             if (abs(fr(il,i))*delt.gt.ridicule) then
-               write(*,*) 'cv30_yield 4048: fr(il,i)=',fr(il,i)
-               stop 
-             else !if (abs(fr(il,i))*delt.gt.ridicule) then
-               do ixt=1,ntraciso
+        else !if (frsum(il).gt.ridicule) THEN
+           IF (abs(frsum(il)).gt.0.0) THEN
+            DO ixt=1,ntraciso
+             fxt(ixt,il,i)=fr(il,i)*fxtsum(ixt,il)/frsum(il)
+            enddo
+           else !if (abs(frsum(il)).gt.0.0) THEN
+             IF (abs(fr(il,i))*delt.gt.ridicule) THEN
+               WRITE(*,*) 'cv30_yield 4048: fr(il,i)=',fr(il,i)
+               stop
+             else !if (abs(fr(il,i))*delt.gt.ridicule) THEN
+               DO ixt=1,ntraciso
                  fxt(ixt,il,i)=0.0
                enddo
-               if (iso_eau.gt.0) then
+               IF (iso_eau.gt.0) THEN
                    fxt(iso_eau,il,i)=1.0
                endif
-             endif !if (abs(fr(il,i))*delt.gt.ridicule) then
-           endif !if (abs(frsum(il)).gt.0.0) then
-         endif !if (frsum(il).gt.0) then
+             endif !if (abs(fr(il,i))*delt.gt.ridicule) THEN
+           endif !if (abs(frsum(il)).gt.0.0) THEN
+         endif !if (frsum(il).gt.0) THEN
 #endif
       END IF
@@ -5676 +5658 @@
 #ifdef ISO
 #ifdef ISOVERIF
-        do i=1,nl
-          do il=1,ncum
-           do ixt=1,ntraciso
-            call iso_verif_noNAN(fxt(ixt,il,i),'cv30_yield 3826')      
+        DO i=1,nl
+          DO il=1,ncum
+           DO ixt=1,ntraciso
+            CALL iso_verif_noNAN(fxt(ixt,il,i),'cv30_yield 3826')
            enddo
           enddo
         enddo
-#endif                
-#ifdef ISOVERIF
-          do i=1,nl
-!             write(*,*) 'cv30_routines temp 3967: i=',i
-             do il=1,ncum
-!                write(*,*) 'cv30_routines 3969: il=',il
-!                write(*,*) 'cv30_routines temp 3967: il,i,inb(il),ncum=',
+#endif
+#ifdef ISOVERIF
+          DO i=1,nl
+!             WRITE(*,*) 'cv30_routines temp 3967: i=',i
+             DO il=1,ncum
+!                WRITE(*,*) 'cv30_routines 3969: il=',il
+!                WRITE(*,*) 'cv30_routines temp 3967: il,i,inb(il),ncum=',
 !     :                           il,i,inb(il),ncum
-!                write(*,*) 'cv30_routines 3974'
-                if (iso_eau.gt.0) then
-                  call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &              fr(il,i),'cv30_yield 3830',errmax,errmaxrel)  
-                endif !if (iso_eau.gt.0) then
-!                write(*,*) 'cv30_routines 3979'
-                if ((iso_HDO.gt.0).and. &
-     &              (delt*fr(il,i).gt.ridicule)) then
-                    if (iso_verif_aberrant_enc_nostop( &
-     &                   fxt(iso_HDO,il,i)/fr(il,i), &
-     &                  'cv30_yield 3834').eq.1) then                        
-                        if (fr(il,i).gt.ridicule*1e5) then
-                           write(*,*) 'il,i,icb(il)=',il,i,icb(il)
-                           write(*,*) 'frsum(il)=',frsum(il)
-                           write(*,*) 'fr(il,i)=',fr(il,i)  
-                           write(*,*) 'csum(il)=',csum(il)  
-                           write(*,*) &
-     &                          'deltaD(bxtsum(iso_HDO,il)/csum(il))=', &
-     &                         deltaD(bxtsum(iso_HDO,il)/csum(il))                             
+!                WRITE(*,*) 'cv30_routines 3974'
+                IF (iso_eau.gt.0) THEN
+                  CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                    fr(il,i),'cv30_yield 3830',errmax,errmaxrel)
+                endif !if (iso_eau.gt.0) THEN
+!                WRITE(*,*) 'cv30_routines 3979'
+                IF ((iso_HDO.gt.0).AND. &
+                    (delt*fr(il,i).gt.ridicule)) THEN
+                    IF (iso_verif_aberrant_enc_nostop( &
+                         fxt(iso_HDO,il,i)/fr(il,i), &
+                        'cv30_yield 3834').EQ.1) THEN
+                        IF (fr(il,i).gt.ridicule*1e5) THEN
+                           WRITE(*,*) 'il,i,icb(il)=',il,i,icb(il)
+                           WRITE(*,*) 'frsum(il)=',frsum(il)
+                           WRITE(*,*) 'fr(il,i)=',fr(il,i)
+                           WRITE(*,*) 'csum(il)=',csum(il)
+                           WRITE(*,*) &
+                                'deltaD(bxtsum(iso_HDO,il)/csum(il))=', &
+                               deltaD(bxtsum(iso_HDO,il)/csum(il))
 !                           stop
                         endif
-!                        write(*,*) 'cv30_routines 3986: temporaire'
-                    endif   !if (iso_verif_aberrant_enc_nostop   
-                endif !if (iso_HDO.gt.0) then
-                if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-                  if (iso_verif_aberrant_enc_nostop( &
-     &          (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
-     &         /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3921c, dans la CL') &
-     &           .eq.1) then
-                     write(*,*) 'il,i,icb(il)=',il,i,icb(il)
-                     write(*,*) 'frsum(il)=',frsum(il)
-                     write(*,*) 'fr(il,i)=',fr(il,i)    
+!                        WRITE(*,*) 'cv30_routines 3986: temporaire'
+                    endif   !if (iso_verif_aberrant_enc_nostop
+                endif !if (iso_HDO.gt.0) THEN
+                IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+                  IF (iso_verif_aberrant_enc_nostop( &
+                (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i)) &
+               /(rr(il,i)+delt*fr(il,i)),'cv30_yield 3921c, dans la CL') &
+                 .EQ.1) THEN
+                     WRITE(*,*) 'il,i,icb(il)=',il,i,icb(il)
+                     WRITE(*,*) 'frsum(il)=',frsum(il)
+                     WRITE(*,*) 'fr(il,i)=',fr(il,i)
                      stop
                   endif
-               endif !if (iso_HDO.gt.0) then
-               
-        if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-         call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 3921d, dans la CL')
-        endif !if (iso_HDO.gt.0) then 
+               endif !if (iso_HDO.gt.0) THEN
+        IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+         CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 3921d, dans la CL')
+        endif !if (iso_HDO.gt.0) THEN
 #ifdef ISOTRAC
-                call iso_verif_traceur_justmass(fxt(1,il,i), &
-     &                  'cv30_routine 4523')
-#endif                 
-!                write(*,*) 'cv30_routines 3994'
+                CALL iso_verif_traceur_justmass(fxt(1,il,i), &
+                        'cv30_routine 4523')
+#endif
+!                WRITE(*,*) 'cv30_routines 3994'
              enddo !do il=1,ncum
-!             write(*,*) 'cv30_routine 3990: fin des il pour i=',i
+!             WRITE(*,*) 'cv30_routine 3990: fin des il pour i=',i
           enddo !do i=1,nl
-!          write(*,*) 'cv30_routine 3990: fin des verifs sur homogen'
+!          WRITE(*,*) 'cv30_routine 3990: fin des verifs sur homogen'
 #endif
 
 #ifdef ISOVERIF
         ! verif finale des tendances:
-          do i=1,nl
-             do il=1,ncum
-                if (iso_eau.gt.0) then
-                  call iso_verif_egalite_choix(fxt(iso_eau,il,i), &
-     &              fr(il,i),'cv30_yield 3830',errmax,errmaxrel)  
-                endif !if (iso_eau.gt.0) then
-                if ((iso_HDO.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-                  call iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
-     &                   +delt*fxt(iso_HDO,il,i)) &
-     &           /(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 5710a, final')
-               endif !if (iso_HDO.gt.0) then               
-               if ((iso_HDO.gt.0).and.(iso_O18.gt.0).and. &
-     &           (rr(il,i)+delt*fr(il,i).gt.ridicule)) then
-                  call iso_verif_O18_aberrant( &
-     &           (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
-     &           'cv30_yield 5710b, final')
-               endif !if (iso_HDO.gt.0) then 
+          DO i=1,nl
+             DO il=1,ncum
+                IF (iso_eau.gt.0) THEN
+                  CALL iso_verif_egalite_choix(fxt(iso_eau,il,i), &
+                    fr(il,i),'cv30_yield 3830',errmax,errmaxrel)
+                endif !if (iso_eau.gt.0) THEN
+                IF ((iso_HDO.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+                  CALL iso_verif_aberrant_encadre((xt(iso_HDO,il,i) &
+                         +delt*fxt(iso_HDO,il,i)) &
+                 /(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 5710a, final')
+               endif !if (iso_HDO.gt.0) THEN
+               IF ((iso_HDO.gt.0).AND.(iso_O18.gt.0).AND. &
+                 (rr(il,i)+delt*fr(il,i).gt.ridicule)) THEN
+                  CALL iso_verif_O18_aberrant( &
+                 (xt(iso_HDO,il,i)+delt*fxt(iso_HDO,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 (xt(iso_O18,il,i)+delt*fxt(iso_O18,il,i))/(rr(il,i)+delt*fr(il,i)), &
+                 'cv30_yield 5710b, final')
+               endif !if (iso_HDO.gt.0) THEN
              enddo !do il=1,ncum
           enddo !do i=1,nl
@@ -5835 +5816 @@
     DO k = i, nl
       DO il = 1, ncum
-        ! test         if (i.ge.icb(il).and.i.le.inb(il).and.k.le.inb(il))
-        ! then
+        ! test         if (i.ge.icb(il).AND.i.le.inb(il).AND.k.le.inb(il))
+        ! THEN
         IF (i<=inb(il) .AND. k<=inb(il)) THEN
           upwd(il, i) = upwd(il, i) + m(il, k) + up1(il, k, i)
@@ -5933 +5914 @@
   ! *** diagnose the in-cloud mixing ratio   ***            ! cld
   ! ***           of condensed water         ***            ! cld
-  ! ! cld
+  ! cld
 
   DO i = 1, nd ! cld
@@ -5992 +5973 @@
   END DO ! cld
 
-  RETURN
+
 END SUBROUTINE cv30_yield
 
-! !RomP >>>
+!RomP >>>
 SUBROUTINE cv30_tracer(nloc, len, ncum, nd, na, ment, sij, da, phi, phi2, &
     d1a, dam, ep, vprecip, elij, clw, epmlmmm, eplamm, icb, inb)
   IMPLICIT NONE
 
-  include "cv30param.h"
+
 
   ! inputs:
@@ -6053 +6034 @@
       DO i = 1, ncum
         IF (k>=icb(i) .AND. k<=inb(i) .AND. j<=inb(i)) THEN
-          ! !jyg             epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/elij(i,k,j)
+          !jyg             epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/elij(i,k,j)
           epm(i, j, k) = 1. - (1.-ep(i,j))*clw(i, j)/max(elij(i,k,j), 1.E-16)
-          ! !
+
           epm(i, j, k) = max(epm(i,j,k), 0.0)
         END IF
@@ -6104 +6085 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_tracer
 ! RomP <<<
@@ -6116 +6097 @@
     elij1, clw1, epmlmmm1, eplamm1, wdtraina1, wdtrainm1,epmax_diag1 & ! epmax_cape
 #ifdef ISO
-     &         ,xtprecip,fxt,xtVPrecip,xtevap,xtclw,xtwdtraina &
-     &         ,xtprecip1,fxt1,xtVPrecip1,xtevap1,xtclw1,xtwdtraina1 &
+               ,xtprecip,fxt,xtVPrecip,xtevap,xtclw,xtwdtraina &
+               ,xtprecip1,fxt1,xtVPrecip1,xtevap1,xtclw1,xtwdtraina1 &
 #ifdef DIAGISO
-     &         , water,xtwater,qp,xtp &
-     &         , fq_detrainement,fq_ddft,fq_fluxmasse,fq_evapprecip &
-     &         , fxt_detrainement,fxt_ddft,fxt_fluxmasse, fxt_evapprecip &
-     &         , f_detrainement,q_detrainement,xt_detrainement &
-     &         , water1,xtwater1,qp1,xtp1 &
-     &         , fq_detrainement1,fq_ddft1,fq_fluxmasse1,fq_evapprecip1 &
-     &         , fxt_detrainement1,fxt_ddft1,fxt_fluxmasse1, fxt_evapprecip1 &
-     &         , f_detrainement1,q_detrainement1,xt_detrainement1 &
-#endif          
-#endif 
-     &         )
-
-#ifdef ISO
-    use infotrac_phy, ONLY: ntraciso=>ntiso
-#ifdef ISOVERIF
-    use isotopes_verif_mod, ONLY: Tmin_verif,iso_verif_aberrant, &
+               , water,xtwater,qp,xtp &
+               , fq_detrainement,fq_ddft,fq_fluxmasse,fq_evapprecip &
+               , fxt_detrainement,fxt_ddft,fxt_fluxmasse, fxt_evapprecip &
+               , f_detrainement,q_detrainement,xt_detrainement &
+               , water1,xtwater1,qp1,xtp1 &
+               , fq_detrainement1,fq_ddft1,fq_fluxmasse1,fq_evapprecip1 &
+               , fxt_detrainement1,fxt_ddft1,fxt_fluxmasse1, fxt_evapprecip1 &
+               , f_detrainement1,q_detrainement1,xt_detrainement1 &
+#endif
+#endif
+               )
+
+#ifdef ISO
+    USE infotrac_phy, ONLY: ntraciso=>ntiso
+#ifdef ISOVERIF
+    USE isotopes_verif_mod, ONLY: Tmin_verif,iso_verif_aberrant, &
         iso_verif_egalite,iso_verif_egalite_choix_nostop,iso_verif_positif_nostop, &
         iso_verif_egalite_nostop,iso_verif_aberrant_nostop,deltaD,iso_verif_noNaN_nostop, &
@@ -6142 +6123 @@
   IMPLICIT NONE
 
-  include "cv30param.h"
+
 
   ! inputs:
@@ -6172 +6153 @@
   REAL xtprecip(ntraciso,nloc)
   REAL xtvprecip(ntraciso,nloc, nd+1), xtevap(ntraciso,nloc, nd)
-  real fxt(ntraciso,nloc,nd)
-  real xtclw(ntraciso,nloc,nd)
+  REAL fxt(ntraciso,nloc,nd)
+  REAL xtclw(ntraciso,nloc,nd)
   REAL xtwdtraina(ntraciso,nloc, nd)
 #endif
@@ -6201 +6182 @@
   ! RomP <<<
 #ifdef ISO
-  real xtprecip1(ntraciso,len)
-  real fxt1(ntraciso,len,nd)
-  real xtVPrecip1(ntraciso,len,nd+1),xtevap1(ntraciso,len, nd)
+  REAL xtprecip1(ntraciso,len)
+  REAL fxt1(ntraciso,len,nd)
+  REAL xtVPrecip1(ntraciso,len,nd+1),xtevap1(ntraciso,len, nd)
   REAL xtwdtraina1(ntraciso,len, nd)
   REAL xtclw1(ntraciso,len, nd)
@@ -6211 +6192 @@
   INTEGER i, k, j
 #ifdef ISO
-      integer ixt
+      INTEGER ixt
 #endif
 
 #ifdef DIAGISO
-      real water(nloc,nd)
-      real xtwater(ntraciso,nloc,nd)
-      real qp(nloc,nd),xtp(ntraciso,nloc,nd)
-      real fq_detrainement(nloc,nd)
-      real f_detrainement(nloc,nd)
-      real q_detrainement(nloc,nd)
-      real fq_ddft(nloc,nd)
-      real fq_fluxmasse(nloc,nd)
-      real fq_evapprecip(nloc,nd)
-      real fxt_detrainement(ntraciso,nloc,nd)
-      real xt_detrainement(ntraciso,nloc,nd)
-      real fxt_ddft(ntraciso,nloc,nd)
-      real fxt_fluxmasse(ntraciso,nloc,nd)
-      real fxt_evapprecip(ntraciso,nloc,nd)
-
-      real water1(len,nd)
-      real xtwater1(ntraciso,len,nd)
-      real qp1(len,nd),xtp1(ntraciso,len,nd)
-      real fq_detrainement1(len,nd)
-      real f_detrainement1(len,nd)
-      real q_detrainement1(len,nd)
-      real fq_ddft1(len,nd)
-      real fq_fluxmasse1(len,nd)
-      real fq_evapprecip1(len,nd)
-      real fxt_detrainement1(ntraciso,len,nd)
-      real xt_detrainement1(ntraciso,len,nd)
-      real fxt_ddft1(ntraciso,len,nd)
-      real fxt_fluxmasse1(ntraciso,len,nd)
-      real fxt_evapprecip1(ntraciso,len,nd)
-#endif
-
-#ifdef ISOVERIF
-        write(*,*) 'cv30_routines 4293: entree dans cv3_uncompress'
+      REAL water(nloc,nd)
+      REAL xtwater(ntraciso,nloc,nd)
+      REAL qp(nloc,nd),xtp(ntraciso,nloc,nd)
+      REAL fq_detrainement(nloc,nd)
+      REAL f_detrainement(nloc,nd)
+      REAL q_detrainement(nloc,nd)
+      REAL fq_ddft(nloc,nd)
+      REAL fq_fluxmasse(nloc,nd)
+      REAL fq_evapprecip(nloc,nd)
+      REAL fxt_detrainement(ntraciso,nloc,nd)
+      REAL xt_detrainement(ntraciso,nloc,nd)
+      REAL fxt_ddft(ntraciso,nloc,nd)
+      REAL fxt_fluxmasse(ntraciso,nloc,nd)
+      REAL fxt_evapprecip(ntraciso,nloc,nd)
+
+      REAL water1(len,nd)
+      REAL xtwater1(ntraciso,len,nd)
+      REAL qp1(len,nd),xtp1(ntraciso,len,nd)
+      REAL fq_detrainement1(len,nd)
+      REAL f_detrainement1(len,nd)
+      REAL q_detrainement1(len,nd)
+      REAL fq_ddft1(len,nd)
+      REAL fq_fluxmasse1(len,nd)
+      REAL fq_evapprecip1(len,nd)
+      REAL fxt_detrainement1(ntraciso,len,nd)
+      REAL xt_detrainement1(ntraciso,len,nd)
+      REAL fxt_ddft1(ntraciso,len,nd)
+      REAL fxt_fluxmasse1(ntraciso,len,nd)
+      REAL fxt_evapprecip1(ntraciso,len,nd)
+#endif
+
+#ifdef ISOVERIF
+        WRITE(*,*) 'cv30_routines 4293: entree dans cv3_uncompress'
 #endif
   DO i = 1, ncum
@@ -6257 +6238 @@
     epmax_diag1(idcum(i))=epmax_diag(i) ! epmax_cape
 #ifdef ISO
-         do ixt = 1, ntraciso
+         DO ixt = 1, ntraciso
           xtprecip1(ixt,idcum(i))=xtprecip(ixt,i)
          enddo
@@ -6290 +6271 @@
       ! RomP <<<
 #ifdef ISO
-            do ixt = 1, ntraciso
+            DO ixt = 1, ntraciso
              fxt1(ixt,idcum(i),k)=fxt(ixt,i,k)
              xtVPrecip1(ixt,idcum(i),k)=xtVPrecip(ixt,i,k)
@@ -6309 +6290 @@
 
 #ifdef ISO
-#ifdef DIAGISO 
-        do k=1,nl
-          do i=1,ncum   
+#ifdef DIAGISO
+        DO k=1,nl
+          DO i=1,ncum
             water1(idcum(i),k)=water(i,k)
             qp1(idcum(i),k)=qp(i,k)
@@ -6321 +6302 @@
             fq_evapprecip1(idcum(i),k)=fq_evapprecip(i,k)
             fq_fluxmasse1(idcum(i),k)=fq_fluxmasse(i,k)
-            do ixt = 1, ntraciso
+            DO ixt = 1, ntraciso
              xtwater1(ixt,idcum(i),k)=xtwater(ixt,i,k)
              xtp1(ixt,idcum(i),k)=xtp(ixt,i,k)
@@ -6332 +6313 @@
            enddo
          enddo
-         do i=1,ncum   
+         DO i=1,ncum
             epmax_diag1(idcum(i))=epmax_diag(i)
          enddo
@@ -6358 +6339 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_uncompress
 
-        subroutine cv30_epmax_fn_cape(nloc,ncum,nd &
+        SUBROUTINE cv30_epmax_fn_cape(nloc,ncum,nd &
                 ,cape,ep,hp,icb,inb,clw,nk,t,h,lv &
                 ,epmax_diag)
-        USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
-          , clmci, eps, epsi, epsim1, ginv, hrd, grav
-implicit none
+        USE conema3_mod_h
+        USE cvthermo_mod_h
+
+        IMPLICIT NONE
 
         ! On fait varier epmax en fn de la cape
@@ -6373 +6355 @@
         ! Toutes les autres variables fn de ep sont calculees plus bas.
 
-INCLUDE "cv30param.h"
-INCLUDE "conema3.h"
-
 ! inputs:
-      integer ncum, nd, nloc
-      integer icb(nloc), inb(nloc)
-      real cape(nloc)
-      real clw(nloc,nd),lv(nloc,nd),t(nloc,nd),h(nloc,nd)
-      integer nk(nloc)
+      INTEGER ncum, nd, nloc
+      INTEGER icb(nloc), inb(nloc)
+      REAL cape(nloc)
+      REAL clw(nloc,nd),lv(nloc,nd),t(nloc,nd),h(nloc,nd)
+      INTEGER nk(nloc)
 ! inouts:
-      real ep(nloc,nd)
-      real hp(nloc,nd)
+      REAL ep(nloc,nd)
+      REAL hp(nloc,nd)
 ! outputs ou local
-      real epmax_diag(nloc)
+      REAL epmax_diag(nloc)
 ! locals
-      integer i,k    
-      real hp_bak(nloc,nd)
+      INTEGER i,k
+      REAL hp_bak(nloc,nd)
       CHARACTER (LEN=20) :: modname='cv30_epmax_fn_cape'
       CHARACTER (LEN=80) :: abort_message
 
         ! on recalcule ep et hp
-        
-        if (coef_epmax_cape.gt.1e-12) then
-        do i=1,ncum
+
+        IF (coef_epmax_cape.gt.1e-12) THEN
+        DO i=1,ncum
            epmax_diag(i)=epmax-coef_epmax_cape*sqrt(cape(i))
-           do k=1,nl
+           DO k=1,nl
                 ep(i,k)=ep(i,k)/epmax*epmax_diag(i)
                 ep(i,k)=amax1(ep(i,k),0.0)
@@ -6406 +6385 @@
 
 ! On recalcule hp:
-      do k=1,nl
-        do i=1,ncum
-          hp_bak(i,k)=hp(i,k)
-        enddo
+      DO k=1,nl
+        DO i=1,ncum
+      hp_bak(i,k)=hp(i,k)
+    enddo
       enddo
-      do k=1,nlp
-        do i=1,ncum
-          hp(i,k)=h(i,k)
-        enddo
+      DO k=1,nlp
+        DO i=1,ncum
+      hp(i,k)=h(i,k)
+    enddo
       enddo
-      do k=minorig+1,nl
-       do i=1,ncum
-        if((k.ge.icb(i)).and.(k.le.inb(i)))then
+      DO k=minorig+1,nl
+       DO i=1,ncum
+        IF((k.ge.icb(i)).AND.(k.le.inb(i)))THEN
           hp(i,k)=h(i,nk(i))+(lv(i,k)+(cpd-cpv)*t(i,k))*ep(i,k)*clw(i,k)
         endif
        enddo
       enddo !do k=minorig+1,n
-!     write(*,*) 'cv30_routines 6218: hp(1,20)=',hp(1,20)
-      do i=1,ncum  
-       do k=1,nl
-        if (abs(hp_bak(i,k)-hp(i,k)).gt.0.01) then
-           write(*,*) 'i,k=',i,k
-           write(*,*) 'coef_epmax_cape=',coef_epmax_cape
-           write(*,*) 'epmax_diag(i)=',epmax_diag(i)
-           write(*,*) 'ep(i,k)=',ep(i,k)
-           write(*,*) 'hp(i,k)=',hp(i,k)
-           write(*,*) 'hp_bak(i,k)=',hp_bak(i,k)
-           write(*,*) 'h(i,k)=',h(i,k)
-           write(*,*) 'nk(i)=',nk(i)
-           write(*,*) 'h(i,nk(i))=',h(i,nk(i))
-           write(*,*) 'lv(i,k)=',lv(i,k)
-           write(*,*) 't(i,k)=',t(i,k)
-           write(*,*) 'clw(i,k)=',clw(i,k)
-           write(*,*) 'cpd,cpv=',cpd,cpv
+!     WRITE(*,*) 'cv30_routines 6218: hp(1,20)=',hp(1,20)
+      DO i=1,ncum
+       DO k=1,nl
+        IF (abs(hp_bak(i,k)-hp(i,k)).gt.0.01) THEN
+           WRITE(*,*) 'i,k=',i,k
+           WRITE(*,*) 'coef_epmax_cape=',coef_epmax_cape
+           WRITE(*,*) 'epmax_diag(i)=',epmax_diag(i)
+           WRITE(*,*) 'ep(i,k)=',ep(i,k)
+           WRITE(*,*) 'hp(i,k)=',hp(i,k)
+           WRITE(*,*) 'hp_bak(i,k)=',hp_bak(i,k)
+           WRITE(*,*) 'h(i,k)=',h(i,k)
+           WRITE(*,*) 'nk(i)=',nk(i)
+           WRITE(*,*) 'h(i,nk(i))=',h(i,nk(i))
+           WRITE(*,*) 'lv(i,k)=',lv(i,k)
+           WRITE(*,*) 't(i,k)=',t(i,k)
+           WRITE(*,*) 'clw(i,k)=',clw(i,k)
+           WRITE(*,*) 'cpd,cpv=',cpd,cpv
            CALL abort_physic(modname,abort_message,0)
         endif
        enddo !do k=1,nl
-      enddo !do i=1,ncum  
-      endif !if (coef_epmax_cape.gt.1e-12) then
-
-      return
-      end subroutine cv30_epmax_fn_cape
-
-
+      enddo !do i=1,ncum
+      endif !if (coef_epmax_cape.gt.1e-12) THEN
+      END SUBROUTINE  cv30_epmax_fn_cape
+
+
+
+
+
+
+END MODULE cv30_routines_mod
+
+

LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90

@@ -11 +11 @@
   USE ioipsl_getin_p_mod, ONLY : getin_p
   use mod_phys_lmdz_para
-
+  USE conema3_mod_h
   IMPLICIT NONE
 
@@ -38 +38 @@
 
   include "cv3param.h"
-  include "conema3.h"
 
   INTEGER, INTENT(IN)              :: nd
@@ -1493 +1492 @@
   USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
           ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
+  USE conema3_mod_h
   IMPLICIT NONE
 
@@ -1514 +1514 @@
 
   include "cv3param.h"
-  include "conema3.h"
   include "YOMCST2.h"
 
@@ -4734 +4733 @@
 #endif
 #endif
-  USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
+USE conema3_mod_h
+    USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
           , clmci, eps, epsi, epsim1, ginv, hrd, grav
   USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
@@ -4741 +4741 @@
 
   include "cv3param.h"
-  include "conema3.h"
 
 !inputs:
@@ -7625 +7624 @@
                  , pbase, p, ph, tv, buoy, sig, w0,iflag &
                  , epmax_diag)
-        USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
+USE conema3_mod_h
+          USE cvthermo_mod_h, ONLY: cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl  &
           , clmci, eps, epsi, epsim1, ginv, hrd, grav
   USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
@@ -7637 +7637 @@
 
   include "cv3param.h"
-  include "conema3.h"
 
 ! inputs:

LMDZ6/trunk/libf/phylmdiso/cv_driver.F90

@@ -42 +42 @@
 #endif
 #endif
+  USE cv30_routines_mod, ONLY: cv30_param, cv30_prelim, cv30_feed, cv30_undilute1, cv30_trigger, cv30_compress, cv30_undilute2, &
+          cv30_closure, cv30_epmax_fn_cape, cv30_mixing, cv30_unsat, cv30_yield, cv30_tracer, cv30_uncompress
   IMPLICIT NONE
 

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -444 +444 @@
           , RALPD, RBETD, RGAMD
        USE clesphys_mod_h
+       USE conema3_mod_h
 
     IMPLICIT NONE
@@ -1295 +1296 @@
     include "FCTTRE.h"
     !IM 100106 BEG : pouvoir sortir les ctes de la physique
-    include "conema3.h"
     include "nuage.h"
     include "compbl.h"