Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/abort_gcm.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/abort_gcm.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/abort_gcm.F	(revision 5082)
@@ -47,5 +47,5 @@
       write(lunout,*) 'Stopping in ', modname
       write(lunout,*) 'Reason = ',message
-      if (ierr .eq. 0) then
+      if (ierr == 0) then
         write(lunout,*) 'Everything is cool'
         stop
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/advtrac.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/advtrac.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/advtrac.F90	(revision 5082)
@@ -289,5 +289,5 @@
                END DO
             END DO
-            IF(CFLmaxz.GE.1) WRITE(*,*) 'WARNING vertical','CFLmaxz=', CFLmaxz
+            IF(CFLmaxz>=1) WRITE(*,*) 'WARNING vertical','CFLmaxz=', CFLmaxz
             !----------------------------------------------------------------
             !     Ss-prg interface LMDZ.4->PPM3d (ss-prg de Lin)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F	(revision 5082)
@@ -26,5 +26,5 @@
 c====================================================================
 c
-c   Sous-programme consacre à des diagnostics dynamiques de base
+c   Sous-programme consacre � des diagnostics dynamiques de base
 c
 c 
@@ -89,5 +89,5 @@
       real ww
 
-c   variables dynamiques intermédiaires
+c   variables dynamiques interm�diaires
       REAL vcont(iip1,jjm,llm),ucont(iip1,jjp1,llm)
       REAL ang(iip1,jjp1,llm),unat(iip1,jjp1,llm)
@@ -97,8 +97,8 @@
       REAL bern(iip1,jjp1,llm)
 
-c   champ contenant les scalaires advectés.
+c   champ contenant les scalaires advect�s.
       real Q(iip1,jjp1,llm,nQ)
     
-c   champs cumulés
+c   champs cumul�s
       real ps_cum(iip1,jjp1)
       real masse_cum(iip1,jjp1,llm)
@@ -180,5 +180,5 @@
 c   ncum est la frequence de stokage en pas de temps
         ncum=dt_cum/dt_app
-        if (abs(ncum*dt_app-dt_cum).gt.1.e-5*dt_app) then
+        if (abs(ncum*dt_app-dt_cum)>1.e-5*dt_app) then
            WRITE(lunout,*)
      .            'Pb : le pas de cumule doit etre multiple du pas'
@@ -188,5 +188,5 @@
         endif
 
-        if (i_sortie.eq.1) then
+        if (i_sortie==1) then
          file='dynzon'
          call inigrads(ifile,1
@@ -239,5 +239,5 @@
       do iQ=1,nQ
          do itr=1,ntr
-            if(itr.eq.1) then
+            if(itr==1) then
                znom(itr,iQ)=nom(iQ)
                znoml(itr,iQ)=nom(iQ)
@@ -308,10 +308,10 @@
 c   ----------------------------
 
-c   énergie cinétique
+c   �nergie cin�tique
       ucont(:,:,:)=0
       CALL covcont(llm,ucov,vcov,ucont,vcont)
       CALL enercin(vcov,ucov,vcont,ucont,ecin)
 
-c   moment cinétique
+c   moment cin�tique
       do l=1,llm
          ang(:,:,l)=ucov(:,:,l)+constang(:,:)
@@ -332,5 +332,5 @@
 c=====================================================================
 c
-      if(icum.EQ.0) then
+      if(icum==0) then
          ps_cum=0.
          masse_cum=0.
@@ -373,5 +373,5 @@
       enddo
 
-c    flux méridien
+c    flux m�ridien
 c    -------------
       do iQ=1,nQ
@@ -413,5 +413,5 @@
 c   PAS DE TEMPS D'ECRITURE
 c=====================================================================
-      if (icum.eq.ncum) then
+      if (icum==ncum) then
 c=====================================================================
 
@@ -440,5 +440,5 @@
  
 c=====================================================================
-c   Transport méridien
+c   Transport m�ridien
 c=====================================================================
 
@@ -534,5 +534,5 @@
 c     print*,'4OK'
 c   sorties proprement dites
-      if (i_sortie.eq.1) then
+      if (i_sortie==1) then
       do iQ=1,nQ
          do itr=1,ntr
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/caladvtrac.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/caladvtrac.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/caladvtrac.F	(revision 5082)
@@ -51,5 +51,5 @@
 c
 ! Earth-specific stuff for the first 2 tracers (water)
-      if (planet_type.eq."earth") then
+      if (planet_type=="earth") then
 C initialisation
 ! CRisi: il faut gérer tous les traceurs si on veut pouvoir faire des
@@ -70,6 +70,6 @@
 c
 
-      IF( iapptrac.EQ.iapp_tracvl ) THEN
-        if (planet_type.eq."earth") then
+      IF( iapptrac==iapp_tracvl ) THEN
+        if (planet_type=="earth") then
 ! Earth-specific treatment for the first 2 tracers (water)
 c
@@ -108,5 +108,5 @@
         endif ! of if (planet_type.eq."earth")
       ELSE
-        if (planet_type.eq."earth") then
+        if (planet_type=="earth") then
 ! Earth-specific treatment for the first 2 tracers (water)
           dq(:,:,1:nqtot)=0.
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/caldyn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/caldyn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/caldyn.F	(revision 5082)
@@ -124,5 +124,5 @@
       DO l = 1, llm
          DO ij = 1, ip1jm, iip1
-           IF( dv(ij,l).NE.dv(ij+iim,l) )  THEN
+           IF( dv(ij,l)/=dv(ij+iim,l) )  THEN
 !         PRINT *,'!!!ATTENTION!!! probleme de periodicite sur vcov',  
 !    ,   ' dans caldyn'
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/conf_gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/conf_gcm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/conf_gcm.F90	(revision 5082)
@@ -419,5 +419,5 @@
      CALL getin('clat',clatt)
 
-     IF( ABS(clat - clatt).GE. 0.001 )  THEN
+     IF( ABS(clat - clatt)>= 0.001 )  THEN
         write(lunout,*)'conf_gcm: La valeur de clat passee par run.def', &
              ' est differente de celle lue sur le fichier  start '
@@ -433,5 +433,5 @@
      CALL getin('grossismx',grossismxx)
 
-     IF( ABS(grossismx - grossismxx).GE. 0.001 )  THEN
+     IF( ABS(grossismx - grossismxx)>= 0.001 )  THEN
         write(lunout,*)'conf_gcm: La valeur de grossismx passee par ', &
              'run.def est differente de celle lue sur le fichier  start '
@@ -447,5 +447,5 @@
      CALL getin('grossismy',grossismyy)
 
-     IF( ABS(grossismy - grossismyy).GE. 0.001 )  THEN
+     IF( ABS(grossismy - grossismyy)>= 0.001 )  THEN
         write(lunout,*)'conf_gcm: La valeur de grossismy passee par ', &
              'run.def est differente de celle lue sur le fichier  start '
@@ -453,5 +453,5 @@
      ENDIF
 
-     IF( grossismx.LT.1. )  THEN
+     IF( grossismx<1. )  THEN
         write(lunout,*) &
              'conf_gcm: ***  ATTENTION !! grossismx < 1 .   *** '
@@ -461,5 +461,5 @@
      ENDIF
 
-     IF( grossismy.LT.1. )  THEN
+     IF( grossismy<1. )  THEN
         write(lunout,*) &
              'conf_gcm: ***  ATTENTION !! grossismy < 1 .   *** '
@@ -506,5 +506,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(dzoomx - dzoomxx).GE. 0.001 )  THEN
+        IF( ABS(dzoomx - dzoomxx)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de dzoomx passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -522,5 +522,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(dzoomy - dzoomyy).GE. 0.001 )  THEN
+        IF( ABS(dzoomy - dzoomyy)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de dzoomy passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -537,5 +537,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(taux - tauxx).GE. 0.001 )  THEN
+        IF( ABS(taux - tauxx)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de taux passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -552,5 +552,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(tauy - tauyy).GE. 0.001 )  THEN
+        IF( ABS(tauy - tauyy)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de tauy passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -715,5 +715,5 @@
      CALL getin('grossismy',grossismy)
 
-     IF( grossismx.LT.1. )  THEN
+     IF( grossismx<1. )  THEN
         write(lunout,*) &
              'conf_gcm: ***  ATTENTION !! grossismx < 1 .   *** '
@@ -723,5 +723,5 @@
      ENDIF
 
-     IF( grossismy.LT.1. )  THEN
+     IF( grossismy<1. )  THEN
         write(lunout,*) 'conf_gcm: ***ATTENTION !! grossismy < 1 . *** '
         CALL abort_gcm("conf_gcm","stopped",1)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F	(revision 5082)
@@ -79,5 +79,5 @@
 
 
-      IF(iadvtr.EQ.0) THEN
+      IF(iadvtr==0) THEN
          phic(:,:)=0
          tetac(:,:)=0
@@ -99,5 +99,5 @@
 
 c   selection de la masse instantannee des mailles avant le transport.
-      IF(iadvtr.EQ.0) THEN
+      IF(iadvtr==0) THEN
          CALL SCOPY(ip1jmp1*llm,masse,1,massem,1)
       ENDIF
@@ -107,5 +107,5 @@
 
 c   Test pour savoir si on advecte a ce pas de temps
-      IF ( iadvtr.EQ.istdyn ) THEN
+      IF ( iadvtr==istdyn ) THEN
 c    normalisation
       DO l=1,llm
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F	(revision 5082)
@@ -53,5 +53,5 @@
         ! set friction type
         call getin("friction_type",friction_type)
-        if ((friction_type.lt.0).or.(friction_type.gt.1)) then
+        if ((friction_type<0).or.(friction_type>1)) then
           abort_message="wrong friction type"
           write(lunout,*)'Friction: wrong friction type',friction_type
@@ -61,5 +61,5 @@
       ENDIF
 
-      if (friction_type.eq.0) then
+      if (friction_type==0) then
 c   calcul des composantes au carre du vent naturel
       do j=1,jjp1
@@ -124,5 +124,5 @@
       endif ! of if (friction_type.eq.0)
 
-      if (friction_type.eq.1) then
+      if (friction_type==1) then
         do l=1,llm
           ucov(:,:,l)=ucov(:,:,l)*(1.-pdt*kfrict(l))
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.F90	(revision 5082)
@@ -216,5 +216,5 @@
      ! we still need to run iniacademic to initialize some
      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
-     if (iflag_phys.ne.1) then
+     if (iflag_phys/=1) then
         CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
      endif
@@ -250,5 +250,5 @@
   !  on recalcule eventuellement le pas de temps
 
-  IF(MOD(day_step,iperiod).NE.0) THEN
+  IF(MOD(day_step,iperiod)/=0) THEN
      abort_message =  &
           'Il faut choisir un nb de pas par jour multiple de iperiod'
@@ -256,5 +256,5 @@
   ENDIF
 
-  IF(MOD(day_step,iphysiq).NE.0) THEN
+  IF(MOD(day_step,iphysiq)/=0) THEN
      abort_message =  &
           'Il faut choisir un nb de pas par jour multiple de iphysiq'
@@ -263,5 +263,5 @@
 
   zdtvr    = daysec/REAL(day_step)
-  IF(dtvr.NE.zdtvr) THEN
+  IF(dtvr/=zdtvr) THEN
      WRITE(lunout,*) &
           'WARNING!!! changement de pas de temps',dtvr,'>',zdtvr
@@ -290,5 +290,5 @@
      write(lunout,*) &
           'GCM: On reinitialise a la date lue dans gcm.def'
-  ELSE IF (annee_ref .ne. anneeref .or. day_ref .ne. dayref) THEN
+  ELSE IF (annee_ref /= anneeref .or. day_ref /= dayref) THEN
      write(lunout,*) &
           'GCM: Attention les dates initiales lues dans le fichier'
@@ -350,5 +350,5 @@
 
 
-  if (iflag_phys.eq.1) then
+  if (iflag_phys==1) then
      ! these initialisations have already been done (via iniacademic)
      ! if running in SW or Newtonian mode
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F	(revision 5082)
@@ -51,5 +51,5 @@
       if (firstcall) then
          if (groupe_ok) then
-            if(mod(iim,2**ngroup).ne.0)         
+            if(mod(iim,2**ngroup)/=0)
      &        CALL abort_gcm('groupe','probleme du nombre de point',1)
          endif
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/iniinterp_horiz.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/iniinterp_horiz.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/iniinterp_horiz.F	(revision 5082)
@@ -116,12 +116,12 @@
       do jj = 1,jmn+1
        do j=1, jmo+1
-          if((cn(jj).lt.d(j)).and.(dn(jj).gt.c(j)))then
+          if((cn(jj)<d(j)).and.(dn(jj)>c(j)))then
               do ii=1,imn + 1
                 do i=1, imo +1
-                    if (  ((an(ii).lt.b(i)).and.(bn(ii).gt.a(i)))
-     &        .or. ((an(ii).lt.b(i)-2*pi).and.(bn(ii).gt.a(i)-2*pi)
-     &             .and.(b(i)-2*pi.lt.-pi) )
-     &        .or. ((an(ii).lt.b(i)+2*pi).and.(bn(ii).gt.a(i)+2*pi)
-     &             .and.(a(i)+2*pi.gt.pi) )
+                    if (  ((an(ii)<b(i)).and.(bn(ii)>a(i)))
+     &        .or. ((an(ii)<b(i)-2*pi).and.(bn(ii)>a(i)-2*pi)
+     &             .and.(b(i)-2*pi<-pi) )
+     &        .or. ((an(ii)<b(i)+2*pi).and.(bn(ii)>a(i)+2*pi)
+     &             .and.(a(i)+2*pi>pi) )
      &                     )then
                       ktotal = ktotal +1
@@ -133,19 +133,19 @@
                       dd = min(d(j), dn(jj))
                       cc = cn(jj)
-                      if (cc.lt. c(j))cc=c(j)
-                      if((an(ii).lt.b(i)-2*pi).and.
-     &                  (bn(ii).gt.a(i)-2*pi)) then 
+                      if (cc< c(j))cc=c(j)
+                      if((an(ii)<b(i)-2*pi).and.
+     &                  (bn(ii)>a(i)-2*pi)) then
                           bb = min(b(i)-2*pi,bn(ii))
                           aa = an(ii)
-                          if (aa.lt.a(i)-2*pi) aa=a(i)-2*pi
-                      else if((an(ii).lt.b(i)+2*pi).and.
-     &                       (bn(ii).gt.a(i)+2*pi)) then
+                          if (aa<a(i)-2*pi) aa=a(i)-2*pi
+                      else if((an(ii)<b(i)+2*pi).and.
+     &                       (bn(ii)>a(i)+2*pi)) then
                           bb = min(b(i)+2*pi,bn(ii))
                           aa = an(ii)
-                          if (aa.lt.a(i)+2*pi) aa=a(i)+2*pi
+                          if (aa<a(i)+2*pi) aa=a(i)+2*pi
                       else 
                           bb = min(b(i),bn(ii))
                           aa = an(ii)
-                          if (aa.lt.a(i)) aa=a(i)
+                          if (aa<a(i)) aa=a(i)
                       end if
                       intersec(ktotal)=(bb-aa)*(sin(dd)-sin(cc))
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F	(revision 5082)
@@ -98,5 +98,5 @@
 c
       DO ij = 1,ip1jmp1
-        IF( ps(ij).LT.0. ) THEN
+        IF( ps(ij)<0. ) THEN
          write(lunout,*) "integrd: negative surface pressure ",ps(ij)
          write(lunout,*) " at node ij =", ij
@@ -204,5 +204,5 @@
 c$$$      ENDIF
 
-      if (planet_type.eq."earth") then
+      if (planet_type=="earth") then
 ! Earth-specific treatment of first 2 tracers (water)
         DO l = 1, llm
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F	(revision 5082)
@@ -65,5 +65,5 @@
       DO k = 1, llm
         DO i = 1, ip1jmp1
-          if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then
+          if (seuil_liq - q(i,k,iq_liq) > 0.d0 ) then
 
             if (niso > 0) zx_defau_diag(i,k,2)=AMAX1
@@ -82,5 +82,5 @@
 ccc      zx_abc = dpres(k) / dpres(k-1)
         DO i = 1, ip1jmp1
-          if ( seuil_vap - q(i,k,iq_vap) .gt. 0.d0 ) then
+          if ( seuil_vap - q(i,k,iq_vap) > 0.d0 ) then
 
             if (niso > 0) zx_defau_diag(i,k,1)
@@ -104,8 +104,8 @@
       ENDDO
       pompe = SSUM(ip1jmp1,zx_pump,1)
-      IF (imprim.LE.500 .AND. pompe.GT.0.0) THEN
+      IF (imprim<=500 .AND. pompe>0.0) THEN
          WRITE(6,'(1x,"ATT!:on pompe de l eau au sol",e15.7)') pompe
          DO i = 1, ip1jmp1
-            IF (zx_pump(i).GT.0.0) THEN
+            IF (zx_pump(i)>0.0) THEN
                imprim = imprim + 1
                PRINT*,'QMINIMUM:  en ',i,zx_pump(i)
@@ -124,5 +124,5 @@
       ! génant
       DO i = 1,ip1jmp1
-        if (zx_pump(i).gt.0.0) then
+        if (zx_pump(i)>0.0) then
           q_follow(i,1,1)=q_follow(i,1,1)+zx_pump(i)
         endif !if (zx_pump(i).gt.0.0) then
@@ -133,5 +133,5 @@
       do k=2,llm
         DO i = 1,ip1jmp1
-          if (zx_defau_diag(i,k,1).gt.0.0) then             
+          if (zx_defau_diag(i,k,1)>0.0) then
               ! on ajoute la vapeur en k              
               do ixt=1,ntiso
@@ -165,5 +165,5 @@
         do k=1,llm
         DO i = 1,ip1jmp1
-          if (zx_defau_diag(i,k,2).gt.0.0) then
+          if (zx_defau_diag(i,k,2)>0.0) then
 
               ! on ajoute eau liquide en k en k              
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F	(revision 5082)
@@ -57,5 +57,5 @@
 c=====================================================================
       if (lnew) then
-c   on réinitialise les réindicages et les poids
+c   on r�initialise les r�indicages et les poids
 c=====================================================================
 
@@ -67,5 +67,5 @@
       DO 130 i = 1, ilon
 cIM      IF ( ABS(pres-pgcm(i,ilev) ) .LT.
-         IF ( ABS(pres-pgcm(i,ilev) ) .GT.
+         IF ( ABS(pres-pgcm(i,ilev) ) >
      .        ABS(pres-pgcm(i,1)) ) THEN
             lt(i) = ilev     ! 2
@@ -83,5 +83,5 @@
             ptop = pgcm(i,k+1)
 cIM         IF (ptop.LE.pres .AND. pbot.GE.pres) THEN
-            IF (ptop.GE.pres .AND. pbot.LE.pres) THEN
+            IF (ptop>=pres .AND. pbot<=pres) THEN
                lt(i) = k+1
                lb(i) = k
@@ -96,8 +96,8 @@
 c
 c ...   Modif . P. Le Van    ( 20/01/98) ....
-c       Modif Frédéric Hourdin (3/01/02)
+c       Modif Fr�d�ric Hourdin (3/01/02)
 
-        IF(pgcm(i,lb(i)).EQ.0.OR.
-     $     pgcm(i,lt(i)).EQ.0.) THEN
+        IF(pgcm(i,lb(i))==0.OR.
+     $     pgcm(i,lt(i))==0.) THEN
 c
         PRINT*,'i,lb,lt,2pgcm,pres',i,lb(i),
@@ -128,5 +128,5 @@
       do i = 1, ilon
 cIM      if (pgcm(i,1).LT.pres) THEN
-         if (pgcm(i,1).GT.pres) THEN
+         if (pgcm(i,1)>pres) THEN
 c           Qpres(i)=1e33
             Qpres(i)=1e+20
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F	(revision 5082)
@@ -57,5 +57,5 @@
 c=====================================================================
       if (lnew) then
-c   on réinitialise les réindicages et les poids
+c   on r�initialise les r�indicages et les poids
 c=====================================================================
 
@@ -67,5 +67,5 @@
       DO 130 i = 1, ilon
 cIM      IF ( ABS(pres-pgcm(i,ilev) ) .LT.
-         IF ( ABS(pres-pgcm(i,ilev) ) .GT.
+         IF ( ABS(pres-pgcm(i,ilev) ) >
      .        ABS(pres-pgcm(i,1)) ) THEN
             lt(i) = ilev     ! 2
@@ -83,5 +83,5 @@
             ptop = pgcm(i,k+1)
 cIM         IF (ptop.LE.pres .AND. pbot.GE.pres) THEN
-            IF (ptop.GE.pres .AND. pbot.LE.pres) THEN
+            IF (ptop>=pres .AND. pbot<=pres) THEN
                lt(i) = k+1
                lb(i) = k
@@ -96,8 +96,8 @@
 c
 c ...   Modif . P. Le Van    ( 20/01/98) ....
-c       Modif Frédéric Hourdin (3/01/02)
+c       Modif Fr�d�ric Hourdin (3/01/02)
 
-        IF(pgcm(i,lb(i)).EQ.0.OR.
-     $     pgcm(i,lt(i)).EQ.0.) THEN
+        IF(pgcm(i,lb(i))==0.OR.
+     $     pgcm(i,lt(i))==0.) THEN
 c
         PRINT*,'i,lb,lt,2pgcm,pres',i,lb(i),
@@ -128,5 +128,5 @@
       do i = 1, ilon
 cIM      if (pgcm(i,1).LT.pres) THEN
-         if (pgcm(i,1).GT.pres) THEN
+         if (pgcm(i,1)>pres) THEN
 c           Qpres(i)=1e33
             Qpres(i)=1e+20
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/top_bound.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/top_bound.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/top_bound.F	(revision 5082)
@@ -27,5 +27,5 @@
 c   ------
 c
-c   Dissipation linéaire (ex top_bound de la physique)
+c   Dissipation lin�aire (ex top_bound de la physique)
 c
 c=======================================================================
@@ -80,8 +80,8 @@
       INTEGER j,l
       
-      if (iflag_top_bound.eq.0) return
+      if (iflag_top_bound==0) return
 
       if (first) then
-         if (iflag_top_bound.eq.1) then
+         if (iflag_top_bound==1) then
 ! sponge quenching over the topmost 4 atmospheric layers
              lambda(:)=0.
@@ -90,5 +90,5 @@
              lambda(llm-2)=tau_top_bound/4.
              lambda(llm-3)=tau_top_bound/8.
-         else if (iflag_top_bound.eq.2) then
+         else if (iflag_top_bound==2) then
 ! sponge quenching over topmost layers down to pressures which are
 ! higher than 100 times the topmost layer pressure
@@ -105,5 +105,5 @@
          write(lunout,*)'p (Pa)  z(km)  tau(s)   1./tau (Hz)'
          do l=1,llm
-           if (rdamp(l).ne.0.) then
+           if (rdamp(l)/=0.) then
              write(lunout,'(6(1pe12.4,1x))')
      &        presnivs(l),log(preff/presnivs(l))*scaleheight,
@@ -117,5 +117,5 @@
 
       ! compute zonal average of vcov and u
-      if (mode_top_bound.ge.2) then
+      if (mode_top_bound>=2) then
        do l=1,llm
         do j=1,jjm
@@ -149,5 +149,5 @@
 
       ! compute zonal average of potential temperature, if necessary
-      if (mode_top_bound.ge.3) then
+      if (mode_top_bound>=3) then
        do l=1,llm
         do j=2,jjm ! excluding poles
@@ -163,5 +163,5 @@
       endif ! of if (mode_top_bound.ge.3)
 
-      if (mode_top_bound.ge.1) then
+      if (mode_top_bound>=1) then
        ! Apply sponge quenching on vcov:
        do l=1,llm
@@ -185,5 +185,5 @@
       endif ! of if (mode_top_bound.ge.1)
 
-      if (mode_top_bound.ge.3) then
+      if (mode_top_bound>=3) then
        ! Apply sponge quenching on teta:
        do l=1,llm
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F	(revision 5082)
@@ -174,5 +174,5 @@
 
 
-      IF (pente_max.gt.-1.e-5) THEN
+      IF (pente_max>-1.e-5) THEN
 c       IF (pente_max.gt.10) THEN
 
@@ -214,5 +214,5 @@
      ,         cvmgp(dxqu(ij-1)+dxqu(ij),0.,dxqu(ij-1)*dxqu(ij))
 #else
-               IF(dxqu(ij-1)*dxqu(ij).gt.0) THEN
+               IF(dxqu(ij-1)*dxqu(ij)>0) THEN
                   dxq(ij,l)=dxqu(ij-1)+dxqu(ij)
                ELSE
@@ -245,5 +245,5 @@
                zz(ij)=dxqu(ij-1)*dxqu(ij)
                zz(ij)=zz(ij)+zz(ij)
-               IF(zz(ij).gt.0) THEN
+               IF(zz(ij)>0) THEN
                   dxq(ij,l)=zz(ij)/(dxqu(ij-1)+dxqu(ij))
                ELSE
@@ -297,5 +297,5 @@
        DO ij=iip2,ip1jm-1
 c	print*,'masse(',ij,')=',masse(ij,l,iq)
-          IF (u_m(ij,l).gt.0.) THEN
+          IF (u_m(ij,l)>0.) THEN
              zdum(ij,l)=1.-u_m(ij,l)/masse(ij,l,iq)
              u_mq(ij,l)=u_m(ij,l)*(q(ij,l,iq)+0.5*zdum(ij,l)*dxq(ij,l))
@@ -314,5 +314,5 @@
       DO l=1,llm
          DO ij=iip2,ip1jm-1
-            IF(zdum(ij,l).lt.0) THEN
+            IF(zdum(ij,l)<0) THEN
                iadvplus(ij,l)=1
                u_mq(ij,l)=0.
@@ -344,5 +344,5 @@
       ENDDO
 
-      IF(n0.gt.0) THEN
+      IF(n0>0) THEN
       if (prt_level > 2) PRINT *,
      $        'Nombre de points pour lesquels on advect plus que le'
@@ -350,9 +350,9 @@
 
          DO l=1,llm
-            IF(nl(l).gt.0) THEN
+            IF(nl(l)>0) THEN
                iju=0
 c   indicage des mailles concernees par le traitement special
                DO ij=iip2,ip1jm
-                  IF(iadvplus(ij,l).eq.1.and.mod(ij,iip1).ne.0) THEN
+                  IF(iadvplus(ij,l)==1.and.mod(ij,iip1)/=0) THEN
                      iju=iju+1
                      indu(iju)=ij
@@ -368,9 +368,9 @@
                   zu_m=u_m(ij,l)
                   u_mq(ij,l)=0.
-                  IF(zu_m.gt.0.) THEN
+                  IF(zu_m>0.) THEN
                      ijq=ij
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(zu_m.gt.masse(ijq,l,iq))
+                     do while(zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)+q(ijq,l,iq)
      &                          *masse(ijq,l,iq)
@@ -387,5 +387,5 @@
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(-zu_m.gt.masse(ijq,l,iq))
+                     do while(-zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)-q(ijq,l,iq)
      &                          *masse(ijq,l,iq)
@@ -426,5 +426,5 @@
             !Mvals: veiller a ce qu'on n'ait pas de denominateur nul
             masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
-            if (q(ij,l,iq).gt.min_qParent) then
+            if (q(ij,l,iq)>min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -624,8 +624,8 @@
       fs=1.
       DO ij=1,iim
-         IF(pente_max*adyqv(ij).lt.abs(dyq(ij,l))) THEN
+         IF(pente_max*adyqv(ij)<abs(dyq(ij,l))) THEN
             fn=min(pente_max*adyqv(ij)/abs(dyq(ij,l)),fn)
          ENDIF
-      IF(pente_max*adyqv(ij+ip1jm-iip1).lt.abs(dyq(ij+ip1jm,l))) THEN
+      IF(pente_max*adyqv(ij+ip1jm-iip1)<abs(dyq(ij+ip1jm,l))) THEN
          fs=min(pente_max*adyqv(ij+ip1jm-iip1)/abs(dyq(ij+ip1jm,l)),fs)
          ENDIF
@@ -711,5 +711,5 @@
 
       DO ij=iip2,ip1jm
-         IF(dyqv(ij)*dyqv(ij-iip1).gt.0.) THEN
+         IF(dyqv(ij)*dyqv(ij-iip1)>0.) THEN
             dyq(ij,l)=sign(min(abs(dyq(ij,l)),dyqmax(ij)),dyq(ij,l))
          ELSE
@@ -723,5 +723,5 @@
       DO l=1,llm
        DO ij=1,ip1jm
-          IF(masse_adv_v(ij,l).gt.0) THEN
+          IF(masse_adv_v(ij,l)>0) THEN
               qbyv(ij,l)=q(ij+iip1,l,iq)+dyq(ij+iip1,l)*
      ,                   0.5*(1.-masse_adv_v(ij,l)
@@ -750,5 +750,5 @@
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
             masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
-            if (q(ij,l,iq).gt.min_qParent) then
+            if (q(ij,l,iq)>min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -917,5 +917,5 @@
      ,      cvmgp(dzqw(ij,l)+dzqw(ij,l+1),0.,dzqw(ij,l)*dzqw(ij,l+1))
 #else
-            IF(dzqw(ij,l)*dzqw(ij,l+1).gt.0.) THEN
+            IF(dzqw(ij,l)*dzqw(ij,l+1)>0.) THEN
                 dzq(ij,l)=0.5*(dzqw(ij,l)+dzqw(ij,l+1))
             ELSE
@@ -948,5 +948,5 @@
        DO l = 1,llm-1
          do  ij = 1,ip1jmp1
-          IF(w(ij,l+1).gt.0.) THEN
+          IF(w(ij,l+1)>0.) THEN
              sigw=w(ij,l+1)/masse(ij,l+1,iq)
              wq(ij,l+1)=w(ij,l+1)*(q(ij,l+1,iq)
@@ -975,5 +975,5 @@
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
             masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
-            if (q(ij,l,iq).gt.min_qParent) then
+            if (q(ij,l,iq)>min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -1074,9 +1074,9 @@
       zqmax=zq(ijlmax,lmax)
 
-       if(zqmin.lt.qmin) 
+       if(zqmin<qmin)
 c     s     write(*,9999) comment,
      s     write(*,*) comment,
      s     imin,jmin,lmin,zqmin,zzq(imin,jmin,lmin)
-       if(zqmax.gt.qmax) 
+       if(zqmax>qmax)
 c     s     write(*,9999) comment,
      s     write(*,*) comment,
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F	(revision 5082)
@@ -242,5 +242,5 @@
 
 
-      IF (pente_max.gt.-1.e-5) THEN
+      IF (pente_max>-1.e-5) THEN
 c     IF (pente_max.gt.10) THEN
 
@@ -282,5 +282,5 @@
      ,         cvmgp(dxqu(ij-1)+dxqu(ij),0.,dxqu(ij-1)*dxqu(ij))
 #else
-               IF(dxqu(ij-1)*dxqu(ij).gt.0) THEN
+               IF(dxqu(ij-1)*dxqu(ij)>0) THEN
                   dxq(ij,l)=dxqu(ij-1)+dxqu(ij)
                ELSE
@@ -312,5 +312,5 @@
                zz(ij)=dxqu(ij-1)*dxqu(ij)
                zz(ij)=zz(ij)+zz(ij)
-               IF(zz(ij).gt.0) THEN
+               IF(zz(ij)>0) THEN
                   dxq(ij,l)=zz(ij)/(dxqu(ij-1)+dxqu(ij))
                ELSE
@@ -362,5 +362,5 @@
       DO l=1,llm
        DO ij=iip2,ip1jm-1
-          IF (u_m(ij,l).gt.0.) THEN
+          IF (u_m(ij,l)>0.) THEN
              zdum(ij,l)=1.-u_m(ij,l)/masse(ij,l,iq)
              u_mq(ij,l)=u_m(ij,l)*
@@ -380,5 +380,5 @@
       DO l=1,llm
          DO ij=iip2,ip1jm-1
-            IF(zdum(ij,l).lt.0) THEN
+            IF(zdum(ij,l)<0) THEN
                iadvplus(ij,l)=1
                u_mq(ij,l)=0.
@@ -411,14 +411,14 @@
       ENDDO
 
-      IF(n0.gt.0) THEN
+      IF(n0>0) THEN
 ccc      PRINT*,'Nombre de points pour lesquels on advect plus que le'
 ccc     &       ,'contenu de la maille : ',n0
 
          DO l=1,llm
-            IF(nl(l).gt.0) THEN
+            IF(nl(l)>0) THEN
                iju=0
 c   indicage des mailles concernees par le traitement special
                DO ij=iip2,ip1jm
-                  IF(iadvplus(ij,l).eq.1.and.mod(ij,iip1).ne.0) THEN
+                  IF(iadvplus(ij,l)==1.and.mod(ij,iip1)/=0) THEN
                      iju=iju+1
                      indu(iju)=ij
@@ -434,9 +434,9 @@
                   zu_m=u_m(ij,l)
                   u_mq(ij,l)=0.
-                  IF(zu_m.gt.0.) THEN
+                  IF(zu_m>0.) THEN
                      ijq=ij
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(zu_m.gt.masse(ijq,l,iq))
+                     do while(zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)+q(ijq,l,iq)
      &                          *masse(ijq,l,iq)
@@ -453,5 +453,5 @@
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(-zu_m.gt.masse(ijq,l,iq))
+                     do while(-zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)-q(ijq,l,iq)
      &                          *masse(ijq,l,iq)
@@ -681,8 +681,8 @@
       fs=1.
       DO ij=1,iim
-         IF(pente_max*adyqv(ij).lt.abs(dyq(ij,l))) THEN
+         IF(pente_max*adyqv(ij)<abs(dyq(ij,l))) THEN
             fn=min(pente_max*adyqv(ij)/abs(dyq(ij,l)),fn)
          ENDIF
-      IF(pente_max*adyqv(ij+ip1jm-iip1).lt.abs(dyq(ij+ip1jm,l))) THEN
+      IF(pente_max*adyqv(ij+ip1jm-iip1)<abs(dyq(ij+ip1jm,l))) THEN
          fs=min(pente_max*adyqv(ij+ip1jm-iip1)/abs(dyq(ij+ip1jm,l)),fs)
          ENDIF
@@ -763,5 +763,5 @@
 
       DO ij=iip2,ip1jm
-         IF(dyqv(ij)*dyqv(ij-iip1).gt.0.) THEN
+         IF(dyqv(ij)*dyqv(ij-iip1)>0.) THEN
             dyq(ij,l)=sign(min(abs(dyq(ij,l)),dyqmax(ij)),dyq(ij,l))
          ELSE
@@ -774,5 +774,5 @@
       DO l=1,llm
        DO ij=1,ip1jm
-         IF( masse_adv_v(ij,l).GT.0. ) THEN
+         IF( masse_adv_v(ij,l)>0. ) THEN
            qbyv(ij,l)= MIN( qsat(ij+iip1,l), q(ij+iip1,l,iq )  +
      ,      dyq(ij+iip1,l)*0.5*(1.-masse_adv_v(ij,l)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.F	(revision 5082)
@@ -46,5 +46,5 @@
 
       if(firsttime(if)) then
-         if(name.eq.var(1,if)) then
+         if(name==var(1,if)) then
             firsttime(if)=.false.
             ivar(if)=1
@@ -68,10 +68,10 @@
       else
          ivar(if)=mod(ivar(if),nvar(if))+1
-         if (ivar(if).eq.nvar(if)) then
+         if (ivar(if)==nvar(if)) then
             writectl=.true.
             itime(if)=itime(if)+1
          endif
 
-         if(var(ivar(if),if).ne.name) then
+         if(var(ivar(if),if)/=name) then
            print*,'Il faut stoker la meme succession de champs a chaque'
            print*,'pas de temps'
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.F	(revision 5082)
@@ -170,5 +170,5 @@
 c   calcul des pentes en u:
 c   -----------------------
-      if (mode.eq.0) then
+      if (mode==0) then
          do l=1,llm
             do ij=1,ip1jm
@@ -211,5 +211,5 @@
          enddo
          do ij=iip2+1,ip1jm
-            extremum(ij)=dxqu(ij)*dxqu(ij-1).le.0.
+            extremum(ij)=dxqu(ij)*dxqu(ij-1)<=0.
          enddo
          do ij=iip1+iip1,ip1jm,iip1
@@ -285,5 +285,5 @@
       data mode/1/
 
-      if (mode.eq.0) then
+      if (mode==0) then
          do l=1,llm
             do ij=1,ip1jmp1
@@ -307,5 +307,5 @@
 
          do ij=iip2,ip1jm
-            extremum(ij)=dyqv(ij)*dyqv(ij-iip1).le.0.
+            extremum(ij)=dyqv(ij)*dyqv(ij-iip1)<=0.
          enddo
 
@@ -385,5 +385,5 @@
 c   -----------------------
 
-      if (mode.eq.0) then
+      if (mode==0) then
          do l=1,llm
             do ij=1,ip1jmp1
@@ -410,5 +410,5 @@
       do l=2,llm-1
          do ij=1,ip1jmp1
-            extremum(ij,l)=dzqw(ij,l)*dzqw(ij,l+1).le.0.
+            extremum(ij,l)=dzqw(ij,l)*dzqw(ij,l+1)<=0.
          enddo
       enddo
@@ -525,5 +525,5 @@
 c                 qg(ij,l)=q(ij,l)
 c              endif
-               if(abs(zdq).gt.prec) then
+               if(abs(zdq)>prec) then
                   zsigd(ij,l)=(q(ij,l)-qg(ij,l))/zdq
                   zsigg(ij,l)=1.-zsigd(ij,l)
@@ -548,5 +548,5 @@
        do l=1,llm
        do ij=iip2,ip1jm-1
-          if (u_m(ij,l).ge.0.) then
+          if (u_m(ij,l)>=0.) then
              zsigp=zsigd(ij,l)
              zsigm=zsigg(ij,l)
@@ -564,16 +564,16 @@
           endif
           zu=abs(u_m(ij,l))
-          ladvplus(ij,l)=zu.gt.zm
+          ladvplus(ij,l)=zu>zm
           zsig=zu/zm
-          if(zsig.eq.0.) zsigp=0.1
-          if (mode.eq.1) then
-             if (zsig.le.zsigp) then
+          if(zsig==0.) zsigp=0.1
+          if (mode==1) then
+             if (zsig<=zsigp) then
                  u_mq(ij,l)=u_m(ij,l)*zqp
-             else if (mode.eq.1) then
+             else if (mode==1) then
                  u_mq(ij,l)=
      s           sign(zm,u_m(ij,l))*(zsigp*zqp+(zsig-zsigp)*zqm)
              endif 
           else
-             if (zsig.le.zsigp) then
+             if (zsig<=zsigp) then
                  u_mq(ij,l)=u_m(ij,l)*(zqp-0.5*zsig/zsigp*(zqp-zq))
              else
@@ -613,5 +613,5 @@
       enddo
 
-      if(n0.gt.1) then
+      if(n0>1) then
       IF (prt_level > 9) WRITE(lunout,*)
      & 'Nombre de points pour lesquels on advect plus que le'
@@ -619,9 +619,9 @@
 
          do l=1,llm
-            if(nl(l).gt.0) then
+            if(nl(l)>0) then
                iju=0
 c   indicage des mailles concernees par le traitement special
                do ij=iip2,ip1jm
-                  if(ladvplus(ij,l).and.mod(ij,iip1).ne.0) then
+                  if(ladvplus(ij,l).and.mod(ij,iip1)/=0) then
                      iju=iju+1
                      indu(iju)=ij
@@ -637,9 +637,9 @@
                   zu_m=u_m(ij,l)
                   u_mq(ij,l)=0.
-                  if(zu_m.gt.0.) then
+                  if(zu_m>0.) then
                      ijq=ij
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(zu_m.gt.masse(ijq,l))
+                     do while(zu_m>masse(ijq,l))
                         u_mq(ij,l)=u_mq(ij,l)+q(ijq,l)*masse(ijq,l)
                         zu_m=zu_m-masse(ijq,l)
@@ -650,5 +650,5 @@
 c   ajout de la maille non completement advectee
              zsig=zu_m/masse(ijq,l)
-             if(zsig.le.zsigd(ijq,l)) then
+             if(zsig<=zsigd(ijq,l)) then
                 u_mq(ij,l)=u_mq(ij,l)+zu_m*(qd(ijq,l)
      s          -0.5*zsig/zsigd(ijq,l)*(qd(ijq,l)-q(ijq,l)))
@@ -657,5 +657,5 @@
 c         goto 8888
                 zz=0.5*(zsig-zsigd(ijq,l))/zsigg(ijq,l)
-                if(.not.(zz.gt.0..and.zz.le.0.5)) then
+                if(.not.(zz>0..and.zz<=0.5)) then
                      WRITE(lunout,*)'probleme2 au point ij=',ij,
      s               '  l=',l
@@ -671,5 +671,5 @@
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(-zu_m.gt.masse(ijq,l))
+                     do while(-zu_m>masse(ijq,l))
                         u_mq(ij,l)=u_mq(ij,l)-q(ijq,l)*masse(ijq,l)
                         zu_m=zu_m+masse(ijq,l)
@@ -680,5 +680,5 @@
 c 2eme MODIF SPECIFIQUE
              zsig=-zu_m/masse(ij+1,l)
-             if(zsig.le.zsigg(ijq,l)) then
+             if(zsig<=zsigg(ijq,l)) then
                 u_mq(ij,l)=u_mq(ij,l)+zu_m*(qg(ijq,l)
      s          -0.5*zsig/zsigg(ijq,l)*(qg(ijq,l)-q(ijq,l)))
@@ -687,5 +687,5 @@
 c           goto 9999
                 zz=0.5*(zsig-zsigg(ijq,l))/zsigd(ijq,l)
-                if(.not.(zz.gt.0..and.zz.le.0.5)) then
+                if(.not.(zz>0..and.zz<=0.5)) then
                      WRITE(lunout,*)'probleme22 au point ij=',ij
      s               ,'  l=',l
@@ -786,5 +786,5 @@
 c                 qs(ij,l)=q(ij,l)
 c              endif
-               if(abs(zdq).gt.prec) then
+               if(abs(zdq)>prec) then
                   zsign(ij)=(q(ij,l)-qs(ij,l))/zdq
                   zsigs(ij)=1.-zsign(ij)
@@ -804,5 +804,5 @@
 
        do ij=1,ip1jm
-          if (v_m(ij,l).ge.0.) then
+          if (v_m(ij,l)>=0.) then
              zsigp=zsign(ij+iip1)
              zsigm=zsigs(ij+iip1)
@@ -820,6 +820,6 @@
           endif
           zsig=abs(v_m(ij,l))/zm
-          if(zsig.eq.0.) zsigp=0.1
-          if (zsig.le.zsigp) then
+          if(zsig==0.) zsigp=0.1
+          if (zsig<=zsigp) then
               v_mq(ij,l)=v_m(ij,l)*(zqp-0.5*zsig/zsigp*(zqp-zq))
           else
@@ -918,5 +918,5 @@
 c              endif
 
-               if(abs(zdq).gt.prec) then
+               if(abs(zdq)>prec) then
                   zsigb(ij,l)=(q(ij,l)-qh(ij,l))/zdq
                   zsigh(ij,l)=1.-zsigb(ij,l)
@@ -933,5 +933,5 @@
        do l=2,llm
        do ij=1,ip1jmp1
-          if (w_m(ij,l).ge.0.) then
+          if (w_m(ij,l)>=0.) then
              zsigp=zsigb(ij,l)
              zsigm=zsigh(ij,l)
@@ -949,6 +949,6 @@
           endif
           zsig=abs(w_m(ij,l))/zm
-          if(zsig.eq.0.) zsigp=0.1
-          if (zsig.le.zsigp) then
+          if(zsig==0.) zsigp=0.1
+          if (zsig<=zsigp) then
               w_mq(ij,l)=w_m(ij,l)*(zqp-0.5*zsig/zsigp*(zqp-zq))
           else
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/coordij.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/coordij.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/coordij.F	(revision 5082)
@@ -28,5 +28,5 @@
 
       DO i=1,iim+1
-         IF (rlonu(i).GT.zlon) THEN
+         IF (rlonu(i)>zlon) THEN
             ilon=i
             GOTO 10
@@ -37,5 +37,5 @@
       j=0
       DO j=1,jjm
-         IF(rlatv(j).LT.zlat) THEN
+         IF(rlatv(j)<zlat) THEN
             jlat=j
             GOTO 20
@@ -43,5 +43,5 @@
       ENDDO
 20    CONTINUE
-      IF(j.EQ.0) j=jjm+1
+      IF(j==0) j=jjm+1
 
       RETURN
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/diagedyn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/diagedyn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/diagedyn.F	(revision 5082)
@@ -279,5 +279,5 @@
 C     ===================================
 C
-      IF ( (idiag2.gt.0) .and. (pas(idiag2) .ne. 0) ) THEN
+      IF ( (idiag2>0) .and. (pas(idiag2) /= 0) ) THEN
         d_h_vcol  = (h_vcol_tot - h_vcol_pre(idiag2) )/dtime
         d_h_dair = (h_dair_tot- h_dair_pre(idiag2))/dtime
@@ -303,5 +303,5 @@
       ENDIF 
 C
-      IF (iprt.ge.2) THEN
+      IF (iprt>=2) THEN
         WRITE(6,9000) tit,pas(idiag),d_qt,d_qw,d_ql,d_qs
  9000   format('Dyn3d. Watter Mass Budget (kg/m2/s)',A15
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.F	(revision 5082)
@@ -24,5 +24,5 @@
 c
 c=======================================================================
-c    Discretisation verticale en coordonnée hybride (ou sigma)
+c    Discretisation verticale en coordonn�e hybride (ou sigma)
 c
 c=======================================================================
@@ -66,5 +66,5 @@
          open(99,file="esasig.def",status='old',form='formatted',
      s   iostat=ierr2)
-         if(ierr2.ne.0) then
+         if(ierr2/=0) then
               close(99)
               open(99,file="z2sig.def",status='old',form='formatted',
@@ -76,5 +76,5 @@
 c   ----------------------------------------
 
-      IF(ierr2.eq.0) then
+      IF(ierr2==0) then
 
 c        Lecture de esasig.def :
@@ -114,5 +114,5 @@
          s( llm )  = 1.
          s(llm-1) = quoi
-         IF( llm.gt.2 )  THEN
+         IF( llm>2 )  THEN
             DO  ll = 2, llm-1
                l         = llm+1 - ll
@@ -131,5 +131,5 @@
 c   ----------------------------------------
 
-      ELSE IF(ierr4.eq.0) then
+      ELSE IF(ierr4==0) then
          write(lunout,*)'****************************'
          write(lunout,*)'Reading z2sig.def'
@@ -208,9 +208,9 @@
 c     Calcul au milieu des couches :
 c     WARNING : le choix de placer le milieu des couches au niveau de
-c     pression intermédiaire est arbitraire et pourrait etre modifié.
+c     pression interm�diaire est arbitraire et pourrait etre modifi�.
 c     Le calcul du niveau pour la derniere couche 
 c     (on met la meme distance (en log pression)  entre P(llm)
 c     et P(llm -1) qu'entre P(llm-1) et P(llm-2) ) est
-c     Specifique.  Ce choix est spécifié ici ET dans exner_milieu.F
+c     Specifique.  Ce choix est sp�cifi� ici ET dans exner_milieu.F
 
       DO l = 1, llm-1
@@ -284,6 +284,6 @@
 c     L'objectif est de calculer newsig telle que
 c       (1 -pa/preff)*exp(1-1./newsig**2)+(pa/preff)*newsig = sig
-c     Cela ne se résoud pas analytiquement: 
-c     => on résoud par iterration bourrine 
+c     Cela ne se r�soud pas analytiquement: 
+c     => on r�soud par iterration bourrine 
 c     ----------------------------------------------
 c     Information  : where exp(1-1./x**2) become << x
@@ -307,11 +307,11 @@
       x1=0
       x2=1
-      if (sig.ge.1) then
+      if (sig>=1) then
             newsig= sig
-      else if (sig*preff/pa.ge.0.25) then
+      else if (sig*preff/pa>=0.25) then
         DO J=1,9999  ! nombre d''iteration max
           F=((1 -pa/preff)*exp(1-1./newsig**2)+(pa/preff)*newsig)/sig
 c         write(0,*) J, ' newsig =', newsig, ' F= ', F
-          if (F.gt.1) then
+          if (F>1) then
               X2 = newsig
               newsig=(X1+newsig)*0.5
@@ -320,7 +320,7 @@
               newsig=(X2+newsig)*0.5
           end if
-c         Test : on arete lorsque on approxime sig à moins de 0.01 m près 
+c         Test : on arete lorsque on approxime sig � moins de 0.01 m pr�s 
 c         (en pseudo altitude) :
-          IF(abs(10.*log(F)).LT.1.E-5) goto 999
+          IF(abs(10.*log(F))<1.E-5) goto 999
         END DO
        else   !    if (sig*preff/pa.le.0.25) then
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/dump2d.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/dump2d.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/dump2d.F	(revision 5082)
@@ -22,10 +22,10 @@
       DO j=1,jm
          DO i=1,im
-            IF(z(i,j).GT.zllm) THEN
+            IF(z(i,j)>zllm) THEN
                illm=i
                jllm=j
                zllm=z(i,j)
             ENDIF
-            IF(z(i,j).LT.zmin) THEN
+            IF(z(i,j)<zmin) THEN
                imin=i
                jmin=j
@@ -38,5 +38,5 @@
       PRINT*,'MAX: ',zllm
 
-      IF(zllm.GT.zmin) THEN
+      IF(zllm>zmin) THEN
        DO j=1,jm
         WRITE(*,'(600i1)') (NINT(10.*(z(i,j)-zmin)/(zllm-zmin)),i=1,im)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90	(revision 5082)
@@ -58,10 +58,10 @@
     if (firstcall) then
        ! sanity checks for Shallow Water case (1 vertical layer)
-       if (llm.eq.1) then
-          if (kappa.ne.1) then
+       if (llm==1) then
+          if (kappa/=1) then
              call abort_gcm(modname, &
                   "kappa!=1 , but running in Shallow Water mode!!",42)
           endif
-          if (cpp.ne.r) then
+          if (cpp/=r) then
              call abort_gcm(modname, &
                   "cpp!=r , but running in Shallow Water mode!!",42)
@@ -73,5 +73,5 @@
 
     ! Specific behaviour for Shallow Water (1 vertical layer) case:
-    if (llm.eq.1) then
+    if (llm==1) then
 
        ! Compute pks(:),pk(:),pkf(:)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90	(revision 5082)
@@ -55,10 +55,10 @@
     if (firstcall) then
        ! sanity checks for Shallow Water case (1 vertical layer)
-       if (llm.eq.1) then
-          if (kappa.ne.1) then
+       if (llm==1) then
+          if (kappa/=1) then
              call abort_gcm(modname, &
                   "kappa!=1 , but running in Shallow Water mode!!",42)
           endif
-          if (cpp.ne.r) then
+          if (cpp/=r) then
              call abort_gcm(modname, &
                   "cpp!=r , but running in Shallow Water mode!!",42)
@@ -70,5 +70,5 @@
 
     ! Specific behaviour for Shallow Water (1 vertical layer) case:
-    if (llm.eq.1) then
+    if (llm==1) then
 
        ! Compute pks(:),pk(:),pkf(:)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gr_int_dyn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gr_int_dyn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gr_int_dyn.F	(revision 5082)
@@ -34,7 +34,7 @@
       do j = 1, jp1
         do i = 1, iim
-          if (j .eq. 1) then
+          if (j == 1) then
             champdyn(i, j) = polenord
-          else if (j .eq. jp1) then
+          else if (j == jp1) then
             champdyn(i, j) = polesud
           else
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv2.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv2.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/gradiv2.F	(revision 5082)
@@ -49,5 +49,5 @@
       CALL    divergf( klevel, gdx,   gdy , div )
 
-      IF( ld.GT.1 )   THEN
+      IF( ld>1 )   THEN
 
         CALL laplacien ( klevel, div,  div     )
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/heavyside.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/heavyside.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/heavyside.F	(revision 5082)
@@ -12,5 +12,5 @@
        REAL(KIND=8) heavyside , a
 
-       IF ( a.LE.0. )  THEN
+       IF ( a<=0. )  THEN
          heavyside = 0.
        ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90	(revision 5082)
@@ -175,7 +175,7 @@
 
    lerr=strParse(type_trac, '|', types_trac, n=nt)
-   IF (nt .GT. 1) THEN
-      IF (nt .GT. 2) CALL abort_gcm(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
-      if (nt .EQ. 2) type_trac=types_trac(2)
+   IF (nt > 1) THEN
+      IF (nt > 2) CALL abort_gcm(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
+      if (nt == 2) type_trac=types_trac(2)
    ENDIF
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90	(revision 5082)
@@ -76,5 +76,5 @@
   CALL minmax(iip1*jjp1,zh,zhmin,zhmax )
 
-  IF ( zhmin .GE. zhmax  )     THEN
+  IF ( zhmin >= zhmax  )     THEN
      write(lunout,*)'  Inidissip  zh min max  ',zhmin,zhmax
      abort_message='probleme generateur alleatoire dans inidissip'
@@ -122,5 +122,5 @@
 
      DO    l = 1, 50
-        IF(ii.EQ.1) THEN
+        IF(ii==1) THEN
            !cccc             CALL covcont( 1,zu,zv,zu,zv )
            IF(lstardis) THEN
@@ -142,5 +142,5 @@
      end DO
 
-     IF ( ii.EQ.1 ) THEN
+     IF ( ii==1 ) THEN
         IF(lstardis) THEN
            cdivu  = 1./zllm
@@ -201,7 +201,7 @@
      tetah(l)      = zvert(l)/tetatemp
 
-     IF( tetamin.GT. (1./tetaudiv(l)) ) tetamin = 1./ tetaudiv(l)
-     IF( tetamin.GT. (1./tetaurot(l)) ) tetamin = 1./ tetaurot(l)
-     IF( tetamin.GT. (1./   tetah(l)) ) tetamin = 1./    tetah(l)
+     IF( tetamin> (1./tetaudiv(l)) ) tetamin = 1./ tetaudiv(l)
+     IF( tetamin> (1./tetaurot(l)) ) tetamin = 1./ tetaurot(l)
+     IF( tetamin> (1./   tetah(l)) ) tetamin = 1./    tetah(l)
   ENDDO
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.F	(revision 5082)
@@ -170,15 +170,15 @@
 c
 c
-      IF( nitergdiv.NE.2 ) THEN
+      IF( nitergdiv/=2 ) THEN
         gamdi_gdiv = coefdis/ ( REAL(nitergdiv) -2. )
       ELSE
         gamdi_gdiv = 0.
       ENDIF
-      IF( nitergrot.NE.2 ) THEN
+      IF( nitergrot/=2 ) THEN
         gamdi_grot = coefdis/ ( REAL(nitergrot) -2. )
       ELSE
         gamdi_grot = 0.
       ENDIF
-      IF( niterh.NE.2 ) THEN
+      IF( niterh/=2 ) THEN
         gamdi_h = coefdis/ ( REAL(niterh) -2. )
       ELSE
@@ -230,5 +230,5 @@
         x1  = x1 - f/df
         xdm = ABS( x1- xo1 )
-        IF( xdm.LE.eps )GO TO 11
+        IF( xdm<=eps )GO TO 11
         xo1 = x1
  10     CONTINUE
@@ -247,5 +247,5 @@
         y1   = y1 -f/df
         ydm  = ABS(y1-yo1)
-        IF(ydm.LE.eps) GO TO 17
+        IF(ydm<=eps) GO TO 17
         yo1  = y1
  15     CONTINUE
@@ -410,5 +410,5 @@
 c
 
-      IF ( j .gt. 1 .AND. j .lt. jjp1 )  THEN
+      IF ( j > 1 .AND. j < jjp1 )  THEN
 c
         rlatp    = rlatu2 ( j-1 )
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigrads.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigrads.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigrads.F	(revision 5082)
@@ -33,5 +33,5 @@
       unit(9)=46
 
-      if (if.le.nf) stop'verifier les appels a inigrads'
+      if (if<=nf) stop'verifier les appels a inigrads'
 
       print*,'Entree dans inigrads'
@@ -51,6 +51,6 @@
       do i=1,im
          xd(i,if)=x(i)*fx
-         if(xd(i,if).lt.xmin) iid(if)=i+1
-         if(xd(i,if).le.xmax) ifd(if)=i
+         if(xd(i,if)<xmin) iid(if)=i+1
+         if(xd(i,if)<=xmax) ifd(if)=i
       enddo
       print*,'On stoke du point ',iid(if),'  a ',ifd(if),' en x'
@@ -61,6 +61,6 @@
       do j=1,jm
          yd(j,if)=y(j)*fy
-         if(yd(j,if).gt.ymax) jid(if)=j+1
-         if(yd(j,if).ge.ymin) jfd(if)=j
+         if(yd(j,if)>ymax) jid(if)=j+1
+         if(yd(j,if)>=ymin) jfd(if)=j
       enddo
       print*,'On stoke du point ',jid(if),'  a ',jfd(if),' en y'
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90	(revision 5082)
@@ -153,5 +153,5 @@
 
     CALL minmax( imodmax, xxim, chmin, chmax)
-    IF( chmax.LT.6.50 )   THEN
+    IF( chmax<6.50 )   THEN
        DO imod = 1, imodmax
           xxim(imod) = xxim(imod) * 180./pi
@@ -172,5 +172,5 @@
 
     CALL minmax( idatmax, xxd, chmin, chmax)
-    IF( chmax.LT.6.50 )  THEN
+    IF( chmax<6.50 )  THEN
        DO idat = 1, idatmax
           xxd(idat) = xxd(idat) * 180./pi
@@ -213,10 +213,10 @@
 
     DO idat = 1, idatmax
-       IF ( xxd( idatmax1- idat ).LT.360.) exit
+       IF ( xxd( idatmax1- idat )<360.) exit
        id1 = id1 + 1
     ENDDO
 
     DO idat = 1, idatmax
-       IF (xxd(idat).GT.0.) exit
+       IF (xxd(idat)>0.) exit
        id0 = id0 + 1
     END DO
@@ -264,5 +264,5 @@
 
     do while (imod <= imodmax)
-       do while (xxim(imod).GT.xxid(idat))
+       do while (xxim(imod)>xxid(idat))
           dx   = xxid(idat) - x0
           dxm  = dxm + dx
@@ -271,5 +271,5 @@
           idat = idat + 1
        end do
-       IF (xxim(imod).LT.xxid(idat)) THEN
+       IF (xxim(imod)<xxid(idat)) THEN
           dx   = xxim(imod) - x0
           dxm  = dxm + dx
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iso_verif_dyn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iso_verif_dyn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iso_verif_dyn.F	(revision 5082)
@@ -13,5 +13,5 @@
         integer iso_verif_noNaN_nostop
 
-        if ((x.gt.-borne).and.(x.lt.borne)) then
+        if ((x>-borne).and.(x<borne)) then
                 iso_verif_noNAN_nostop=0
         else
@@ -47,7 +47,7 @@
         iso_verif_egalite_nostop=0
 
-        if (abs(a-b).gt.errmax) then
+        if (abs(a-b)>errmax) then
           if (abs((a-b)/max(max(abs(b),abs(a)),1e-18))
-     :            .gt.errmaxrel) then
+     :            >errmaxrel) then
             write(*,*) 'erreur detectee par iso_verif_egalite:'
             write(*,*) err_msg
@@ -84,5 +84,5 @@
 
         ! verifier que HDO est raisonable
-         if (q.gt.qmin) then
+         if (q>qmin) then
              IF(getKey('tnat', tnat, isoName(iso))) THEN
                   err_msg = 'Missing isotopic parameter "tnat"'
@@ -91,5 +91,5 @@
              END IF
              deltaD=(x/q/tnat-1)*1000
-             if ((deltaD.gt.deltaDmax).or.(deltaD.lt.deltaDmin)) then
+             if ((deltaD>deltaDmax).or.(deltaD<deltaDmin)) then
                   write(*,*) 'erreur detectee par iso_verif_aberrant:'
                   write(*,*) err_msg
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limx.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limx.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limx.F	(revision 5082)
@@ -84,6 +84,6 @@
 
          do ij=iip2+1,ip1jm
-            if(     dxqu(ij-1)*dxqu(ij).gt.0.
-     &         .and. dxq(ij,l)*dxqu(ij).gt.0.) then
+            if(     dxqu(ij-1)*dxqu(ij)>0.
+     &         .and. dxq(ij,l)*dxqu(ij)>0.) then
               dxq(ij,l)=
      &         sign(min(abs(dxq(ij,l)),dxqmax(ij)),dxq(ij,l))
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limz.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limz.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/limz.F	(revision 5082)
@@ -77,6 +77,6 @@
 
          do l=2,llm-1
-            if(     dzqw(l-1)*dzqw(l).gt.0.
-     &         .and. dzq(ij,l)*dzqw(l).gt.0.) then
+            if(     dzqw(l-1)*dzqw(l)>0.
+     &         .and. dzq(ij,l)*dzqw(l)>0.) then
               dzq(ij,l)=
      &         sign(min(abs(dzq(ij,l)),dzqmax(l)),dzq(ij,l))
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.F	(revision 5082)
@@ -74,5 +74,5 @@
 c     if (mode.eq.1.or.mode.eq.3) then
 c     if (mode.eq.1) then
-      if (mode.ge.1) then
+      if (mode>=1) then
         lati=2
         latf=jjm
@@ -187,5 +187,5 @@
 c      enddo
 CCC
-       if(mode.eq.2) then
+       if(mode==2) then
           do l=1,llm
             s0s=0.
@@ -247,5 +247,5 @@
       endif
 
-      if (mode.eq.4) then
+      if (mode==4) then
          do l=1,llm
             do i=1,iip1
@@ -261,5 +261,5 @@
        call advx( limit,.5*dtvr,pbaru,sm,s0,sx,sy,sz,lati,latf)
 c     call minmaxq(zq,1.e33,-1.e33,'avant advy     ')
-      if (mode.eq.4) then
+      if (mode==4) then
          do l=1,llm
             do i=1,iip1
@@ -282,5 +282,5 @@
        call limz(s0,sz,sm,pente_max)
        call advz( limit,dtvr,w,sm,s0,sx,sy,sz )
-      if (mode.eq.4) then
+      if (mode==4) then
          do l=1,llm
             do i=1,iip1
@@ -306,5 +306,5 @@
 
 c     call minmaxq(zq,1.e33,-1.e33,'avant advx     ')
-      if (mode.eq.4) then
+      if (mode==4) then
          do l=1,llm
             do i=1,iip1
@@ -346,5 +346,5 @@
 c Traitements specifiques au pole
 
-      if(mode.ge.1) then
+      if(mode>=1) then
       DO l=1,llm
 c   filtrages aux poles
@@ -361,5 +361,5 @@
             q( i,jjp1,llm+1-l,0)=qps
          enddo
-         if(mode.eq.3) then
+         if(mode==3) then
             dyn1=0.
             dys1=0.
@@ -382,5 +382,5 @@
             enddo
          endif
-         if(mode.eq.1) then
+         if(mode==1) then
 c   on filtre les valeurs au bord de la "grande maille pole"
             dyn1=0.
@@ -440,5 +440,5 @@
              DO j = 1,jjp1
               DO i = 1,iip1
-                IF (q(i,j,l,0).lt.0.)  THEN
+                IF (q(i,j,l,0)<0.)  THEN
 c                    PRINT*,'------------ BIP-----------' 
 c                    PRINT*,'Q0(',i,j,l,')=',q(i,j,l,0)
@@ -459,5 +459,5 @@
           do j=1,jjp1
            do i=1,iip1
-             if(q(i,j,l,0).lt.qmin)
+             if(q(i,j,l,0)<qmin)
      ,       print*,'apres pentes, s0(',i,',',j,',',l,')=',q(i,j,l,0)
            enddo
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.F	(revision 5082)
@@ -330,5 +330,5 @@
     	 DO j = 2,jjm
            DO i = 1,iip1
-         IF (q(i,j,l,0).lt.0.)  THEN
+         IF (q(i,j,l,0)<0.)  THEN
          PRINT*,'------------ BIP-----------' 
          PRINT*,'S0(',i,j,l,')=',q(i,j,l,0),
@@ -346,5 +346,5 @@
          do j=1,jjp1,jjm
          do i=1,iip1
-               IF (q(i,j,l,0).lt.0.)  THEN
+               IF (q(i,j,l,0)<0.)  THEN
                PRINT*,'------------ BIP 2-----------'
          PRINT*,'S0(',i,j,l,')=',q(i,j,l,0)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/sortvarc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/sortvarc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/sortvarc.F	(revision 5082)
@@ -79,5 +79,5 @@
        heure     = ( itau*dtvrs1j-rjour ) * 24.
        imjmp1    = iim * jjp1
-       IF(ABS(heure - 24.).LE.0.0001 ) heure = 0.
+       IF(ABS(heure - 24.)<=0.0001 ) heure = 0.
 c
        CALL massbarxy ( masse, massebxy )
@@ -161,5 +161,5 @@
       ! compute relative changes in etot,... (except if 'reference' values
       ! are zero, which can happen when using iniacademic)
-      if (etot0.ne.0) then
+      if (etot0/=0) then
         etot= etot/etot0
       else
@@ -167,20 +167,20 @@
       endif
       rmsv= SQRT(rmsv/ptot)
-      if (ptot0.ne.0) then
+      if (ptot0/=0) then
         ptot= ptot/ptot0
       else
         ptot=1.
       endif
-      if (ztot0.ne.0) then
+      if (ztot0/=0) then
         ztot= ztot/ztot0
       else
         ztot=1.
       endif
-      if (stot0.ne.0) then
+      if (stot0/=0) then
         stot= stot/stot0
       else
         stot=1.
       endif
-      if (ang0.ne.0) then
+      if (ang0/=0) then
         ang = ang /ang0
       else
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.F	(revision 5082)
@@ -27,5 +27,5 @@
       DO l = 1, llm
          DO ij = 1, ip1jmp1, iip1
-          IF( ucov(ij,l).NE.ucov(ij+iim,l) )  THEN
+          IF( ucov(ij,l)/=ucov(ij+iim,l) )  THEN
           PRINT *,'STOP dans test_period car ---  UCOV  ---  n est pas',  
      ,  ' periodique en longitude ! '
@@ -33,5 +33,5 @@
           STOP
           ENDIF
-          IF( teta(ij,l).NE.teta(ij+iim,l) )  THEN
+          IF( teta(ij,l)/=teta(ij+iim,l) )  THEN
           PRINT *,'STOP dans test_period car ---  TETA  ---  n est pas',  
      ,   ' periodique en longitude ! '
@@ -43,6 +43,6 @@
 
          do ij=1,iim
-          if (teta(ij,l).ne.teta(1,l)
-     s     .or.teta(ip1jm+ij,l).ne.teta(ip1jm+1,l) ) then
+          if (teta(ij,l)/=teta(1,l)
+     s     .or.teta(ip1jm+ij,l)/=teta(ip1jm+1,l) ) then
           PRINT *,'STOP dans test_period car ---  TETA  ---  n est pas',  
      ,  ' constant aux poles ! '
@@ -59,5 +59,5 @@
       DO l = 1, llm
          DO ij = 1, ip1jm, iip1
-          IF( vcov(ij,l).NE.vcov(ij+iim,l) )  THEN
+          IF( vcov(ij,l)/=vcov(ij+iim,l) )  THEN
           PRINT *,'STOP dans test_period car ---  VCOV  ---  n est pas',  
      ,   ' periodique en longitude !'
@@ -73,5 +73,5 @@
         DO l =1, llm
           DO ij = 1, ip1jmp1, iip1
-          IF( q(ij,l,nq).NE.q(ij+iim,l,nq) )  THEN
+          IF( q(ij,l,nq)/=q(ij+iim,l,nq) )  THEN
           PRINT *,'STOP dans test_period car ---  Q  ---  n est pas ',  
      ,   'periodique en longitude !'
@@ -85,5 +85,5 @@
        DO l = 1, llm
          DO ij = 1, ip1jmp1, iip1
-          IF( p(ij,l).NE.p(ij+iim,l) )  THEN
+          IF( p(ij,l)/=p(ij+iim,l) )  THEN
           PRINT *,'STOP dans test_period car ---  P  ---  n est pas',  
      ,    ' periodique en longitude !'
@@ -91,5 +91,5 @@
           STOP
           ENDIF
-          IF( phis(ij).NE.phis(ij+iim) )  THEN
+          IF( phis(ij)/=phis(ij+iim) )  THEN
           PRINT *,'STOP dans test_period car ---  PHIS  ---  n est pas',  
      ,   ' periodique en longitude !  l, IJ = ', l, ij,ij+iim
@@ -99,6 +99,6 @@
          ENDDO
          do ij=1,iim
-          if (p(ij,l).ne.p(1,l)
-     s     .or.p(ip1jm+ij,l).ne.p(ip1jm+1,l) ) then
+          if (p(ij,l)/=p(1,l)
+     s     .or.p(ip1jm+ij,l)/=p(ip1jm+1,l) ) then
           PRINT *,'STOP dans test_period car ---  P     ---  n est pas',  
      ,  ' constant aux poles ! '
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90	(revision 5082)
@@ -29,5 +29,5 @@
   DO j=1,jjm
 
-     if (abs(sin(rlatv(j))).lt.1.e-4) then
+     if (abs(sin(rlatv(j)))<1.e-4) then
         zlat=1.e-4
      else
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/abort_gcm.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/abort_gcm.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/abort_gcm.F	(revision 5082)
@@ -32,5 +32,5 @@
       call histclo
       call restclo
-      if (MPI_rank .eq. 0) then
+      if (MPI_rank == 0) then
          call getin_dump
       endif
@@ -43,5 +43,5 @@
       write(lunout,*) 'Stopping in ', modname
       write(lunout,*) 'Reason = ',message
-      if (ierr .eq. 0) then
+      if (ierr == 0) then
         write(lunout,*) 'Everything is cool'
       else
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advtrac_loc.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advtrac_loc.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/advtrac_loc.F90	(revision 5082)
@@ -216,5 +216,5 @@
                END DO
             END DO
-            IF(CFLmaxz.GE.1) WRITE(*,*) 'WARNING vertical','CFLmaxz=', CFLmaxz
+            IF(CFLmaxz>=1) WRITE(*,*) 'WARNING vertical','CFLmaxz=', CFLmaxz
             !----------------------------------------------------------------
             !     Ss-prg interface LMDZ.4->PPM3d (ss-prg de Lin)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/allocate_field_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/allocate_field_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/allocate_field_mod.F90	(revision 5082)
@@ -39,5 +39,5 @@
   SUBROUTINE Init_nan
   IMPLICIT NONE
-    REAL*8 :: rnan
+    REAL(kind=8) :: rnan
     INTEGER :: inan(2)
     EQUIVALENCE(rnan,inan)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bilan_dyn_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bilan_dyn_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bilan_dyn_loc.F	(revision 5082)
@@ -30,5 +30,5 @@
 c====================================================================
 c
-c   Sous-programme consacre à des diagnostics dynamiques de base
+c   Sous-programme consacre � des diagnostics dynamiques de base
 c
 c 
@@ -88,5 +88,5 @@
       real ww
 
-c   variables dynamiques intermédiaires
+c   variables dynamiques interm�diaires
       REAL,SAVE,ALLOCATABLE :: vcont(:,:,:),ucont(:,:,:)
       REAL,SAVE,ALLOCATABLE :: ang(:,:,:),unat(:,:,:)
@@ -96,8 +96,8 @@
       REAL,SAVE,ALLOCATABLE :: bern(:,:,:)
 
-c   champ contenant les scalaires advectés.
+c   champ contenant les scalaires advect�s.
       real,SAVE,ALLOCATABLE :: Q(:,:,:,:)
     
-c   champs cumulés
+c   champs cumul�s
       real,SAVE,ALLOCATABLE ::  ps_cum(:,:)
       real,SAVE,ALLOCATABLE ::  masse_cum(:,:,:)
@@ -225,5 +225,5 @@
 c   ncum est la frequence de stokage en pas de temps
         ncum=dt_cum/dt_app
-        if (abs(ncum*dt_app-dt_cum).gt.1.e-5*dt_app) then
+        if (abs(ncum*dt_app-dt_cum)>1.e-5*dt_app) then
            WRITE(lunout,*)
      .            'Pb : le pas de cumule doit etre multiple du pas'
@@ -298,5 +298,5 @@
       do iQ=1,nQ
          do itr=1,ntr
-            if(itr.eq.1) then
+            if(itr==1) then
                znom(itr,iQ)=nom(iQ)
                znoml(itr,iQ)=nom(iQ)
@@ -370,5 +370,5 @@
       jje=jj_end
     
-c   énergie cinétique
+c   �nergie cin�tique
 !      ucont(:,jjb:jje,:)=0
 
@@ -382,5 +382,5 @@
       CALL enercin_loc(vcov,ucov,vcont,ucont,ecin)
 
-c   moment cinétique
+c   moment cin�tique
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       do l=1,llm
@@ -406,5 +406,5 @@
 c=====================================================================
 c
-      if(icum.EQ.0) then
+      if(icum==0) then
          jjb=jj_begin
          jje=jj_end
@@ -490,5 +490,5 @@
       enddo
 
-c    flux méridien
+c    flux m�ridien
 c    -------------
       do iQ=1,nQ
@@ -584,5 +584,5 @@
 c   PAS DE TEMPS D'ECRITURE
 c=====================================================================
-      if (icum.eq.ncum) then
+      if (icum==ncum) then
 c=====================================================================
 
@@ -642,5 +642,5 @@
 
 c=====================================================================
-c   Transport méridien
+c   Transport m�ridien
 c=====================================================================
 
@@ -778,5 +778,5 @@
 c   sorties proprement dites
 !$OMP MASTER      
-      if (i_sortie.eq.1) then
+      if (i_sortie==1) then
       jjb=jj_begin
       jje=jj_end
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caladvtrac_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caladvtrac_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caladvtrac_loc.F	(revision 5082)
@@ -64,5 +64,5 @@
       if (pole_sud)  ijev=ij_end-iip1
 
-      IF(iadvtr.EQ.0) THEN
+      IF(iadvtr==0) THEN
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)        
 	DO l=1,llm   
@@ -86,5 +86,5 @@
 
 c   selection de la masse instantannee des mailles avant le transport.
-      IF(iadvtr.EQ.0) THEN
+      IF(iadvtr==0) THEN
 
           ijb=ij_begin
@@ -107,5 +107,5 @@
 c   Test pour savoir si on advecte a ce pas de temps
 
-      IF ( iadvtr.EQ.iapp_tracvl ) THEN
+      IF ( iadvtr==iapp_tracvl ) THEN
       !write(*,*) 'caladvtrac 133'
 c$OMP MASTER
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caldyn_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caldyn_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/caldyn_loc.F	(revision 5082)
@@ -170,5 +170,5 @@
       DO l = 1, llm
          DO ij = ijb, ije, iip1
-           IF( dv(ij,l).NE.dv(ij+iim,l) )  THEN
+           IF( dv(ij,l)/=dv(ij+iim,l) )  THEN
 c         PRINT *,'!!!ATTENTION!!! probleme de periodicite sur vcov',  
 c    ,   ' dans caldyn'
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/conf_gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/conf_gcm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/conf_gcm.F90	(revision 5082)
@@ -121,7 +121,7 @@
 
   !Config  Key  = prt_level
-  !Config  Desc = niveau d'impressions de débogage
+  !Config  Desc = niveau d'impressions de d�bogage
   !Config  Def  = 0
-  !Config  Help = Niveau d'impression pour le débogage
+  !Config  Help = Niveau d'impression pour le d�bogage
   !Config         (0 = minimum d'impression)
   prt_level = 0
@@ -458,5 +458,5 @@
      CALL getin('clat',clatt)
 
-     IF( ABS(clat - clatt).GE. 0.001 )  THEN
+     IF( ABS(clat - clatt)>= 0.001 )  THEN
         write(lunout,*)'conf_gcm: La valeur de clat passee par run.def', &
              ' est differente de celle lue sur le fichier  start '
@@ -472,5 +472,5 @@
      CALL getin('grossismx',grossismxx)
 
-     IF( ABS(grossismx - grossismxx).GE. 0.001 )  THEN
+     IF( ABS(grossismx - grossismxx)>= 0.001 )  THEN
         write(lunout,*)'conf_gcm: La valeur de grossismx passee par ', &
              'run.def est differente de celle lue sur le fichier  start '
@@ -486,5 +486,5 @@
      CALL getin('grossismy',grossismyy)
 
-     IF( ABS(grossismy - grossismyy).GE. 0.001 )  THEN
+     IF( ABS(grossismy - grossismyy)>= 0.001 )  THEN
         write(lunout,*)'conf_gcm: La valeur de grossismy passee par ', &
              'run.def est differente de celle lue sur le fichier  start '
@@ -492,5 +492,5 @@
      ENDIF
 
-     IF( grossismx.LT.1. )  THEN
+     IF( grossismx<1. )  THEN
         write(lunout,*) &
              'conf_gcm: ***  ATTENTION !! grossismx < 1 .   *** '
@@ -500,5 +500,5 @@
      ENDIF
 
-     IF( grossismy.LT.1. )  THEN
+     IF( grossismy<1. )  THEN
         write(lunout,*) &
              'conf_gcm: ***  ATTENTION !! grossismy < 1 .   *** '
@@ -545,5 +545,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(dzoomx - dzoomxx).GE. 0.001 )  THEN
+        IF( ABS(dzoomx - dzoomxx)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de dzoomx passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -561,5 +561,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(dzoomy - dzoomyy).GE. 0.001 )  THEN
+        IF( ABS(dzoomy - dzoomyy)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de dzoomy passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -576,5 +576,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(taux - tauxx).GE. 0.001 )  THEN
+        IF( ABS(taux - tauxx)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de taux passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -591,5 +591,5 @@
 
      IF( fxyhypb )  THEN
-        IF( ABS(tauy - tauyy).GE. 0.001 )  THEN
+        IF( ABS(tauy - tauyy)>= 0.001 )  THEN
            write(lunout,*)'conf_gcm: La valeur de tauy passee par ', &
                 'run.def est differente de celle lue sur le fichier  start '
@@ -779,5 +779,5 @@
      CALL getin('grossismy',grossismy)
 
-     IF( grossismx.LT.1. )  THEN
+     IF( grossismx<1. )  THEN
         write(lunout,*) 'conf_gcm: ***ATTENTION !! grossismx < 1 . *** '
         CALL abort_gcm("conf_gcm","stopped",1)
@@ -786,5 +786,5 @@
      ENDIF
 
-     IF( grossismy.LT.1. )  THEN
+     IF( grossismy<1. )  THEN
         write(lunout,*) 'conf_gcm: ***ATTENTION !! grossismy < 1 . *** '
         CALL abort_gcm("conf_gcm","stopped",1)
@@ -921,9 +921,9 @@
 
      !Config  Key  = use_mpi_alloc
-     !Config  Desc = Utilise un buffer MPI en mï¿½moire globale
+     !Config  Desc = Utilise un buffer MPI en m�moire globale
      !Config  Def  = false
      !Config  Help = permet d'activer l'utilisation d'un buffer MPI
-     !Config         en mï¿½moire globale a l'aide de la fonction MPI_ALLOC.
-     !Config         Cela peut amï¿½liorer la bande passante des transferts MPI
+     !Config         en m�moire globale a l'aide de la fonction MPI_ALLOC.
+     !Config         Cela peut am�liorer la bande passante des transferts MPI
      !Config         d'un facteur 2  
      use_mpi_alloc=.FALSE.
@@ -933,5 +933,5 @@
      !Config  Desc = activation de la version strato
      !Config  Def  = .FALSE.
-     !Config  Help = active la version stratosphérique de LMDZ de F. Lott
+     !Config  Help = active la version stratosph�rique de LMDZ de F. Lott
 
      ok_strato=.FALSE.
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_hyb_loc_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_hyb_loc_m.F90	(revision 5082)
@@ -65,10 +65,10 @@
     if (firstcall) then
        ! sanity checks for Shallow Water case (1 vertical layer)
-       if (llm.eq.1) then
-          if (kappa.ne.1) then
+       if (llm==1) then
+          if (kappa/=1) then
              call abort_gcm(modname, &
                   "kappa!=1 , but running in Shallow Water mode!!",42)
           endif
-          if (cpp.ne.r) then
+          if (cpp/=r) then
              call abort_gcm(modname, &
                   "cpp!=r , but running in Shallow Water mode!!",42)
@@ -82,5 +82,5 @@
 
     ! Specific behaviour for Shallow Water (1 vertical layer) case:
-    if (llm.eq.1) then
+    if (llm==1) then
 
        ! Compute pks(:),pk(:),pkf(:)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_milieu_loc_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/exner_milieu_loc_m.F90	(revision 5082)
@@ -58,10 +58,10 @@
     if (firstcall) then
        ! sanity checks for Shallow Water case (1 vertical layer)
-       if (llm.eq.1) then
-          if (kappa.ne.1) then
+       if (llm==1) then
+          if (kappa/=1) then
              call abort_gcm(modname, &
                   "kappa!=1 , but running in Shallow Water mode!!",42)
           endif
-          if (cpp.ne.r) then
+          if (cpp/=r) then
              call abort_gcm(modname, &
                   "cpp!=r , but running in Shallow Water mode!!",42)
@@ -75,5 +75,5 @@
 
     ! Specific behaviour for Shallow Water (1 vertical layer) case:
-    if (llm.eq.1) then
+    if (llm==1) then
 
        ! Compute pks(:),pk(:),pkf(:)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/filtreg_p.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/filtreg_p.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/filtreg_p.F	(revision 5082)
@@ -99,9 +99,9 @@
 c-------------------------------------------------------c
 
-      IF(ifiltre.EQ.1.or.ifiltre.EQ.-1)
+      IF(ifiltre==1.or.ifiltre==-1)
      & CALL abort_gcm("fitreg_p","Pas de transformee simple 
      &dans cette version",1)
       
-      IF( iter.EQ. 2 )  THEN
+      IF( iter== 2 )  THEN
          PRINT *,' Pas d iteration du filtre dans cette version !'
      &        , ' Utiliser old_filtreg et repasser !'
@@ -109,5 +109,5 @@
       ENDIF
 
-      IF( ifiltre.EQ. -2 .AND..NOT.griscal )     THEN
+      IF( ifiltre== -2 .AND..NOT.griscal )     THEN
          PRINT *,' Cette routine ne calcule le filtre inverse que '
      &        , ' sur la grille des scalaires !'
@@ -115,5 +115,5 @@
       ENDIF
 
-      IF( ifiltre.NE.2 .AND.ifiltre.NE. - 2 )  THEN
+      IF( ifiltre/=2 .AND.ifiltre/= - 2 )  THEN
          PRINT *,' Probleme dans filtreg car ifiltre NE 2 et NE -2'
      &        , ' corriger et repasser !'
@@ -131,5 +131,5 @@
          ELSE
 c     
-            IF( iaire.EQ.1 )  THEN
+            IF( iaire==1 )  THEN
                sdd1_type = type_sddv
                sdd2_type = type_unsddv
@@ -145,9 +145,9 @@
          ENDIF
       ELSE
-         IF( nlat.NE.jjm )  THEN
+         IF( nlat/=jjm )  THEN
             CALL abort_gcm("fitreg_p","nlat. NE. jjm",1)
          ELSE
 c
-            IF( iaire.EQ.1 )  THEN
+            IF( iaire==1 )  THEN
                sdd1_type = type_sddu
                sdd2_type = type_unsddu
@@ -166,5 +166,5 @@
       DO hemisph = 1, 2
 c     
-         IF ( hemisph.EQ.1 )  THEN
+         IF ( hemisph==1 )  THEN
 cym
             jdfil = max(jdfil1,ibeg)
@@ -203,7 +203,7 @@
             nbniv_loc = ll_nb
 
-            IF( hemisph.EQ.1 )      THEN
-               
-               IF( ifiltre.EQ.-2 )   THEN
+            IF( hemisph==1 )      THEN
+               
+               IF( ifiltre==-2 )   THEN
                   DO j = jdfil,jffil
 #ifdef BLAS
@@ -248,5 +248,5 @@
             ELSE
                
-               IF( ifiltre.EQ.-2 )   THEN
+               IF( ifiltre==-2 )   THEN
                   DO j = jdfil,jffil
 #ifdef BLAS
@@ -296,5 +296,5 @@
             ENDIF
 !     c     
-            IF( ifiltre.EQ.2 )  THEN
+            IF( ifiltre==2 )  THEN
                
 c     !-------------------------------------!
@@ -371,5 +371,5 @@
 
 
-            IF( ifiltre.EQ. 2 )  THEN
+            IF( ifiltre== 2 )  THEN
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)          
                DO l=1,nbniv
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/fluxstokenc_p.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/fluxstokenc_p.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/fluxstokenc_p.F	(revision 5082)
@@ -56,5 +56,5 @@
       if (pole_sud)  ijev=ij_end-iip1
 
-      IF(pasflx.EQ.0) THEN
+      IF(pasflx==0) THEN
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)        
       DO l=1,llm   
@@ -83,5 +83,5 @@
 
 c   selection de la masse instantannee des mailles avant le transport.
-      IF(pasflx.EQ.0) THEN
+      IF(pasflx==0) THEN
 
           ijb=ij_begin
@@ -101,5 +101,5 @@
 c   Test pour savoir si on advecte a ce pas de temps
 
-      IF ( pasflx.EQ.(iphysiq*istphy) ) THEN
+      IF ( pasflx==(iphysiq*istphy) ) THEN
       !write(*,*) 'caladvtrac 133'
 c$OMP MASTER
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/friction_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/friction_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/friction_loc.F	(revision 5082)
@@ -56,5 +56,5 @@
         ! set friction type
         call getin("friction_type",friction_type)
-        if ((friction_type.lt.0).or.(friction_type.gt.1)) then
+        if ((friction_type<0).or.(friction_type>1)) then
           abort_message="wrong friction type"
           write(lunout,*)'Friction: wrong friction type',friction_type
@@ -65,5 +65,5 @@
 !$OMP END SINGLE COPYPRIVATE(friction_type,firstcall)
 
-      if (friction_type.eq.0) then ! friction on first layer only
+      if (friction_type==0) then ! friction on first layer only
 !$OMP SINGLE
 c   calcul des composantes au carre du vent naturel
@@ -172,5 +172,5 @@
       endif ! of if (friction_type.eq.0)
 
-      if (friction_type.eq.1) then
+      if (friction_type==1) then
        ! for ucov() 
         jjb=jj_begin
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90	(revision 5082)
@@ -222,5 +222,5 @@
      ! we still need to run iniacademic to initialize some
      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
-     if (iflag_phys.ne.1) then
+     if (iflag_phys/=1) then
         CALL iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
      endif
@@ -254,5 +254,5 @@
   !  on recalcule eventuellement le pas de temps
 
-  IF(MOD(day_step,iperiod).NE.0) THEN
+  IF(MOD(day_step,iperiod)/=0) THEN
      abort_message =  &
           'Il faut choisir un nb de pas par jour multiple de iperiod'
@@ -260,5 +260,5 @@
   ENDIF
 
-  IF(MOD(day_step,iphysiq).NE.0) THEN
+  IF(MOD(day_step,iphysiq)/=0) THEN
      abort_message =  &
           'Il faut choisir un nb de pas par jour multiple de iphysiq'
@@ -267,5 +267,5 @@
 
   zdtvr    = daysec/REAL(day_step)
-  IF(dtvr.NE.zdtvr) THEN
+  IF(dtvr/=zdtvr) THEN
      WRITE(lunout,*) &
           'WARNING!!! changement de pas de temps',dtvr,'>',zdtvr
@@ -295,5 +295,5 @@
      write(lunout,*) &
           'GCM: On reinitialise a la date lue dans gcm.def'
-  ELSE IF (annee_ref .ne. anneeref .or. day_ref .ne. dayref) THEN
+  ELSE IF (annee_ref /= anneeref .or. day_ref /= dayref) THEN
      write(lunout,*) &
           'GCM: Attention les dates initiales lues dans le fichier'
@@ -353,5 +353,5 @@
 #endif
 
-  if (iflag_phys.eq.1) then
+  if (iflag_phys==1) then
      ! these initialisations have already been done (via iniacademic)
      ! if running in SW or Newtonian mode
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gradiv2_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gradiv2_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gradiv2_loc.F	(revision 5082)
@@ -81,5 +81,5 @@
 c      call write_field3d_p('div1',reshape(div,(/iip1,jjp1,llm/)))
 
-      IF( ld.GT.1 )   THEN
+      IF( ld>1 )   THEN
 c$OMP BARRIER
        call Register_Hallo_u(div,llm,1,1,1,1,Request_dissip)
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initdynav_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initdynav_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/initdynav_loc.F	(revision 5082)
@@ -53,5 +53,5 @@
 C   Arguments
 C
-      integer*4 day0, anne0
+      integer(kind=4) day0, anne0
       real tstep, t_ops, t_wrt
 
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/integrd_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/integrd_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/integrd_loc.F	(revision 5082)
@@ -140,5 +140,5 @@
 !c$OMP DO SCHEDULE(STATIC)
       DO ij = ijb,ije
-         IF( ps(ij).LT.0. ) THEN
+         IF( ps(ij)<0. ) THEN
            IF (checksum) stop_it=ij
            checksum=.FALSE.
@@ -333,5 +333,5 @@
       ije=ij_end
 
-         if (planet_type.eq."earth") then
+         if (planet_type=="earth") then
 ! Earth-specific treatment of first 2 tracers (water)
 c$OMP BARRIER
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/leapfrog_loc.F	(revision 5082)
@@ -445,20 +445,20 @@
       IF( purmats ) THEN
       ! Purely Matsuno time stepping
-         IF( MOD(itau,iconser) .EQ.0.AND.  forward    ) conser = .TRUE.
-         IF( MOD(itau,dissip_period ).EQ.0.AND..NOT.forward ) 
+         IF( MOD(itau,iconser) ==0.AND.  forward    ) conser = .TRUE.
+         IF( MOD(itau,dissip_period )==0.AND..NOT.forward )
      s        apdiss = .TRUE.
-         IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 
+         IF( MOD(itau,iphysiq )==0.AND..NOT.forward
      s          .and. physic                        ) apphys = .TRUE.
       ELSE
       ! Leapfrog/Matsuno time stepping 
-         IF( MOD(itau   ,iconser) .EQ. 0              ) conser = .TRUE.
-         IF( MOD(itau+1,dissip_period).EQ.0 .AND. .NOT. forward )
+         IF( MOD(itau   ,iconser) == 0              ) conser = .TRUE.
+         IF( MOD(itau+1,dissip_period)==0 .AND. .NOT. forward )
      s        apdiss = .TRUE.
-         IF( MOD(itau+1,iphysiq).EQ.0.AND.physic) apphys=.TRUE.
+         IF( MOD(itau+1,iphysiq)==0.AND.physic) apphys=.TRUE.
       END IF
 
 ! Ehouarn: for Shallow Water case (ie: 1 vertical layer),
 !          supress dissipation step
-      if (llm.eq.1) then
+      if (llm==1) then
         apdiss=.false.
       endif
@@ -806,5 +806,5 @@
 c
        IF( purmats )  THEN
-          IF( itau.EQ.itaufin.AND..NOT.forward ) lafin = .TRUE.
+          IF( itau==itaufin.AND..NOT.forward ) lafin = .TRUE.
        ELSE
           IF( itau+1. EQ. itaufin )              lafin = .TRUE.
@@ -1148,5 +1148,5 @@
         !write(*,*) 'leapfrog 1134: iflag_phys=',iflag_phys
 
-      IF(iflag_phys.EQ.2) THEN ! "Newtonian" case
+      IF(iflag_phys==2) THEN ! "Newtonian" case
 c$OMP MASTER
          if (FirstPhysic) then
@@ -1174,5 +1174,5 @@
 
 !$OMP MASTER
-       if (planet_type.eq."giant") then
+       if (planet_type=="giant") then
          ! add an intrinsic heat flux at the base of the atmosphere
          teta(ijb:ije,1) = teta(ijb:ije,1)
@@ -1602,7 +1602,7 @@
 c   -------------------------------------
 
-            IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin) THEN
-c$OMP BARRIER
-               IF(itau.EQ.itaufin) THEN
+            IF(MOD(itau,iperiod)==0 .OR. itau==itaufin) THEN
+c$OMP BARRIER
+               IF(itau==itaufin) THEN
                   iav=1
                ELSE
@@ -1640,5 +1640,5 @@
 c   ------------------------------
 
-            IF( MOD(itau,iecri).EQ.0) THEN
+            IF( MOD(itau,iecri)==0) THEN
              ! Ehouarn: output only during LF or Backward Matsuno
              if (leapf.or.(.not.leapf.and.(.not.forward))) then
@@ -1671,5 +1671,5 @@
            ENDIF ! of IF(MOD(itau,iecri).EQ.0)
 
-            IF(itau.EQ.itaufin) THEN
+            IF(itau==itaufin) THEN
 
 c$OMP BARRIER
@@ -1695,5 +1695,5 @@
 c   ------------------------------------
 
-            IF( MOD(itau,iperiod).EQ.0 )    THEN
+            IF( MOD(itau,iperiod)==0 )    THEN
                     GO TO 1
             ELSE IF ( MOD(itau-1,iperiod). EQ. 0 ) THEN
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/lmdz_call_calfis.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/lmdz_call_calfis.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/lmdz_call_calfis.F90	(revision 5082)
@@ -145,5 +145,5 @@
      &        + (itau+1)/day_step
 
-           IF (planet_type .eq."generic") THEN
+           IF (planet_type =="generic") THEN
               ! AS: we make jD_cur to be pday
               jD_cur = int(day_ini + itau/day_step)
@@ -393,5 +393,5 @@
 !
 !  Diagnostique de conservation de l'energie : difference
-    IF (ip_ebil_dyn.ge.1 ) THEN 
+    IF (ip_ebil_dyn>=1 ) THEN
       ztit='bil phys'
 !      CALL diagedyn(ztit,2,1,1,dtphys,ucov, vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_filtreg_p.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_filtreg_p.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_filtreg_p.F	(revision 5082)
@@ -103,9 +103,9 @@
 c-------------------------------------------------------c
 
-      IF(ifiltre.EQ.1.or.ifiltre.EQ.-1) 
+      IF(ifiltre==1.or.ifiltre==-1)
      &  CALL abort_gcm("mod_filtreg_p",'Pas de transformee 
      &simple dans cette version',1)
       
-      IF( iter.EQ. 2 )  THEN
+      IF( iter== 2 )  THEN
          PRINT *,' Pas d iteration du filtre dans cette version !'
      &        , ' Utiliser old_filtreg et repasser !'
@@ -113,5 +113,5 @@
       ENDIF
 
-      IF( ifiltre.EQ. -2 .AND..NOT.griscal )     THEN
+      IF( ifiltre== -2 .AND..NOT.griscal )     THEN
          PRINT *,' Cette routine ne calcule le filtre inverse que '
      &        , ' sur la grille des scalaires !'
@@ -119,5 +119,5 @@
       ENDIF
 
-      IF( ifiltre.NE.2 .AND.ifiltre.NE. - 2 )  THEN
+      IF( ifiltre/=2 .AND.ifiltre/= - 2 )  THEN
          PRINT *,' Probleme dans filtreg car ifiltre NE 2 et NE -2'
      &        , ' corriger et repasser !'
@@ -135,5 +135,5 @@
          ELSE
 c     
-            IF( iaire.EQ.1 )  THEN
+            IF( iaire==1 )  THEN
                sdd1_type = type_sddv
                sdd2_type = type_unsddv
@@ -149,9 +149,9 @@
          ENDIF
       ELSE
-         IF( nlat.NE.jjm )  THEN
+         IF( nlat/=jjm )  THEN
             CALL abort_gcm("mod_filtreg_p"," nlat. NE. jjm",1)
          ELSE
 c
-            IF( iaire.EQ.1 )  THEN
+            IF( iaire==1 )  THEN
                sdd1_type = type_sddu
                sdd2_type = type_unsddu
@@ -170,5 +170,5 @@
       DO hemisph = 1, 2
 c     
-         IF ( hemisph.EQ.1 )  THEN
+         IF ( hemisph==1 )  THEN
 cym
             jdfil = max(jdfil1,ibeg)
@@ -207,7 +207,7 @@
             nbniv_loc = ll_nb
 
-            IF( hemisph.EQ.1 )      THEN
-               
-               IF( ifiltre.EQ.-2 )   THEN
+            IF( hemisph==1 )      THEN
+               
+               IF( ifiltre==-2 )   THEN
                   DO j = jdfil,jffil
 #ifdef BLAS
@@ -255,5 +255,5 @@
             ELSE
                
-               IF( ifiltre.EQ.-2 )   THEN
+               IF( ifiltre==-2 )   THEN
                   DO j = jdfil,jffil
 #ifdef BLAS
@@ -303,5 +303,5 @@
             ENDIF
 !     c     
-            IF( ifiltre.EQ.2 )  THEN
+            IF( ifiltre==2 )  THEN
                
 c     !-------------------------------------!
@@ -379,5 +379,5 @@
 
 
-            IF( ifiltre.EQ. 2 )  THEN
+            IF( ifiltre== 2 )  THEN
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)          
                DO l=1,nbniv
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_hallo.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_hallo.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_hallo.F90	(revision 5082)
@@ -1176,17 +1176,17 @@
       ENDIF
       
-      if (Sup.eq.0) then
+      if (Sup==0) then
         SendUp=.FALSE.
        endif
       
-      if (Sdown.eq.0) then
+      if (Sdown==0) then
         SendDown=.FALSE.
       endif
 
-      if (Rup.eq.0) then
+      if (Rup==0) then
         RecvUp=.FALSE.
       endif
       
-      if (Rdown.eq.0) then
+      if (Rdown==0) then
         RecvDown=.FALSE.
       endif
@@ -1240,17 +1240,17 @@
       ENDIF
       
-      if (Sup.eq.0) then
+      if (Sup==0) then
         SendUp=.FALSE.
        endif
       
-      if (Sdown.eq.0) then
+      if (Sdown==0) then
         SendDown=.FALSE.
       endif
 
-      if (Rup.eq.0) then
+      if (Rup==0) then
         RecvUp=.FALSE.
       endif
       
-      if (Rdown.eq.0) then
+      if (Rdown==0) then
         RecvDown=.FALSE.
       endif
@@ -1303,17 +1303,17 @@
       ENDIF
       
-      if (Sup.eq.0) then
+      if (Sup==0) then
         SendUp=.FALSE.
        endif
       
-      if (Sdown.eq.0) then
+      if (Sdown==0) then
         SendDown=.FALSE.
       endif
 
-      if (Rup.eq.0) then
+      if (Rup==0) then
         RecvUp=.FALSE.
       endif
       
-      if (Rdown.eq.0) then
+      if (Rdown==0) then
         RecvDown=.FALSE.
       endif
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90	(revision 5082)
@@ -130,5 +130,5 @@
          WRITE(num,'(I4.4)') mpi_rank
          filename='lmdz.out_'//num
-         IF (mpi_rank .NE. 0) THEN
+         IF (mpi_rank /= 0) THEN
             OPEN(UNIT=lunout,FILE=TRIM(filename),ACTION='write', &
                STATUS='unknown',FORM='formatted',IOSTAT=ierr) 
@@ -178,5 +178,5 @@
       ij_end=jj_end*iip1
       
-      if (mpi_rank.eq.0) then
+      if (mpi_rank==0) then
         pole_nord=.TRUE.
       else 
@@ -184,5 +184,5 @@
       endif
       
-      if (mpi_rank.eq.mpi_size-1) then
+      if (mpi_rank==mpi_size-1) then
         pole_sud=.TRUE.
       else 
@@ -544,10 +544,10 @@
         ENDIF
         
-        if (up.eq.0) then
+        if (up==0) then
           SendDown=.FALSE.
           RecvUp=.FALSE.
         endif
       
-        if (down.eq.0) then
+        if (down==0) then
           SendUp=.FALSE.
           RecvDown=.FALSE.
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/qminimum_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/qminimum_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/qminimum_loc.F	(revision 5082)
@@ -87,5 +87,5 @@
 c$OMP DO SCHEDULE(STATIC)       
         DO i = ijb, ije
-          if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then
+          if (seuil_liq - q(i,k,iq_liq) > 0.d0 ) then
 
             if (niso > 0) zx_defau_diag(i,k,2)=AMAX1
@@ -109,5 +109,5 @@
         DO i = ijb, ije
 
-          if ( seuil_vap - q(i,k,iq_vap) .gt. 0.d0 ) then
+          if ( seuil_vap - q(i,k,iq_vap) > 0.d0 ) then
 
             if (niso > 0) zx_defau_diag(i,k,1)
@@ -141,5 +141,5 @@
 !      pompe = SSUM(ije-ijb+1,zx_pump(ijb),1)
 
-      IF (imprim.LE.100 .AND. nb_pump .GT. 0 ) THEN
+      IF (imprim<=100 .AND. nb_pump > 0 ) THEN
          PRINT *, 'ATT!:on pompe de l eau au sol'
          DO i = 1, nb_pump
@@ -166,5 +166,5 @@
 c$OMP DO SCHEDULE(STATIC)      
       DO i = ijb, ije
-        if (zx_pump(i).gt.0.0) then
+        if (zx_pump(i)>0.0) then
           q_follow(i,1,1)=q_follow(i,1,1)+zx_pump(i)
         endif !if (zx_pump(i).gt.0.0) then
@@ -177,9 +177,9 @@
 c$OMP DO SCHEDULE(STATIC)      
         DO i = ijb, ije
-          if (zx_defau_diag(i,k,1).gt.0.0) then             
+          if (zx_defau_diag(i,k,1)>0.0) then
               ! on ajoute la vapeur en k     
 !              write(lunout,*) 'i,k,q_follow(i,k-1,ivap)=',
 !     :                 i,k,q_follow(i,k-1,1)          
-              if (q_follow(i,k-1,1).lt.min_qParent) then
+              if (q_follow(i,k-1,1)<min_qParent) then
                 write(lunout,*) 'tmp qmin: on stoppe'
                 write(lunout,*) 'zx_pump(i)=',zx_pump(i)
@@ -204,5 +204,5 @@
               if (isoCheck) then
                 if(iso_verif_noNaN_nostop(q(i,k,iqIsoPha(ixt,iq_vap)),
-     :                   'qminimum 155').eq.1) then
+     :                   'qminimum 155')==1) then
                    write(*,*) 'i,k,ixt=',i,k,ixt
                    write(*,*) 'q_follow(i,k-1,ivap)=',
@@ -229,5 +229,5 @@
                 if (iso_verif_noNaN_nostop(
      :              q(i,k-1,iqIsoPha(ixt,iq_vap)),
-     :                   'qminimum 175').eq.1) then
+     :                   'qminimum 175')==1) then
                    write(*,*) 'k,i,ixt=',k,i,ixt
                    write(*,*) 'q_follow(i,k-1,ivap)=',
@@ -262,5 +262,5 @@
 c$OMP DO SCHEDULE(STATIC)
         DO i = ijb, ije
-          if (zx_defau_diag(i,k,2).gt.0.0) then
+          if (zx_defau_diag(i,k,2)>0.0) then
 
               ! on ajoute eau liquide en k en k              
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/top_bound_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/top_bound_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/top_bound_loc.F	(revision 5082)
@@ -27,5 +27,5 @@
 c   ------
 c
-c   Dissipation linéaire (ex top_bound de la physique)
+c   Dissipation lin�aire (ex top_bound de la physique)
 c
 c=======================================================================
@@ -110,5 +110,5 @@
          write(lunout,*)'p (Pa)  z(km)  tau(s)   1./tau (Hz)'
          do l=1,llm
-           if (rdamp(l).ne.0.) then
+           if (rdamp(l)/=0.) then
              write(lunout,'(6(1pe12.4,1x))')
      &        presnivs(l),log(preff/presnivs(l))*scaleheight,
@@ -125,5 +125,5 @@
 
       ! compute zonal average of vcov (or set it to zero)
-      if (mode_top_bound.ge.2) then
+      if (mode_top_bound>=2) then
        jjb=jj_begin
        jje=jj_end
@@ -153,5 +153,5 @@
 
       ! compute zonal average of u (or set it to zero)
-      if (mode_top_bound.ge.2) then
+      if (mode_top_bound>=2) then
        jjb=jj_begin
        jje=jj_end
@@ -180,5 +180,5 @@
 
       ! compute zonal average of potential temperature, if necessary
-      if (mode_top_bound.ge.3) then
+      if (mode_top_bound>=3) then
        jjb=jj_begin
        jje=jj_end
@@ -200,5 +200,5 @@
       endif ! of if (mode_top_bound.ge.3)
 
-      if (mode_top_bound.ge.1) then
+      if (mode_top_bound>=1) then
        ! Apply sponge quenching on vcov:
        jjb=jj_begin
@@ -235,5 +235,5 @@
       endif ! of if (mode_top_bound.ge.1)
 
-      if (mode_top_bound.ge.3) then   
+      if (mode_top_bound>=3) then
        ! Apply sponge quenching on teta:
        jjb=jj_begin
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlsplt_loc.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlsplt_loc.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlsplt_loc.F	(revision 5082)
@@ -65,5 +65,5 @@
       if (pole_sud.and.ije==ip1jmp1)  ije=ije-iip1
          
-      IF (pente_max.gt.-1.e-5) THEN
+      IF (pente_max>-1.e-5) THEN
 c       IF (pente_max.gt.10) THEN
 
@@ -109,5 +109,5 @@
      ,         cvmgp(dxqu(ij-1)+dxqu(ij),0.,dxqu(ij-1)*dxqu(ij))
 #else
-               IF(dxqu(ij-1)*dxqu(ij).gt.0) THEN
+               IF(dxqu(ij-1)*dxqu(ij)>0) THEN
                   dxq(ij,l)=dxqu(ij-1)+dxqu(ij)
                ELSE
@@ -141,5 +141,5 @@
                zz(ij)=dxqu(ij-1)*dxqu(ij)
                zz(ij)=zz(ij)+zz(ij)
-               IF(zz(ij).gt.0) THEN
+               IF(zz(ij)>0) THEN
                   dxq(ij,l)=zz(ij)/(dxqu(ij-1)+dxqu(ij))
                ELSE
@@ -197,5 +197,5 @@
        DO ij=ijb,ije-1
 c	print*,'masse(',ij,')=',masse(ij,l,iq)
-          IF (u_m(ij,l).gt.0.) THEN
+          IF (u_m(ij,l)>0.) THEN
              zdum(ij,l)=1.-u_m(ij,l)/masse(ij,l,iq)
              u_mq(ij,l)=u_m(ij,l)*(q(ij,l,iq)
@@ -217,5 +217,5 @@
       DO l=1,llm
          DO ij=ijb,ije-1
-            IF(zdum(ij,l).lt.0) THEN
+            IF(zdum(ij,l)<0) THEN
                iadvplus(ij,l)=1
                u_mq(ij,l)=0.
@@ -261,9 +261,9 @@
 
          DO l=1,llm
-            IF(nl(l).gt.0) THEN
+            IF(nl(l)>0) THEN
                iju=0
 c   indicage des mailles concernees par le traitement special
                DO ij=ijb,ije
-                  IF(iadvplus(ij,l).eq.1.and.mod(ij,iip1).ne.0) THEN
+                  IF(iadvplus(ij,l)==1.and.mod(ij,iip1)/=0) THEN
                      iju=iju+1
                      indu(iju)=ij
@@ -279,9 +279,9 @@
                   zu_m=u_m(ij,l)
                   u_mq(ij,l)=0.
-                  IF(zu_m.gt.0.) THEN
+                  IF(zu_m>0.) THEN
                      ijq=ij
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(zu_m.gt.masse(ijq,l,iq))
+                     do while(zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)
      &                          +q(ijq,l,iq)*masse(ijq,l,iq)
@@ -298,5 +298,5 @@
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(-zu_m.gt.masse(ijq,l,iq))
+                     do while(-zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)-q(ijq,l,iq)
      &                           *masse(ijq,l,iq)
@@ -341,5 +341,5 @@
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
             masse(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
-            if (q(ij,l,iq).gt.min_qParent) then ! modif 13 nov 2020
+            if (q(ij,l,iq)>min_qParent) then ! modif 13 nov 2020
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -692,5 +692,5 @@
 
       DO ij=ijb,ije
-         IF(dyqv(ij)*dyqv(ij-iip1).gt.0.) THEN
+         IF(dyqv(ij)*dyqv(ij-iip1)>0.) THEN
             dyq(ij,l)=sign(min(abs(dyq(ij,l)),dyqmax(ij)),dyq(ij,l))
          ELSE
@@ -710,5 +710,5 @@
       DO l=1,llm
        DO ij=ijb,ije
-          IF(masse_adv_v(ij,l).gt.0) THEN
+          IF(masse_adv_v(ij,l)>0) THEN
               qbyv(ij,l)=q(ij+iip1,l,iq)+dyq(ij+iip1,l)*
      ,                   0.5*(1.-masse_adv_v(ij,l)
@@ -750,5 +750,5 @@
           DO ij=ijb,ije
           !MVals: veiller a ce qu'on n'ait pas de denominateur nul
-            if (q(ij,l,iq).gt.min_qParent) then ! modif 13 nov 2020
+            if (q(ij,l,iq)>min_qParent) then ! modif 13 nov 2020
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -969,5 +969,5 @@
      ,      cvmgp(dzqw(ij,l)+dzqw(ij,l+1),0.,dzqw(ij,l)*dzqw(ij,l+1))
 #else
-            IF(dzqw(ij,l)*dzqw(ij,l+1).gt.0.) THEN
+            IF(dzqw(ij,l)*dzqw(ij,l+1)>0.) THEN
                 dzq(ij,l)=0.5*(dzqw(ij,l)+dzqw(ij,l+1))
             ELSE
@@ -1030,5 +1030,5 @@
        DO l = 1,llm-1
          do  ij = ijb,ije
-          IF(w(ij,l+1,iq).gt.0.) THEN
+          IF(w(ij,l+1,iq)>0.) THEN
              sigw=w(ij,l+1,iq)/masse(ij,l+1,iq)
              wq(ij,l+1,iq)=w(ij,l+1,iq)*(q(ij,l+1,iq)
@@ -1060,5 +1060,5 @@
             wresi(ij,l)=w(ij,l,iq)
             wq(ij,l,iq)=0.
-            IF(w(ij,l,iq).gt.0.) THEN
+            IF(w(ij,l,iq)>0.) THEN
                lorig(ij,l)=l
                morig(ij,l)=masse(ij,l,iq)
@@ -1103,5 +1103,5 @@
              ! CRisi 24nov2020: ajout d'un message d'erreur clair au lieu d'un plantage
              ! pour seg fault
-             if (lorig(ij,l).eq.0) then
+             if (lorig(ij,l)==0) then
                 call abort_gcm("vlz in vlsplt_loc",
      :           "unfixable violation of CFL",1)
@@ -1121,5 +1121,5 @@
          do  ij = ijb,ije
           sigw=wresi(ij,l)/morig(ij,l)
-          IF(w(ij,l,iq).gt.0.) THEN
+          IF(w(ij,l,iq)>0.) THEN
              wq(ij,l,iq)=wq(ij,l,iq)+wresi(ij,l)*(qorig(ij,l)
      :           +0.5*(1.-sigw)*dzqorig(ij,l))
@@ -1155,5 +1155,5 @@
            !MVals: veiller a ce qu'on n'ait pas de denominateur nul
             masse(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
-            if (q(ij,l,iq).gt.min_qParent) then
+            if (q(ij,l,iq)>min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
Index: /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/wrgrads.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/wrgrads.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dyn3dmem/wrgrads.F	(revision 5082)
@@ -42,5 +42,5 @@
 
       if(firsttime(if)) then
-         if(name.eq.var(1,if)) then
+         if(name==var(1,if)) then
             firsttime(if)=.false.
             ivar(if)=1
@@ -64,10 +64,10 @@
       else
          ivar(if)=mod(ivar(if),nvar(if))+1
-         if (ivar(if).eq.nvar(if)) then
+         if (ivar(if)==nvar(if)) then
             writectl=.true.
             itime(if)=itime(if)+1
          endif
 
-         if(var(ivar(if),if).ne.name) then
+         if(var(ivar(if),if)/=name) then
            print*,'Il faut stoker la meme succession de champs a chaque'
            print*,'pas de temps'
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/calfis.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/calfis.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/calfis.F	(revision 5082)
@@ -180,5 +180,5 @@
       IF ( firstcal )  THEN
         debut = .TRUE.
-        IF (ngridmx.NE.2+(jjm-1)*iim) THEN
+        IF (ngridmx/=2+(jjm-1)*iim) THEN
          write(lunout,*) 'STOP dans calfis'
          write(lunout,*)
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/gr_dyn_fi.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/gr_dyn_fi.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/gr_dyn_fi.F	(revision 5082)
@@ -22,5 +22,5 @@
 c   -------
 
-      IF (ngrid.NE.2+(jm-2)*(im-1)) then
+      IF (ngrid/=2+(jm-2)*(im-1)) then
          call abort_gcm("gr_dyn_fi", 'probleme de dim', 1)
       end if
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/inigeomphy_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/inigeomphy_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/inigeomphy_mod.F90	(revision 5082)
@@ -144,5 +144,5 @@
         boundslonfi_glo(k,north_east)=rlonu(i)
         boundslatfi_glo(k,north_east)=rlatv(j-1)
-        if (i.eq.1) then
+        if (i==1) then
           ! special case for the first longitude's west bound
           boundslonfi_glo(k,north_west)=rlonu(iim)-2*PI
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/callphysiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/callphysiq_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/callphysiq_mod.F90	(revision 5082)
@@ -62,5 +62,5 @@
 ! Sanity check on physics package type
   IF (firstcall) THEN
-    IF (planet_type.ne."earth") THEN
+    IF (planet_type/="earth") THEN
       CALL abort_gcm(modname,"wrong planet_type for this physics package",1)
     ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 5082)
@@ -129,5 +129,5 @@
   slab_ekman=0
   CALL getin_p('slab_ekman',slab_ekman)
-  IF ((type_ocean=='slab').AND.(slab_hdiff.OR.(slab_ekman.GT.0))) THEN
+  IF ((type_ocean=='slab').AND.(slab_hdiff.OR.(slab_ekman>0))) THEN
      CALL ini_slab_transp_geom(ip1jm,ip1jmp1,unsairez,fext,unsaire,&
                                   cu,cuvsurcv,cv,cvusurcu, &
Index: /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90	(revision 5082)
@@ -59,5 +59,5 @@
 ! Sub-surfaces initialization
 !*******************************************************************************
-  IF (landice_opt .LT. 2) THEN
+  IF (landice_opt < 2) THEN
      ! Continue with reading landice.nc file
      WRITE(lunout,*)"Read landice.nc file to attribute is_lic fraction"
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/eigen_sort.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/eigen_sort.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/eigen_sort.F	(revision 5082)
@@ -12,5 +12,5 @@
           p=d(i)
         DO j=i+1,n
-           IF(d(j).ge.p) THEN
+           IF(d(j)>=p) THEN
             k=j
             p=d(j)
@@ -18,5 +18,5 @@
         ENDDO
           
-        IF(k.ne.i) THEN
+        IF(k/=i) THEN
           d(k)=d(i)
           d(i)=p
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg.F	(revision 5082)
@@ -83,8 +83,8 @@
       ENDIF
 
-      IF(ifiltre.EQ.1.or.ifiltre.EQ.-1) 
+      IF(ifiltre==1.or.ifiltre==-1)
      &     STOP'Pas de transformee simple dans cette version'
       
-      IF( iter.EQ. 2 )  THEN
+      IF( iter== 2 )  THEN
          PRINT *,' Pas d iteration du filtre dans cette version !'
      &        , ' Utiliser old_filtreg et repasser !'
@@ -92,5 +92,5 @@
       ENDIF
       
-      IF( ifiltre.EQ. -2 .AND..NOT.griscal )     THEN
+      IF( ifiltre== -2 .AND..NOT.griscal )     THEN
          PRINT *,' Cette routine ne calcule le filtre inverse que '
      &        , ' sur la grille des scalaires !'
@@ -98,5 +98,5 @@
       ENDIF
       
-      IF( ifiltre.NE.2 .AND.ifiltre.NE. - 2 )  THEN
+      IF( ifiltre/=2 .AND.ifiltre/= - 2 )  THEN
          PRINT *,' Probleme dans filtreg car ifiltre NE 2 et NE -2'
      &        , ' corriger et repasser !'
@@ -113,5 +113,5 @@
          ELSE
             
-            IF( iaire.EQ.1 )  THEN
+            IF( iaire==1 )  THEN
                sdd1_type = type_sddv
                sdd2_type = type_unsddv
@@ -135,10 +135,10 @@
          END IF
       ELSE
-         IF( nlat.NE.jjm )  THEN
+         IF( nlat/=jjm )  THEN
             PRINT  2222
             STOP
          ELSE
             
-            IF( iaire.EQ.1 )  THEN
+            IF( iaire==1 )  THEN
                sdd1_type = type_sddu
                sdd2_type = type_unsddu
@@ -165,5 +165,5 @@
       DO hemisph = 1, 2
          
-         IF ( hemisph.EQ.1 )  THEN
+         IF ( hemisph==1 )  THEN
             jdfil = jdfil1
             jffil = jffil1
@@ -279,5 +279,5 @@
          ENDIF
          
-         IF( ifiltre.EQ. 2 )  THEN
+         IF( ifiltre== 2 )  THEN
             
             DO l = 1, nbniv
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg_mod.F90	(revision 5082)
@@ -129,5 +129,5 @@
     ! if maxlatfilter >0, prescribe the colat0 value from the .def files
    
-    IF (maxlatfilter .LT. 0.) THEN
+    IF (maxlatfilter < 0.) THEN
 
     colat0  =  MIN( 0.5, dymin/dxmin )
@@ -152,5 +152,5 @@
 50  FORMAT(/15x,' Inifilr colat0 alphax ',2e16.7)
     !
-    IF(alphax.EQ.1. )  THEN
+    IF(alphax==1. )  THEN
        PRINT *,' Inifilr  alphax doit etre  <  a 1.  Corriger '
        STOP
@@ -195,6 +195,6 @@
     DO j = 2, jjm/2+1
        cof = COS( rlatu(j) )/ colat0
-       IF ( cof .LT. 1. ) THEN
-          IF( rlamda(imx) * COS(rlatu(j) ).LT.1. ) THEN
+       IF ( cof < 1. ) THEN
+          IF( rlamda(imx) * COS(rlatu(j) )<1. ) THEN
             jfiltnu= j
           ENDIF
@@ -202,6 +202,6 @@
 
        cof = COS( rlatu(jjp1-j+1) )/ colat0
-       IF ( cof .LT. 1. ) THEN
-          IF( rlamda(imx) * COS(rlatu(jjp1-j+1) ).LT.1. ) THEN
+       IF ( cof < 1. ) THEN
+          IF( rlamda(imx) * COS(rlatu(jjp1-j+1) )<1. ) THEN
                jfiltsu= jjp1-j+1
           ENDIF
@@ -211,6 +211,6 @@
     DO j = 1, jjm/2
        cof = COS( rlatv(j) )/ colat0
-       IF ( cof .LT. 1. ) THEN
-          IF( rlamda(imx) * COS(rlatv(j) ).LT.1. ) THEN
+       IF ( cof < 1. ) THEN
+          IF( rlamda(imx) * COS(rlatv(j) )<1. ) THEN
             jfiltnv= j
           ENDIF
@@ -218,6 +218,6 @@
 
        cof = COS( rlatv(jjm-j+1) )/ colat0
-       IF ( cof .LT. 1. ) THEN
-          IF( rlamda(imx) * COS(rlatv(jjm-j+1) ).LT.1. ) THEN
+       IF ( cof < 1. ) THEN
+          IF( rlamda(imx) * COS(rlatv(jjm-j+1) )<1. ) THEN
                jfiltsv= jjm-j+1
           ENDIF
@@ -226,20 +226,20 @@
     !                                 
 
-    IF( jfiltnu.GT. jjm/2 +1 )  THEN
+    IF( jfiltnu> jjm/2 +1 )  THEN
        PRINT *,' jfiltnu en dehors des valeurs acceptables ' ,jfiltnu
        STOP
     ENDIF
 
-    IF( jfiltsu.GT.  jjm  +1 )  THEN
+    IF( jfiltsu>  jjm  +1 )  THEN
        PRINT *,' jfiltsu en dehors des valeurs acceptables ' ,jfiltsu
        STOP
     ENDIF
 
-    IF( jfiltnv.GT. jjm/2    )  THEN
+    IF( jfiltnv> jjm/2    )  THEN
        PRINT *,' jfiltnv en dehors des valeurs acceptables ' ,jfiltnv
        STOP
     ENDIF
 
-    IF( jfiltsv.GT.     jjm  )  THEN
+    IF( jfiltsv>     jjm  )  THEN
        PRINT *,' jfiltsv en dehors des valeurs acceptables ' ,jfiltsv
        STOP
@@ -273,5 +273,5 @@
        DO k = 2,modemax
           cof = rlamda(k) * COS( rlatu(j) )
-          IF ( cof .LT. 1. ) GOTO 82
+          IF ( cof < 1. ) GOTO 82
        ENDDO
        GOTO 84
@@ -292,5 +292,5 @@
        DO k = 2,modemax
           cof = rlamda(k) * COS( rlatv(j) )
-          IF ( cof .LT. 1. ) GOTO 87
+          IF ( cof < 1. ) GOTO 87
        ENDDO
        GOTO 89
@@ -309,5 +309,5 @@
        DO k = 2,modemax
           cof = rlamda(k) * COS( rlatu(j) )
-          IF ( cof .LT. 1. ) GOTO 92
+          IF ( cof < 1. ) GOTO 92
        ENDDO
        GOTO 94
@@ -326,5 +326,5 @@
        DO k = 2,modemax
           cof = rlamda(k) * COS( rlatv(j) )
-          IF ( cof .LT. 1. ) GOTO 97
+          IF ( cof < 1. ) GOTO 97
        ENDDO
        GOTO 99
@@ -341,9 +341,9 @@
     !
 
-    IF(jfiltnv.GE.jjm/2 .OR. jfiltnu.GE.jjm/2)THEN
+    IF(jfiltnv>=jjm/2 .OR. jfiltnu>=jjm/2)THEN
 ! Ehouarn: and what are these for??? Trying to handle a limit case
 !          where filters extend to and meet at the equator?
-       IF(jfiltnv.EQ.jfiltsv)jfiltsv=1+jfiltnv
-       IF(jfiltnu.EQ.jfiltsu)jfiltsu=1+jfiltnu
+       IF(jfiltnv==jfiltsv)jfiltsv=1+jfiltnv
+       IF(jfiltnu==jfiltsu)jfiltsu=1+jfiltnu
 
        PRINT *,'jfiltnv jfiltsv jfiltnu jfiltsu' , &
@@ -367,5 +367,5 @@
        DO i=1,iim
           coff = coefilu(i,j)
-          IF( i.LT.modfrstu(j) ) coff = 0.
+          IF( i<modfrstu(j) ) coff = 0.
           DO k=1,iim
              eignft(i,k) = eignfnv(k,i) * coff
@@ -397,5 +397,5 @@
        DO i=1,iim
           coff = coefilu(i,j)
-          IF( i.LT.modfrstu(j) ) coff = 0.
+          IF( i<modfrstu(j) ) coff = 0.
           DO k=1,iim
              eignft(i,k) = eignfnv(k,i) * coff
@@ -434,5 +434,5 @@
        DO i = 1, iim
           coff = coefilv(i,j)
-          IF( i.LT.modfrstv(j) ) coff = 0.
+          IF( i<modfrstv(j) ) coff = 0.
           DO k = 1, iim
              eignft(i,k) = eignfnu(k,i) * coff
@@ -464,5 +464,5 @@
        DO i = 1, iim
           coff = coefilv(i,j)
-          IF( i.LT.modfrstv(j) ) coff = 0.
+          IF( i<modfrstv(j) ) coff = 0.
           DO k = 1, iim
              eignft(i,k) = eignfnu(k,i) * coff
@@ -501,5 +501,5 @@
        DO i = 1,iim
           coff = coefilu(i,j)/ ( 1. + coefilu(i,j) )
-          IF( i.LT.modfrstu(j) ) coff = 0.
+          IF( i<modfrstu(j) ) coff = 0.
           DO k=1,iim
              eignft(i,k) = eignfnv(k,i) * coff
@@ -531,5 +531,5 @@
        DO i = 1,iim
           coff = coefilu(i,j) / ( 1. + coefilu(i,j) )
-          IF( i.LT.modfrstu(j) ) coff = 0.
+          IF( i<modfrstu(j) ) coff = 0.
           DO k=1,iim
              eignft(i,k) = eignfnv(k,i) * coff
Index: /LMDZ6/branches/Amaury_dev/libf/filtrez/jacobi.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/filtrez/jacobi.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/filtrez/jacobi.F90	(revision 5082)
@@ -38,6 +38,6 @@
           ENDDO
         ENDDO
-        IF(SM.EQ.0.)RETURN
-        IF(I.LT.4)THEN
+        IF(SM==0.)RETURN
+        IF(I<4)THEN
           TRESH=0.2*SM/N**2
         ELSE
@@ -47,15 +47,15 @@
           DO IQ=IP+1,N
             G=100.*ABS(A(IP,IQ))
-            IF((I.GT.4).AND.(ABS(D(IP))+G.EQ.ABS(D(IP))) &
-               .AND.(ABS(D(IQ))+G.EQ.ABS(D(IQ))))THEN
+            IF((I>4).AND.(ABS(D(IP))+G==ABS(D(IP))) &
+               .AND.(ABS(D(IQ))+G==ABS(D(IQ))))THEN
               A(IP,IQ)=0.
-            ELSE IF(ABS(A(IP,IQ)).GT.TRESH)THEN
+            ELSE IF(ABS(A(IP,IQ))>TRESH)THEN
               H=D(IQ)-D(IP)
-              IF(ABS(H)+G.EQ.ABS(H))THEN
+              IF(ABS(H)+G==ABS(H))THEN
                 T=A(IP,IQ)/H
               ELSE
                 THETA=0.5*H/A(IP,IQ)
                 T=1./(ABS(THETA)+SQRT(1.+THETA**2))
-                IF(THETA.LT.0.)T=-T
+                IF(THETA<0.)T=-T
               ENDIF
               C=1./SQRT(1+T**2)
Index: /LMDZ6/branches/Amaury_dev/libf/misc/chfev.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/chfev.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/chfev.F	(revision 5082)
@@ -100,7 +100,7 @@
 C
 C***FIRST EXECUTABLE STATEMENT  CHFEV
-      IF (NE .LT. 1)  GO TO 5001
+      IF (NE < 1)  GO TO 5001
       H = X2 - X1
-      IF (H .EQ. ZERO)  GO TO 5002
+      IF (H == ZERO)  GO TO 5002
 C
 C  INITIALIZE.
@@ -128,6 +128,6 @@
          FE(I) = F1 + X*(D1 + X*(C2 + X*C3))
 C          COUNT EXTRAPOLATION POINTS.
-         IF ( X.LT.XMI )  NEXT(1) = NEXT(1) + 1
-         IF ( X.GT.XMA )  NEXT(2) = NEXT(2) + 1
+         IF ( X<XMI )  NEXT(1) = NEXT(1) + 1
+         IF ( X>XMA )  NEXT(2) = NEXT(2) + 1
 C        (NOTE REDUNDANCY--IF EITHER CONDITION IS TRUE, OTHER IS FALSE.)
   500 CONTINUE
Index: /LMDZ6/branches/Amaury_dev/libf/misc/formcoord.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/formcoord.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/formcoord.F	(revision 5082)
@@ -25,5 +25,5 @@
       endif
 
-      if (n.lt.2) then
+      if (n<2) then
          ndec=1
          write(unit,1000) text,n,x(1)*a
@@ -32,9 +32,9 @@
          do i=2,n-1
             dx=abs(x(i+1)-x(i))
-            if (dx.lt.dxmin) dxmin=dx
+            if (dx<dxmin) dxmin=dx
          enddo
 
          ndec=-log10(dxmin)+2
-         if(mod(n,6).eq.1) then
+         if(mod(n,6)==1) then
             write(unit,1000) text,n,x(i1)*a
             write(unit,2000) (x(i)*a,i=i2,in,id)
Index: /LMDZ6/branches/Amaury_dev/libf/misc/i1mach.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/i1mach.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/i1mach.F	(revision 5082)
@@ -114,5 +114,5 @@
       IMACH(15) =      minexponent(0d0)
       IMACH(16) =       maxexponent(0d0)
-      IF (I .LT. 1  .OR.  I .GT. 16) GO TO 10
+      IF (I < 1  .OR.  I > 16) GO TO 10
 C
       I1MACH = IMACH(I)
Index: /LMDZ6/branches/Amaury_dev/libf/misc/ismax.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/ismax.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/ismax.F	(revision 5082)
@@ -14,5 +14,5 @@
       do 10 i=1,n-1
        ix=ix+incx
-       if(sx(ix).gt.sxmax) then
+       if(sx(ix)>sxmax) then
          sxmax=sx(ix)
          ismax=i+1
Index: /LMDZ6/branches/Amaury_dev/libf/misc/ismin.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/ismin.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/ismin.F	(revision 5082)
@@ -14,5 +14,5 @@
       DO i=1,n-1
          ix=ix+incx
-         if(sx(ix).lt.sxmin) then
+         if(sx(ix)<sxmin) then
              sxmin=sx(ix)
              ismin=i+1
Index: /LMDZ6/branches/Amaury_dev/libf/misc/juldate.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/juldate.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/juldate.F	(revision 5082)
@@ -18,10 +18,10 @@
 	    year=dble(ian)
 	    rmon=dble(imoi)
-	if (imoi .le. 2) then
+	if (imoi <= 2) then
 	    year=year-1.
 	    rmon=rmon+12.
 	endif
 	cf=year+(rmon/100.)+(ojou/10000.)
-	if (cf .ge. 1582.1015) then
+	if (cf >= 1582.1015) then
 	    a=int(year/100)
 	    b=2-a+int(a/4)
Index: /LMDZ6/branches/Amaury_dev/libf/misc/pchdf.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/pchdf.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/pchdf.F	(revision 5082)
@@ -72,5 +72,5 @@
 C
 C***FIRST EXECUTABLE STATEMENT  PCHDF
-      IF (K .LT. 3)  GO TO 5001
+      IF (K < 3)  GO TO 5001
 C
 C  COMPUTE COEFFICIENTS OF INTERPOLATING POLYNOMIAL.
Index: /LMDZ6/branches/Amaury_dev/libf/misc/pchfe.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/pchfe.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/pchfe.F	(revision 5082)
@@ -143,8 +143,8 @@
       IF (SKIP)  GO TO 5
 C
-      IF ( N.LT.2 )  GO TO 5001
-      IF ( INCFD.LT.1 )  GO TO 5002
+      IF ( N<2 )  GO TO 5001
+      IF ( INCFD<1 )  GO TO 5002
       DO 1  I = 2, N
-         IF ( X(I).LE.X(I-1) )  GO TO 5003
+         IF ( X(I)<=X(I-1) )  GO TO 5003
     1 CONTINUE
 C
@@ -152,5 +152,5 @@
 C
     5 CONTINUE
-      IF ( NE.LT.1 )  GO TO 5004
+      IF ( NE<1 )  GO TO 5004
       IERR = 0
       SKIP = .TRUE.
@@ -164,10 +164,10 @@
 C     SKIP OUT OF LOOP IF HAVE PROCESSED ALL EVALUATION POINTS.
 C
-         IF (JFIRST .GT. NE)  GO TO 5000
+         IF (JFIRST > NE)  GO TO 5000
 C
 C     LOCATE ALL POINTS IN INTERVAL.
 C
          DO 20  J = JFIRST, NE
-            IF (XE(J) .GE. X(IR))  GO TO 30
+            IF (XE(J) >= X(IR))  GO TO 30
    20    CONTINUE
          J = NE + 1
@@ -177,5 +177,5 @@
 C
    30    CONTINUE
-         IF (IR .EQ. N)  J = NE + 1
+         IF (IR == N)  J = NE + 1
 C
    40    CONTINUE
@@ -184,5 +184,5 @@
 C     SKIP EVALUATION IF NO POINTS IN INTERVAL.
 C
-         IF (NJ .EQ. 0)  GO TO 50
+         IF (NJ == 0)  GO TO 50
 C
 C     EVALUATE CUBIC AT XE(I),  I = JFIRST (1) J-1 .
@@ -192,12 +192,12 @@
      *              NJ, XE(JFIRST), FE(JFIRST), NEXT, IERC)
 C       ----------------------------------------------------------------
-         IF (IERC .LT. 0)  GO TO 5005
-C
-         IF (NEXT(2) .EQ. 0)  GO TO 42
+         IF (IERC < 0)  GO TO 5005
+C
+         IF (NEXT(2) == 0)  GO TO 42
 C        IF (NEXT(2) .GT. 0)  THEN
 C           IN THE CURRENT SET OF XE-POINTS, THERE ARE NEXT(2) TO THE
 C           RIGHT OF X(IR).
 C
-            IF (IR .LT. N)  GO TO 41
+            IF (IR < N)  GO TO 41
 C           IF (IR .EQ. N)  THEN
 C              THESE ARE ACTUALLY EXTRAPOLATION POINTS.
@@ -212,10 +212,10 @@
    42    CONTINUE
 C
-         IF (NEXT(1) .EQ. 0)  GO TO 49
+         IF (NEXT(1) == 0)  GO TO 49
 C        IF (NEXT(1) .GT. 0)  THEN
 C           IN THE CURRENT SET OF XE-POINTS, THERE ARE NEXT(1) TO THE
 C           LEFT OF X(IR-1).
 C
-            IF (IR .GT. 2)  GO TO 43
+            IF (IR > 2)  GO TO 43
 C           IF (IR .EQ. 2)  THEN
 C              THESE ARE ACTUALLY EXTRAPOLATION POINTS.
@@ -229,5 +229,5 @@
 C              FIRST, LOCATE FIRST POINT TO LEFT OF X(IR-1).
                DO 44  I = JFIRST, J-1
-                  IF (XE(I) .LT. X(IR-1))  GO TO 45
+                  IF (XE(I) < X(IR-1))  GO TO 45
    44          CONTINUE
 C              NOTE-- CANNOT DROP THROUGH HERE UNLESS THERE IS AN ERROR
@@ -241,5 +241,5 @@
 C              NOW FIND OUT HOW FAR TO BACK UP IN THE X-ARRAY.
                DO 46  I = 1, IR-1
-                  IF (XE(J) .LT. X(I)) GO TO 47
+                  IF (XE(J) < X(I)) GO TO 47
    46          CONTINUE
 C              NB-- CAN NEVER DROP THROUGH HERE, SINCE XE(J).LT.X(IR-1).
@@ -261,5 +261,5 @@
    50 CONTINUE
       IR = IR + 1
-      IF (IR .LE. N)  GO TO 10
+      IF (IR <= N)  GO TO 10
 C
 C  NORMAL RETURN.
Index: /LMDZ6/branches/Amaury_dev/libf/misc/pchsp.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/pchsp.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/pchsp.F	(revision 5082)
@@ -162,8 +162,8 @@
 C
 C***FIRST EXECUTABLE STATEMENT  PCHSP
-      IF ( N.LT.2 )  GO TO 5001
-      IF ( INCFD.LT.1 )  GO TO 5002
+      IF ( N<2 )  GO TO 5001
+      IF ( INCFD<1 )  GO TO 5002
       DO 1  J = 2, N
-         IF ( X(J).LE.X(J-1) )  GO TO 5003
+         IF ( X(J)<=X(J-1) )  GO TO 5003
     1 CONTINUE
 C
@@ -171,11 +171,11 @@
       IEND = IC(2)
       IERR = 0
-      IF ( (IBEG.LT.0).OR.(IBEG.GT.4) )  IERR = IERR - 1
-      IF ( (IEND.LT.0).OR.(IEND.GT.4) )  IERR = IERR - 2
-      IF ( IERR.LT.0 )  GO TO 5004
+      IF ( (IBEG<0).OR.(IBEG>4) )  IERR = IERR - 1
+      IF ( (IEND<0).OR.(IEND>4) )  IERR = IERR - 2
+      IF ( IERR<0 )  GO TO 5004
 C
 C  FUNCTION DEFINITION IS OK -- GO ON.
 C
-      IF ( NWK .LT. 2*N )  GO TO 5007
+      IF ( NWK < 2*N )  GO TO 5007
 C
 C  COMPUTE FIRST DIFFERENCES OF X SEQUENCE AND STORE IN WK(1,.). ALSO,
@@ -188,12 +188,12 @@
 C  SET TO DEFAULT BOUNDARY CONDITIONS IF N IS TOO SMALL.
 C
-      IF ( IBEG.GT.N )  IBEG = 0
-      IF ( IEND.GT.N )  IEND = 0
+      IF ( IBEG>N )  IBEG = 0
+      IF ( IEND>N )  IEND = 0
 C
 C  SET UP FOR BOUNDARY CONDITIONS.
 C
-      IF ( (IBEG.EQ.1).OR.(IBEG.EQ.2) )  THEN
+      IF ( (IBEG==1).OR.(IBEG==2) )  THEN
          D(1,1) = VC(1)
-      ELSE IF (IBEG .GT. 2)  THEN
+      ELSE IF (IBEG > 2)  THEN
 C        PICK UP FIRST IBEG POINTS, IN REVERSE ORDER.
          DO 10  J = 1, IBEG
@@ -201,16 +201,16 @@
 C           INDEX RUNS FROM IBEG DOWN TO 1.
             XTEMP(J) = X(INDEX)
-            IF (J .LT. IBEG)  STEMP(J) = WK(2,INDEX)
+            IF (J < IBEG)  STEMP(J) = WK(2,INDEX)
    10    CONTINUE
 C                 --------------------------------
          D(1,1) = PCHDF (IBEG, XTEMP, STEMP, IERR)
 C                 --------------------------------
-         IF (IERR .NE. 0)  GO TO 5009
+         IF (IERR /= 0)  GO TO 5009
          IBEG = 1
       ENDIF
 C
-      IF ( (IEND.EQ.1).OR.(IEND.EQ.2) )  THEN
+      IF ( (IEND==1).OR.(IEND==2) )  THEN
          D(1,N) = VC(2)
-      ELSE IF (IEND .GT. 2)  THEN
+      ELSE IF (IEND > 2)  THEN
 C        PICK UP LAST IEND POINTS.
          DO 15  J = 1, IEND
@@ -218,10 +218,10 @@
 C           INDEX RUNS FROM N+1-IEND UP TO N.
             XTEMP(J) = X(INDEX)
-            IF (J .LT. IEND)  STEMP(J) = WK(2,INDEX+1)
+            IF (J < IEND)  STEMP(J) = WK(2,INDEX+1)
    15    CONTINUE
 C                 --------------------------------
          D(1,N) = PCHDF (IEND, XTEMP, STEMP, IERR)
 C                 --------------------------------
-         IF (IERR .NE. 0)  GO TO 5009
+         IF (IERR /= 0)  GO TO 5009
          IEND = 1
       ENDIF
@@ -237,6 +237,6 @@
 C             WK(2,1)*S(1) + WK(1,1)*S(2) = D(1,1)
 C
-      IF (IBEG .EQ. 0)  THEN
-         IF (N .EQ. 2)  THEN
+      IF (IBEG == 0)  THEN
+         IF (N == 2)  THEN
 C           NO CONDITION AT LEFT END AND N = 2.
             WK(2,1) = ONE
@@ -250,5 +250,5 @@
      *                        + WK(1,2)**2*WK(2,3)) / WK(1,1)
          ENDIF
-      ELSE IF (IBEG .EQ. 1)  THEN
+      ELSE IF (IBEG == 1)  THEN
 C        SLOPE PRESCRIBED AT LEFT END.
          WK(2,1) = ONE
@@ -266,7 +266,7 @@
 C
       NM1 = N-1
-      IF (NM1 .GT. 1)  THEN
+      IF (NM1 > 1)  THEN
          DO 20 J=2,NM1
-            IF (WK(2,J-1) .EQ. ZERO)  GO TO 5008
+            IF (WK(2,J-1) == ZERO)  GO TO 5008
             G = -WK(1,J+1)/WK(2,J-1)
             D(1,J) = G*D(1,J-1)
@@ -282,17 +282,17 @@
 C     SUBSTITUTION, SINCE ARRAYS HAPPEN TO BE SET UP JUST RIGHT FOR IT
 C     AT THIS POINT.
-      IF (IEND .EQ. 1)  GO TO 30
-C
-      IF (IEND .EQ. 0)  THEN
-         IF (N.EQ.2 .AND. IBEG.EQ.0)  THEN
+      IF (IEND == 1)  GO TO 30
+C
+      IF (IEND == 0)  THEN
+         IF (N==2 .AND. IBEG==0)  THEN
 C           NOT-A-KNOT AT RIGHT ENDPOINT AND AT LEFT ENDPOINT AND N = 2.
             D(1,2) = WK(2,2)
             GO TO 30
-         ELSE IF ((N.EQ.2) .OR. (N.EQ.3 .AND. IBEG.EQ.0))  THEN
+         ELSE IF ((N==2) .OR. (N==3 .AND. IBEG==0))  THEN
 C           EITHER (N=3 AND NOT-A-KNOT ALSO AT LEFT) OR (N=2 AND *NOT*
 C           NOT-A-KNOT AT LEFT END POINT).
             D(1,N) = TWO*WK(2,N)
             WK(2,N) = ONE
-            IF (WK(2,N-1) .EQ. ZERO)  GO TO 5008
+            IF (WK(2,N-1) == ZERO)  GO TO 5008
             G = -ONE/WK(2,N-1)
          ELSE
@@ -303,5 +303,5 @@
             D(1,N) = ((WK(1,N)+TWO*G)*WK(2,N)*WK(1,N-1)
      *                  + WK(1,N)**2*(F(1,N-1)-F(1,N-2))/WK(1,N-1))/G
-            IF (WK(2,N-1) .EQ. ZERO)  GO TO 5008
+            IF (WK(2,N-1) == ZERO)  GO TO 5008
             G = -G/WK(2,N-1)
             WK(2,N) = WK(1,N-1)
@@ -311,5 +311,5 @@
          D(1,N) = THREE*WK(2,N) + HALF*WK(1,N)*D(1,N)
          WK(2,N) = TWO
-         IF (WK(2,N-1) .EQ. ZERO)  GO TO 5008
+         IF (WK(2,N-1) == ZERO)  GO TO 5008
          G = -ONE/WK(2,N-1)
       ENDIF
@@ -318,5 +318,5 @@
 C
       WK(2,N) = G*WK(1,N-1) + WK(2,N)
-      IF (WK(2,N) .EQ. ZERO)   GO TO 5008
+      IF (WK(2,N) == ZERO)   GO TO 5008
       D(1,N) = (G*D(1,N-1) + D(1,N))/WK(2,N)
 C
@@ -325,5 +325,5 @@
    30 CONTINUE
       DO 40 J=NM1,1,-1
-         IF (WK(2,J) .EQ. ZERO)  GO TO 5008
+         IF (WK(2,J) == ZERO)  GO TO 5008
          D(1,J) = (D(1,J) - WK(1,J)*D(1,J+1))/WK(2,J)
    40 CONTINUE
Index: /LMDZ6/branches/Amaury_dev/libf/misc/q_sat.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/q_sat.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/q_sat.F	(revision 5082)
@@ -52,5 +52,5 @@
 !       write(*,*)'temp,pres=',temp(ip),pres(ip)
 !
-         IF (temp(ip) .LE. rtt) THEN
+         IF (temp(ip) <= rtt) THEN
             r3es = r3ies
             r4es = r4ies
Index: /LMDZ6/branches/Amaury_dev/libf/misc/ran1.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/ran1.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/ran1.F	(revision 5082)
@@ -14,5 +14,5 @@
       INTEGER :: IDUM,J
 
-      IF (IDUM.LT.0.OR.IFF.EQ.0) THEN
+      IF (IDUM<0.OR.IFF==0) THEN
         IFF=1
         IX1=MOD(IC1-IDUM,M1)
@@ -32,5 +32,5 @@
       IX3=MOD(IA3*IX3+IC3,M3)
       J=1+(97*IX3)/M3
-      IF(J.GT.97.OR.J.LT.1) stop 1
+      IF(J>97.OR.J<1) stop 1
       RAN1=R(J)
       R(J)=(REAL(IX1)+REAL(IX2)*RM2)*RM1
Index: /LMDZ6/branches/Amaury_dev/libf/misc/sort.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/sort.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/sort.F	(revision 5082)
@@ -22,5 +22,5 @@
         p=d(i)
         DO j=i+1,n
-         IF(d(j).LE.p) THEN
+         IF(d(j)<=p) THEN
            k=j
            p=d(j)
@@ -28,5 +28,5 @@
         ENDDO
 
-       IF(k.ne.i) THEN
+       IF(k/=i) THEN
          d(k)=d(i)
          d(i)=p
Index: /LMDZ6/branches/Amaury_dev/libf/misc/xermsg.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/xermsg.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/xermsg.F	(revision 5082)
@@ -205,6 +205,6 @@
 C          AND THE LEVEL SHOULD BE BETWEEN 0 AND 2.
 C
-      IF (NERR.LT.-9999999 .OR. NERR.GT.99999999 .OR. NERR.EQ.0 .OR.
-     *   LEVEL.LT.-1 .OR. LEVEL.GT.2) THEN
+      IF (NERR<-9999999 .OR. NERR>99999999 .OR. NERR==0 .OR.
+     *   LEVEL<-1 .OR. LEVEL>2) THEN
          CALL XERPRN (' ***', -1, 'FATAL ERROR IN...$$ ' //
      *      'XERMSG -- INVALID ERROR NUMBER OR LEVEL$$ '//
@@ -222,5 +222,5 @@
 C       HANDLE PRINT-ONCE WARNING MESSAGES.
 C
-      IF (LEVEL.EQ.-1 .AND. KOUNT.GT.1) RETURN
+      IF (LEVEL==-1 .AND. KOUNT>1) RETURN
 C
 C       ALLOW TEMPORARY USER OVERRIDE OF THE CONTROL FLAG.
@@ -239,8 +239,8 @@
 C       ZERO AND THE ERROR IS NOT FATAL.
 C
-      IF (LEVEL.LT.2 .AND. LKNTRL.EQ.0) GO TO 30
-      IF (LEVEL.EQ.0 .AND. KOUNT.GT.MAXMES) GO TO 30
-      IF (LEVEL.EQ.1 .AND. KOUNT.GT.MAXMES .AND. MKNTRL.EQ.1) GO TO 30
-      IF (LEVEL.EQ.2 .AND. KOUNT.GT.MAX(1,MAXMES)) GO TO 30
+      IF (LEVEL<2 .AND. LKNTRL==0) GO TO 30
+      IF (LEVEL==0 .AND. KOUNT>MAXMES) GO TO 30
+      IF (LEVEL==1 .AND. KOUNT>MAXMES .AND. MKNTRL==1) GO TO 30
+      IF (LEVEL==2 .AND. KOUNT>MAX(1,MAXMES)) GO TO 30
 C
 C       ANNOUNCE THE NAMES OF THE LIBRARY AND SUBROUTINE BY BUILDING A
@@ -249,5 +249,5 @@
 C       IS NOT ZERO.
 C
-      IF (LKNTRL .NE. 0) THEN
+      IF (LKNTRL /= 0) THEN
          TEMP(1:21) = 'MESSAGE FROM ROUTINE '
          I = MIN(LEN(SUBROU), 16)
@@ -281,12 +281,12 @@
 C       WE SKIP THE NEXT BLOCK IF THE INTRODUCTORY LINE IS NOT NEEDED.
 C
-      IF (LKNTRL .GT. 0) THEN
+      IF (LKNTRL > 0) THEN
 C
 C       THE FIRST PART OF THE MESSAGE TELLS ABOUT THE LEVEL.
 C
-         IF (LEVEL .LE. 0) THEN
+         IF (LEVEL <= 0) THEN
             TEMP(1:20) = 'INFORMATIVE MESSAGE,'
             LTEMP = 20
-         ELSEIF (LEVEL .EQ. 1) THEN
+         ELSEIF (LEVEL == 1) THEN
             TEMP(1:30) = 'POTENTIALLY RECOVERABLE ERROR,'
             LTEMP = 30
@@ -298,6 +298,6 @@
 C       THEN WHETHER THE PROGRAM WILL CONTINUE.
 C
-         IF ((MKNTRL.EQ.2 .AND. LEVEL.GE.1) .OR.
-     *       (MKNTRL.EQ.1 .AND. LEVEL.EQ.2)) THEN
+         IF ((MKNTRL==2 .AND. LEVEL>=1) .OR.
+     *       (MKNTRL==1 .AND. LEVEL==2)) THEN
             TEMP(LTEMP+1:LTEMP+14) = ' PROG ABORTED,'
             LTEMP = LTEMP + 14
@@ -309,5 +309,5 @@
 C       FINALLY TELL WHETHER THERE SHOULD BE A TRACEBACK.
 C
-         IF (LKNTRL .GT. 0) THEN
+         IF (LKNTRL > 0) THEN
             TEMP(LTEMP+1:LTEMP+20) = ' TRACEBACK REQUESTED'
             LTEMP = LTEMP + 20
@@ -326,8 +326,8 @@
 C          TRACEBACK.
 C
-      IF (LKNTRL .GT. 0) THEN
+      IF (LKNTRL > 0) THEN
          WRITE (TEMP, '(''ERROR NUMBER = '', I8)') NERR
          DO 10 I=16,22
-            IF (TEMP(I:I) .NE. ' ') GO TO 20
+            IF (TEMP(I:I) /= ' ') GO TO 20
    10    CONTINUE
 C
@@ -338,5 +338,5 @@
 C       IF LKNTRL IS NOT ZERO, PRINT A BLANK LINE AND AN END OF MESSAGE.
 C
-      IF (LKNTRL .NE. 0) THEN
+      IF (LKNTRL /= 0) THEN
          CALL XERPRN (' *  ', -1, ' ', 72)
          CALL XERPRN (' ***', -1, 'END OF MESSAGE', 72)
@@ -347,5 +347,5 @@
 C       CONTROL FLAG IS SET FOR RECOVERY, THEN RETURN.
 C
-   30 IF (LEVEL.LE.0 .OR. (LEVEL.EQ.1 .AND. MKNTRL.LE.1)) RETURN
+   30 IF (LEVEL<=0 .OR. (LEVEL==1 .AND. MKNTRL<=1)) RETURN
 C
 C       THE PROGRAM WILL BE STOPPED DUE TO AN UNRECOVERED ERROR OR A
@@ -353,6 +353,6 @@
 C       SUMMARY IF THE CONTROL FLAG AND THE MAXIMUM ERROR COUNT PERMIT.
 C
-      IF (LKNTRL.GT.0 .AND. KOUNT.LT.MAX(1,MAXMES)) THEN
-         IF (LEVEL .EQ. 1) THEN
+      IF (LKNTRL>0 .AND. KOUNT<MAX(1,MAXMES)) THEN
+         IF (LEVEL == 1) THEN
             CALL XERPRN
      *         (' ***', -1, 'JOB ABORT DUE TO UNRECOVERED ERROR.', 72)
Index: /LMDZ6/branches/Amaury_dev/libf/misc/xerprn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/xerprn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/xerprn.F	(revision 5082)
@@ -93,5 +93,5 @@
       N = I1MACH(4)
       DO 10 I=1,NUNIT
-         IF (IU(I) .EQ. 0) IU(I) = N
+         IF (IU(I) == 0) IU(I) = N
    10 CONTINUE
 C
@@ -100,5 +100,5 @@
 C       THE REST OF THIS ROUTINE.
 C
-      IF ( NPREF .LT. 0 ) THEN
+      IF ( NPREF < 0 ) THEN
          LPREF = LEN(PREFIX)
       ELSE
@@ -106,5 +106,5 @@
       ENDIF
       LPREF = MIN(16, LPREF)
-      IF (LPREF .NE. 0) CBUFF(1:LPREF) = PREFIX
+      IF (LPREF /= 0) CBUFF(1:LPREF) = PREFIX
 C
 C       LWRAP IS THE MAXIMUM NUMBER OF CHARACTERS WE WANT TO TAKE AT ONE
@@ -118,5 +118,5 @@
       N = LENMSG
       DO 20 I=1,N
-         IF (MESSG(LENMSG:LENMSG) .NE. ' ') GO TO 30
+         IF (MESSG(LENMSG:LENMSG) /= ' ') GO TO 30
          LENMSG = LENMSG - 1
    20 CONTINUE
@@ -125,5 +125,5 @@
 C       IF THE MESSAGE IS ALL BLANKS, THEN PRINT ONE BLANK LINE.
 C
-      IF (LENMSG .EQ. 0) THEN
+      IF (LENMSG == 0) THEN
          CBUFF(LPREF+1:LPREF+1) = ' '
          DO 40 I=1,NUNIT
@@ -172,5 +172,5 @@
       NEXTC = 1
    50 LPIECE = INDEX(MESSG(NEXTC:LENMSG), NEWLIN)
-      IF (LPIECE .EQ. 0) THEN
+      IF (LPIECE == 0) THEN
 C
 C       THERE WAS NO NEW LINE SENTINEL FOUND.
@@ -178,7 +178,7 @@
          IDELTA = 0
          LPIECE = MIN(LWRAP, LENMSG+1-NEXTC)
-         IF (LPIECE .LT. LENMSG+1-NEXTC) THEN
+         IF (LPIECE < LENMSG+1-NEXTC) THEN
             DO 52 I=LPIECE+1,2,-1
-               IF (MESSG(NEXTC+I-1:NEXTC+I-1) .EQ. ' ') THEN
+               IF (MESSG(NEXTC+I-1:NEXTC+I-1) == ' ') THEN
                   LPIECE = I-1
                   IDELTA = 1
@@ -189,5 +189,5 @@
    54    CBUFF(LPREF+1:LPREF+LPIECE) = MESSG(NEXTC:NEXTC+LPIECE-1)
          NEXTC = NEXTC + LPIECE + IDELTA
-      ELSEIF (LPIECE .EQ. 1) THEN
+      ELSEIF (LPIECE == 1) THEN
 C
 C       WE HAVE A NEW LINE SENTINEL AT MESSG(NEXTC:NEXTC+1).
@@ -196,5 +196,5 @@
          NEXTC = NEXTC + 2
          GO TO 50
-      ELSEIF (LPIECE .GT. LWRAP+1) THEN
+      ELSEIF (LPIECE > LWRAP+1) THEN
 C
 C       LPIECE SHOULD BE SET DOWN TO LWRAP.
@@ -203,5 +203,5 @@
          LPIECE = LWRAP
          DO 56 I=LPIECE+1,2,-1
-            IF (MESSG(NEXTC+I-1:NEXTC+I-1) .EQ. ' ') THEN
+            IF (MESSG(NEXTC+I-1:NEXTC+I-1) == ' ') THEN
                LPIECE = I-1
                IDELTA = 1
@@ -227,5 +227,5 @@
    60 CONTINUE
 C
-      IF (NEXTC .LE. LENMSG) GO TO 50
+      IF (NEXTC <= LENMSG) GO TO 50
       RETURN
       END
Index: /LMDZ6/branches/Amaury_dev/libf/misc/xersve.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/xersve.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/xersve.F	(revision 5082)
@@ -72,9 +72,9 @@
 C***FIRST EXECUTABLE STATEMENT  XERSVE
 C
-      IF (KFLAG.LE.0) THEN
+      IF (KFLAG<=0) THEN
 C
 C        Dump the table.
 C
-         IF (NMSG.EQ.0) RETURN
+         IF (NMSG==0) RETURN
 C
 C        Print to each unit.
@@ -83,5 +83,5 @@
          DO 20 KUNIT = 1,NUNIT
             IUNIT = LUN(KUNIT)
-            IF (IUNIT.EQ.0) IUNIT = I1MACH(4)
+            IF (IUNIT==0) IUNIT = I1MACH(4)
 C
 C           Print the table header.
@@ -98,5 +98,5 @@
 C           Print number of other errors.
 C
-            IF (KOUNTX.NE.0) WRITE (IUNIT,9020) KOUNTX
+            IF (KOUNTX/=0) WRITE (IUNIT,9020) KOUNTX
             WRITE (IUNIT,9030)
    20    CONTINUE
@@ -104,5 +104,5 @@
 C        Clear the error tables.
 C
-         IF (KFLAG.EQ.0) THEN
+         IF (KFLAG==0) THEN
             NMSG = 0
             KOUNTX = 0
@@ -118,7 +118,7 @@
          MES = MESSG
          DO 30 I = 1,NMSG
-            IF (LIB.EQ.LIBTAB(I) .AND. SUB.EQ.SUBTAB(I) .AND.
-     *         MES.EQ.MESTAB(I) .AND. NERR.EQ.NERTAB(I) .AND.
-     *         LEVEL.EQ.LEVTAB(I)) THEN
+            IF (LIB==LIBTAB(I) .AND. SUB==SUBTAB(I) .AND.
+     *         MES==MESTAB(I) .AND. NERR==NERTAB(I) .AND.
+     *         LEVEL==LEVTAB(I)) THEN
                   KOUNT(I) = KOUNT(I) + 1
                   ICOUNT = KOUNT(I)
@@ -127,5 +127,5 @@
    30    CONTINUE
 C
-         IF (NMSG.LT.LENTAB) THEN
+         IF (NMSG<LENTAB) THEN
 C
 C           Empty slot found for new message.
Index: /LMDZ6/branches/Amaury_dev/libf/misc/xgetua.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/misc/xgetua.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/misc/xgetua.F	(revision 5082)
@@ -47,5 +47,5 @@
       DO 30 I=1,N
          INDEX = I+4
-         IF (I.EQ.1) INDEX = 3
+         IF (I==1) INDEX = 3
          IUNITA(I) = J4SAVE(INDEX,0,.FALSE.)
    30 CONTINUE
Index: /LMDZ6/branches/Amaury_dev/libf/obsolete/mkstat.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/obsolete/mkstat.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/obsolete/mkstat.F90	(revision 5082)
@@ -127,5 +127,5 @@
       enddo
 
-    else if (ndims.eq.3) then
+    else if (ndims==3) then
 
 !      dimout(1)=lonid
Index: /LMDZ6/branches/Amaury_dev/libf/obsolete/wstats.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/obsolete/wstats.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/obsolete/wstats.F90	(revision 5082)
@@ -37,5 +37,5 @@
 endif
 
-if (mod(step,istats).ne.0) then
+if (mod(step,istats)/=0) then
    RETURN
 endif
@@ -46,5 +46,5 @@
 ierr= NF_INQ_VARID(nid,namebis,meanid)
 
-if (ierr.ne.NF_NOERR) then
+if (ierr/=NF_NOERR) then
 
    if (firstvar==nom) then 
@@ -59,5 +59,5 @@
    ierr= NF_INQ_DIMID(nid,"longitude",id(1))
    ierr= NF_INQ_DIMID(nid,"latitude",id(2))
-   if (dim.eq.3) then
+   if (dim==3) then
       ierr= NF_INQ_DIMID(nid,"altitude",id(3))
       ierr= NF_INQ_DIMID(nid,"Time",id(4))
@@ -95,10 +95,10 @@
 
 if (count(index)==0) then
-   if (dim.eq.3) then
+   if (dim==3) then
       start=(/1,1,1,index/)
       size=(/iip1,jjp1,llm,1/)
       mean3d=0
       sd3d=0
-   else if (dim.eq.2) then
+   else if (dim==2) then
       start=(/1,1,index,0/)
       size=(/iip1,jjp1,1,0/)
@@ -107,5 +107,5 @@
    endif
 else
-   if (dim.eq.3) then
+   if (dim==3) then
       start=(/1,1,1,index/)
       size=(/iip1,jjp1,llm,1/)
@@ -117,10 +117,10 @@
       ierr = NF_GET_VARA_REAL(nid,sdid,start,size,sd3d)
 #endif
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
          write (*,*) NF_STRERROR(ierr)
          stop ""
       endif
 
-   else if (dim.eq.2) then
+   else if (dim==2) then
       start=(/1,1,index,0/)
       size=(/iip1,jjp1,1,0/)
@@ -132,5 +132,5 @@
       ierr = NF_GET_VARA_REAL(nid,sdid,start,size,sd2d)
 #endif
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
          write (*,*) NF_STRERROR(ierr)
          stop ""
@@ -139,5 +139,5 @@
 endif
 
-if (dim.eq.3) then
+if (dim==3) then
 
 !  Passage variable physique -->  variable dynamique
@@ -167,10 +167,10 @@
    ierr = NF_PUT_VARA_REAL(nid,sdid,start,size,sd3d)
 #endif
-   if (ierr.ne.NF_NOERR) then
+   if (ierr/=NF_NOERR) then
      write (*,*) NF_STRERROR(ierr)
      stop ""
    endif
 
-else if (dim.eq.2) then
+else if (dim==2) then
 
 !    Passage variable physique -->  physique dynamique
@@ -198,5 +198,5 @@
    ierr = NF_PUT_VARA_REAL(nid,sdid,start,size,sd2d)
 #endif
-   if (ierr.ne.NF_NOERR) then
+   if (ierr/=NF_NOERR) then
      write (*,*) NF_STRERROR(ierr)
      stop ""
@@ -230,5 +230,5 @@
 real, dimension(iip1,jjp1) :: dx2
 
-if (dim.eq.3) then
+if (dim==3) then
 
    start=(/1,1,1,index/)
@@ -257,5 +257,5 @@
 #endif
 
-else if (dim.eq.2) then
+else if (dim==2) then
 
       start=(/1,1,index,0/)
Index: /LMDZ6/branches/Amaury_dev/libf/phy_common/abort_physic.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phy_common/abort_physic.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phy_common/abort_physic.F90	(revision 5082)
@@ -36,5 +36,5 @@
       write(lunout,*) 'Stopping in ', modname
       write(lunout,*) 'Reason = ',message
-      if (ierr .eq. 0) then
+      if (ierr == 0) then
         write(lunout,*) 'Everything is cool'
         if (using_mpi) then
Index: /LMDZ6/branches/Amaury_dev/libf/phy_common/mod_phys_lmdz_mpi_data.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phy_common/mod_phys_lmdz_mpi_data.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phy_common/mod_phys_lmdz_mpi_data.F90	(revision 5082)
@@ -65,5 +65,5 @@
     is_using_mpi = using_mpi
     
-    if ((nbp_lon.eq.1).and.(nbp_lat.eq.1)) then ! running 1D column model
+    if ((nbp_lon==1).and.(nbp_lat==1)) then ! running 1D column model
        klon_glo=1
     else
Index: /LMDZ6/branches/Amaury_dev/libf/phy_common/print_control_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phy_common/print_control_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phy_common/print_control_mod.F90	(revision 5082)
@@ -44,5 +44,5 @@
 
     IF ( alert_first_call) then
-       IF ( alarm_file .ne. lunout ) THEN
+       IF ( alarm_file /= lunout ) THEN
           OPEN(unit = alarm_file, file = "ALERTES.txt")
        ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90	(revision 5082)
@@ -243,6 +243,6 @@
       DO ip=1, npstn
 !     print*,'histwrite2d is_sequential npstn ip name nptabij',npstn,ip,name,nptabij(ip)
-       IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-          nptabij(ip).LE.klon_mpi_end) THEN
+       IF(nptabij(ip)>=klon_mpi_begin.AND. &
+          nptabij(ip)<=klon_mpi_end) THEN
          fieldok(ip)=buffer_omp(nptabij(ip)-klon_mpi_begin+1)
        ENDIF
@@ -305,6 +305,6 @@
        DO n=1, nlev
        DO ip=1, npstn
-        IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-         nptabij(ip).LE.klon_mpi_end) THEN
+        IF(nptabij(ip)>=klon_mpi_begin.AND. &
+         nptabij(ip)<=klon_mpi_end) THEN
          fieldok(ip,n)=buffer_omp(nptabij(ip)-klon_mpi_begin+1,n)
         ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.F	(revision 5082)
@@ -130,6 +130,6 @@
       rh=MIN(RHcl(i,k)*100.,RH_MAX)
       RH_num = INT( rh/10. + 1.)
-      IF (rh.gt.85.) RH_num=10
-      IF (rh.gt.90.) RH_num=11
+      IF (rh>85.) RH_num=10
+      IF (rh>90.) RH_num=11
 c      IF (rh.gt.40.) THEN 
 c          RH_num=5   ! Added by NHL temporarily
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/checknanqfi.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/checknanqfi.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/checknanqfi.F90	(revision 5082)
@@ -21,5 +21,5 @@
         ENDIF
      ENDDO
-     IF (jbad.GT.0) THEN
+     IF (jbad>0) THEN
         WRITE(*,*)comment
         DO i = 1, jbad
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/coarsemission.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/coarsemission.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/coarsemission.F	(revision 5082)
@@ -197,5 +197,5 @@
       
       DO i=1,klon   
-         if (maskd(i).gt.0) then 
+         if (maskd(i)>0) then
       IF(id_fine>0)    source_tr(i,id_fine)=
      . scale_param_dustacc(iregion_dust(i))*
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/dustemission_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/dustemission_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/dustemission_mod.F90	(revision 5082)
@@ -482,5 +482,5 @@
 ! 1440 = 15 days
 ! 480 = 5 days
-if (MOD(counter,1440).eq. 0) THEN
+if (MOD(counter,1440)== 0) THEN
    !if (MOD(counter,480).eq. 0) THEN
    do k = 1,klon
@@ -760,5 +760,5 @@
          dp=dp*exp(dstep)
          sizeclass(i)=dp
-         if(dp.ge.dmax+eps)goto 30
+         if(dp>=dmax+eps)goto 30
          newstep(i)=dstep
         ! WRITE(18,*)i,sizeclass(i)
@@ -769,5 +769,5 @@
       print*,'   soil size classes used   ',ncl,' / ',nclass
       print*,'   soil size min: ',sizeclass(1),' soil size max: ',sizeclass(ncl)
-      if(ncl.gt.nclass)stop
+      if(ncl>nclass)stop
 
 ! Threshold velocity:
@@ -780,5 +780,5 @@
             cc=sqrt(1+ddust*(sizeclass(i)**(-2.5)))
             xk=sqrt(abs(rop*gravity*sizeclass(i)/roa))
-            if (bb.lt.10.) then
+            if (bb<10.) then
                dd=sqrt(1.928*(bb**0.092)-1.)
                uth(i)=0.129*xk*cc/dd
@@ -817,5 +817,5 @@
            nsi=((j-1)*3)+2
            npi=((j-1)*3)+3
-           IF (solspe(ns,nd).EQ.0.)THEN
+           IF (solspe(ns,nd)==0.)THEN
               su_loc=0.
            ELSE
@@ -833,5 +833,5 @@
      END DO
      DO i=1,ncl
-        IF (subsoildist(i).gt.0..and.stotale.gt.0.)THEN
+        IF (subsoildist(i)>0..and.stotale>0.)THEN
             srel(ns,i)=subsoildist(i)/stotale
 
@@ -854,5 +854,5 @@
           do k=1,ntyp
      !     print*,'IKKK ',i,klon,k,ntyp
-             if (zos(i,k).eq.0..or.z01(i,k).eq.0.) then
+             if (zos(i,k)==0..or.z01(i,k)==0.) then
      !       if (zos(i,k)<=0..or.z01(i,k)<=0.) then
 !              if (zos(i,k)<0..or.z01(i,k)<0.) then
@@ -873,5 +873,5 @@
 ! drag partition between zo1 and zo2
 ! feff: total efficient fraction
-              if(D(i,k).eq.0.)then
+              if(D(i,k)==0.)then
                  feff(i,k)=cc
    !       print*,'IKKK C ',i,klon,k,ntyp
@@ -882,8 +882,8 @@
    !       print*,'IKKK D ',i,klon,k,ntyp
               endif
-              if (feff(i,k).lt.0.)feff(i,k)=0.
-              if (feffdbg(i,k).lt.0.)feffdbg(i,k)=0.
-              if (feff(i,k).gt.1.)feff(i,k)=1.
-              if (feffdbg(i,k).gt.1.)feffdbg(i,k)=1.
+              if (feff(i,k)<0.)feff(i,k)=0.
+              if (feffdbg(i,k)<0.)feffdbg(i,k)=0.
+              if (feff(i,k)>1.)feff(i,k)=1.
+              if (feffdbg(i,k)>1.)feffdbg(i,k)=1.
     !      print*,'IKKK E ',i,klon,k,ntyp
             endif
@@ -891,5 +891,5 @@
         enddo
 ! JE20150120<<
-  if (flag_feff .eq. 0) then
+  if (flag_feff == 0) then
     print *,'JE_dbg FORCED deactivated feff'
     do i=1,klon
@@ -1208,5 +1208,5 @@
                          - 0.5*log(auxreal/(2.*pi))+1./(12.*auxreal) &
                          -1./(360.*(auxreal**3.))+1./(1260.*(auxreal**5.)))
-                IF(nwb.gt.1)THEN
+                IF(nwb>1)THEN
                    wind10ms(kwb)=kwb*2.*U10mMOD/nwb
 !original
@@ -1220,5 +1220,5 @@
                    probu(kwb)=pdfu*2.*U10mMOD/nwb
                    pdfcum=pdfcum+probu(kwb)
-                      IF(probu(kwb).le.1.e-2)GOTO 70
+                      IF(probu(kwb)<=1.e-2)GOTO 70
                 ELSE
                    wind10ms(kwb)=U10mMOD
@@ -1235,8 +1235,8 @@
 !                  nat=int(sol(i,n))
 !                    print *,i,n
-                    IF(sol(i,n).gt.1..and.sol(i,n).lt.15.) nat=int(sol(i,n))
+                    IF(sol(i,n)>1..and.sol(i,n)<15.) nat=int(sol(i,n))
 !JE20140526<<
 !                    print *,'JE: WARNING: nat=0 forced to nat=99!! and doing nothing'
-                   IF(sol(i,n).lt.0.5) THEN
+                   IF(sol(i,n)<0.5) THEN
                       nat=99
                       GOTO 80
@@ -1247,5 +1247,5 @@
                  !IF(n.eq.1.and.nat.eq.99)GOTO 80
              !      if(n.eq.1) print*,'nat1=',nat,'sol1=',sol(i,n)
-                   IF(n.eq.1.and.nat.eq.99)GOTO 80
+                   IF(n==1.and.nat==99)GOTO 80
 
              ENDIF
@@ -1261,6 +1261,6 @@
                       cpcent=P(i,n)
                       ustarsalt=0.
-                   IF(ceff.le.0..or.z0salt.eq.0.)GOTO 80
-                   IF(cerod.eq.0.or.cpcent.eq.0.)GOTO 80
+                   IF(ceff<=0..or.z0salt==0.)GOTO 80
+                   IF(cerod==0.or.cpcent==0.)GOTO 80
 ! in cm: utmin, umin, z10m, z0salt, ustarns
 ! in meters: modwm
@@ -1273,5 +1273,5 @@
 
 
-                   IF(ustarsalt.lt.umin/ceff)GOTO 80
+                   IF(ustarsalt<umin/ceff)GOTO 80
 !                      print*,'ustarsalt = ',ustarsalt
 !----------------------------------------
@@ -1281,5 +1281,5 @@
       do ni=1,kfin
          fdp1=1.-(uth2(ni)/(ceff*ustarsalt))
-         if (fdp1.le.0..or.srel2(nat,ni).eq.0.) then
+         if (fdp1<=0..or.srel2(nat,ni)==0.) then
             ad1=0.
             ad2=0.
@@ -1297,8 +1297,8 @@
             t2=0.
             t3=0.
-            if(ec.ge.e1)t1=1.
-            if(ec.ge.e2)t2=1.
-            if(ec.ge.e3)t3=1.
-            if(dfec3.ne.0.)then
+            if(ec>=e1)t1=1.
+            if(ec>=e2)t2=1.
+            if(ec>=e3)t3=1.
+            if(dfec3/=0.)then
                p1=t1*dfec1/dfec3
                p2=t2*(1.-p1)*dfec2/dfec3
@@ -1409,5 +1409,5 @@
             srel2(nat,kfin)=srel(nat,i)*istep
          enddo
-         if(kfin.ge.nclass)then
+         if(kfin>=nclass)then
             print*,'$$$$ Tables dimension problem:',kfin,'>',nclass
          endif
@@ -1440,5 +1440,5 @@
       ihalf=int((ismax+ismin)/2.)
       do k2=1,1000000
-          if(ds.gt.siz(ihalf))then
+          if(ds>siz(ihalf))then
              ismin=ihalf
           else
@@ -1447,5 +1447,5 @@
           ihalf=int((ismax+ismin)/2.)
           idiff=ismax-ismin
-          if(idiff.le.1)then
+          if(idiff<=1)then
              iout=ismin
              goto 52
@@ -1453,5 +1453,5 @@
       enddo
  52   continue
-      if(iout.eq.0)then
+      if(iout==0)then
         print*,'$$$$ Tables dimension problem: ',iout
       endif
@@ -1519,15 +1519,15 @@
        diffmol1(nb)=dmn1*(1.+dmn2+dmn3)
        diffmol2(nb)=bolz*temp*Cc/(3.*pi*muair*binsHRcm(nb))
-       IF(idiffusi.EQ.1)diffmole(nb)=diffmol1(nb)
-       IF(idiffusi.EQ.2)diffmole(nb)=diffmol2(nb)
+       IF(idiffusi==1)diffmole(nb)=diffmol1(nb)
+       IF(idiffusi==2)diffmole(nb)=diffmol2(nb)
        schmidtnumb(nb)=nuair/diffmole(nb)
        St=setvel(nb)*ustarbin*ustarbin/(gravity*nuair)
        rb=1./(ustarbin*((schmidtnumb(nb))**(-2./3.)+10.**(-3./St)))
 !c wesely (primarily designed for gases)
-       IF(idrydep.EQ.1)THEN
+       IF(idrydep==1)THEN
           vdout(nb)=1./(ra+rb+ra*rb*setvel(nb))+setvel(nb)
        END IF
 !c venkatram and pleim (more adaptated to particles but numerically unstable)
-       IF(idrydep.EQ.2)THEN
+       IF(idrydep==2)THEN
         rexp=exp(-(ra+rb)*setvel(nb))
         vdout(nb)=setvel(nb)/(1.-rexp)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/finemission.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/finemission.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/finemission.F	(revision 5082)
@@ -65,5 +65,5 @@
 
       DO i=1,klon
-         IF (iregion_ind(i).GT.0) THEN
+         IF (iregion_ind(i)>0) THEN
        IF(id_fine>0)    source_tr(i,id_fine)=source_tr(i,id_fine)+
      .                (scale_param_ff(iregion_ind(i))*lmt_bcff(i)+     !g/m2/s
@@ -81,5 +81,5 @@
      .                     *1.e4*1.e3
          ENDIF
-         IF (iregion_bb(i).GT.0) THEN
+         IF (iregion_bb(i)>0) THEN
        IF(id_fine>0)    source_tr(i,id_fine)=source_tr(i,id_fine)+
      .                (scale_param_bb(iregion_bb(i))*lmt_bcbb_l(i)+   !g/m2/s
@@ -132,5 +132,5 @@
           zzdz=zalt(i,kmaxbc+1)-zalt(i,kminbc)
 c
-         IF (iregion_bb(i) .GT.0) THEN
+         IF (iregion_bb(i) >0) THEN
         IF(id_fine>0)   tr_seri(i,k,id_fine)=tr_seri(i,k,id_fine)+
      .              (scale_param_bb(iregion_bb(i))*lmt_bcbb_h(i)+
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/inscav_spl.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/inscav_spl.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/inscav_spl.F	(revision 5082)
@@ -58,5 +58,5 @@
 c
 cnhl      IF (it.EQ.2.OR.it.EQ.3) THEN !--aerosol  ! AS IT WAS FIRST
-      IF (it.EQ.2.OR.it.EQ.3.OR.it.EQ.4) THEN !--aerosol
+      IF (it==2.OR.it==3.OR.it==4) THEN !--aerosol
         frac=frac_aer
       ELSE                                                !--gas
@@ -64,5 +64,5 @@
       ENDIF
 c
-      IF (it.EQ.1) THEN 
+      IF (it==1) THEN
       DO k=1, klev
       DO i=1, klon 
@@ -75,5 +75,5 @@
       ENDDO 
       ENDDO
-      ELSEIF (it.EQ.2) THEN
+      ELSEIF (it==2) THEN
       DO k=1, klev
       DO i=1, klon 
@@ -81,5 +81,5 @@
       ENDDO 
       ENDDO
-      ELSEIF (it.EQ.3) THEN
+      ELSEIF (it==3) THEN
       DO k=1, klev
       DO i=1, klon 
@@ -87,5 +87,5 @@
       ENDDO 
       ENDDO 
-      ELSEIF (it.EQ.4) THEN
+      ELSEIF (it==4) THEN
       DO k=1, klev
       DO i=1, klon 
@@ -119,6 +119,6 @@
 c--reevaporation
         beta=flxr_aux(i,k)-flxr_aux(i,k+1)+flxs_aux(i,k)-flxs_aux(i,k+1)
-        IF (beta.LT.0.) beta=beta/(flxr_aux(i,k+1)+flxs_aux(i,k+1))
-        IF (flxr_aux(i,k)+flxs_aux(i,k).EQ.0) THEN  !--reevaporation totale
+        IF (beta<0.) beta=beta/(flxr_aux(i,k+1)+flxs_aux(i,k+1))
+        IF (flxr_aux(i,k)+flxs_aux(i,k)==0) THEN  !--reevaporation totale
           beta=MIN(MAX(0.0,-beta),1.0)
         ELSE                          !--reevaporation non totale pour aerosols
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_orig.F90	(revision 5082)
@@ -177,5 +177,5 @@
   ENDDO
 
-    IF (it.gt.1) THEN                               !  aerosol   
+    IF (it>1) THEN                               !  aerosol
       frac_ev=frac_aer
     ELSE                                                !  gas
@@ -183,5 +183,5 @@
     ENDIF
 
-    IF(it.gt.1) then  ! aerosol
+    IF(it>1) then  ! aerosol
      DO k=1, klev
       DO i=1, klon 
@@ -203,5 +203,5 @@
 !  incloud scavenging
 !   if(inscav_fisrt) then 
-   if (iflag_lscav .eq. 4) then
+   if (iflag_lscav == 4) then
       beta=beta_fisrt(i,k)*rneb(i,k)
    else
@@ -219,5 +219,5 @@
 
 !  below-cloud impaction
-    IF(it.eq.1) then
+    IF(it==1) then
       d_tr_bcscav(i,k,it)=0.
     ELSE
@@ -236,5 +236,5 @@
       deltaP(i,k)=max(deltaP(i,k),0.)
 
-      if(flxr(i,k+1)+flxs(i,k+1).gt.1.e-16) then
+      if(flxr(i,k+1)+flxs(i,k+1)>1.e-16) then
        beta_ev(i,k)=deltaP(i,k)/(flxr(i,k+1)+flxs(i,k+1))
       else
@@ -246,5 +246,5 @@
 !jyg
       
-      if(abs(1-(1-frac_ev)*beta_ev(i,k)).gt.1.e-16) then
+      if(abs(1-(1-frac_ev)*beta_ev(i,k))>1.e-16) then
 ! remove tracers from precipitation owing to release by evaporation in his_dh
 !      dxev=frac_ev*beta_ev(i,k)*his_dh(i) *pdtime/(zrho(i,k)*zdz(i,k)) &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/lsc_scav_spl.F90	(revision 5082)
@@ -188,5 +188,5 @@
 
 !JE<<
-    IF (it.eq.id_prec) THEN                               !  gas
+    IF (it==id_prec) THEN                               !  gas
       frac_ev=frac_gas
     ELSE                                   !aerosol
@@ -194,5 +194,5 @@
     ENDIF
 
-    IF (it.eq.id_prec) THEN                               !  gas
+    IF (it==id_prec) THEN                               !  gas
      DO k=1, klev
       DO i=1, klon 
@@ -214,5 +214,5 @@
 !  incloud scavenging
 !   if(inscav_fisrt) then 
-   if (iflag_lscav .eq. 4) then
+   if (iflag_lscav == 4) then
       beta=beta_fisrt(i,k)*rneb(i,k)
    else
@@ -230,5 +230,5 @@
 
 !  below-cloud impaction
-    IF(it.eq.id_prec) then
+    IF(it==id_prec) then
       d_tr_bcscav(i,k,it)=0.
     ELSE
@@ -247,5 +247,5 @@
       deltaP(i,k)=max(deltaP(i,k),0.)
 
-      if(flxr(i,k+1)+flxs(i,k+1).gt.1.e-16) then
+      if(flxr(i,k+1)+flxs(i,k+1)>1.e-16) then
        beta_ev(i,k)=deltaP(i,k)/(flxr(i,k+1)+flxs(i,k+1))
       else
@@ -257,5 +257,5 @@
 !jyg
       
-      if(abs(1-(1-frac_ev)*beta_ev(i,k)).gt.1.e-16) then
+      if(abs(1-(1-frac_ev)*beta_ev(i,k))>1.e-16) then
 ! remove tracers from precipitation owing to release by evaporation in his_dh
 !      dxev=frac_ev*beta_ev(i,k)*his_dh(i) *pdtime/(zrho(i,k)*zdz(i,k)) &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/minmaxqfi2.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/minmaxqfi2.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/minmaxqfi2.F	(revision 5082)
@@ -25,5 +25,5 @@
       zqmax=zq(ijmax,lmax)
  
-      if(zqmin.lt.qmin.or.zqmax.gt.qmax) 
+      if(zqmin<qmin.or.zqmax>qmax)
      s     write(*,9999) comment,
      s     ijmin,lmin,zqmin,ijmax,lmax,zqmax
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/minmaxsource.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/minmaxsource.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/minmaxsource.F	(revision 5082)
@@ -26,5 +26,5 @@
       zqmax=zq(ijmax,lmax)
 
-      if(zqmin.lt.qmin.or.zqmax.gt.qmax) 
+      if(zqmin<qmin.or.zqmax>qmax)
      s     write(*,9999) comment,
      s     ijmin,lmin,zqmin,ijmax,lmax,zqmax
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/neutral.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/neutral.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/neutral.F	(revision 5082)
@@ -44,7 +44,7 @@
         do i=1,klon
 
-	if (u10_mps(i) .lt. 0.) u10_mps(i) = 0.0
+	if (u10_mps(i) < 0.) u10_mps(i) = 0.0
 	
-	if  (obklen_m(i) .lt. 0.) then 
+	if  (obklen_m(i) < 0.) then
 		phi = (1. - 160./obklen_m(i))**(-0.25)
 		phi_inv = 1./phi
@@ -56,5 +56,5 @@
 		f3 = atan(dum1)
 		psi = 2.*log(f1) + log(f2) - 2.*f3 + pi/2.   
-	else if (obklen_m(i) .gt. 0.) then
+	else if (obklen_m(i) > 0.) then
 		psi = -50. / obklen_m(i)
 	end if
@@ -62,8 +62,8 @@
 	u10n_mps(i) = u10_mps(i) + (ustar_mps(i) * psi /von_karman )
 c u10n set to 0. if -1 < obklen < 20
-        if ((obklen_m(i).gt.-1.).and.(obklen_m(i).lt.20.)) then
+        if ((obklen_m(i)>-1.).and.(obklen_m(i)<20.)) then
             u10n_mps(i) = 0.
         endif
-	if (u10n_mps(i) .lt. 0.) u10n_mps(i) = 0.0
+	if (u10n_mps(i) < 0.) u10n_mps(i) = 0.0
 
         enddo
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/nightingale.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/nightingale.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/nightingale.F	(revision 5082)
@@ -59,5 +59,5 @@
 c equal to value at 30 deg C.
 
-      IF (ftsol(i,is_oce) .LE. 303.15) THEN
+      IF (ftsol(i,is_oce) <= 303.15) THEN
          t1 = ftsol(i,is_oce) 
       ELSE
@@ -77,5 +77,5 @@
      .        * lmt_dmsconc(i)/1.0e12 * schmidt_corr * RNAVO
 c
-      IF (lmt_dmsconc(i).LE.1.e-20) lmt_dms(i)=0.0
+      IF (lmt_dmsconc(i)<=1.e-20) lmt_dms(i)=0.0
 c
       ENDDO
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90	(revision 5082)
@@ -680,5 +680,5 @@
        CALL histwrite_phy(o_tauy, zx_tmp_fi2d)
 
-       IF (landice_opt .GE. 1 ) THEN
+       IF (landice_opt >= 1 ) THEN
           CALL histwrite_phy(o_snowsrf, snow_o)
           CALL histwrite_phy(o_qsnow, qsnow)
@@ -769,5 +769,5 @@
        CALL histwrite_phy(o_uq, uq)
        CALL histwrite_phy(o_vq, vq)
-       IF (iflag_con.GE.3) THEN ! sb
+       IF (iflag_con>=3) THEN ! sb
           CALL histwrite_phy(o_cape, cape)
           CALL histwrite_phy(o_pbase, ema_pcb)
@@ -865,8 +865,8 @@
           DO k=1, nlevSTD
              bb2=clevSTD(k) 
-             IF (bb2.EQ."850".OR.bb2.EQ."700".OR. &
-                bb2.EQ."500".OR.bb2.EQ."200".OR. &
-                bb2.EQ."100".OR. &
-                bb2.EQ."50".OR.bb2.EQ."10") THEN
+             IF (bb2=="850".OR.bb2=="700".OR. &
+                bb2=="500".OR.bb2=="200".OR. &
+                bb2=="100".OR. &
+                bb2=="50".OR.bb2=="10") THEN
                 ll=ll+1
                 CALL histwrite_phy(o_uSTDlevs(ll),ulevSTD(:,k))
@@ -882,6 +882,6 @@
        IF (vars_defined) THEN
           DO i=1, klon
-             IF (pctsrf(i,is_oce).GT.epsfra.OR. &
-                  pctsrf(i,is_sic).GT.epsfra) THEN
+             IF (pctsrf(i,is_oce)>epsfra.OR. &
+                  pctsrf(i,is_sic)>epsfra) THEN
                 zx_tmp_fi2d(i) = (ftsol(i, is_oce) * pctsrf(i,is_oce)+ &
                      ftsol(i, is_sic) * pctsrf(i,is_sic))/ &
@@ -895,5 +895,5 @@
 
        ! Couplage convection-couche limite
-       IF (iflag_con.GE.3) THEN
+       IF (iflag_con>=3) THEN
           IF (iflag_coupl>=1) THEN
              CALL histwrite_phy(o_ale_bl, ale_bl)
@@ -902,5 +902,5 @@
        ENDIF !(iflag_con.GE.3)
        ! Wakes
-       IF (iflag_con.EQ.3) THEN
+       IF (iflag_con==3) THEN
           IF (iflag_wake>=1) THEN
              CALL histwrite_phy(o_ale_wk, ale_wake)
@@ -924,5 +924,5 @@
           CALL histwrite_phy(o_fqd, fqd)
        ENDIF !(iflag_con.EQ.3)
-       IF (iflag_con.EQ.3.OR.iflag_con.EQ.30) THEN
+       IF (iflag_con==3.OR.iflag_con==30) THEN
           ! sortie RomP convection descente insaturee iflag_con=30
           ! etendue a iflag_con=3 (jyg)
@@ -953,5 +953,5 @@
           CALL histwrite_phy(o_slab_qflux, slab_wfbils)
           !CALL histwrite_phy(o_slab_bils, slab_bils)
-          IF (nslay.EQ.1) THEN
+          IF (nslay==1) THEN
               zx_tmp_fi2d(:)=tslab(:,1)
               CALL histwrite_phy(o_tslab, zx_tmp_fi2d)
@@ -1013,5 +1013,5 @@
 !--OLIVIER
 !This is warranted by treating INCA aerosols as offline aerosols
-       IF (flag_aerosol.GT.0) THEN
+       IF (flag_aerosol>0) THEN
           CALL histwrite_phy(o_od550aer, od550aer)
           CALL histwrite_phy(o_od865aer, od865aer)
@@ -1037,5 +1037,5 @@
           !--STRAT AER
        ENDIF
-       IF (flag_aerosol.GT.0.OR.flag_aerosol_strat>=1) THEN
+       IF (flag_aerosol>0.OR.flag_aerosol_strat>=1) THEN
 !          DO naero = 1, naero_spc
 !--correction mini bug OB
@@ -1083,5 +1083,5 @@
           CALL histwrite_phy(o_solswai, solswai_aero)
        ENDIF
-       IF (flag_aerosol.GT.0.AND.ok_cdnc) THEN
+       IF (flag_aerosol>0.AND.ok_cdnc) THEN
           CALL histwrite_phy(o_scdnc, scdnc)
           CALL histwrite_phy(o_cldncl, cldncl)
@@ -1215,5 +1215,5 @@
        ENDIF
        CALL histwrite_phy(o_dtcon, zx_tmp_fi3d)
-       IF (iflag_thermals.eq.0)THEN
+       IF (iflag_thermals==0)THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_t_con(1:klon,1:klev)/pdtphys + &
@@ -1221,5 +1221,5 @@
           ENDIF
           CALL histwrite_phy(o_tntc, zx_tmp_fi3d)
-       ELSEIF (iflag_thermals.ge.1.and.iflag_wake.EQ.1)THEN
+       ELSEIF (iflag_thermals>=1.and.iflag_wake==1)THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_t_con(1:klon,1:klev)/pdtphys + &
@@ -1236,8 +1236,8 @@
        CALL histwrite_phy(o_dqcon, zx_tmp_fi3d)
 
-       IF (iflag_thermals.EQ.0) THEN
+       IF (iflag_thermals==0) THEN
           IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys
           CALL histwrite_phy(o_tnhusc, zx_tmp_fi3d)
-       ELSEIF (iflag_thermals.GE.1.AND.iflag_wake.EQ.1) THEN
+       ELSEIF (iflag_thermals>=1.AND.iflag_wake==1) THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys + &
@@ -1449,7 +1449,7 @@
        CALL histwrite_phy(o_ref_liq, ref_liq)
        CALL histwrite_phy(o_ref_ice, ref_ice)
-       IF (RCO2_per.NE.RCO2_act.OR.RCH4_per.NE.RCH4_act.OR. &
-            RN2O_per.NE.RN2O_act.OR.RCFC11_per.NE.RCFC11_act.OR. &
-            RCFC12_per.NE.RCFC12_act) THEN
+       IF (RCO2_per/=RCO2_act.OR.RCH4_per/=RCH4_act.OR. &
+            RN2O_per/=RN2O_act.OR.RCFC11_per/=RCFC11_act.OR. &
+            RCFC12_per/=RCFC12_act) THEN
           IF (vars_defined) zx_tmp_fi2d(1 : klon) = swupp ( 1 : klon, klevp1 )
           CALL histwrite_phy(o_rsut4co2, zx_tmp_fi2d)
@@ -1575,5 +1575,5 @@
              DO k=1, nlevSTD
                 DO i=1, klon
-                   IF (O3STD(i,k).NE.missing_val) THEN
+                   IF (O3STD(i,k)/=missing_val) THEN
                       zx_tmp_fi3d_STD(i,k) = O3STD(i,k) * 1.e+9
                    ELSE
@@ -1588,5 +1588,5 @@
                 DO k=1, nlevSTD
                    DO i=1, klon
-                      IF (O3daySTD(i,k).NE.missing_val) THEN
+                      IF (O3daySTD(i,k)/=missing_val) THEN
                          zx_tmp_fi3d_STD(i,k) = O3daySTD(i,k) * 1.e+9
                       ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90	(revision 5082)
@@ -94,5 +94,5 @@
   LOGICAL , parameter :: edgar = .true.
   INTEGER , parameter :: flag_dms=4
-  INTEGER*4  nbjour
+  INTEGER(kind=4)  nbjour
 
       !
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/precuremission.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/precuremission.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/precuremission.F	(revision 5082)
@@ -105,5 +105,5 @@
 
       DO i=1, klon
-         IF (iregion_ind(i).GT.0) THEN
+         IF (iregion_ind(i)>0) THEN
        IF(id_prec>0) source_tr(i,id_prec)=source_tr(i,id_prec) 
      .             + fracso2emis
@@ -137,5 +137,5 @@
      .               *1.e4/RNAVO*masse_ammsulfate*1.e3    ! mgS/m2/s
          ENDIF
-         IF (iregion_bb(i).GT.0) THEN
+         IF (iregion_bb(i)>0) THEN
       IF(id_prec>0) source_tr(i,id_prec)= 
      .                  source_tr(i,id_prec) + fracso2emis
@@ -213,6 +213,6 @@
       DO i = 1, klon
         zaltmid(i,k)=zalt(i,k)+zdz(i,k)/2.
-        IF (zalt(i,k+1).LT.lmt_altvolc_cont(i)) kkk_cont(i)=k+1
-        IF (zalt(i,k+1).LT.lmt_altvolc_expl(i)) kkk_expl(i)=k+1
+        IF (zalt(i,k+1)<lmt_altvolc_cont(i)) kkk_cont(i)=k+1
+        IF (zalt(i,k+1)<lmt_altvolc_expl(i)) kkk_expl(i)=k+1
       ENDDO
       ENDDO
@@ -234,5 +234,5 @@
       DO i = 1, klon
 c
-         IF (iregion_bb(i).GT.0) THEN
+         IF (iregion_bb(i)>0) THEN
       IF(id_prec>0)   tr_seri(i,k,id_prec)=
      .              tr_seri(i,k,id_prec) + fracso2emis
@@ -245,5 +245,5 @@
      .              *masse_ammsulfate/RNAVO/zdz(i,k)/100.*pdtphys   !g/cm3
          ENDIF
-         IF (iregion_ind(i).GT.0) THEN
+         IF (iregion_ind(i)>0) THEN
        IF(id_prec>0)  tr_seri(i,k,id_prec)=
      .              tr_seri(i,k,id_prec) + (fracso2emis
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_newemissions.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_newemissions.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_newemissions.F	(revision 5082)
@@ -204,5 +204,5 @@
       print *,'READ_EMISSION: test_vent & test_day = ',test_vent, 
      +                                                 test_day
-      IF (test_vent.EQ.0) THEN    !--on lit toutes les 6 h                                                                      
+      IF (test_vent==0) THEN    !--on lit toutes les 6 h
         CALL SCOPY(klon, u10m_ec2, 1, u10m_ec1, 1)
         CALL SCOPY(klon, v10m_ec2, 1, v10m_ec1, 1)
@@ -246,5 +246,5 @@
       jH_vent=jH_vent+pdtphys/(24.*3600.)
       test_vent=test_vent+1
-      IF (jH_vent.GT.(vent_resol)/24.) THEN
+      IF (jH_vent>(vent_resol)/24.) THEN
           test_vent=0
           jH_vent=jH_init
@@ -258,5 +258,5 @@
       DO i=1, klon
 c
-        IF (cly(i).LT.9990..AND.wth(i).LT.9990.) THEN
+        IF (cly(i)<9990..AND.wth(i)<9990.) THEN
           zprecipinsoil(i)=zprecipinsoil(i) +
      .           (pmflxr(i,1)+pmflxs(i,1)+prfl(i,1)+psfl(i,1))*pdtphys
@@ -277,6 +277,6 @@
       icount=0
       DO i=1, klon
-        IF (cly(i).GE.9990..OR.wth(i).GE.9990..OR.
-     .     t_seri(i,1).LE.273.15.OR.zprecipinsoil(i).GT.1.e-8) THEN
+        IF (cly(i)>=9990..OR.wth(i)>=9990..OR.
+     .     t_seri(i,1)<=273.15.OR.zprecipinsoil(i)>1.e-8) THEN
              dust_ec(i)=0.0 ! commented out for test dustemtest
 !             print *,'Dust emissions surpressed at grid = ',i
@@ -330,5 +330,5 @@
 c
       
-      IF (test_day.EQ.0) THEN
+      IF (test_day==0) THEN
         print *,'Computing SULFATE emissions for day : ',iday,julien, 
      .                                                   step_vent
@@ -362,5 +362,5 @@
       jH_day=jH_day+pdtphys/(24.*3600.)
       test_day=test_day+1
-      IF (jH_day.GT.(day_resol)/24.) THEN
+      IF (jH_day>(day_resol)/24.) THEN
           print *,'LAST TIME STEP OF DAY ',julien
           test_day=0
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/satellite_out_spla.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/satellite_out_spla.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/satellite_out_spla.F90	(revision 5082)
@@ -170,7 +170,7 @@
      lon_cen=(ATAN(TAN(tempo)*COS(incli))-duree_orb*tempo)*RADEG
      demi_larg=demi_larg_eq/COS(rlat(i)*DTOR)
-     IF (ABS(SIN(rlat(i)*DTOR)/SIN(incli)).GE.1.0) demi_larg=200.0
-     IF (rlat(i).GE.lat_fin.AND.rlat(i).LE.lat_debut) THEN 
-        IF (demi_larg.GE. 180.) THEN 
+     IF (ABS(SIN(rlat(i)*DTOR)/SIN(incli))>=1.0) demi_larg=200.0
+     IF (rlat(i)>=lat_fin.AND.rlat(i)<=lat_debut) THEN
+        IF (demi_larg>= 180.) THEN
            masque(i)=1
         ELSE  
@@ -178,8 +178,8 @@
            lon_east = MOD(lon0+lon_cen+demi_larg,      360.)
            zlon     = MOD(rlon(i)+360.,                360.)
-           IF (lon_west.LE.lon_east) THEN 
-              IF (zlon.GE.lon_west.AND.zlon.LE.lon_east) masque(i)=1
+           IF (lon_west<=lon_east) THEN
+              IF (zlon>=lon_west.AND.zlon<=lon_east) masque(i)=1
            ELSE               
-              IF (zlon.GE.lon_west.OR.zlon.LE.lon_east) masque(i)=1
+              IF (zlon>=lon_west.OR.zlon<=lon_east) masque(i)=1
            ENDIF
         ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/sediment_mod.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/sediment_mod.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/sediment_mod.F	(revision 5082)
@@ -106,5 +106,5 @@
        temp=t_seri(i,k)-RTT
 c
-       IF (temp.LT.0.) THEN
+       IF (temp<0.) THEN
          air_visco(i,k)=(1.718+0.0049*temp-1.2e-5*temp*temp)*1.e-4 
        ELSE
@@ -127,6 +127,6 @@
         rh=MIN(RHcl(i,k)*100.,RH_MAX)
         RH_num = INT( rh/10. + 1.)
-        IF (rh.gt.85.) RH_num=10
-        IF (rh.gt.90.) RH_num=11
+        IF (rh>85.) RH_num=10
+        IF (rh>90.) RH_num=11
         DELTA=(rh-RH_tab(RH_num))/(RH_tab(RH_num+1)-RH_tab(RH_num))
 c
@@ -149,5 +149,5 @@
 c---------check for v_sed*dt<zdz
 c
-       IF (v_sed*time_step.GT.zdz(i,k)) THEN
+       IF (v_sed*time_step>zdz(i,k)) THEN
          v_sed=zdz(i,k)/time_step      
        ENDIF
@@ -216,5 +216,5 @@
 c---------check for v_sed*dt<zdz
 c
-       IF (v_sed*time_step.GT.zdz(i,k)) THEN
+       IF (v_sed*time_step>zdz(i,k)) THEN
          v_sed=zdz(i,k)/time_step      
        ENDIF
@@ -285,5 +285,5 @@
 
 
-       IF (v_sed*time_step.GT.zdz(i,k)) THEN
+       IF (v_sed*time_step>zdz(i,k)) THEN
          v_sed=zdz(i,k)/time_step
        ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_5wv_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_5wv_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_5wv_rrtm.F90	(revision 5082)
@@ -94,5 +94,5 @@
   modname='splaeropt_5wv_rrtm'
 
-  IF (naero.GT.naero_tot) THEN 
+  IF (naero>naero_tot) THEN
     CALL abort_physic(modname,'Too many aerosol types',1)
   ENDIF
@@ -106,6 +106,6 @@
       rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
       RH_num(i,k) = INT( rh(i,k)/10. + 1.)
-      IF (rh(i,k).GT.85.) RH_num(i,k)=10
-      IF (rh(i,k).GT.90.) RH_num(i,k)=11
+      IF (rh(i,k)>85.) RH_num(i,k)=10
+      IF (rh(i,k)>90.) RH_num(i,k)=11
       delta(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -128,5 +128,5 @@
 
       !--only 550 and 865 nm are used
-      IF (la.NE.la550.AND.la.NE.la865) CYCLE
+      IF (la/=la550.AND.la/=la865) CYCLE
 
       IF (soluble) THEN  !--soluble aerosol with RH dependence
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_6bands_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_6bands_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_6bands_rrtm.F90	(revision 5082)
@@ -143,5 +143,5 @@
   modname='splaeropt_6bands_rrt'
 
-  IF (NSW.NE.nbands_sw_rrtm) THEN
+  IF (NSW/=nbands_sw_rrtm) THEN
      CALL abort_physic(modname,'Erreur NSW doit etre egal a 6 pour cette routine',1)
   ENDIF
@@ -155,6 +155,6 @@
       rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
       RH_num(i,k) = INT(rh(i,k)/10. + 1.)
-      IF (rh(i,k).GT.85.) RH_num(i,k)=10
-      IF (rh(i,k).GT.90.) RH_num(i,k)=11
+      IF (rh(i,k)>85.) RH_num(i,k)=10
+      IF (rh(i,k)>90.) RH_num(i,k)=11
       delta(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -236,5 +236,5 @@
   piz_allaer(:,:,2,:)=SUM(tau_ae(:,:,1:naero,:)*piz_ae(:,:,1:naero,:),dim=3)/tau_allaer(:,:,2,:)
   piz_allaer(:,:,2,:)=MIN(MAX(piz_allaer(:,:,2,:),0.01),1.0)
-  WHERE (tau_allaer(:,:,2,:).LE.tau_min) piz_allaer(:,:,2,:)=1.0
+  WHERE (tau_allaer(:,:,2,:)<=tau_min) piz_allaer(:,:,2,:)=1.0
 
   cg_allaer(:,:,2,:)=SUM(tau_ae(:,:,1:naero,:)*piz_ae(:,:,1:naero,:)*cg_ae(:,:,1:naero,:),dim=3)/  & 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_lw_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_lw_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/splaeropt_lw_rrtm.F90	(revision 5082)
@@ -45,5 +45,5 @@
   modname='splaeropt_lw_rrtm'
   ! 
-  IF (NLW.NE.nbands_lw_rrtm) THEN
+  IF (NLW/=nbands_lw_rrtm) THEN
     CALL abort_physic(modname,'Erreur NLW doit etre egal a 16 pour cette routine',1)
   ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.F	(revision 5082)
@@ -29,5 +29,5 @@
         nb_neg = 0
         DO i = 1,klon
-          IF (q(i,l)+d_q(i,l).LT.qmin) THEN 
+          IF (q(i,l)+d_q(i,l)<qmin) THEN
           nb_neg = nb_neg + 1
           d_q(i,l-1) = d_q(i,l-1) + (q(i,l)+d_q(i,l)-qmin)
@@ -44,5 +44,5 @@
         nb_neg = 0
         DO i = 1,klon
-          IF (q(i,l)+d_q(i,l).LT.qmin) THEN
+          IF (q(i,l)+d_q(i,l)<qmin) THEN
           nb_neg = nb_neg + 1
           d_q(i,l+1) = d_q(i,l+1) + (q(i,l)+d_q(i,l)-qmin)
@@ -58,5 +58,5 @@
       l = klev
       DO i = 1,klon
-        IF (q(i,l)+d_q(i,l).LT.qmin) THEN 
+        IF (q(i,l)+d_q(i,l)<qmin) THEN
           d_q(i,l) = qmin - q(i,l)
         ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/trconvect.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/trconvect.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/trconvect.F	(revision 5082)
@@ -70,5 +70,5 @@
       DO k = 1, klev
       DO i = 1, klon
-        IF (d_tr(i,k,it).LT.0.) THEN
+        IF (d_tr(i,k,it)<0.) THEN
           tr_seri(i,k,it)=tr_seri(i,k,it)+d_tr(i,k,it)
         ELSE
@@ -88,5 +88,5 @@
       DO k = 1, klev
       DO i = 1, klon
-        IF (d_tr(i,k,it).GE.0.) THEN
+        IF (d_tr(i,k,it)>=0.) THEN
         dtrconv(i,it)=dtrconv(i,it)+(1.-xconv(it))*d_tr(i,k,it)
      .                /RNAVO*masse(it)*1.e3*1.e6*zdz(i,k)/pdtphys
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/aer_sedimnt.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/aer_sedimnt.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/aer_sedimnt.F90	(revision 5082)
@@ -52,5 +52,5 @@
 
 ! dynamic viscosity of air (Pruppacher and Klett, 1978) [kg/(m*s)]
-WHERE (t_seri.GE.273.15)
+WHERE (t_seri>=273.15)
   zvis=(1.718 + 0.0049*(t_seri-273.15))*1.E-5
   ELSEWHERE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/calcaerosolstrato_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/calcaerosolstrato_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/calcaerosolstrato_rrtm.F90	(revision 5082)
@@ -96,12 +96,12 @@
   ENDDO
 
-  WHERE (tau_aero_sw_rrtm .LT. 1.e-14) piz_aero_sw_rrtm=1.0
-  WHERE (tau_aero_sw_rrtm .LT. 1.e-14) tau_aero_sw_rrtm=1.e-15
-  WHERE (tau_aero_lw_rrtm .LT. 1.e-14) tau_aero_lw_rrtm=1.e-15
+  WHERE (tau_aero_sw_rrtm < 1.e-14) piz_aero_sw_rrtm=1.0
+  WHERE (tau_aero_sw_rrtm < 1.e-14) tau_aero_sw_rrtm=1.e-15
+  WHERE (tau_aero_lw_rrtm < 1.e-14) tau_aero_lw_rrtm=1.e-15
 
   tausum_strat(:,:)=0.0
   DO i=1,klon
   DO k=1,klev
-    IF (stratomask(i,k).GT.0.5) THEN
+    IF (stratomask(i,k)>0.5) THEN
       tausum_strat(i,1)=tausum_strat(i,1)+tau_strat_wave(i,k,2)  !--550 nm
       tausum_strat(i,2)=tausum_strat(i,2)+tau_strat_wave(i,k,5)  !--1020 nm
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/coagulate.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/coagulate.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/coagulate.F90	(revision 5082)
@@ -106,15 +106,15 @@
   DO j=1, nbtr_bin
   DO i=1, nbtr_bin
-    IF (k.EQ.1) THEN
+    IF (k==1) THEN
       ff(i,j,k)= 0.0
-    ELSEIF (k.GT.1.AND.Vdry(k-1).LT.Vij(i,j).AND.Vij(i,j).LT.Vdry(k)) THEN
+    ELSEIF (k>1.AND.Vdry(k-1)<Vij(i,j).AND.Vij(i,j)<Vdry(k)) THEN
       ff(i,j,k)= 1.-ff(i,j,k-1)
-    ELSEIF (k.EQ.nbtr_bin) THEN
-      IF (Vij(i,j).GE.Vdry(k)) THEN
+    ELSEIF (k==nbtr_bin) THEN
+      IF (Vij(i,j)>=Vdry(k)) THEN
         ff(i,j,k)= 1.
       ELSE
         ff(i,j,k)= 0.0
       ENDIF
-    ELSEIF (k.LE.(nbtr_bin-1).AND.Vdry(k).LE.Vij(i,j).AND.Vij(i,j).LT.Vdry(k+1)) THEN
+    ELSEIF (k<=(nbtr_bin-1).AND.Vdry(k)<=Vij(i,j).AND.Vij(i,j)<Vdry(k+1)) THEN
       ff(i,j,k)= Vdry(k)/Vij(i,j)*(Vdry(k+1)-Vij(i,j))/(Vdry(k+1)-Vdry(k))
     ENDIF
@@ -159,5 +159,5 @@
 
   ! dynamic viscosity of air (Pruppacher and Klett, 2010, p.417) [kg/(m*s)]
-  IF (t_seri(ilon,ilev).GE.273.15) THEN
+  IF (t_seri(ilon,ilev)>=273.15) THEN
     eta=(1.718+0.0049*(t_seri(ilon,ilev)-273.15))*1.E-5
   ELSE
@@ -212,11 +212,11 @@
 !
 !--compute enhancement factor due to van der Waals forces
-   IF (ok_vdw .EQ. 0) THEN      !--no enhancement factor
+   IF (ok_vdw == 0) THEN      !--no enhancement factor
       Evdw=1.0
-   ELSEIF (ok_vdw .EQ. 1) THEN  !--E(0) case
+   ELSEIF (ok_vdw == 1) THEN  !--E(0) case
       AvdWi = AvdW/(RKBOL*t_seri(ilon,ilev))*(4.*radiuswet(i)*radiuswet(j))/(radiuswet(i)+radiuswet(j))**2.
       xvdW = LOG(1.+AvdWi)
       EvdW = 1. + avdW1*xvdW + avdW3*xvdW**3
-   ELSEIF (ok_vdw .EQ. 2) THEN  !--E(infinity) case
+   ELSEIF (ok_vdw == 2) THEN  !--E(infinity) case
       AvdWi = AvdW/(RKBOL*t_seri(ilon,ilev))*(4.*radiuswet(i)*radiuswet(j))/(radiuswet(i)+radiuswet(j))**2.
       xvdW = LOG(1.+AvdWi)
@@ -239,5 +239,5 @@
   ENDDO
 
-  IF (k.EQ.1) THEN
+  IF (k==1) THEN
 !--calculate new concentration of smallest bin
     tr_tp1(ilon,ilev,k)=tr_t(ilon,ilev,k)/(1.+pdtcoag*denom)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/interp_sulf_input.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/interp_sulf_input.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/interp_sulf_input.F90	(revision 5082)
@@ -112,5 +112,5 @@
  IF (.NOT.ALLOCATED(SO2_clim)) ALLOCATE(SO2_clim(klon,klev))
 
-  IF (debutphy.OR.mth_cur.NE.mth_pre) THEN
+  IF (debutphy.OR.mth_cur/=mth_pre) THEN
 
 !--preparation of global fields
@@ -233,12 +233,12 @@
       DO kk=1, n_lev
 !--added tests on VMR of species for realism
-        IF (OCS_clim_tmp(i,kk).LT.1.e-20) THEN
+        IF (OCS_clim_tmp(i,kk)<1.e-20) THEN
           OCS_clim_tmp(i,kk)=1.0e-20
         ENDIF
-        IF (SO2_clim_tmp(i,kk).LT.1.e-20) THEN
+        IF (SO2_clim_tmp(i,kk)<1.e-20) THEN
           SO2_clim_tmp(i,kk)=1.0e-20
         ENDIF
         !       50 ppbv min for O3
-        IF (O3_clim_tmp(i,kk).LT.50.0e-9) THEN
+        IF (O3_clim_tmp(i,kk)<50.0e-9) THEN
            O3_clim_tmp(i,kk)=50.0e-9
         ENDIF
@@ -325,5 +325,5 @@
 !--set to background value everywhere in the very beginning, later only in the troposphere
 !--a little dangerous as the MAXVAL is not computed on the global field
-  IF (debutphy.AND.MAXVAL(tr_seri).LT.1.e-30) THEN
+  IF (debutphy.AND.MAXVAL(tr_seri)<1.e-30) THEN
     p_bound=0.0
   ELSE
@@ -336,5 +336,5 @@
       !
       !--OCS and SO2 prescribed back to their clim values below p_bound
-      IF (paprs(i,k).GT.p_bound) THEN
+      IF (paprs(i,k)>p_bound) THEN
         budg_3D_backgr_ocs(i,k)=OCS_clim(i,k)-tr_seri(i,k,id_OCS_strat)
         budg_3D_backgr_so2(i,k)=SO2_clim(i,k)-tr_seri(i,k,id_SO2_strat)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/micphy_tstep.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/micphy_tstep.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/micphy_tstep.F90	(revision 5082)
@@ -82,5 +82,5 @@
     DO WHILE (PDT>0.0)
       count_tstep=count_tstep+1
-      IF (count_tstep .GT. nbtstep)  EXIT
+      IF (count_tstep > nbtstep)  EXIT
       ! convert tr_seri(GASH2SO4) (in kg/kgA) to H2SO4 number density (in molecules/cm3) 
       rhoa=tr_seri(ilon,ilev,id_H2SO4_strat) &
@@ -91,6 +91,6 @@
       !NL - add nucleation box (if flag on)
       IF (flag_nuc_rate_box) THEN
-         IF (latitude_deg(ilon).LE.nuclat_min .OR. latitude_deg(ilon).GE.nuclat_max &
-              .OR. pplay(ilon,ilev).GE.nucpres_max .AND. pplay(ilon,ilev).LE.nucpres_min) THEN
+         IF (latitude_deg(ilon)<=nuclat_min .OR. latitude_deg(ilon)>=nuclat_max &
+              .OR. pplay(ilon,ilev)>=nucpres_max .AND. pplay(ilon,ilev)<=nucpres_min) THEN
             nucl_rate=0.0
          ENDIF
@@ -122,5 +122,5 @@
       ! determine appropriate time step
       dt=(H2SO4_init-H2SO4_sat)/float(nbtstep)/MAX(1.e-30, nucl_rate+cond_evap_rate) !cond_evap_rate pos. for cond. and neg. for evap.
-      IF (dt.LT.0.0) THEN
+      IF (dt<0.0) THEN
         dt=PDT
       ENDIF
@@ -178,9 +178,9 @@
   ENDDO
 
-  IF (MINVAL(tr_seri).LT.0.0) THEN
+  IF (MINVAL(tr_seri)<0.0) THEN
     DO ilon=1, klon
     DO ilev=1, klev    
     DO it=1, nbtr
-      IF (tr_seri(ilon,ilev,it).LT.0.0) THEN
+      IF (tr_seri(ilon,ilev,it)<0.0) THEN
          WRITE(lunout,*) 'micphy_tstep: negative concentration', tr_seri(ilon,ilev,it), ilon, ilev, it
       ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/miecalc_aer.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/miecalc_aer.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/miecalc_aer.F90	(revision 5082)
@@ -275,9 +275,9 @@
         ilambda_min=ref_ind(nb_lambda_h2so4,2)/1.e6 !--in m
         DO Nwv=1, NwvmaxSW+nwave_sw+nwave_lw+NwvmaxLW
-          IF (lambda_int(Nwv).GT.ilambda_max) THEN
+          IF (lambda_int(Nwv)>ilambda_max) THEN
             !for lambda out of data range, take boundary values
             n_r(Nwv)=ref_ind(1,3)
             n_i(Nwv)=ref_ind(1,4)
-          ELSEIF (lambda_int(Nwv).LE.ilambda_min) THEN
+          ELSEIF (lambda_int(Nwv)<=ilambda_min) THEN
             n_r(Nwv)=ref_ind(nb_lambda_h2so4,3)
             n_i(Nwv)=ref_ind(nb_lambda_h2so4,4)
@@ -290,6 +290,6 @@
               n_i_h2so4=ref_ind(nb,4)
               n_i_h2so4_prev=ref_ind(nb-1,4)
-              IF (lambda_int(Nwv).GT.ilambda.AND. &
-                lambda_int(Nwv).LE.ilambda_prev) THEN !--- linear interpolation
+              IF (lambda_int(Nwv)>ilambda.AND. &
+                lambda_int(Nwv)<=ilambda_prev) THEN !--- linear interpolation
                 n_r(Nwv)=n_r_h2so4+(lambda_int(Nwv)-ilambda)/ &
                      (ilambda_prev-ilambda)*(n_r_h2so4_prev-n_r_h2so4)
@@ -307,5 +307,5 @@
           n_i(Nwv)=ref_ind(1,4)
           DO nb=2,nb_lambda_h2so4
-            IF (ref_ind(nb,2)/1.e6.GT.lambda_int(Nwv)) THEN !--- step function
+            IF (ref_ind(nb,2)/1.e6>lambda_int(Nwv)) THEN !--- step function
               n_r(Nwv)=ref_ind(nb,3)
               n_i(Nwv)=ref_ind(nb,4)
@@ -342,5 +342,5 @@
 !we impose a minimum value for x and extrapolate quantities for small x values
       smallx = .FALSE.
-      IF (x.LT.0.001) THEN
+      IF (x<0.001) THEN
         smallx = .TRUE.
         x_old = x
@@ -359,9 +359,9 @@
       z1=m*z2
 
-      IF (0.0.LE.x.AND.x.LE.8.) THEN
+      IF (0.0<=x.AND.x<=8.) THEN
         Nmax=INT(x+4*x**(1./3.)+1.)+2
-      ELSEIF (8..LT.x.AND.x.LT.4200.) THEN
+      ELSEIF (8.<x.AND.x<4200.) THEN
         Nmax=INT(x+4.05*x**(1./3.)+2.)+1
-      ELSEIF (4200..LE.x.AND.x.LE.20000.) THEN
+      ELSEIF (4200.<=x.AND.x<=20000.) THEN
         Nmax=INT(x+4*x**(1./3.)+2.)+1
       ELSE
@@ -435,5 +435,5 @@
       Q_abs=Q_ext-Q_sca
 
-      IF (AIMAG(m).EQ.0.0) Q_abs=0.0
+      IF (AIMAG(m)==0.0) Q_abs=0.0
       omega=Q_sca/Q_ext
 
@@ -488,11 +488,11 @@
       DO Nwv=1,NwvmaxSW
 
-        IF (lambda_int(Nwv).LE.wv_rrtm_SW(3)) THEN      !--RRTM spectral interval 2
+        IF (lambda_int(Nwv)<=wv_rrtm_SW(3)) THEN      !--RRTM spectral interval 2
           bandSW=2
-        ELSEIF (lambda_int(Nwv).LE.wv_rrtm_SW(4)) THEN  !--RRTM spectral interval 3
+        ELSEIF (lambda_int(Nwv)<=wv_rrtm_SW(4)) THEN  !--RRTM spectral interval 3
           bandSW=3
-        ELSEIF (lambda_int(Nwv).LE.wv_rrtm_SW(5)) THEN  !--RRTM spectral interval 4
+        ELSEIF (lambda_int(Nwv)<=wv_rrtm_SW(5)) THEN  !--RRTM spectral interval 4
           bandSW=4
-        ELSEIF (lambda_int(Nwv).LE.wv_rrtm_SW(6)) THEN  !--RRTM spectral interval 5
+        ELSEIF (lambda_int(Nwv)<=wv_rrtm_SW(6)) THEN  !--RRTM spectral interval 5
           bandSW=5
         ELSE                                            !--RRTM spectral interval 6
@@ -515,5 +515,5 @@
         bandLW=1  !--default value starting from the highest lambda
         DO band=2, nbands_lw_rrtm
-          IF (ll.LT.wv_rrtm(band)) THEN   !--as long as
+          IF (ll<wv_rrtm(band)) THEN   !--as long as
             bandLW=band
           ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/nucleation_tstep_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/nucleation_tstep_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/nucleation_tstep_mod.F90	(revision 5082)
@@ -102,18 +102,18 @@
   DO k=1, nbtr_bin 
   ! CK 20160531: bug fix for first bin
-    IF (k.LE.nbtr_bin-1) THEN 
-      IF (Vbin(k).LE.Vnew.AND.Vnew.LT.Vbin(k+1)) THEN
+    IF (k<=nbtr_bin-1) THEN
+      IF (Vbin(k)<=Vnew.AND.Vnew<Vbin(k+1)) THEN
         ff(k)= Vbin(k)/Vnew*(Vbin(k+1)-Vnew)/(Vbin(k+1)-Vbin(k))
       ENDIF
     ENDIF
-    IF (k.EQ.1.AND.Vnew.LE.Vbin(k)) THEN
+    IF (k==1.AND.Vnew<=Vbin(k)) THEN
       ff(k)= 1.
     ENDIF
-    IF (k.GT.1) THEN 
-      IF (Vbin(k-1).LT.Vnew.AND.Vnew.LT.Vbin(k)) THEN
+    IF (k>1) THEN
+      IF (Vbin(k-1)<Vnew.AND.Vnew<Vbin(k)) THEN
         ff(k)= 1.-ff(k-1)
       ENDIF
     ENDIF
-    IF (k.EQ.nbtr_bin.AND.Vnew.GE.Vbin(k)) THEN
+    IF (k==nbtr_bin.AND.Vnew>=Vbin(k)) THEN
       ff(k)= 1.
     ENDIF
@@ -416,11 +416,11 @@
 
   !Temperature bounds
-  IF (t.LE.165.) THEN
+  IF (t<=165.) THEN
      tln=165.0
   ENDIF
-  IF (t.LE.195.) THEN
+  IF (t<=195.) THEN
      tli=195.0
   ENDIF
-  IF (t.GE.400.) THEN
+  IF (t>=400.) THEN
      tln=400.
      tli=400.
@@ -428,26 +428,26 @@
   
   ! Saturation ratio bounds
-  IF (satrat.LT.1.E-7) THEN
+  IF (satrat<1.E-7) THEN
      satratli=1.E-7
   ENDIF
-  IF (satrat.LT.1.E-5) THEN
+  IF (satrat<1.E-5) THEN
      satratln=1.E-5
   ENDIF
-  IF (satrat.GT.0.95) THEN
+  IF (satrat>0.95) THEN
      satratli=0.95
   ENDIF
-  IF (satrat.GT.1.0) THEN
+  IF (satrat>1.0) THEN
      satratln=1.0
   ENDIF
   
   ! Sulfuric acid concentration bounds
-  IF (rhoa.LE.1.E4) THEN
+  IF (rhoa<=1.E4) THEN
      rhoaln=1.E4
      rhoali=1.E4
   ENDIF
-  IF (rhoa.GT.1.E13) THEN
+  IF (rhoa>1.E13) THEN
      rhoaln=1.E13
   ENDIF
-  IF (rhoa.GT.1.E16) THEN
+  IF (rhoa>1.E16) THEN
      rhoali=1.E16
   ENDIF
@@ -473,5 +473,5 @@
   
   !Kinetic limit check
-  IF (satratln .GE. 1.E-2 .AND. satratln .LE. 1.) THEN
+  IF (satratln >= 1.E-2 .AND. satratln <= 1.) THEN
      kinrhotresn=EXP(7.8920778706888086E+1 + 7.3665492897447082*satratln - 1.2420166571163805E+4/tln &
           & + (-6.1831234251470971E+2*satratln)/tln - 2.4501159970109945E-2*tln                      &
@@ -479,8 +479,8 @@
           & -1.4673887785408892*LOG(satratln) + (-3.2141890006517094E+1*LOG(satratln))/tln           &
           & + 2.7137429081917556E-3*tln*LOG(satratln)) !1/cm3     
-     IF (kinrhotresn.LT.rhoaln) kinetic_n=.TRUE.
-  ENDIF
-
-  IF (satratln .GE. 1.E-4  .AND. satratln .LT. 1.E-2) THEN     
+     IF (kinrhotresn<rhoaln) kinetic_n=.TRUE.
+  ENDIF
+
+  IF (satratln >= 1.E-4  .AND. satratln < 1.E-2) THEN
      kinrhotresn=EXP(7.9074383049843647E+1 - 2.8746005462158347E+1*satratln - 1.2070272068458380E+4/tln &
           & + (-5.9205040320056632E+3*satratln)/tln - 2.4800372593452726E-2*tln                         &
@@ -488,8 +488,8 @@
           & -2.3141363245211317*LOG(satratln) + (9.9186787997857735E+1*LOG(satratln))/tln               &
           & + 5.6819382556144681E-3*tln*LOG(satratln)) !1/cm3
-     IF (kinrhotresn.LT.rhoaln) kinetic_n=.TRUE.
-  ENDIF
-
-  IF (satratln .GE. 5.E-6  .AND. satratln .LT. 1.E-4) THEN
+     IF (kinrhotresn<rhoaln) kinetic_n=.TRUE.
+  ENDIF
+
+  IF (satratln >= 5.E-6  .AND. satratln < 1.E-4) THEN
      kinrhotresn=EXP(8.5599712000361677E+1 + 2.7335119660796581E+3*satratln - 1.1842350246291651E+4/tln &
           & + (-1.2439843468881438E+6*satratln)/tln - 5.4536964974944230E-2*tln                         &
@@ -497,5 +497,5 @@
           & -2.4472627526306372*LOG(satratln) + (1.7561478001423779E+2*LOG(satratln))/tln               &
           & + 6.2640132818141811E-3*tln*LOG(satratln)) !1/cm3
-     IF (kinrhotresn.LT.rhoaln) kinetic_n=.TRUE. 
+     IF (kinrhotresn<rhoaln) kinetic_n=.TRUE.
   ENDIF
   
@@ -584,5 +584,5 @@
      
      na_n=x_n*ntot_n
-     IF (na_n .LT. 1.) THEN
+     IF (na_n < 1.) THEN
         na_n=1.0
      ENDIF
@@ -590,5 +590,5 @@
   
   ! Set the neutral nucleation rate to 0.0 if less than 1.0E-7      
-  IF (jnuc_n.LT.1.E-7) THEN
+  IF (jnuc_n<1.E-7) THEN
      jnuc_n=0.0
   ENDIF
@@ -598,5 +598,5 @@
   ! Ion-induced nucleation parameterization 
  
-  IF (ipr.GT.0.0) THEN ! if the ion production rate is above zero
+  IF (ipr>0.0) THEN ! if the ion production rate is above zero
      
      ! Calculate the ion induced nucleation rate wrt. concentration of 1 ion/cm3
@@ -617,5 +617,5 @@
      kinrhotresi=EXP(kinrhotresi) !1/cm3
      
-     IF (kinrhotresi.LT.rhoali) kinetic_i=.true.
+     IF (kinrhotresi<rhoali) kinetic_i=.true.
      
      IF (kinetic_i) THEN    
@@ -770,5 +770,5 @@
                     
         na_i=x_i*ntot_i
-        IF (na_i .LT. 1.) THEN
+        IF (na_i < 1.) THEN
            na_n=1.0
         ENDIF
@@ -790,5 +790,5 @@
      jnuc_i=MIN(ipr,n_i*jnuc_i1)
      ! Set the ion-induced nucleation rate to 0.0 if less than 1.0E-7      
-     IF (jnuc_i.LT.1.E-7) THEN
+     IF (jnuc_i<1.E-7) THEN
         jnuc_i=0.0
      ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/ocs_to_so2.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/ocs_to_so2.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/ocs_to_so2.F90	(revision 5082)
@@ -34,9 +34,9 @@
         !only in the stratosphere
         IF (is_strato(ilon,ilev)) THEN
-          IF (OCS_lifetime(ilon,ilev).GT.0.0.AND.OCS_lifetime(ilon,ilev).LT.1.E10) THEN
+          IF (OCS_lifetime(ilon,ilev)>0.0.AND.OCS_lifetime(ilon,ilev)<1.E10) THEN
             rreduce = OCS_lifetime(ilon,ilev)
             ! Check lifetime rreduce < timestep*3 (such as H2SO4 loss > 0.28*H2SO4) with exp(-1/3)=0.72
             IF(flag_min_rreduce) THEN
-               IF (rreduce .LT. (3.*pdtphys)) rreduce = 3.*pdtphys
+               IF (rreduce < (3.*pdtphys)) rreduce = 3.*pdtphys
             ENDIF
             budg_3D_ocs_to_so2(ilon,ilev)=tr_seri(ilon,ilev,id_OCS_strat)*(1.0-exp(-pdtphys/rreduce))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/so2_to_h2so4.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/so2_to_h2so4.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/so2_to_h2so4.F90	(revision 5082)
@@ -37,5 +37,5 @@
      !only in the stratosphere
         IF (is_strato(ilon,ilev)) THEN
-           IF (SO2_lifetime(ilon,ilev).GT.0.0 .AND. SO2_lifetime(ilon,ilev).LT.1.E10) THEN
+           IF (SO2_lifetime(ilon,ilev)>0.0 .AND. SO2_lifetime(ilon,ilev)<1.E10) THEN
               IF (flag_OH_reduced) THEN
                  !--convert SO2 to H2SO4 (slimane)
@@ -83,5 +83,5 @@
                       & *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mSO2mol
                  
-                 IF (rrak1 .GE. 0.0) THEN
+                 IF (rrak1 >= 0.0) THEN
                     rreduce =( (rkho2o3+rkoho3)*rrak0 + rkso2oh*rrak1 ) / &
                          (  (rkho2o3+rkoho3)*rrak0 )
@@ -100,5 +100,5 @@
               ! Check lifetime rreduce < timestep*3 (such as SO2 loss > 0.28*SO2) with exp(-1/3)=0.72
               IF(flag_min_rreduce) THEN
-                 IF (rreduce .LT. (3.*pdtphys)) rreduce = 3.*pdtphys
+                 IF (rreduce < (3.*pdtphys)) rreduce = 3.*pdtphys
               ENDIF
               budg_3D_so2_to_h2so4(ilon,ilev)=tr_seri(ilon,ilev,id_SO2_strat)*(1.0-exp(-pdtphys/rreduce))
@@ -122,5 +122,5 @@
               ! test: quick sequential integration for SO2 to H2SO4 and reverse
               
-              IF (H2SO4_lifetime(ilon,ilev).GT.0.0 .AND. H2SO4_lifetime(ilon,ilev).LT.1.E10) THEN
+              IF (H2SO4_lifetime(ilon,ilev)>0.0 .AND. H2SO4_lifetime(ilon,ilev)<1.E10) THEN
                  
                  rreduce = H2SO4_lifetime(ilon,ilev)
@@ -130,5 +130,5 @@
                  ! Check lifetime rreduce < timestep*3 (such as H2SO4 loss > 0.28*H2SO4) with exp(-1/3)=0.72
                  IF(flag_min_rreduce) THEN
-                    IF (rreduce .LT. (3.*pdtphys)) rreduce = 3.*pdtphys
+                    IF (rreduce < (3.*pdtphys)) rreduce = 3.*pdtphys
                  ENDIF
                  dummyso4toso2 = (mSO2mol/mH2SO4mol)*tr_seri(ilon,ilev,id_H2SO4_strat)*(1.0-exp(-pdtphys/rreduce))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_emiss_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_emiss_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_emiss_mod.F90	(revision 5082)
@@ -16,5 +16,5 @@
     WRITE(lunout,*) 'IN STRATAER_EMISS INIT WELCOME!'
 
-    IF (flag_emit.EQ.1 .OR. flag_emit.EQ.4) THEN ! Volcano
+    IF (flag_emit==1 .OR. flag_emit==4) THEN ! Volcano
        CALL getin_p('nErupt',nErupt) !eruption nb
        CALL getin_p('injdur',injdur) !injection duration
@@ -26,5 +26,5 @@
        ENDIF
 
-       IF (nErupt.GT.0) THEN
+       IF (nErupt>0) THEN
           ALLOCATE(year_emit_vol(nErupt),mth_emit_vol(nErupt),day_emit_vol(nErupt))
           year_emit_vol=0 ; mth_emit_vol=0 ; day_emit_vol=0
@@ -242,6 +242,6 @@
           DO j=1,nbp_lat
              lat_reg_deg = lat_reg(j)*180./RPI
-             IF  ( lat_reg_deg.GE.xlat_min_vol(ieru)-dlat .AND. lat_reg_deg.LT.xlat_max_vol(ieru)+dlat .AND. &
-                  lon_reg_deg.GE.xlon_min_vol(ieru)-dlon .AND. lon_reg_deg.LT.xlon_max_vol(ieru)+dlon ) THEN
+             IF  ( lat_reg_deg>=xlat_min_vol(ieru)-dlat .AND. lat_reg_deg<xlat_max_vol(ieru)+dlat .AND. &
+                  lon_reg_deg>=xlon_min_vol(ieru)-dlon .AND. lon_reg_deg<xlon_max_vol(ieru)+dlon ) THEN
                 ponde_lonlat_vol(ieru) = ponde_lonlat_vol(ieru) + 1
              ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_local_var_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_local_var_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/strataer_local_var_mod.F90	(revision 5082)
@@ -251,5 +251,5 @@
     !--initialising dry diameters to geometrically spaced mass/volume (see Jacobson 1994)
     mdw(1)=mdwmin
-    IF (V_rat.LT.1.62) THEN ! compensate for dip in second bin for lower volume ratio
+    IF (V_rat<1.62) THEN ! compensate for dip in second bin for lower volume ratio
        mdw(2)=mdw(1)*2.**(1./3.)
        DO it=3, nbtr_bin
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratemit.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratemit.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratemit.F90	(revision 5082)
@@ -74,8 +74,8 @@
        theta_max = min(xlat(i)+dlat_loc,latmax)
                 
-       IF (  xlat(i).GE.latmin-dlat_loc .AND. &
-         &   xlat(i).LT.latmax+dlat_loc .AND. &
-         &   xlon(i).GE.lonmin-dlon .AND. &
-         &   xlon(i).LT.lonmax+dlon ) THEN
+       IF (  xlat(i)>=latmin-dlat_loc .AND. &
+         &   xlat(i)<latmax+dlat_loc .AND. &
+         &   xlon(i)>=lonmin-dlon .AND. &
+         &   xlon(i)<lonmax+dlon ) THEN
                    !
           WRITE(*,*) 'coordinates of volcanic injection point=',&
@@ -95,5 +95,5 @@
           CALL STRATDISTRIB(altLMDz,altemiss,sigma_alt,f_lay_emiss)
           
-          IF (flag_emit.EQ.3) then
+          IF (flag_emit==3) then
              theta=(sin(theta_max/180.*RPI)-sin(theta_min/180.*RPI))/ &
                & (sin(xlat_max_sai/180.*RPI)-sin(xlat_min_sai/180.*RPI))
@@ -122,5 +122,5 @@
              IF(emission < 1.E-34) emission = 0.0
              
-             IF (flh2o.EQ.0) THEN
+             IF (flh2o==0) THEN
                 IF(flag_verbose_strataer) WRITE(*,*) 'IN STRATEMIT: tr_ser avant/apres',&
                   &  'i= ',i,'k= ',k, 'flh2o= ',flh2o, &
@@ -129,8 +129,8 @@
               
                 tr_seri(i,k,id_spec)=tr_seri(i,k,id_spec)+emission*pdtphys
-                IF (id_species_total.NE.0) THEN
+                IF (id_species_total/=0) THEN
                    tr_seri(i,k,id_species_total)=tr_seri(i,k,id_species_total)+emission*pdtphys
                 ENDIF
-             ELSE IF(flh2o.EQ.1) THEN
+             ELSE IF(flh2o==1) THEN
                 d_q_emiss(i,k)=emission*pdtphys
                 IF(d_q_emiss(i,k) > 1.E34) THEN
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/sulfate_aer_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/sulfate_aer_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/sulfate_aer_mod.F90	(revision 5082)
@@ -93,5 +93,5 @@
 !      ***   H2SO4-H2O curved surface - Kelvin effect factor ***
 !            wet radius (m) (RRSI(IK) in [cm])
-             if (f_r_wetB(ilon,ilev,IK) .gt. 1.0) then 
+             if (f_r_wetB(ilon,ilev,IK) > 1.0) then
                radwet = 1.e-2*RRSI(IK)*f_r_wetB(ilon,ilev,IK)
              else 
@@ -197,5 +197,5 @@
     H2O(:,:)=sh(:,:)*mAIRmol/mH2Omol
 
-    IF(INSTEP.EQ.0) THEN
+    IF(INSTEP==0) THEN
     
        INSTEP=1
@@ -508,6 +508,6 @@
        DO I=1,16
        DO J=1,28
-         IF (F(I,J).LT.9.0)  F(I,J)=30.0
-         IF (F(I,J).GT.99.99) F(I,J)=99.99
+         IF (F(I,J)<9.0)  F(I,J)=30.0
+         IF (F(I,J)>99.99) F(I,J)=99.99
        ENDDO
        ENDDO
@@ -518,15 +518,15 @@
     DO J=1,klev
         TP=t_seri(I,J)
-        IF (TP.LT.175.1) TP=175.1
+        IF (TP<175.1) TP=175.1
 !    Partial pressure of H2O (mb)
         PH2O =PMB(I,J)*H2O(I,J)
-        IF (PH2O.LT.XC1) THEN 
+        IF (PH2O<XC1) THEN
           R2SO4(I,J)=99.99
 !          PH2O=XC(1)+1.0E-10
         ELSE 
-          IF (PH2O.GT.XC16) PH2O=XC16 
+          IF (PH2O>XC16) PH2O=XC16
 !         SIMPLE LINEAR INTERPOLATIONS
           CALL FIND(PH2O,TP,XC,YC,F,VAL,N,M)
-          IF (PMB(I,J).GE.10.0.AND.VAL.LT.60.0) VAL=60.0
+          IF (PMB(I,J)>=10.0.AND.VAL<60.0) VAL=60.0
           R2SO4(I,J)=VAL
         ENDIF
@@ -601,7 +601,7 @@
         CALL POSACT(XT,XC,NN,JX)
         JX1=JX+1
-        IF(JX.EQ.0) THEN
+        IF(JX==0) THEN
           ACTSO4(I,J)=0.0 
-        ELSE IF(JX.GE.NN) THEN
+        ELSE IF(JX>=NN) THEN
           ACTSO4(I,J)=15811.0 
         ELSE 
@@ -684,10 +684,10 @@
     CALL POSITION(YC,Y,M,JY,IERY)
 
-    IF(JX.EQ.0.OR.IERY.EQ.1) THEN
+    IF(JX==0.OR.IERY==1) THEN
        VAL=99.99
        RETURN
     ENDIF
 
-    IF(JY.EQ.0.OR.IERX.EQ.1) THEN
+    IF(JY==0.OR.IERX==1) THEN
        VAL=9.0
        RETURN
@@ -714,6 +714,6 @@
     VAL=(1.-T)*(1.-U)*SXY + T*(1.0-U)*SX1Y + T*U*SX1Y1 + (1.0-T)*U*SXY1
 
-    IF(VAL.LT.9.0) VAL=9.0
-    IF(VAL.GT.99.99) VAL=99.99
+    IF(VAL<9.0) VAL=9.0
+    IF(VAL>99.99) VAL=99.99
    
     RETURN
@@ -728,9 +728,9 @@
 
        IER=0
-       IF(X.LT.XC(1)) THEN
+       IF(X<XC(1)) THEN
          JX=0
        ELSE
          DO 10 I=1,N
-           IF (X.LT.XC(I)) GO TO 20
+           IF (X<XC(I)) GO TO 20
  10      CONTINUE
          IER=1
@@ -753,9 +753,9 @@
        INTEGER JX,I
   
-       IF(XT.GT.X(1)) THEN
+       IF(XT>X(1)) THEN
          JX=0
        ELSE
          DO 10 I=1,N
-           IF (XT.GT.X(I)) GO TO 20
+           IF (XT>X(I)) GO TO 20
  10      CONTINUE
  20      JX=I
@@ -814,5 +814,5 @@
       real, intent(in) :: T
 
-      if(T.gt.229.) then
+      if(T>229.) then
 !        Preining et al., 1981 (from Kulmala et al., 1998)
 !        saturation vapor pressure (N/m2 = 1 Pa = 1 kg/(m·s2))
@@ -955,10 +955,10 @@
 !       composition
 !       calculation of h2so4 molality
-            if(aw .le. 0.05 .and. aw .gt. 0.) then
+            if(aw <= 0.05 .and. aw > 0.) then
                y1=12.372089320*aw**(-0.16125516114) &
                  &  -30.490657554*aw -2.1133114241
                y2=13.455394705*aw**(-0.19213122550) &
                  &  -34.285174607*aw -1.7620073078
-            else if(aw .le. 0.85 .and. aw .gt. 0.05) then
+            else if(aw <= 0.85 .and. aw > 0.05) then
                y1=11.820654354*aw**(-0.20786404244) &
                  &  -4.8073063730*aw -5.1727540348
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/traccoag_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/traccoag_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/traccoag_mod.F90	(revision 5082)
@@ -96,8 +96,8 @@
 !--set boundaries of size bins
     DO it=1, nbtr_bin
-    IF (it.EQ.1) THEN
+    IF (it==1) THEN
       r_upper(it)=sqrt(r_bin(it+1)*r_bin(it))
       r_lower(it)=r_bin(it)**2./r_upper(it)
-    ELSEIF (it.EQ.nbtr_bin) THEN
+    ELSEIF (it==nbtr_bin) THEN
       r_lower(it)=sqrt(r_bin(it)*r_bin(it-1))
       r_upper(it)=r_bin(it)**2./r_lower(it)
@@ -116,5 +116,5 @@
 !--initialising logical is_strato from stratomask
     is_strato(:,:)=.FALSE. 
-    WHERE (stratomask.GT.0.5) is_strato=.TRUE. 
+    WHERE (stratomask>0.5) is_strato=.TRUE.
 
     IF(flag_new_strat_compo) THEN
@@ -335,5 +335,5 @@
     DO i=1,klon
       DO it=1, nbtr_bin
-        IF (mdw(it) .LT. 2.5e-6) THEN
+        IF (mdw(it) < 2.5e-6) THEN
           !surf_PM25_sulf(i)=surf_PM25_sulf(i)+tr_seri(i,1,it+nbtr_sulgas)*m_part(i,1,it) &
           !assume that particles consist of ammonium sulfate at the surface (132g/mol) 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/aeropt_2bands.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/aeropt_2bands.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/aeropt_2bands.F90	(revision 5082)
@@ -588,20 +588,20 @@
   ENDDO
 
-  IF (flag_aerosol .EQ. 1) THEN 
+  IF (flag_aerosol == 1) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASSO4M_phy
      aerosol_name(2) = id_CSSO4M_phy
-  ELSEIF (flag_aerosol .EQ. 2) THEN
+  ELSEIF (flag_aerosol == 2) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASBCM_phy
      aerosol_name(2) = id_AIBCM_phy
-  ELSEIF (flag_aerosol .EQ. 3) THEN 
+  ELSEIF (flag_aerosol == 3) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASPOMM_phy
      aerosol_name(2) = id_AIPOMM_phy
-  ELSEIF (flag_aerosol .EQ. 4) THEN 
+  ELSEIF (flag_aerosol == 4) THEN
      nb_aer = 3
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -609,9 +609,9 @@
      aerosol_name(2) = id_SSSSM_phy
      aerosol_name(3) = id_ASSSM_phy
-  ELSEIF (flag_aerosol .EQ. 5) THEN 
+  ELSEIF (flag_aerosol == 5) THEN
      nb_aer = 1
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_CIDUSTM_phy
-  ELSEIF (flag_aerosol .EQ. 6) THEN 
+  ELSEIF (flag_aerosol == 6) THEN
      nb_aer = 10
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -647,6 +647,6 @@
       rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
       RH_num(i,k) = INT( rh(i,k)/10. + 1.)
-      IF (rh(i,k).GT.85.) RH_num(i,k)=10
-      IF (rh(i,k).GT.90.) RH_num(i,k)=11
+      IF (rh(i,k)>85.) RH_num(i,k)=10
+      IF (rh(i,k)>90.) RH_num(i,k)=11
       DELTA(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -657,43 +657,43 @@
   DO m=1,nb_aer   ! tau is only computed for each mass
     fac=1.0
-     IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
+     IF (aerosol_name(m)==id_ASBCM_phy) THEN
          soluble=.TRUE.
          spsol=1
          spss=0
-     ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_ASPOMM_phy) THEN
         soluble=.TRUE.
         spsol=2 
         spss=0
-     ELSEIF (aerosol_name(m).EQ.id_ASSO4M_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_ASSO4M_phy) THEN
         soluble=.TRUE.
         spsol=3
         spss=0
         fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for OD
-     ELSEIF  (aerosol_name(m).EQ.id_CSSO4M_phy) THEN
+     ELSEIF  (aerosol_name(m)==id_CSSO4M_phy) THEN
         soluble=.TRUE.
         spsol=4
         spss=0
         fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for OD
-     ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_SSSSM_phy) THEN
          soluble=.TRUE.
          spsol=5
          spss=3
-     ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_CSSSM_phy) THEN
          soluble=.TRUE.
          spsol=6
          spss=2
-     ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
+     ELSEIF (aerosol_name(m)==id_ASSSM_phy) THEN
          soluble=.TRUE.
          spsol=7
          spss=1
-     ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_CIDUSTM_phy) THEN
          soluble=.FALSE.
          spinsol=1
          spss=0
-     ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN 
+     ELSEIF  (aerosol_name(m)==id_AIBCM_phy) THEN
          soluble=.FALSE.
          spinsol=2
          spss=0
-     ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_AIPOMM_phy) THEN
          soluble=.FALSE.
          spinsol=3
@@ -708,7 +708,7 @@
     IF (soluble) THEN
 
-      IF (spss.NE.0) THEN
-
-         IF (spss.EQ.1) THEN !accumulation mode
+      IF (spss/=0) THEN
+
+         IF (spss==1) THEN !accumulation mode
             DO k=1, KLEV
 !CDIR ON_ADB(A1_ASSSM_b1)
@@ -757,5 +757,5 @@
           ENDIF
 
-          IF (spss.EQ.2) THEN !coarse mode
+          IF (spss==2) THEN !coarse mode
             DO k=1, KLEV
 !CDIR ON_ADB(A1_CSSSM_b1)
@@ -803,5 +803,5 @@
          ENDIF
 
-         IF (spss.EQ.3) THEN !super coarse mode
+         IF (spss==3) THEN !super coarse mode
             DO k=1, KLEV
 !CDIR ON_ADB(A1_SSSSM_b1)
@@ -928,5 +928,5 @@
     DO mrfspecies=2,3    !--only deal with total and natural aerosols
 
-      IF (mrfspecies .EQ. 2) THEN             ! = total aerosol AER	 
+      IF (mrfspecies == 2) THEN             ! = total aerosol AER
 
         DO k=1, KLEV
@@ -976,5 +976,5 @@
         ENDDO 
 
-      ELSEIF (mrfspecies .EQ. 3) THEN             ! = natural aerosol NAT
+      ELSEIF (mrfspecies == 3) THEN             ! = natural aerosol NAT
 
         DO k=1, KLEV
@@ -1022,5 +1022,5 @@
         ENDDO
                    
-      ELSEIF (mrfspecies .EQ. 4) THEN             ! = BC
+      ELSEIF (mrfspecies == 4) THEN             ! = BC
 
         DO k=1, KLEV
@@ -1038,5 +1038,5 @@
         ENDDO
               
-      ELSEIF (mrfspecies .EQ. 5) THEN             ! = SO4
+      ELSEIF (mrfspecies == 5) THEN             ! = SO4
 
         DO k=1, KLEV
@@ -1056,5 +1056,5 @@
         ENDDO
 
-      ELSEIF (mrfspecies .EQ. 6) THEN             ! = POM
+      ELSEIF (mrfspecies == 6) THEN             ! = POM
 
         DO k=1, KLEV
@@ -1072,5 +1072,5 @@
         ENDDO
               
-      ELSEIF (mrfspecies .EQ. 7) THEN             ! = DUST
+      ELSEIF (mrfspecies == 7) THEN             ! = DUST
 
         DO k=1, KLEV
@@ -1083,5 +1083,5 @@
         ENDDO
 
-      ELSEIF (mrfspecies .EQ. 8) THEN             ! = SS
+      ELSEIF (mrfspecies == 8) THEN             ! = SS
 
         DO k=1, KLEV
@@ -1101,5 +1101,5 @@
         ENDDO
       
-      ELSEIF (mrfspecies .EQ. 9) THEN             ! = NO3
+      ELSEIF (mrfspecies == 9) THEN             ! = NO3
       
         DO k=1, KLEV
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/aeropt_5wv.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/aeropt_5wv.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/aeropt_5wv.F90	(revision 5082)
@@ -613,20 +613,20 @@
   ENDDO
 
-  IF (flag_aerosol .EQ. 1) THEN 
+  IF (flag_aerosol == 1) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASSO4M_phy
      aerosol_name(2) = id_CSSO4M_phy
-  ELSEIF (flag_aerosol .EQ. 2) THEN
+  ELSEIF (flag_aerosol == 2) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASBCM_phy
      aerosol_name(2) = id_AIBCM_phy
-  ELSEIF (flag_aerosol .EQ. 3) THEN 
+  ELSEIF (flag_aerosol == 3) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASPOMM_phy
      aerosol_name(2) = id_AIPOMM_phy
-  ELSEIF (flag_aerosol .EQ. 4) THEN 
+  ELSEIF (flag_aerosol == 4) THEN
      nb_aer = 3
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -634,9 +634,9 @@
      aerosol_name(2) = id_SSSSM_phy
      aerosol_name(3) = id_ASSSM_phy
-  ELSEIF (flag_aerosol .EQ. 5) THEN 
+  ELSEIF (flag_aerosol == 5) THEN
      nb_aer = 1
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_CIDUSTM_phy
-  ELSEIF (flag_aerosol .EQ. 6) THEN 
+  ELSEIF (flag_aerosol == 6) THEN
      nb_aer = 10
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -674,6 +674,6 @@
 !--test olivier pour pas de reindicage
 !      RH_num(i,k) =1
-      IF (rh(i,k).GT.85.) RH_num(i,k)=10
-      IF (rh(i,k).GT.90.) RH_num(i,k)=11
+      IF (rh(i,k)>85.) RH_num(i,k)=10
+      IF (rh(i,k)>90.) RH_num(i,k)=11
       DELTA(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -684,43 +684,43 @@
   DO m=1,nb_aer   ! tau is only computed for each mass    
     fac=1.0
-    IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
+    IF (aerosol_name(m)==id_ASBCM_phy) THEN
         soluble=.TRUE.
         spsol=1
         spss=0
-    ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_ASPOMM_phy) THEN
         soluble=.TRUE.
         spsol=2 
         spss=0
-    ELSEIF (aerosol_name(m).EQ.id_ASSO4M_phy) THEN
+    ELSEIF (aerosol_name(m)==id_ASSO4M_phy) THEN
         soluble=.TRUE.
         spsol=3
         spss=0
         fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for OD
-    ELSEIF (aerosol_name(m).EQ.id_CSSO4M_phy) THEN
+    ELSEIF (aerosol_name(m)==id_CSSO4M_phy) THEN
         soluble=.TRUE.
         spsol=4
         spss=0
         fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for OD
-    ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_SSSSM_phy) THEN
         soluble=.TRUE.
         spsol=5
         spss=3
-    ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_CSSSM_phy) THEN
         soluble=.TRUE.
         spsol=6
         spss=2
-    ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
+    ELSEIF (aerosol_name(m)==id_ASSSM_phy) THEN
         soluble=.TRUE.
         spsol=7
         spss=1
-    ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_CIDUSTM_phy) THEN
         soluble=.FALSE.
         spinsol=1
         spss=0
-    ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN 
+    ELSEIF  (aerosol_name(m)==id_AIBCM_phy) THEN
         soluble=.FALSE.
         spinsol=2
         spss=0
-    ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_AIPOMM_phy) THEN
         soluble=.FALSE.
         spinsol=3
@@ -741,10 +741,10 @@
 
     !--only 550 and 865 nm are used
-    IF (la.NE.la550.AND.la.NE.la865) CYCLE
+    IF (la/=la550.AND.la/=la865) CYCLE
 
       IF (soluble) THEN
 
-        IF ((la.EQ.2).AND.(spss.NE.0)) THEN !la=2 corresponds to 550 nm
-          IF (spss.EQ.1) THEN !accumulation mode
+        IF ((la==2).AND.(spss/=0)) THEN !la=2 corresponds to 550 nm
+          IF (spss==1) THEN !accumulation mode
             DO k=1, klev
               DO i=1, klon
@@ -757,5 +757,5 @@
           ENDIF
   
-          IF (spss.EQ.2) THEN !coarse mode
+          IF (spss==2) THEN !coarse mode
             DO k=1, klev
               DO i=1, klon
@@ -768,5 +768,5 @@
           ENDIF
 
-          IF (spss.EQ.3) THEN !super coarse mode
+          IF (spss==3) THEN !super coarse mode
             DO k=1, klev
               DO i=1, klon
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale.F90	(revision 5082)
@@ -75,5 +75,5 @@
        !calcul de ale_wake et alp_wake
        if (iflag_wake>=1) then
-          if (itap .le. it_wape_prescr) then
+          if (itap <= it_wape_prescr) then
              do i = 1,klon
                 ale_wake(i) = wape_prescr
@@ -96,6 +96,6 @@
        !combinaison avec ale et alp de couche limite: constantes si pas
        !de couplage, valeurs calculees dans le thermique sinon
-       if (iflag_coupl.eq.0) then
-          if (debut.and.prt_level.gt.9) &
+       if (iflag_coupl==0) then
+          if (debut.and.prt_level>9) &
                WRITE(lunout,*)'ALE et ALP imposes'
           do i = 1,klon
@@ -145,5 +145,5 @@
              ALE(i) = max(ale_wake(i),Ale_bl(i))
              !cc nrlmd le 10/04/2012----------Stochastic triggering------------
-             if (iflag_trig_bl.ge.1) then
+             if (iflag_trig_bl>=1) then
                 ALE(i) = max(ale_wake(i),Ale_bl_trig(i))
              endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale_th.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale_th.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/alpale_th.F90	(revision 5082)
@@ -89,8 +89,8 @@
     IF (first) THEN
       CALL getin_p('multiply_proba_notrig',multiply_proba_notrig)
-      IF (iflag_clos_bl .LT. 3) THEN
+      IF (iflag_clos_bl < 3) THEN
          random_notrig_max=1.
          CALL getin_p('random_notrig_max',random_notrig_max)
-      ELSEIF (iflag_clos_bl .EQ. 3) THEN  ! (iflag_clos_bl .LT. 3)
+      ELSEIF (iflag_clos_bl == 3) THEN  ! (iflag_clos_bl .LT. 3)
          cv_feed_area = 1.e10   ! m2
          CALL getin_p('cv_feed_area', cv_feed_area)
@@ -120,5 +120,5 @@
 !!
 !---------------------------------------
-  IF (iflag_clos_bl .LT. 3) THEN
+  IF (iflag_clos_bl < 3) THEN
 !---------------------------------------
 !
@@ -127,7 +127,7 @@
           !cc nrlmd le 10/04/2012
           !-----------Stochastic triggering-----------
-          if (iflag_trig_bl.ge.1) then
+          if (iflag_trig_bl>=1) then
              !
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'cin, ale_bl_stat, alp_bl, alp_bl_stat ', &
                      cin, ale_bl_stat, alp_bl, alp_bl_stat
@@ -140,5 +140,5 @@
                 random_notrig(i)=1e6*ale_bl_stat(i)-int(1e6*ale_bl_stat(i))
                 if ( random_notrig(i) > random_notrig_max ) random_notrig(i)=0.
-                if ( ale_bl_trig(i) .lt. abs(cin(i))+1.e-10 ) then 
+                if ( ale_bl_trig(i) < abs(cin(i))+1.e-10 ) then
                    tau_trig(i)=tau_trig_shallow
                 else
@@ -147,5 +147,5 @@
              enddo
              !
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'random_notrig, tau_trig ', &
                      random_notrig, tau_trig
@@ -155,13 +155,13 @@
 
              !Option pour re-activer l'ancien calcul de Ale_bl (iflag_trig_bl=2)
-             IF (iflag_trig_bl.eq.1) then
+             IF (iflag_trig_bl==1) then
 
                 !----Tirage al\'eatoire et calcul de ale_bl_trig
                 do i=1,klon
-                   if ( (ale_bl_stat(i) .gt. abs(cin(i))+1.e-10) )  then
+                   if ( (ale_bl_stat(i) > abs(cin(i))+1.e-10) )  then
                       proba_notrig(i)=proba_notrig(i)* &
                          (1.-exp(-strig(i)/s2(i)))**(n2(i)*dtime/tau_trig(i))
                       !        print *, 'proba_notrig(i) ',proba_notrig(i)
-                      if (random_notrig(i) .ge. proba_notrig(i)) then 
+                      if (random_notrig(i) >= proba_notrig(i)) then
                          ale_bl_trig(i)=ale_bl_stat(i)
                       else
@@ -178,12 +178,12 @@
                 enddo
 
-             ELSE IF (iflag_trig_bl.ge.2) then
+             ELSE IF (iflag_trig_bl>=2) then
 
                 do i=1,klon
-                   if ( (Ale_bl(i) .gt. abs(cin(i))+1.e-10) )  then
+                   if ( (Ale_bl(i) > abs(cin(i))+1.e-10) )  then
                       proba_notrig(i)=proba_notrig(i)* &
                          (1.-exp(-strig(i)/s2(i)))**(n2(i)*dtime/tau_trig(i))
                       !        print *, 'proba_notrig(i) ',proba_notrig(i)
-                      if (random_notrig(i) .ge. proba_notrig(i)) then 
+                      if (random_notrig(i) >= proba_notrig(i)) then
                          ale_bl_trig(i)=Ale_bl(i)
                       else
@@ -203,5 +203,5 @@
 
              !
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'proba_notrig, ale_bl_trig ', &
                      proba_notrig, ale_bl_trig
@@ -211,14 +211,14 @@
 
           !-----------Statistical closure-----------
-          if (iflag_clos_bl.eq.1) then 
+          if (iflag_clos_bl==1) then
 
              do i=1,klon
                 !CR: alp probabiliste
-                if (ale_bl_trig(i).gt.0.) then
+                if (ale_bl_trig(i)>0.) then
                    alp_bl(i)=alp_bl(i)/(1.-min(proba_notrig(i),0.999))
                 endif
              enddo
 
-          else if (iflag_clos_bl.eq.2) then
+          else if (iflag_clos_bl==2) then
 
              !CR: alp calculee dans thermcell_main
@@ -235,5 +235,5 @@
 !
 !---------------------------------------
-  ELSEIF (iflag_clos_bl .EQ. 3) THEN  ! (iflag_clos_bl .LT. 3)
+  ELSEIF (iflag_clos_bl == 3) THEN  ! (iflag_clos_bl .LT. 3)
 !---------------------------------------
 !
@@ -242,7 +242,7 @@
 
           !-----------Stochastic triggering-----------
-     if (iflag_trig_bl.ge.1) then
+     if (iflag_trig_bl>=1) then
         !
-        IF (prt_level .GE. 10) THEN
+        IF (prt_level >= 10) THEN
            WRITE(lunout,*)'cin, ale_bl_stat, alp_bl_stat ', &
                 cin, ale_bl_stat, alp_bl_stat
@@ -251,9 +251,9 @@
         ! Use ale_bl_stat (Rochetin's code) or ale_bl (old code) according to 
         ! iflag_trig_bl value.
-        IF (iflag_trig_bl.eq.1) then         ! use ale_bl_stat (Rochetin computation)
+        IF (iflag_trig_bl==1) then         ! use ale_bl_stat (Rochetin computation)
          do i=1,klon
               ale_bl_ref(i)=ale_bl_stat(i)
          enddo
-        ELSE IF (iflag_trig_bl.ge.2) then    ! use ale_bl (old computation)
+        ELSE IF (iflag_trig_bl>=2) then    ! use ale_bl (old computation)
          do i=1,klon
               ale_bl_ref(i)=Ale_bl(i)
@@ -266,5 +266,5 @@
 !!jyg           proba_notrig(i)=1.
            random_notrig(i)=1e6*ale_bl_stat(i)-int(1e6*ale_bl_stat(i))
-           if ( ale_bl_trig(i) .lt. abs(cin(i))+1.e-10 ) then 
+           if ( ale_bl_trig(i) < abs(cin(i))+1.e-10 ) then
               tau_trig(i)=tau_trig_shallow
            else
@@ -273,5 +273,5 @@
         enddo
         !
-        IF (prt_level .GE. 10) THEN
+        IF (prt_level >= 10) THEN
            WRITE(lunout,*)'random_notrig, tau_trig ', &
                 random_notrig, tau_trig
@@ -282,5 +282,5 @@
         !----alp_bl computation
         do i=1,klon
-           if ( (ale_bl_ref(i) .gt. abs(cin(i))+1.e-10) )  then
+           if ( (ale_bl_ref(i) > abs(cin(i))+1.e-10) )  then
               birth_number = n2(i)*exp(-strig(i)/s2(i))
               birth_rate(i) = birth_number/(tau_trig(i)*cell_area(i))
@@ -301,5 +301,5 @@
         !----ale_bl_trig computation
          do i=1,klon
-           if (random_notrig(i) .ge. proba_notrig(i)) then 
+           if (random_notrig(i) >= proba_notrig(i)) then
               ale_bl_trig(i)=ale_bl_ref(i)
            else
@@ -309,5 +309,5 @@
 
         !
-        IF (prt_level .GE. 10) THEN
+        IF (prt_level >= 10) THEN
            WRITE(lunout,*)'proba_notrig, ale_bl_trig ', &
                 proba_notrig, ale_bl_trig
@@ -320,5 +320,5 @@
 !---------------------------------------
 
-          IF (prt_level .GE. 10) THEN
+          IF (prt_level >= 10) THEN
              WRITE(lunout,*)'alpale_th: ale_bl_trig, alp_bl_stat, birth_rate ', &
                       ale_bl_trig(1), alp_bl_stat(1), birth_rate(1)
@@ -330,5 +330,5 @@
           ! Couplage Thermiques/Emanuel seulement si T<0
           if (iflag_coupl==2) then
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'Couplage Thermiques/Emanuel seulement si T<0'
              ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/borne_var_surf.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/borne_var_surf.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/borne_var_surf.F90	(revision 5082)
@@ -44,5 +44,5 @@
     u10m_cor(i,nsrf)=u10m(i,nsrf)
     v10m_cor(i,nsrf)=v10m(i,nsrf)
-     IF(iflag_bug_t2m_stab_ipslcm61.EQ.-2.AND.q2m(i,nsrf).LT.0.) THEN
+     IF(iflag_bug_t2m_stab_ipslcm61==-2.AND.q2m(i,nsrf)<0.) THEN
       t2m_cor(i,nsrf)=MIN(t2m(i,nsrf),MAX(t1(i),ftsol(i,nsrf)))
       t2m_cor(i,nsrf)=MAX(t2m_cor(i,nsrf),MIN(t1(i),ftsol(i,nsrf)))
@@ -52,5 +52,5 @@
       u10m_cor(i,nsrf)=SIGN(MIN(ABS(u1(i)),ABS(u10m(i,nsrf))),u1(i))
       v10m_cor(i,nsrf)=SIGN(MIN(ABS(v1(i)),ABS(v10m(i,nsrf))),v1(i))
-     ELSEIF(iflag_bug_t2m_stab_ipslcm61.EQ.-1.AND.(ftsol(i,nsrf).LE.t1(i).OR.q2m(i,nsrf).LT.0.)) THEN
+     ELSEIF(iflag_bug_t2m_stab_ipslcm61==-1.AND.(ftsol(i,nsrf)<=t1(i).OR.q2m(i,nsrf)<0.)) THEN
       t2m_cor(i,nsrf)=MIN(t2m(i,nsrf),MAX(t1(i),ftsol(i,nsrf)))
       t2m_cor(i,nsrf)=MAX(t2m_cor(i,nsrf),MIN(t1(i),ftsol(i,nsrf)))
@@ -60,5 +60,5 @@
       u10m_cor(i,nsrf)=SIGN(MIN(ABS(u1(i)),ABS(u10m(i,nsrf))),u1(i))
       v10m_cor(i,nsrf)=SIGN(MIN(ABS(v1(i)),ABS(v10m(i,nsrf))),v1(i))
-     ELSEIF(iflag_bug_t2m_stab_ipslcm61.EQ.1.AND.ftsol(i,nsrf).LE.t1(i)) THEN
+     ELSEIF(iflag_bug_t2m_stab_ipslcm61==1.AND.ftsol(i,nsrf)<=t1(i)) THEN
       t2m_cor(i,nsrf)=MIN(t2m(i,nsrf),MAX(t1(i),ftsol(i,nsrf)))
       t2m_cor(i,nsrf)=MAX(t2m_cor(i,nsrf),MIN(t1(i),ftsol(i,nsrf)))
@@ -68,5 +68,5 @@
       u10m_cor(i,nsrf)=SIGN(MIN(ABS(u1(i)),ABS(u10m(i,nsrf))),u1(i))
       v10m_cor(i,nsrf)=SIGN(MIN(ABS(v1(i)),ABS(v10m(i,nsrf))),v1(i))
-     ELSEIF(iflag_bug_t2m_stab_ipslcm61.EQ.0) THEN
+     ELSEIF(iflag_bug_t2m_stab_ipslcm61==0) THEN
       t2m_cor(i,nsrf)=MIN(t2m(i,nsrf),MAX(t1(i),ftsol(i,nsrf)))
       t2m_cor(i,nsrf)=MAX(t2m_cor(i,nsrf),MIN(t1(i),ftsol(i,nsrf)))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/calbeta.F90	(revision 5082)
@@ -51,5 +51,5 @@
   vdif(:) = 0.0
   
-  IF (indice.EQ.is_oce) THEN
+  IF (indice==is_oce) THEN
      DO i = 1, knon
         vcal(i)   = 0.0
@@ -59,8 +59,8 @@
   ENDIF
   
-  IF (indice.EQ.is_sic) THEN
+  IF (indice==is_sic) THEN
      DO i = 1, knon
         vcal(i) = calice
-        IF (snow(i) .GT. 0.0) vcal(i) = calsno
+        IF (snow(i) > 0.0) vcal(i) = calsno
         vbeta(i)  = 1.0
         vdif(i) = 1.0/tau_gl
@@ -69,8 +69,8 @@
   ENDIF
   
-  IF (indice.EQ.is_ter) THEN
+  IF (indice==is_ter) THEN
      DO i = 1, knon
         vcal(i) = calsol
-        IF (snow(i) .GT. 0.0) vcal(i) = calsno
+        IF (snow(i) > 0.0) vcal(i) = calsno
         vbeta(i)  = MIN(2.0*qsol(i)/mx_eau_sol, 1.0)
         vdif(i) = 0.0
@@ -78,8 +78,8 @@
   ENDIF
   
-  IF (indice.EQ.is_lic) THEN
+  IF (indice==is_lic) THEN
      DO i = 1, knon
         vcal(i) = calice
-        IF (snow(i) .GT. 0.0) vcal(i) = calsno
+        IF (snow(i) > 0.0) vcal(i) = calsno
         vbeta(i)  = 1.0
         vdif(i) = 0.0
@@ -88,5 +88,5 @@
 
   ! EV: when beta is prescribed for 1D cases:
-  IF (knon.EQ.1 .AND. ok_prescr_beta) THEN
+  IF (knon==1 .AND. ok_prescr_beta) THEN
      DO i = 1, knon
           vbeta(i)=betaevap
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/calcul_fluxs_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/calcul_fluxs_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/calcul_fluxs_mod.F90	(revision 5082)
@@ -55,7 +55,7 @@
 !   dflux_s      derivee du flux de chaleur sensible / Ts
 !   dflux_l      derivee du flux de chaleur latente  / Ts
-!   sens_prec_liq flux sensible lié aux echanges de precipitations liquides
+!   sens_prec_liq flux sensible li� aux echanges de precipitations liquides
 !   sens_prec_sol                                    precipitations solides
-!   lat_prec_liq  flux latent lié aux echanges de precipitations liquides
+!   lat_prec_liq  flux latent li� aux echanges de precipitations liquides
 !   lat_prec_sol                                  precipitations solides
 
@@ -162,5 +162,5 @@
                /RLVTT / zx_pkh(i)
        ELSE
-          IF (tsurf(i).LT.t_coup) THEN
+          IF (tsurf(i)<t_coup) THEN
              zx_qs = qsats(tsurf(i)) / ps(i)
              zx_dq_s_dh = dqsats(tsurf(i),zx_qs)/RLVTT &
@@ -190,5 +190,5 @@
     DO i = 1, knon
        zx_sl(i) = RLVTT
-       IF (tsurf(i) .LT. RTT) zx_sl(i) = RLSTT
+       IF (tsurf(i) < RTT) zx_sl(i) = RLSTT
     ENDDO
     
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90	(revision 5082)
@@ -198,10 +198,10 @@
          ale_bl(:)=0.
          alp_bl(:)=0.
-         if (prt_level.ge.10) then
+         if (prt_level>=10) then
           print*,'thermV4 nsplit: ',nsplit_thermals,' weak_inversion'
          endif
 
 !   tests sur les valeurs negatives de l'eau
-         logexpr0=prt_level.ge.10
+         logexpr0=prt_level>=10
          nbptspb=0
          do k=1,klev
@@ -209,5 +209,5 @@
 ! Attention teste abderr 19-03-09
 !               logexpr2(i,k)=.not.q_seri(i,k).ge.0.
-                logexpr2(i,k)=.not.q_seri(i,k).ge.1.e-15
+                logexpr2(i,k)=.not.q_seri(i,k)>=1.e-15
                if (logexpr2(i,k)) then
 #ifdef ISO
@@ -228,5 +228,5 @@
             enddo
          enddo
-         if(nbptspb.GT.0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb   
+         if(nbptspb>0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
 
 
@@ -257,5 +257,5 @@
      &      ,r_aspect_thermals,30.,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.2) then
+          else if (iflag_thermals==2) then
             CALL thermcell_sec(klon,klev,zdt  &
      &      ,pplay,paprs,pphi,zlev  &
@@ -265,5 +265,5 @@
      &      ,r_aspect_thermals,30.,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.3) then
+          else if (iflag_thermals==3) then
             CALL thermcell(klon,klev,zdt  &
      &      ,pplay,paprs,pphi  &
@@ -273,5 +273,5 @@
      &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.10) then
+          else if (iflag_thermals==10) then
             CALL thermcell_eau(klon,klev,zdt  &
      &      ,pplay,paprs,pphi  &
@@ -281,8 +281,8 @@
      &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.11) then
+          else if (iflag_thermals==11) then
               abort_message = 'cas non prevu dans calltherm'
               CALL abort_physic (modname,abort_message,1)
-          else if (iflag_thermals.eq.12) then
+          else if (iflag_thermals==12) then
             CALL calcul_sec(klon,klev,zdt  &
      &      ,pplay,paprs,pphi,zlev  &
@@ -323,5 +323,5 @@
      &        )
 
-           if (prt_level.gt.10) write(lunout,*)'Apres thermcell_main OK'
+           if (prt_level>10) write(lunout,*)'Apres thermcell_main OK'
          else
            abort_message = 'Cas des thermiques non prevu'
@@ -355,5 +355,5 @@
       fact(:)=0.
       DO i=1,klon
-       logexpr1(i)=flag_bidouille_stratocu.or.weak_inversion(i).gt.0.5
+       logexpr1(i)=flag_bidouille_stratocu.or.weak_inversion(i)>0.5
        IF(logexpr1(i)) fact(i)=1./REAL(nsplit_thermals)
       ENDDO
@@ -414,5 +414,5 @@
 #endif
 #endif 
-           if (prt_level.gt.10) write(lunout,*)'Apres apres thermcell_main OK'
+           if (prt_level>10) write(lunout,*)'Apres apres thermcell_main OK'
 
        DO i=1,klon
@@ -422,5 +422,5 @@
             alp_bl(i)=alp_bl(i)+alp(i)/REAL(nsplit_thermals)
 !            write(23,*)'ALP CALLTHERM',alp_bl(i),alp(i)
-        if(prt_level.GE.10) print*,'calltherm i alp_bl alp ale_bl ale',i,alp_bl(i),alp(i),ale_bl(i),ale(i)
+        if(prt_level>=10) print*,'calltherm i alp_bl alp ale_bl ale',i,alp_bl(i),alp(i),ale_bl(i),ale(i)
        ENDDO
 
@@ -431,5 +431,5 @@
             DO k = 1, klev
             DO i = 1, klon
-               logexpr2(i,k)=.not.q_seri(i,k).ge.0.
+               logexpr2(i,k)=.not.q_seri(i,k)>=0.
                if (logexpr2(i,k)) then
                 q_seri(i,k)=1.e-15
@@ -457,10 +457,10 @@
 #endif
 
-        IF(nbptspb.GT.0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb   
+        IF(nbptspb>0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
 ! tests sur les valeurs de la temperature
         nbptspb=0
             DO k = 1, klev
             DO i = 1, klon
-               logexpr2(i,k)=t_seri(i,k).lt.50..or.t_seri(i,k).gt.370.
+               logexpr2(i,k)=t_seri(i,k)<50..or.t_seri(i,k)>370.
                if (logexpr2(i,k)) nbptspb=nbptspb+1
 !              if ((t_seri(i,k).lt.50.) .or.  &
@@ -472,5 +472,5 @@
             ENDDO
             ENDDO
-        IF(nbptspb.GT.0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
+        IF(nbptspb>0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
          enddo ! isplit
 
@@ -483,5 +483,5 @@
                do k=1,klev
             do i=1,klon
-                  if (entr_therm(i,k).gt.0.) then
+                  if (entr_therm(i,k)>0.) then
                      fmc_therm(i,k+1)=fmc_therm(i,k)+entr_therm(i,k)
                   else
@@ -498,9 +498,9 @@
 !      print*,'<<<<calcul de lhumidite dans thermique'
 !CR:on ne le calcule que pour le cas sec
-      if (iflag_thermals.le.11) then      
+      if (iflag_thermals<=11) then
       do i=1,klon
          zqasc(i,1)=q_seri(i,1)
          do k=2,klev
-            if (fmc_therm(i,k+1).gt.1.e-6) then
+            if (fmc_therm(i,k+1)>1.e-6) then
                zqasc(i,k)=(fmc_therm(i,k)*zqasc(i,k-1)  &
      &              +entr_therm(i,k)*q_seri(i,k))/fmc_therm(i,k+1)
@@ -519,6 +519,6 @@
                 do k=1,klev
                    clwcon0(i,k)=zqasc(i,k)-zqsat(i,k)
-                   if (clwcon0(i,k).lt.0. .or.   &
-     &             (fm_therm(i,k+1)+detrc_therm(i,k)).lt.1.e-6) then
+                   if (clwcon0(i,k)<0. .or.   &
+     &             (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
                       clwcon0(i,k)=0.
                    endif
@@ -529,6 +529,6 @@
                 do k=1,klev
                    clwcon0(i,k)=zqla(i,k)  
-                   if (clwcon0(i,k).lt.0. .or.   &
-     &             (fm_therm(i,k+1)+detrc_therm(i,k)).lt.1.e-6) then
+                   if (clwcon0(i,k)<0. .or.   &
+     &             (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
                    clwcon0(i,k)=0. 
                    endif
@@ -542,5 +542,5 @@
           do i=1,klon
              do k=1,klev
-                if (ztla(i,k) .lt. 1.e-10) fraca(i,k) =0.
+                if (ztla(i,k) < 1.e-10) fraca(i,k) =0.
              enddo
           enddo
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/calwake.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/calwake.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/calwake.F90	(revision 5082)
@@ -296,5 +296,5 @@
 
 !jyg<  
-  IF (iflag_wake_tend .EQ. 0) THEN
+  IF (iflag_wake_tend == 0) THEN
 !  Update State variables
     DO l = 1, klev
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/carbon_cycle_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/carbon_cycle_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/carbon_cycle_mod.F90	(revision 5082)
@@ -361,9 +361,9 @@
     IF (is_mpi_root .AND. is_omp_root) THEN
 
-       IF (level_coupling_esm.GT.0) THEN
+       IF (level_coupling_esm>0) THEN
 
           OPEN(200,file='coupling_fields.def',form='formatted',status='old', iostat=ierr)
 
-          IF (ierr.EQ.0) THEN
+          IF (ierr==0) THEN
 
              WRITE(lunout,*) trim(modname),': Open coupling_fields.def : ok'
@@ -398,10 +398,10 @@
                 WRITE(lunout,*) 'coupling field: ',cfname_root(iq), & 
                                ', number: ',iq,', long name: ',cftext_root(iq),', units ',cfunits_root(iq)
-                IF (nbcf_in+nbcf_out.LT.nbcf) THEN
-                  IF (cfintent_root(iq).NE.'OUT') THEN
+                IF (nbcf_in+nbcf_out<nbcf) THEN
+                  IF (cfintent_root(iq)/='OUT') THEN
                     nbcf_in=nbcf_in+1
                     mask_in_root(iq)=.TRUE.
                     mask_out_root(iq)=.FALSE.
-                  ELSE IF (cfintent_root(iq).EQ.'OUT') THEN
+                  ELSE IF (cfintent_root(iq)=='OUT') THEN
                     nbcf_out=nbcf_out+1
                     mask_in_root(iq)=.FALSE.
@@ -446,13 +446,13 @@
     IF (is_mpi_root .AND. is_omp_root) THEN
 
-        IF (nbcf.GT.0)     cfname=cfname_root
-        IF (nbcf_in.GT.0)  cfname_in=PACK(cfname_root,mask_in_root)
-        IF (nbcf_out.GT.0) cfname_out=PACK(cfname_root,mask_out_root)
-        IF (nbcf_in.GT.0)  cftext_in=PACK(cftext_root,mask_in_root)
-        IF (nbcf_out.GT.0) cftext_out=PACK(cftext_root,mask_out_root)
-        IF (nbcf.GT.0)     cfmod1=cfmod1_root
-        IF (nbcf.GT.0)     cfmod2=cfmod2_root
-        IF (nbcf_in.GT.0)  cfunits_in=PACK(cfunits_root,mask_in_root)
-        IF (nbcf_out.GT.0) cfunits_out=PACK(cfunits_root,mask_out_root)
+        IF (nbcf>0)     cfname=cfname_root
+        IF (nbcf_in>0)  cfname_in=PACK(cfname_root,mask_in_root)
+        IF (nbcf_out>0) cfname_out=PACK(cfname_root,mask_out_root)
+        IF (nbcf_in>0)  cftext_in=PACK(cftext_root,mask_in_root)
+        IF (nbcf_out>0) cftext_out=PACK(cftext_root,mask_out_root)
+        IF (nbcf>0)     cfmod1=cfmod1_root
+        IF (nbcf>0)     cfmod2=cfmod2_root
+        IF (nbcf_in>0)  cfunits_in=PACK(cfunits_root,mask_in_root)
+        IF (nbcf_out>0) cfunits_out=PACK(cfunits_root,mask_out_root)
 
         nbcf_in_orc=0
@@ -484,5 +484,5 @@
     WRITE(lunout,*) 'nbcf_in_ant  =',nbcf_in_ant
 
-    IF (nbcf_in.GT.0) THEN 
+    IF (nbcf_in>0) THEN
         DO iq=1,nbcf_in
           CALL bcast(cfname_in(iq))
@@ -492,5 +492,5 @@
     ENDIF
 
-    IF (nbcf_out.GT.0) THEN
+    IF (nbcf_out>0) THEN
         DO iq=1,nbcf_out
           CALL bcast(cfname_out(iq))
@@ -500,5 +500,5 @@
     ENDIF
 
-    IF (nbcf.GT.0) THEN
+    IF (nbcf>0) THEN
         DO iq=1,nbcf
           CALL bcast(cfmod1(iq))
@@ -507,18 +507,18 @@
     ENDIF
 
-    IF (nbcf_in.GT.0)  WRITE(lunout,*)'infocfields_mod --- cfname_in: ',cfname_in
-    IF (nbcf_out.GT.0) WRITE(lunout,*)'infocfields_mod --- cfname_out: ',cfname_out
-
-    IF (nbcf_in.GT.0)  WRITE(lunout,*)'infocfields_mod --- cftext_in: ',cftext_in
-    IF (nbcf_out.GT.0) WRITE(lunout,*)'infocfields_mod --- cftext_out: ',cftext_out
-
-    IF (nbcf.GT.0) WRITE(lunout,*)'infocfields_mod --- cfmod1: ',cfmod1 
-    IF (nbcf.GT.0) WRITE(lunout,*)'infocfields_mod --- cfmod2: ',cfmod2 
-
-    IF (nbcf_in.GT.0)  WRITE(lunout,*)'infocfunits_mod --- cfunits_in: ',cfunits_in
-    IF (nbcf_out.GT.0) WRITE(lunout,*)'infocfunits_mod --- cfunits_out: ',cfunits_out
-
-    IF (nbcf_in.GT.0)  WRITE(*,*)'infocfields_init --- number of fields in to LMDZ: ',nbcf_in
-    IF (nbcf_out.GT.0) WRITE(*,*)'infocfields_init --- number of fields out of LMDZ: ',nbcf_out
+    IF (nbcf_in>0)  WRITE(lunout,*)'infocfields_mod --- cfname_in: ',cfname_in
+    IF (nbcf_out>0) WRITE(lunout,*)'infocfields_mod --- cfname_out: ',cfname_out
+
+    IF (nbcf_in>0)  WRITE(lunout,*)'infocfields_mod --- cftext_in: ',cftext_in
+    IF (nbcf_out>0) WRITE(lunout,*)'infocfields_mod --- cftext_out: ',cftext_out
+
+    IF (nbcf>0) WRITE(lunout,*)'infocfields_mod --- cfmod1: ',cfmod1
+    IF (nbcf>0) WRITE(lunout,*)'infocfields_mod --- cfmod2: ',cfmod2
+
+    IF (nbcf_in>0)  WRITE(lunout,*)'infocfunits_mod --- cfunits_in: ',cfunits_in
+    IF (nbcf_out>0) WRITE(lunout,*)'infocfunits_mod --- cfunits_out: ',cfunits_out
+
+    IF (nbcf_in>0)  WRITE(*,*)'infocfields_init --- number of fields in to LMDZ: ',nbcf_in
+    IF (nbcf_out>0) WRITE(*,*)'infocfields_init --- number of fields out of LMDZ: ',nbcf_out
 
  ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cdrag_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cdrag_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cdrag_mod.F90	(revision 5082)
@@ -228,8 +228,8 @@
   ng_qsurf = 0  ! Initialization
   DO i = 1, knon
-     IF (q1(i).LT.0.0)     ng_q1 = ng_q1 + 1
-     IF (qsurf(i).LT.0.0)  ng_qsurf = ng_qsurf + 1
+     IF (q1(i)<0.0)     ng_q1 = ng_q1 + 1
+     IF (qsurf(i)<0.0)  ng_qsurf = ng_qsurf + 1
   ENDDO
-  IF (ng_q1.GT.0 .and. prt_level > 5) THEN
+  IF (ng_q1>0 .and. prt_level > 5) THEN
       WRITE(lunout,*)" *** Warning: Negative q1(humidity at 1st level) values in cdrag.F90 !"
       WRITE(lunout,*)" The total number of the grids is: ", ng_q1
@@ -238,5 +238,5 @@
 !      CALL abort_physic(modname,abort_message,1)
   ENDIF
-  IF (ng_qsurf.GT.0 .and. prt_level > 5) THEN
+  IF (ng_qsurf>0 .and. prt_level > 5) THEN
       WRITE(lunout,*)" *** Warning: Negative qsurf(humidity at surface) values in cdrag.F90 !"
       WRITE(lunout,*)" The total number of the grids is: ", ng_qsurf
@@ -292,5 +292,5 @@
 !------------------ Rajout (OT2018) --------------------
 !--------------   ON DUPLIQUE POUR METTRE ITERATION SUR OCEAN    ------------------------     
-     IF (iri_in.EQ.1) THEN
+     IF (iri_in==1) THEN
        zri(i) = ri_in(i)
      ENDIF
@@ -299,6 +299,6 @@
         
 !------------------  Pour Core 2 choix Core Pur ou Core Mixte  --------------------
-       IF ((choix_bulk > 1 .AND. choix_bulk < 4) .AND. (nsrf .eq. is_oce)) THEN
-         IF(choix_bulk .eq. 2) THEN
+       IF ((choix_bulk > 1 .AND. choix_bulk < 4) .AND. (nsrf == is_oce)) THEN
+         IF(choix_bulk == 2) THEN
            mixte = .false.
          ELSE
@@ -316,9 +316,9 @@
 
 !------------------                 Pour ECUME                 --------------------
-       ELSE IF ((choix_bulk .eq. 4) .and. (nsrf .eq. is_oce)) THEN
+       ELSE IF ((choix_bulk == 4) .and. (nsrf == is_oce)) THEN
          OPRECIP = .false.
          OPWEBB  = .false.
          OPERTFLUX = .false.
-         IF (nsrf .eq. is_oce) THEN
+         IF (nsrf == is_oce) THEN
            PSSS = 0.0
          ENDIF
@@ -339,5 +339,5 @@
 
 !------------------                 Pour COARE CNRM                 --------------------
-       ELSE IF ((choix_bulk .eq. 5) .and. (nsrf .eq. is_oce)) THEN
+       ELSE IF ((choix_bulk == 5) .and. (nsrf == is_oce)) THEN
          LPRECIP = .false.
          LPWG    = .false.
@@ -362,6 +362,6 @@
 
 !------------------                 Pour COARE Maison                 --------------------
-       ELSE IF ((choix_bulk .eq. 1) .and. (nsrf .eq. is_oce)) THEN
-         IF ( pblh(i) .eq. 0. ) THEN
+       ELSE IF ((choix_bulk == 1) .and. (nsrf == is_oce)) THEN
+         IF ( pblh(i) == 0. ) THEN
            pblh(i) = 1500.
          ENDIF
@@ -381,5 +381,5 @@
 !------------------                 Pour La param LMDZ (ocean)              --------------------
          zri(i) = zgeop1(i)*(ztvd-ztsolv)/(zdu2*ztvd)
-         IF (iri_in.EQ.1) THEN
+         IF (iri_in==1) THEN
            zri(i) = ri_in(i)
          ENDIF
@@ -398,5 +398,5 @@
 ! Calcul des fonctions de stabilite FMs, FHs, FMi, FHi :
 !*******************************************************
-         IF (zri(i) .LT. 0.) THEN    
+         IF (zri(i) < 0.) THEN
            SELECT CASE (iflag_corr_insta)
              CASE (1) ! Louis 1979 + Mascart 1995
@@ -466,5 +466,5 @@
                   FH(i)=FM(i)
              CASE (4)  ! King 2001
-                  IF (zri(i) .LT. C2/2.) THEN
+                  IF (zri(i) < C2/2.) THEN
                     FM(i)=MAX((1.-zri(i)/C2)**2,f_ri_cd_min)
                     FH(i)=  FM(i)
@@ -474,5 +474,5 @@
                   ENDIF
              CASE (5) ! MO
-                  if (zri(i) .LT. 1./alpha) then
+                  if (zri(i) < 1./alpha) then
                     FM(i)=MAX((1.-alpha*zri(i))**2,f_ri_cd_min)
                     FH(i)=FM(i)
@@ -504,5 +504,5 @@
            ENDIF
 
-           IF (nsrf.EQ.is_oce) THEN
+           IF (nsrf==is_oce) THEN
              cdhh(i)=f_cdrag_oce*cdhn(i)*FH(i)
              cdmm(i)=MIN(cdmm(i),cdmmax)
@@ -528,5 +528,5 @@
          ENDIF
        ENDDO
-       IF (nsrf.EQ.is_oce) THEN
+       IF (nsrf==is_oce) THEN
          cdm(i)=MIN(cdmm(i),cdmmax)
          cdh(i)=MIN(cdhh(i),cdhmax)
@@ -536,5 +536,5 @@
      ELSE ! (nsrf == is_oce)
        zri(i) = zgeop1(i)*(ztvd-ztsolv)/(zdu2*ztvd)
-       IF (iri_in.EQ.1) THEN
+       IF (iri_in==1) THEN
          zri(i) = ri_in(i)
        ENDIF
@@ -552,5 +552,5 @@
 ! Cas instables
 !''''''''''''''
-       IF (zri(i) .LT. 0.) THEN    
+       IF (zri(i) < 0.) THEN
          SELECT CASE (iflag_corr_insta)
            CASE (1) ! Louis 1979 + Mascart 1995
@@ -607,5 +607,5 @@
                 FH(i)=FM(i)
            CASE (4)  ! King 2001
-                if (zri(i) .LT. C2/2.) then
+                if (zri(i) < C2/2.) then
                   FM(i)=MAX((1.-zri(i)/C2)**2,f_ri_cd_min)
                   FH(i)=  FM(i)
@@ -615,5 +615,5 @@
                 endif
            CASE (5) ! MO
-                if (zri(i) .LT. 1./alpha) then
+                if (zri(i) < 1./alpha) then
                   FM(i)=MAX((1.-alpha*zri(i))**2,f_ri_cd_min)
                   FH(i)=FM(i)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cfmip_point_locations.F90	(revision 5082)
@@ -17,10 +17,10 @@
 10 READ(20,*) tab(np), lonCFMIP(np), latCFMIP(np)
 !!! passage de 0-360 a -180/180
-   IF (lonCFMIP(np).GT.180.) THEN
+   IF (lonCFMIP(np)>180.) THEN
     lonCFMIP(np)=lonCFMIP(np)-360.
    ENDIF 
    WRITE(21,*) np, lonCFMIP(np), latCFMIP(np)
    np=np+1
-   IF(np.LE.npCFMIP) THEN 
+   IF(np<=npCFMIP) THEN
     GOTO 10
    ENDIF
@@ -56,8 +56,8 @@
 !  lon(i+1)
 !
-   IF(lonCFMIP(np).GE.lon(i).AND.lonCFMIP(np).LT.lon(i+1)) THEN
+   IF(lonCFMIP(np)>=lon(i).AND.lonCFMIP(np)<lon(i+1)) THEN
     dlon1 = abs (lonCFMIP(np) - lon(i))
     dlon2 = abs (lonCFMIP(np) - lon(i+1))
-    IF (dlon1.LE.dlon2) THEN
+    IF (dlon1<=dlon2) THEN
      ipt(np)=i
     ELSE
@@ -70,8 +70,8 @@
    np=1
 30 j=1
-40 IF(latCFMIP(np).LE.io_lat(j).AND.latCFMIP(np).GE.io_lat(j+1)) THEN
+40 IF(latCFMIP(np)<=io_lat(j).AND.latCFMIP(np)>=io_lat(j+1)) THEN
     dlat1 = abs (latCFMIP(np) - io_lat(j))
     dlat2 = abs (latCFMIP(np) - io_lat(j+1))
-    IF (dlat1.LE.dlat2) THEN
+    IF (dlat1<=dlat2) THEN
      jpt(np)=j
     ELSE
@@ -79,10 +79,10 @@
     ENDIF
     np=np+1
-    IF(np.LE.npCFMIP) THEN
+    IF(np<=npCFMIP) THEN
      GOTO 30
     ENDIF 
    ELSE
     j=j+1
-    IF(j.LE.nbp_lat-1) THEN 
+    IF(j<=nbp_lat-1) THEN
      GOTO 40
     ENDIF
@@ -98,9 +98,9 @@
      lonGCM(ip)=lon(ipt(ip))
      latGCM(ip)=io_lat(jpt(ip))
-     if(jpt(ip).GE.2.AND.jpt(ip).LE.nbp_lat-1) THEN     
+     if(jpt(ip)>=2.AND.jpt(ip)<=nbp_lat-1) THEN
       tabijGCM(ip)=1+(jpt(ip)-2)*nbp_lon+ipt(ip)
-     else if(jpt(ip).EQ.1) THEN
+     else if(jpt(ip)==1) THEN
       tabijGCM(ip)=1
-     else if(jpt(ip).EQ.nbp_lat) THEN
+     else if(jpt(ip)==nbp_lat) THEN
       tabijGCM(ip)=klon_glo
      else 
@@ -110,5 +110,5 @@
     ENDDO
     DO ip=1, npCFMIP
-     if(lonGCM(ip).EQ.io_lon(1)) lonGCM(ip)=360.+lonGCM(ip)
+     if(lonGCM(ip)==io_lon(1)) lonGCM(ip)=360.+lonGCM(ip)
     ENDDO
    DO i=1, npCFMIP
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/change_srf_frac_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/change_srf_frac_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/change_srf_frac_mod.F90	(revision 5082)
@@ -165,5 +165,5 @@
        END WHERE
 ! Send fractions back to slab ocean if needed
-       IF (type_ocean == 'slab'.AND. version_ocean.NE.'sicINT') THEN
+       IF (type_ocean == 'slab'.AND. version_ocean/='sicINT') THEN
            WHERE (1.-zmasq(:)>EPSFRA)
                fsic(:)=pctsrf(:,is_sic)/(1.-zmasq(:))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/clc_core_cp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/clc_core_cp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/clc_core_cp.F90	(revision 5082)
@@ -89,5 +89,5 @@
 
 
-  if ( dt .gt. 0. ) then
+  if ( dt > 0. ) then
      ch_n10 = 0.018 * cd_n10_rt                !!!!!!! si regime stable calcul du ch
 !     z_0h = 10. * exp(-k/ch_n10)
@@ -132,5 +132,5 @@
 
 
-     IF ( zeta(1) .GT. 0 ) THEN !!! si regime stable alors valeurs pr chi et psi 
+     IF ( zeta(1) > 0 ) THEN !!! si regime stable alors valeurs pr chi et psi
 
         chi = 0.018 
@@ -151,5 +151,5 @@
 
      do j =2,3
-        IF ( zeta(j) .GT. 0 ) THEN
+        IF ( zeta(j) > 0 ) THEN
            psi(1,j) = -5.*zeta(j)
            psi(2,j) = psi(1,1)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/clcdrag.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/clcdrag.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/clcdrag.F90	(revision 5082)
@@ -98,5 +98,5 @@
 
 !!$        IF (zri(i) .ge. 0.) THEN      ! situation stable
-     IF (zri(i) .GT. 0.) THEN      ! situation stable
+     IF (zri(i) > 0.) THEN      ! situation stable
         zri(i) = MIN(20.,zri(i))
         IF (.NOT.zxli) THEN
@@ -108,5 +108,5 @@
 !!$ PB           zcfh1(i) = f_cdrag_stable * zcdn(i) * FRIH
            zcfh1(i) = f_cdrag_ter * zcdn(i) * FRIH
-           IF(nsrf.EQ.is_oce) zcfh1(i) = f_cdrag_oce * zcdn(i) * FRIH
+           IF(nsrf==is_oce) zcfh1(i) = f_cdrag_oce * zcdn(i) * FRIH
 !!$ PB
            pcfm(i) = zcfm1(i)
@@ -132,5 +132,5 @@
 ! cdrah sur l'ocean cf. Miller et al. (1992) - only active when gustiness parameterization is not active
            zcr = (0.0016/(zcdn(i)*SQRT(zdu2)))*ABS(ztvd-ztsolv)**(1./3.)
-           IF(nsrf.EQ.is_oce) pcfh(i) =f_cdrag_oce* zcdn(i)*(1.0+zcr**1.25)**(1./1.25)
+           IF(nsrf==is_oce) pcfh(i) =f_cdrag_oce* zcdn(i)*(1.0+zcr**1.25)**(1./1.25)
         ENDIF
      ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/climb_qbs_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/climb_qbs_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/climb_qbs_mod.F90	(revision 5082)
@@ -158,5 +158,5 @@
 !
 !****************************************************************************************
-    IF (mod(iflag_pbl_split,10) .ge.1) THEN
+    IF (mod(iflag_pbl_split,10) >=1) THEN
     DO k= 1, klev
       DO i= 1, klon
@@ -164,5 +164,5 @@
         Dcoef_QBS_out(i,k) = Dcoef_QBS(i,k)
         Kcoef_qbs_out(i,k) = Kcoefqbs(i,k)
-          IF (k.eq.1) THEN
+          IF (k==1) THEN
             gama_qbs_out(i,k)  = 0.
           ELSE
@@ -301,5 +301,5 @@
     psref(1:knon) = paprs(1:knon,1)  
 
-       IF (mod(iflag_pbl_split,10) .ge.1) THEN
+       IF (mod(iflag_pbl_split,10) >=1) THEN
     DO i = 1, knon
       Acoef_QBS(i)=Acoef_QBS_in(i)
@@ -311,5 +311,5 @@
         Dcoef_QBS(i,k)=Dcoef_QBS_in(i,k)
         Kcoefqbs(i,k)=Kcoef_qbs_in(i,k)
-          IF (k.gt.1) THEN
+          IF (k>1) THEN
             gamaqbs(i,k)=gama_qbs_in(i,k)
           ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/climb_wind_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/climb_wind_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/climb_wind_mod.F90	(revision 5082)
@@ -173,5 +173,5 @@
 !!! jyg le 07/02/2012
 !!jyg       IF (mod(iflag_pbl_split,2) .eq.1) THEN
-       IF (mod(iflag_pbl_split,10) .ge.1) THEN
+       IF (mod(iflag_pbl_split,10) >=1) THEN
 !!! nrlmd le 02/05/2011
     DO k= 1, klev
@@ -310,5 +310,5 @@
 !!! jyg le 07/02/2012
 !!jyg       IF (mod(iflag_pbl_split,2) .eq.1) THEN
-       IF (mod(iflag_pbl_split,10) .ge.1) THEN
+       IF (mod(iflag_pbl_split,10) >=1) THEN
 !!! nrlmd le 02/05/2011
     DO i = 1, knon
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cltracrn.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cltracrn.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cltracrn.F90	(revision 5082)
@@ -177,5 +177,5 @@
 ! Le Rn est traiter commme une couche Brownienne puisque vdeptr = 0.
 !-------------------------------------------------------------------
-     IF ( NINT(masktr(i)) .EQ. 1 ) THEN
+     IF ( NINT(masktr(i)) == 1 ) THEN
         zx_trs(i) = local_trs(i)
         zx_a = zx_trs(i)                                           &
@@ -197,6 +197,6 @@
 !--------------------------------------------------------
 
-     IF ( (itr.eq.id_rn.AND.NINT(masktr(i)).EQ.1.AND.lat(i).GE.60..AND.lat(i).LE.70.).OR.      &
-          (itr.eq.id_pb.AND.NINT(masktr(i)).EQ.1.AND.lat(i).GE.60..AND.lat(i).LE.70.) ) THEN
+     IF ( (itr==id_rn.AND.NINT(masktr(i))==1.AND.lat(i)>=60..AND.lat(i)<=70.).OR.      &
+          (itr==id_pb.AND.NINT(masktr(i))==1.AND.lat(i)>=60..AND.lat(i)<=70.) ) THEN
         zx_trs(i) = local_trs(i)
         zx_a = zx_trs(i)                                           &
@@ -223,6 +223,6 @@
 !---------------------------------------------------------------
 
-     IF ( (itr.EQ.id_rn.AND.NINT(masktr(i)).EQ.0).OR.       &
-          (itr.EQ.id_rn.AND.NINT(masktr(i)).EQ.1.AND.lat(i).LT.-60.)) THEN
+     IF ( (itr==id_rn.AND.NINT(masktr(i))==0).OR.       &
+          (itr==id_rn.AND.NINT(masktr(i))==1.AND.lat(i)<-60.)) THEN
         zx_trs(i) = 0.
         local_trs(i) = 0.
@@ -232,6 +232,6 @@
 ! des oceans et des continents
 !--------------------------------------------------------------
-     IF ( (itr.EQ.id_rn.AND.NINT(masktr(i)).EQ.0).OR.    &
-          (itr.EQ.id_rn.AND.NINT(masktr(i)).EQ.1.AND.lat(i).GT.70.)) THEN
+     IF ( (itr==id_rn.AND.NINT(masktr(i))==0).OR.    &
+          (itr==id_rn.AND.NINT(masktr(i))==1.AND.lat(i)>70.)) THEN
         zx_trs(i) = 0.
         local_trs(i) = 0.
@@ -241,5 +241,5 @@
 !--------------------------------------------
 
-     IF (itr.eq.id_rn.AND.NINT(masktr(i)).EQ.0) THEN
+     IF (itr==id_rn.AND.NINT(masktr(i))==0) THEN
         zx_trs(i) = 0.
         local_trs(i) = 0.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/coef_diff_turb_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/coef_diff_turb_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/coef_diff_turb_mod.F90	(revision 5082)
@@ -90,5 +90,5 @@
 !****************************************************************************************
 
-    IF (iflag_pbl.EQ.1) THEN
+    IF (iflag_pbl==1) THEN
        CALL coefkz2(nsrf, knon, ypaprs, ypplay, yt, &
             ycoefm0, ycoefh0)
@@ -126,5 +126,5 @@
 !****************************************************************************************
 
-    IF (iflag_pbl.GE.3) THEN
+    IF (iflag_pbl>=3) THEN
 
        yzlay(1:knon,1)= &
@@ -174,5 +174,5 @@
          
 !   iflag_pbl peut etre utilise comme longuer de melange
-       IF (iflag_pbl.GE.31) THEN
+       IF (iflag_pbl>=31) THEN
           if ( klon>1 .or. (klon==1 .and. knon==1) ) then
           CALL vdif_kcay(knon,klev,knon,dtime,RG,RD,ypaprs,yt, &
@@ -333,5 +333,5 @@
 ! Prescrire la valeur de contre-gradient
 !
-    IF (iflag_pbl.EQ.1) THEN
+    IF (iflag_pbl==1) THEN
        DO k = 3, klev
           gamt(k) = -1.0E-03
@@ -344,5 +344,5 @@
     ENDIF
 !IM cf JLD/ GKtest
-    IF ( nsrf .NE. is_oce ) THEN
+    IF ( nsrf /= is_oce ) THEN
 !IM 261103     kstable = kstable_ter
        kstable = ksta_ter
@@ -398,5 +398,5 @@
              zdqs = FOEDE(zt,zdelta,zcvm5,zqs,zcor)
           ELSE
-             IF (zt .LT. t_coup) THEN
+             IF (zt < t_coup) THEN
                 zqs = qsats(zt) / pplay(i,k)
                 zdqs = dqsats(zt,zqs)
@@ -456,5 +456,5 @@
              zalh2=(0.5*ckap/rg*z2geomf &
                   /(1.+0.5*ckap/RG/(clam*SQRT(1.5*cd))*z2geomf))**2
-             IF (zri(i).LT.0.0) THEN  ! situation instable
+             IF (zri(i)<0.0) THEN  ! situation instable
                 zscf = ((zgeop(i,k)/zgeop(i,k-1))**(1./3.)-1.)**3 &
                      / (zmgeom(i)/RG)**3 / (zgeop(i,k-1)/RG)
@@ -483,5 +483,5 @@
 !
     DO i = 1, knon
-       IF (itop(i)+1 .LE. klev) THEN
+       IF (itop(i)+1 <= klev) THEN
           DO k = itop(i)+1, klev
              pcfh(i,k) = 0.0
@@ -567,6 +567,6 @@
                - RD * 0.5*(t(i,k)+t(i,k+1))/RCPD/paprs(i,k+1)
           zdthdp = zdthdp * 100.0
-          IF (pplay(i,k).GT.0.8*paprs(i,1) .AND. &
-               zdthdp.LT.zdthmin(i) ) THEN
+          IF (pplay(i,k)>0.8*paprs(i,1) .AND. &
+               zdthdp<zdthmin(i) ) THEN
              zdthmin(i) = zdthdp
              invb(i) = k
@@ -578,5 +578,5 @@
 ! Introduire une diffusion:
 !
-    IF ( nsrf.EQ.is_oce ) THEN
+    IF ( nsrf==is_oce ) THEN
        DO k = 2, klev
           DO i = 1, knon
@@ -590,5 +590,5 @@
 ! s'il n'y a pas d'inversion ou si l'inversion est trop faible
 !          IF ( (nsrf.EQ.is_oce) .AND. &
-             IF ( (invb(i).EQ.klev) .OR. (zdthmin(i).GT.seuil) ) THEN 
+             IF ( (invb(i)==klev) .OR. (zdthmin(i)>seuil) ) THEN
                 zl2(i)=(mixlen*MAX(0.0,(paprs(i,k)-paprs(i,klev+1)) &
                      /(paprs(i,2)-paprs(i,klev+1)) ))**2
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/coefcdrag.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/coefcdrag.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/coefcdrag.F90	(revision 5082)
@@ -101,9 +101,9 @@
 !
 !IM +++
-       IF(1.EQ.0) THEN
+       IF(1==0) THEN
        IF (okri) THEN
-         IF (ri1(i).GE.0.0.AND.zri1(i).LT.0.0) THEN
+         IF (ri1(i)>=0.0.AND.zri1(i)<0.0) THEN
            zri1(i) = ri1(i)
-         ELSE IF(ri1(i).LT.0.0.AND.zri1(i).GE.0.0) THEN
+         ELSE IF(ri1(i)<0.0.AND.zri1(i)>=0.0) THEN
            zri1(i) = ri1(i)
          ENDIF 
@@ -114,5 +114,5 @@
        cdran(i) = (RKAR/log(1.+zdphi(i)/(RG*rugos(i))))**2
 
-       IF (zri1(i) .ge. 0.) THEN 
+       IF (zri1(i) >= 0.) THEN
 !
 ! situation stable : pour eviter les inconsistances dans les cas 
@@ -128,5 +128,5 @@
 !           zcfh1(i) = cdran(i) * frih(i)
            zcfh1(i) = f_cdrag_ter*cdran(i) * frih(i)
-           IF(nsrf.EQ.is_oce) zcfh1(i)=f_cdrag_oce*cdran(i)*frih(i)
+           IF(nsrf==is_oce) zcfh1(i)=f_cdrag_oce*cdran(i)*frih(i)
            cdram(i) = zcfm1(i)
            cdrah(i) = zcfh1(i)
@@ -159,5 +159,5 @@
 !         IF (nsrf.EQ.is_oce) cdrah(i) = cdran(i)*(1.0+zcr(i)**1.25) &
 !                  **(1./1.25)
-         IF (nsrf.EQ.is_oce) cdrah(i)=f_cdrag_oce*cdran(i)*(1.0+zcr(i)**1.25) &
+         IF (nsrf==is_oce) cdrah(i)=f_cdrag_oce*cdran(i)*(1.0+zcr(i)**1.25) &
                   **(1./1.25)
        ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/MISR_simulator.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/MISR_simulator.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/MISR_simulator.F	(revision 5082)
@@ -133,5 +133,5 @@
             
         ! define location of "layer top"
-        if(ilev.eq.1 .or. ilev.eq.nlev) then
+        if(ilev==1 .or. ilev==nlev) then
             ztest=zfull(j,ilev)
         else
@@ -144,5 +144,5 @@
         do loop=2,n_MISR_CTH
         
-            if ( ztest .gt.
+            if ( ztest >
      &                1000*MISR_CTH_boundaries(loop+1) ) then
         
@@ -173,9 +173,9 @@
              dtau=0
              
-             if (frac_out(j,ibox,ilev).eq.1) then
+             if (frac_out(j,ibox,ilev)==1) then
                         dtau = dtau_s(j,ilev)
                  endif
                  
-                 if (frac_out(j,ibox,ilev).eq.2) then
+                 if (frac_out(j,ibox,ilev)==2) then
                         dtau = dtau_c(j,ilev)
                  end if 
@@ -186,5 +186,5 @@
         ! NOW for MISR ..
         ! if there a cloud ... start the counter ... store this height
-        if(thres_crossed_MISR .eq. 0 .and. dtau .gt. 0.) then
+        if(thres_crossed_MISR == 0 .and. dtau > 0.) then
         
             ! first encountered a "cloud"
@@ -193,8 +193,8 @@
         endif   
                 
-        if( thres_crossed_MISR .lt. 99 .and.
-     &              thres_crossed_MISR .gt. 0 ) then
+        if( thres_crossed_MISR < 99 .and.
+     &              thres_crossed_MISR > 0 ) then
      
-                if( dtau .eq. 0.) then
+                if( dtau == 0.) then
         
                     ! we have come to the end of the current cloud
@@ -212,7 +212,7 @@
             ! then MISR will like see a top below the top of the current 
             ! layer
-            if( dtau.gt.0 .and. (cloud_dtau-dtau) .lt. 1) then
-            
-                if(dtau .lt. 1 .or. ilev.eq.1 .or. ilev.eq.nlev) then
+            if( dtau>0 .and. (cloud_dtau-dtau) < 1) then
+            
+                if(dtau < 1 .or. ilev==1 .or. ilev==nlev) then
 
                     ! MISR will likely penetrate to some point
@@ -233,5 +233,5 @@
         
             ! check for a distinctive water layer
-            if(dtau .gt. 1 .and. at(j,ilev).gt.273 ) then
+            if(dtau > 1 .and. at(j,ilev)>273 ) then
      
                     ! must be a water cloud ... 
@@ -242,5 +242,5 @@
             ! if the total column optical depth is "large" than
             ! MISR can't seen anything else ... set current point as CTH level
-            if(tau(j,ibox) .gt. 5) then 
+            if(tau(j,ibox) > 5) then
 
                 thres_crossed_MISR=99           
@@ -254,5 +254,5 @@
         ! check to see if there was a cloud for which we didn't 
         ! set a MISR cloud top boundary
-        if( thres_crossed_MISR .eq. 1) then
+        if( thres_crossed_MISR == 1) then
     
         ! if the cloud has a total optical depth of greater
@@ -260,9 +260,9 @@
         ! with a height near the true cloud top
         ! otherwise there should be no CTH
-        if( tau(j,ibox) .gt. 0.5) then
+        if( tau(j,ibox) > 0.5) then
 
             ! keep MISR detected CTH
             
-        elseif(tau(j,ibox) .gt. 0.2) then
+        elseif(tau(j,ibox) > 0.2) then
 
             ! MISR may detect but wont likley have a good height
@@ -294,16 +294,16 @@
     !   This setup assumes the columns represent a about a 1 to 4 km scale
     !   it will need to be modified significantly, otherwise
-        if(ncol.eq.1) then
+        if(ncol==1) then
     
        ! adjust based on neightboring points ... i.e. only 2D grid was input
            do j=2,npoints-1
             
-            if(box_MISR_ztop(j-1,1).gt.0 .and. 
-     &             box_MISR_ztop(j+1,1).gt.0       ) then
+            if(box_MISR_ztop(j-1,1)>0 .and.
+     &             box_MISR_ztop(j+1,1)>0       ) then
 
                 if( abs( box_MISR_ztop(j-1,1) -  
-     &                   box_MISR_ztop(j+1,1) ) .lt. 500 
+     &                   box_MISR_ztop(j+1,1) ) < 500
      &              .and.
-     &                   box_MISR_ztop(j,1) .lt. 
+     &                   box_MISR_ztop(j,1) <
      &                   box_MISR_ztop(j+1,1)     ) then
             
@@ -319,11 +319,11 @@
          do ibox=2,ncol-1
             
-            if(box_MISR_ztop(1,ibox-1).gt.0 .and. 
-     &             box_MISR_ztop(1,ibox+1).gt.0        ) then
+            if(box_MISR_ztop(1,ibox-1)>0 .and.
+     &             box_MISR_ztop(1,ibox+1)>0        ) then
 
                 if( abs( box_MISR_ztop(1,ibox-1) -  
-     &                   box_MISR_ztop(1,ibox+1) ) .lt. 500 
+     &                   box_MISR_ztop(1,ibox+1) ) < 500
      &              .and.
-     &                   box_MISR_ztop(1,ibox) .lt. 
+     &                   box_MISR_ztop(1,ibox) <
      &                   box_MISR_ztop(1,ibox+1)     ) then
             
@@ -357,5 +357,5 @@
          do ibox=1,ncol
 
-            if (tau(j,ibox) .gt. (tauchk)) then
+            if (tau(j,ibox) > (tauchk)) then
                box_cloudy(j,ibox)=.true.
             endif
@@ -366,22 +366,22 @@
     
           !determine optical depth category
-              if (tau(j,ibox) .lt. isccp_taumin) then
+              if (tau(j,ibox) < isccp_taumin) then
                   itau=1
-              else if (tau(j,ibox) .ge. isccp_taumin                                    
-     &          .and. tau(j,ibox) .lt. 1.3) then
+              else if (tau(j,ibox) >= isccp_taumin
+     &          .and. tau(j,ibox) < 1.3) then
                   itau=2
-              else if (tau(j,ibox) .ge. 1.3 
-     &          .and. tau(j,ibox) .lt. 3.6) then
+              else if (tau(j,ibox) >= 1.3
+     &          .and. tau(j,ibox) < 3.6) then
                   itau=3
-              else if (tau(j,ibox) .ge. 3.6 
-     &          .and. tau(j,ibox) .lt. 9.4) then
+              else if (tau(j,ibox) >= 3.6
+     &          .and. tau(j,ibox) < 9.4) then
                   itau=4
-              else if (tau(j,ibox) .ge. 9.4 
-     &          .and. tau(j,ibox) .lt. 23.) then
+              else if (tau(j,ibox) >= 9.4
+     &          .and. tau(j,ibox) < 23.) then
                   itau=5
-              else if (tau(j,ibox) .ge. 23. 
-     &          .and. tau(j,ibox) .lt. 60.) then
+              else if (tau(j,ibox) >= 23.
+     &          .and. tau(j,ibox) < 60.) then
                   itau=6
-              else if (tau(j,ibox) .ge. 60.) then
+              else if (tau(j,ibox) >= 60.) then
                   itau=7
               endif
@@ -390,13 +390,13 @@
 
        ! update MISR histograms and summary metrics - roj 5/2005
-       if (sunlit(j).eq.1) then 
+       if (sunlit(j)==1) then
                      
               !if cloudy added by roj 5/2005
-          if( box_MISR_ztop(j,ibox).eq.0) then
+          if( box_MISR_ztop(j,ibox)==0) then
           
             ! no cloud detected
             iMISR_ztop=0
 
-          elseif( box_MISR_ztop(j,ibox).eq.-1) then
+          elseif( box_MISR_ztop(j,ibox)==-1) then
 
             ! cloud can be detected but too thin to get CTH
@@ -416,5 +416,5 @@
             do loop=2,n_MISR_CTH
         
-                if ( box_MISR_ztop(j,ibox) .gt.
+                if ( box_MISR_ztop(j,ibox) >
      &                1000*MISR_CTH_boundaries(loop+1) ) then
         
@@ -466,5 +466,5 @@
        enddo ! ibox - loop over subcolumns          
       
-       if( MISR_cldarea(j) .gt. 0.) then
+       if( MISR_cldarea(j) > 0.) then
         MISR_mean_ztop(j)= MISR_mean_ztop(j) / MISR_cldarea(j)   ! roj 5/2006
        endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/array_lib.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/array_lib.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/array_lib.F90	(revision 5082)
@@ -45,16 +45,16 @@
  
 ! ----- INPUTS -----
-  real*8, dimension(:), intent(in) :: list
-  real*8, intent(in) :: val  
+  real(kind=8), dimension(:), intent(in) :: list
+  real(kind=8), intent(in) :: val
   integer, intent(in), optional :: sort
   
 ! ----- OUTPUTS -----
-  integer*4 :: infind
-  real*8, intent(out), optional :: dist
+  integer(kind=4) :: infind
+  real(kind=8), intent(out), optional :: dist
 
 ! ----- INTERNAL -----
-  real*8, dimension(size(list)) :: lists
-  integer*4 :: nlist, result, tmp(1), sort_list
-  integer*4, dimension(size(list)) :: mask, idx
+  real(kind=8), dimension(size(list)) :: lists
+  integer(kind=4) :: nlist, result, tmp(1), sort_list
+  integer(kind=4), dimension(size(list)) :: mask, idx
 
   if (present(sort)) then
@@ -121,15 +121,15 @@
 
 ! ----- INPUTS -----
-  real*8, dimension(:), intent(in) :: yarr, xarr, xxarr
-  real*8, intent(in) :: tol
+  real(kind=8), dimension(:), intent(in) :: yarr, xarr, xxarr
+  real(kind=8), intent(in) :: tol
 
 ! ----- OUTPUTS -----
-  real*8, dimension(size(xxarr)), intent(out) :: yyarr
+  real(kind=8), dimension(size(xxarr)), intent(out) :: yyarr
 
 ! ----- INTERNAL -----
-  real*8, dimension(size(xarr)) :: ysort, xsort
-  integer*4, dimension(size(xarr)) :: ist
-  integer*4 :: nx, nxx, i, iloc
-  real*8 :: d, m
+  real(kind=8), dimension(size(xarr)) :: ysort, xsort
+  integer(kind=4), dimension(size(xarr)) :: ist
+  integer(kind=4) :: nx, nxx, i, iloc
+  real(kind=8) :: d, m
 
   nx = size(xarr)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/atmos_lib.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/atmos_lib.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/atmos_lib.F90	(revision 5082)
@@ -43,5 +43,5 @@
 
 ! ----- OUTPUTS -----
-  real*8, intent(out), dimension(ndat) :: &
+  real(kind=8), intent(out), dimension(ndat) :: &
   hgt, &                        ! height (m)
   prs, &                        ! pressure (hPa)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/calc_Re.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/calc_Re.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/calc_Re.F90	(revision 5082)
@@ -40,25 +40,25 @@
 ! ----- INPUTS -----  
   
-  real*8, intent(in) :: Q,Np,rho_a
+  real(kind=8), intent(in) :: Q,Np,rho_a
  
   integer, intent(in):: dtype
-  real*8, intent(in) :: dmin,dmax,rho_c,p1,p2,p3
-    
-  real*8, intent(inout) :: apm,bpm  
+  real(kind=8), intent(in) :: dmin,dmax,rho_c,p1,p2,p3
+    
+  real(kind=8), intent(inout) :: apm,bpm
     
 ! ----- OUTPUTS -----
 
-  real*8, intent(out) :: Re
+  real(kind=8), intent(out) :: Re
   
 ! ----- INTERNAL -----
  
   integer :: local_dtype
-  real*8  :: local_p3,local_Np
-
-  real*8 :: pi, &
+  real(kind=8)  :: local_p3,local_Np
+
+  real(kind=8) :: pi, &
   N0,D0,vu,dm,ld, &         ! gamma, exponential variables
   rg,log_sigma_g
   
-  real*8 :: tmp1,tmp2
+  real(kind=8) :: tmp1,tmp2
 
   pi = acos(-1.0)
@@ -72,5 +72,5 @@
   ! Exponential is same as modified gamma with vu =1
   ! if Np is specified then we will just treat as modified gamma
-  if(dtype.eq.2 .and. Np>0) then
+  if(dtype==2 .and. Np>0) then
     local_dtype=1;
     local_p3=1;
@@ -119,5 +119,5 @@
     
 
-    if( Np.eq.0 .and. p2+1 > 1E-8) then     ! use default value for MEAN diameter as first default
+    if( Np==0 .and. p2+1 > 1E-8) then     ! use default value for MEAN diameter as first default
       
         dm = p2             ! by definition, should have units of microns
@@ -126,5 +126,5 @@
     else   ! use value of Np
         
-        if(Np.eq.0) then
+        if(Np==0) then
         
             if( abs(p1+1) > 1E-8 ) then  !   use default number concentration 
@@ -233,5 +233,5 @@
      
     ! get rg ... 
-    if( Np.eq.0 .and. (abs(p2+1) > 1E-8) ) then ! use default value of rg
+    if( Np==0 .and. (abs(p2+1) > 1E-8) ) then ! use default value of rg
     
             rg = p2
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_write_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_write_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_write_mod.F90	(revision 5082)
@@ -185,5 +185,5 @@
     do k=1,PARASOL_NREFL
      do ip=1, Npoints
-      if (stlidar%cldlayer(ip,4).gt.0.01.and.stlidar%parasolrefl(ip,k).ne.missing_val) then
+      if (stlidar%cldlayer(ip,4)>0.01.and.stlidar%parasolrefl(ip,k)/=missing_val) then
         parasolcrefl(ip,k)=(stlidar%parasolrefl(ip,k)-0.03*(1.-stlidar%cldlayer(ip,4)))/ &
                              stlidar%cldlayer(ip,4)
@@ -456,6 +456,6 @@
     CHARACTER(LEN=20) :: typeecrit
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -523,23 +523,23 @@
 
 ! Axe vertical
-      IF (nvertsave.eq.nvertp(iff)) THEN
+      IF (nvertsave==nvertp(iff)) THEN
           klevs=PARASOL_NREFL
           nam_axvert="sza"
-      ELSE IF (nvertsave.eq.nvertisccp(iff)) THEN
+      ELSE IF (nvertsave==nvertisccp(iff)) THEN
           klevs=7
           nam_axvert="pressure2"
-      ELSE IF (nvertsave.eq.nvertcol(iff)) THEN
+      ELSE IF (nvertsave==nvertcol(iff)) THEN
           klevs=Ncolout
           nam_axvert="column"
-      ELSE IF (nvertsave.eq.nverttemp(iff)) THEN
+      ELSE IF (nvertsave==nverttemp(iff)) THEN
           klevs=LIDAR_NTEMP
           nam_axvert="temp"
-      ELSE IF (nvertsave.eq.nvertmisr(iff)) THEN
+      ELSE IF (nvertsave==nvertmisr(iff)) THEN
           klevs=MISR_N_CTH
           nam_axvert="cth16"
-      ELSE IF (nvertsave.eq.nvertReffIce(iff)) THEN
+      ELSE IF (nvertsave==nvertReffIce(iff)) THEN
           klevs= numMODISReffIceBins
           nam_axvert="ReffIce"
-      ELSE IF (nvertsave.eq.nvertReffLiq(iff)) THEN
+      ELSE IF (nvertsave==nvertReffLiq(iff)) THEN
           klevs= numMODISReffLiqBins
           nam_axvert="ReffLiq"
@@ -558,6 +558,6 @@
       END IF
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -628,8 +628,8 @@
     IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d ',var%name
 
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
 !$OMP MASTER
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
       CALL conf_cospoutputs(var%name,var%cles)
       DO iff=1, 3
@@ -640,5 +640,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
   CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
@@ -725,7 +725,7 @@
                nom=var%name
       END IF
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
 !$OMP MASTER
       CALL conf_cospoutputs(var%name,var%cles)
@@ -737,5 +737,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
@@ -809,5 +809,5 @@
 
   IF(cosp_varsdefined) THEN
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)            
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/dsd.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/dsd.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/dsd.F90	(revision 5082)
@@ -60,18 +60,18 @@
   integer, intent(in) :: nsizes
   integer, intent(in) :: dtype
-  real*8, intent(in)  :: Q,Re_,Np,D(nsizes)
-  real*8, intent(in)  :: rho_a,tk,dmin,dmax,rho_c,p1,p2,p3
-    
-  real*8, intent(inout) :: apm,bpm  
+  real(kind=8), intent(in)  :: Q,Re_,Np,D(nsizes)
+  real(kind=8), intent(in)  :: rho_a,tk,dmin,dmax,rho_c,p1,p2,p3
+    
+  real(kind=8), intent(inout) :: apm,bpm
   
 ! ----- OUTPUTS -----
 
-  real*8, intent(out) :: N(nsizes)
+  real(kind=8), intent(out) :: N(nsizes)
   
 ! ----- INTERNAL -----
  
-   real*8 :: fc(nsizes)
-
-  real*8 :: &
+   real(kind=8) :: fc(nsizes)
+
+  real(kind=8) :: &
   N0,D0,vu,local_np,dm,ld, &            ! gamma, exponential variables
   dmin_mm,dmax_mm,ahp,bhp, &        ! power law variables
@@ -79,7 +79,7 @@
   rho_e                 ! particle density (kg m^-3)
   
-  real*8 :: tmp1, tmp2
-  real*8 :: pi,rc,tc
-  real*8 :: Re
+  real(kind=8) :: tmp1, tmp2
+  real(kind=8) :: pi,rc,tc
+  real(kind=8) :: Re
 
   integer k,lidx,uidx
@@ -352,5 +352,5 @@
       log_sigma_g = p3
       tmp2 = (bpm*log_sigma_g)**2.
-      if(Re.le.0) then 
+      if(Re<=0) then
         rg = p2
       else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/format_input.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/format_input.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/format_input.F90	(revision 5082)
@@ -40,9 +40,9 @@
 
 ! ----- INPUTS -----
-  real*8, dimension(:,:), intent(in) :: &
+  real(kind=8), dimension(:,:), intent(in) :: &
     hgt_matrix,env_hgt_matrix,env_t_matrix,env_p_matrix,env_rh_matrix
 
 ! ----- OUTPUTS -----
-  real*8, dimension(:,:), intent(out) :: &
+  real(kind=8), dimension(:,:), intent(out) :: &
     t_matrix,p_matrix,rh_matrix
 
@@ -97,7 +97,7 @@
 
 ! ----- OUTPUTS -----
-  real*8, dimension(:,:), intent(inout) :: &
+  real(kind=8), dimension(:,:), intent(inout) :: &
     hgt_matrix,p_matrix,t_matrix,rh_matrix
-  real*8, dimension(:,:,:), intent(inout) :: &
+  real(kind=8), dimension(:,:,:), intent(inout) :: &
     hm_matrix
   logical, intent(out) :: hgt_reversed
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/gases.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/gases.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/gases.F90	(revision 5082)
@@ -27,12 +27,12 @@
   nbands_o2 = 48 ,&
   nbands_h2o = 30
-  real*8, intent(in) :: PRES_mb, T, RH, f
-  real*8 :: gases, th, e, p, sumo, gm0, a0, ap, term1, term2, term3, &
+  real(kind=8), intent(in) :: PRES_mb, T, RH, f
+  real(kind=8) :: gases, th, e, p, sumo, gm0, a0, ap, term1, term2, term3, &
             bf, be, term4, npp
-  real*8, dimension(nbands_o2) :: v0, a1, a2, a3, a4, a5, a6
-  real*8, dimension(nbands_h2o) :: v1, b1, b2, b3
-  real*8 :: e_th,one_th,pth3,eth35,aux1,aux2,aux3,aux4
-  real*8 :: gm,delt,x,y,gm2
-  real*8 :: fpp_o2,fpp_h2o,s_o2,s_h2o
+  real(kind=8), dimension(nbands_o2) :: v0, a1, a2, a3, a4, a5, a6
+  real(kind=8), dimension(nbands_h2o) :: v1, b1, b2, b3
+  real(kind=8) :: e_th,one_th,pth3,eth35,aux1,aux2,aux3,aux4
+  real(kind=8) :: gm,delt,x,y,gm2
+  real(kind=8) :: fpp_o2,fpp_h2o,s_o2,s_h2o
   integer :: i
   
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/icarus.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/icarus.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/icarus.F	(revision 5082)
@@ -293,5 +293,5 @@
       ncolprint=0
 
-      if ( debug.ne.0 ) then
+      if ( debug/=0 ) then
           j=1
           write(6,'(a10)') 'j='
@@ -347,5 +347,5 @@
 !     ---------------------------------------------------!
 
-      if (ncolprint.ne.0) then
+      if (ncolprint/=0) then
       do j=1,npoints,1000
         write(6,'(a10)') 'j='
@@ -354,5 +354,5 @@
       endif
 
-      if (top_height .eq. 1 .or. top_height .eq. 3) then 
+      if (top_height == 1 .or. top_height == 3) then
 
       do j=1,npoints 
@@ -366,7 +366,7 @@
       do 12 ilev=1,nlev
         do j=1,npoints 
-         if (pfull(j,ilev) .lt. 40000. .and.
-     &          pfull(j,ilev) .gt.  5000. .and.
-     &          at(j,ilev) .lt. attropmin(j)) then
+         if (pfull(j,ilev) < 40000. .and.
+     &          pfull(j,ilev) >  5000. .and.
+     &          at(j,ilev) < attropmin(j)) then
                 ptrop(j) = pfull(j,ilev)
                 attropmin(j) = at(j,ilev)
@@ -379,6 +379,6 @@
       do 13 ilev=1,nlev
         do j=1,npoints 
-           if (at(j,ilev) .gt. atmax(j) .and.
-     &              ilev  .ge. itrop(j)) atmax(j)=at(j,ilev)
+           if (at(j,ilev) > atmax(j) .and.
+     &              ilev  >= itrop(j)) atmax(j)=at(j,ilev)
         enddo
 13    continue
@@ -387,5 +387,5 @@
 
 
-      if (top_height .eq. 1 .or. top_height .eq. 3) then
+      if (top_height == 1 .or. top_height == 3) then
           do j=1,npoints
               meantb(j) = 0.
@@ -408,5 +408,5 @@
           rangevec(j)=0
 
-          if (cc(j,ilev) .lt. 0. .or. cc(j,ilev) .gt. 1.) then
+          if (cc(j,ilev) < 0. .or. cc(j,ilev) > 1.) then
 !           error = cloud fraction less than zero
 !           error = cloud fraction greater than 1
@@ -414,5 +414,5 @@
           endif
 
-          if (conv(j,ilev) .lt. 0. .or. conv(j,ilev) .gt. 1.) then
+          if (conv(j,ilev) < 0. .or. conv(j,ilev) > 1.) then
 !           ' error = convective cloud fraction less than zero'
 !           ' error = convective cloud fraction greater than 1'
@@ -420,15 +420,15 @@
           endif
 
-          if (dtau_s(j,ilev) .lt. 0.) then
+          if (dtau_s(j,ilev) < 0.) then
 !           ' error = stratiform cloud opt. depth less than zero'
             rangevec(j)=rangevec(j)+4
           endif
 
-          if (dtau_c(j,ilev) .lt. 0.) then
+          if (dtau_c(j,ilev) < 0.) then
 !           ' error = convective cloud opt. depth less than zero'
             rangevec(j)=rangevec(j)+8
           endif
 
-          if (dem_s(j,ilev) .lt. 0. .or. dem_s(j,ilev) .gt. 1.) then
+          if (dem_s(j,ilev) < 0. .or. dem_s(j,ilev) > 1.) then
 !             ' error = stratiform cloud emissivity less than zero'
 !             ' error = stratiform cloud emissivity greater than 1'
@@ -436,5 +436,5 @@
           endif
 
-          if (dem_c(j,ilev) .lt. 0. .or. dem_c(j,ilev) .gt. 1.) then
+          if (dem_c(j,ilev) < 0. .or. dem_c(j,ilev) > 1.) then
 !             ' error = convective cloud emissivity less than zero'
 !             ' error = convective cloud emissivity greater than 1'
@@ -448,5 +448,5 @@
         enddo
 
-        if (rangeerror.ne.0) then 
+        if (rangeerror/=0) then
               write (6,*) 'Input variable out of range'
               write (6,*) 'rangevec:'
@@ -481,9 +481,9 @@
             do ibox=1,ncol
               do j=1,npoints 
-                 if (frac_out(j,ibox,ilev).eq.1) then
+                 if (frac_out(j,ibox,ilev)==1) then
                         tau(j,ibox)=tau(j,ibox)
      &                     + dtau_s(j,ilev)
                  endif
-                 if (frac_out(j,ibox,ilev).eq.2) then
+                 if (frac_out(j,ibox,ilev)==2) then
                         tau(j,ibox)=tau(j,ibox)
      &                     + dtau_c(j,ilev)
@@ -492,5 +492,5 @@
             enddo ! ibox
       enddo ! ilev
-          if (ncolprint.ne.0) then
+          if (ncolprint/=0) then
 
               do j=1,npoints ,1000
@@ -521,5 +521,5 @@
 !             sky versions of these quantities.
 
-      if (top_height .eq. 1 .or. top_height .eq. 3) then
+      if (top_height == 1 .or. top_height == 3) then
 
 
@@ -539,5 +539,5 @@
         pstd = 1.013250E+06
         t0 = 296.
-        if (ncolprint .ne. 0) 
+        if (ncolprint /= 0)
      &         write(6,*)  'ilev   pw (kg/m2)   tauwv(j)      dem_wv'
         do 125 ilev=1,nlev
@@ -559,5 +559,5 @@
                dem_wv(j,ilev) = 1. - exp( -1. * tauwv(j))
           enddo
-               if (ncolprint .ne. 0) then
+               if (ncolprint /= 0) then
                do j=1,npoints ,1000
                write(6,'(a10)') 'j='
@@ -598,5 +598,5 @@
 
           enddo   
-            if (ncolprint.ne.0) then
+            if (ncolprint/=0) then
              do j=1,npoints ,1000
               write(6,'(a10)') 'j='
@@ -627,5 +627,5 @@
         enddo
 
-        if (ncolprint.ne.0) then
+        if (ncolprint/=0) then
         do j=1,npoints ,1000
           write(6,'(a10)') 'j='
@@ -649,5 +649,5 @@
 
 
-        if (ncolprint.ne.0) then
+        if (ncolprint/=0) then
 
         do j=1,npoints ,1000
@@ -683,8 +683,8 @@
 
               ! emissivity for point in this layer
-                if (frac_out(j,ibox,ilev).eq.1) then
+                if (frac_out(j,ibox,ilev)==1) then
                 dem(j,ibox)= 1. - 
      &             ( (1. - dem_wv(j,ilev)) * (1. -  dem_s(j,ilev)) )
-                else if (frac_out(j,ibox,ilev).eq.2) then
+                else if (frac_out(j,ibox,ilev)==2) then
                 dem(j,ibox)= 1. - 
      &             ( (1. - dem_wv(j,ilev)) * (1. -  dem_c(j,ilev)) )
@@ -710,5 +710,5 @@
             enddo ! ibox
 
-            if (ncolprint.ne.0) then
+            if (ncolprint/=0) then
               do j=1,npoints,1000
               write (6,'(a)') 'ilev:'
@@ -764,5 +764,5 @@
 	  end do        
 
-        if (ncolprint.ne.0) then
+        if (ncolprint/=0) then
 
           do j=1,npoints ,1000
@@ -819,8 +819,8 @@
           enddo 
 
-          if (top_height .eq. 1) then
+          if (top_height == 1) then
             do j=1,npoints  
-              if (transmax(j) .gt. 0.001 .and. 
-     &          transmax(j) .le. 0.9999999) then
+              if (transmax(j) > 0.001 .and.
+     &          transmax(j) <= 0.9999999) then
                 fluxtopinit(j) = fluxtop(j,ibox)
               tauir(j) = tau(j,ibox) *rec2p13
@@ -829,7 +829,7 @@
             do icycle=1,2
               do j=1,npoints  
-                if (tau(j,ibox) .gt. (tauchk            )) then 
-                if (transmax(j) .gt. 0.001 .and. 
-     &            transmax(j) .le. 0.9999999) then
+                if (tau(j,ibox) > (tauchk            )) then
+                if (transmax(j) > 0.001 .and.
+     &            transmax(j) <= 0.9999999) then
                   emcld(j,ibox) = 1. - exp(-1. * tauir(j)  )
                   fluxtop(j,ibox) = fluxtopinit(j) -   
@@ -839,5 +839,5 @@
                   tb(j,ibox)= 1307.27
      &              / (log(1. + (1./fluxtop(j,ibox))))
-                  if (tb(j,ibox) .gt. 260.) then
+                  if (tb(j,ibox) > 260.) then
                   tauir(j) = tau(j,ibox) / 2.56
                   end if                   
@@ -850,10 +850,10 @@
         
           do j=1,npoints
-            if (tau(j,ibox) .gt. (tauchk            )) then 
+            if (tau(j,ibox) > (tauchk            )) then
                 !cloudy box 
 		!NOTE: tb is the cloud-top temperature not infrared brightness temperature 
 		!at this point in the code
                 tb(j,ibox)= 1307.27/ (log(1. + (1./fluxtop(j,ibox))))
-                if (top_height.eq.1.and.tauir(j).lt.taumin(j)) then
+                if (top_height==1.and.tauir(j)<taumin(j)) then
                          tb(j,ibox) = attrop(j) - 5. 
                    tau(j,ibox) = 2.13*taumin(j)
@@ -866,5 +866,5 @@
         enddo ! ibox
 
-        if (ncolprint.ne.0) then
+        if (ncolprint/=0) then
 
           do j=1,npoints,1000
@@ -927,5 +927,5 @@
       do 30 ibox=1,ncol
         !segregate according to optical thickness
-        if (top_height .eq. 1 .or. top_height .eq. 3) then  
+        if (top_height == 1 .or. top_height == 3) then
           !find level whose temperature
           !most closely matches brightness temperature
@@ -934,5 +934,5 @@
           enddo
           do 29 k1=1,nlev-1
-	    if (top_height_direction .eq. 2) then
+	    if (top_height_direction == 2) then
 	      ilev = nlev - k1 
 	    else
@@ -941,9 +941,9 @@
             !cdir nodep
             do j=1,npoints 
-	     if (ilev .ge. itrop(j)) then
-              if ((at(j,ilev)   .ge. tb(j,ibox) .and. 
-     &          at(j,ilev+1) .le. tb(j,ibox)) .or.
-     &          (at(j,ilev) .le. tb(j,ibox) .and. 
-     &          at(j,ilev+1) .ge. tb(j,ibox))) then 
+	     if (ilev >= itrop(j)) then
+              if ((at(j,ilev)   >= tb(j,ibox) .and.
+     &          at(j,ilev+1) <= tb(j,ibox)) .or.
+     &          (at(j,ilev) <= tb(j,ibox) .and.
+     &          at(j,ilev+1) >= tb(j,ibox))) then
                 nmatch(j)=nmatch(j)+1
 		match(j,nmatch(j))=ilev
@@ -954,5 +954,5 @@
 
           do j=1,npoints 
-            if (nmatch(j) .ge. 1) then
+            if (nmatch(j) >= 1) then
               k1 = match(j,nmatch(j))
 	      k2 = k1 + 1
@@ -962,5 +962,5 @@
               logp=logp1+(logp2-logp1)*abs(tb(j,ibox)-at(j,k1))/atd
               ptop(j,ibox) = exp(logp)
-	      if(abs(pfull(j,k1)-ptop(j,ibox)) .lt.
+	      if(abs(pfull(j,k1)-ptop(j,ibox)) <
      &            abs(pfull(j,k2)-ptop(j,ibox))) then
                  levmatch(j,ibox)=k1
@@ -969,9 +969,9 @@
               end if   
             else
-              if (tb(j,ibox) .le. attrop(j)) then
+              if (tb(j,ibox) <= attrop(j)) then
                 ptop(j,ibox)=ptrop(j)
                 levmatch(j,ibox)=itrop(j)
               end if
-              if (tb(j,ibox) .ge. atmax(j)) then
+              if (tb(j,ibox) >= atmax(j)) then
                 ptop(j,ibox)=pfull(j,nlev)
                 levmatch(j,ibox)=nlev
@@ -987,6 +987,6 @@
           do ilev=1,nlev
             do j=1,npoints     
-              if ((ptop(j,ibox) .eq. 0. )
-     &           .and.(frac_out(j,ibox,ilev) .ne. 0)) then
+              if ((ptop(j,ibox) == 0. )
+     &           .and.(frac_out(j,ibox,ilev) /= 0)) then
                 ptop(j,ibox)=phalf(j,ilev)
               levmatch(j,ibox)=ilev
@@ -997,5 +997,5 @@
           
         do j=1,npoints
-          if (tau(j,ibox) .le. (tauchk            )) then
+          if (tau(j,ibox) <= (tauchk            )) then
             ptop(j,ibox)=0.
             levmatch(j,ibox)=0      
@@ -1035,5 +1035,5 @@
       do 38 ilev2=1,7
         do j=1,npoints ! 
-             if (sunlit(j).eq.1 .or. top_height .eq. 3) then 
+             if (sunlit(j)==1 .or. top_height == 3) then
                 fq_isccp(j,ilev,ilev2)= 0.
 	     else
@@ -1045,5 +1045,5 @@
       !reset variables need for averaging cloud properties
       do j=1,npoints 
-        if (sunlit(j).eq.1 .or. top_height .eq. 3) then 
+        if (sunlit(j)==1 .or. top_height == 3) then
              totalcldarea(j) = 0.
              meanalbedocld(j) = 0.
@@ -1063,6 +1063,6 @@
         do j=1,npoints 
 
-          if (tau(j,ibox) .gt. (tauchk            )
-     &      .and. ptop(j,ibox) .gt. 0.) then
+          if (tau(j,ibox) > (tauchk            )
+     &      .and. ptop(j,ibox) > 0.) then
               box_cloudy(j,ibox)=.true.
           endif
@@ -1070,9 +1070,9 @@
           if (box_cloudy(j,ibox)) then
 
-              if (sunlit(j).eq.1 .or. top_height .eq. 3) then
+              if (sunlit(j)==1 .or. top_height == 3) then
 
                 boxtau(j,ibox) = tau(j,ibox)
 
-		if (tau(j,ibox) .ge. isccp_taumin) then
+		if (tau(j,ibox) >= isccp_taumin) then
 		   totalcldarea(j) = totalcldarea(j) + boxarea
 		
@@ -1091,5 +1091,5 @@
           endif
 
-          if (sunlit(j).eq.1 .or. top_height .eq. 3) then 
+          if (sunlit(j)==1 .or. top_height == 3) then
 
            if (box_cloudy(j,ibox)) then
@@ -1101,5 +1101,5 @@
               boxptop(j,ibox) = ptop(j,ibox)
     
-              if (tau(j,ibox) .ge. isccp_taumin) then
+              if (tau(j,ibox) >= isccp_taumin) then
 	      	meanptop(j) = meanptop(j) + ptop(j,ibox)*boxarea
               end if		
@@ -1110,51 +1110,51 @@
 
               !determine optical depth category
-              if (tau(j,ibox) .lt. isccp_taumin) then
+              if (tau(j,ibox) < isccp_taumin) then
                   itau(j)=1
-              else if (tau(j,ibox) .ge. isccp_taumin
+              else if (tau(j,ibox) >= isccp_taumin
      &                                    
-     &          .and. tau(j,ibox) .lt. 1.3) then
+     &          .and. tau(j,ibox) < 1.3) then
                 itau(j)=2
-              else if (tau(j,ibox) .ge. 1.3 
-     &          .and. tau(j,ibox) .lt. 3.6) then
+              else if (tau(j,ibox) >= 1.3
+     &          .and. tau(j,ibox) < 3.6) then
                 itau(j)=3
-              else if (tau(j,ibox) .ge. 3.6 
-     &          .and. tau(j,ibox) .lt. 9.4) then
+              else if (tau(j,ibox) >= 3.6
+     &          .and. tau(j,ibox) < 9.4) then
                   itau(j)=4
-              else if (tau(j,ibox) .ge. 9.4 
-     &          .and. tau(j,ibox) .lt. 23.) then
+              else if (tau(j,ibox) >= 9.4
+     &          .and. tau(j,ibox) < 23.) then
                   itau(j)=5
-              else if (tau(j,ibox) .ge. 23. 
-     &          .and. tau(j,ibox) .lt. 60.) then
+              else if (tau(j,ibox) >= 23.
+     &          .and. tau(j,ibox) < 60.) then
                   itau(j)=6
-              else if (tau(j,ibox) .ge. 60.) then
+              else if (tau(j,ibox) >= 60.) then
                   itau(j)=7
               end if
 
               !determine cloud top pressure category
-              if (    ptop(j,ibox) .gt. 0.  
-     &          .and.ptop(j,ibox) .lt. 180.) then
+              if (    ptop(j,ibox) > 0.
+     &          .and.ptop(j,ibox) < 180.) then
                   ipres(j)=1
-              else if(ptop(j,ibox) .ge. 180.
-     &          .and.ptop(j,ibox) .lt. 310.) then
+              else if(ptop(j,ibox) >= 180.
+     &          .and.ptop(j,ibox) < 310.) then
                   ipres(j)=2
-              else if(ptop(j,ibox) .ge. 310.
-     &          .and.ptop(j,ibox) .lt. 440.) then
+              else if(ptop(j,ibox) >= 310.
+     &          .and.ptop(j,ibox) < 440.) then
                   ipres(j)=3
-              else if(ptop(j,ibox) .ge. 440.
-     &          .and.ptop(j,ibox) .lt. 560.) then
+              else if(ptop(j,ibox) >= 440.
+     &          .and.ptop(j,ibox) < 560.) then
                   ipres(j)=4
-              else if(ptop(j,ibox) .ge. 560.
-     &          .and.ptop(j,ibox) .lt. 680.) then
+              else if(ptop(j,ibox) >= 560.
+     &          .and.ptop(j,ibox) < 680.) then
                   ipres(j)=5
-              else if(ptop(j,ibox) .ge. 680.
-     &          .and.ptop(j,ibox) .lt. 800.) then
+              else if(ptop(j,ibox) >= 680.
+     &          .and.ptop(j,ibox) < 800.) then
                   ipres(j)=6
-              else if(ptop(j,ibox) .ge. 800.) then
+              else if(ptop(j,ibox) >= 800.) then
                   ipres(j)=7
               end if 
 
               !update frequencies
-              if(ipres(j) .gt. 0.and.itau(j) .gt. 0) then
+              if(ipres(j) > 0.and.itau(j) > 0) then
               fq_isccp(j,itau(j),ipres(j))=
      &          fq_isccp(j,itau(j),ipres(j))+ boxarea
@@ -1170,5 +1170,5 @@
       !compute mean cloud properties
       do j=1,npoints 
-        if (totalcldarea(j) .gt. 0.) then
+        if (totalcldarea(j) > 0.) then
 	  ! code above guarantees that totalcldarea > 0 
 	  ! only if sunlit .eq. 1 .or. top_height = 3 
@@ -1193,5 +1193,5 @@
 !     OPTIONAL PRINTOUT OF DATA TO CHECK PROGRAM
 !
-      if (debugcol.ne.0) then
+      if (debugcol/=0) then
 !     
          do j=1,npoints,debugcol
@@ -1207,5 +1207,5 @@
               do ibox=1,ncol
                    acc(ilev,ibox)=frac_out(j,ibox,ilev)*2
-                   if (levmatch(j,ibox) .eq. ilev) 
+                   if (levmatch(j,ibox) == ilev)
      &                 acc(ilev,ibox)=acc(ilev,ibox)+1
               enddo
@@ -1230,5 +1230,5 @@
              close(9)
 
-             if (ncolprint.ne.0) then
+             if (ncolprint/=0) then
                write(6,'(a1)') ' '
                     write(6,'(a2,1X,5(a7,1X),a50)') 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/lidar_simulator.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/lidar_simulator.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/lidar_simulator.F90	(revision 5082)
@@ -247,5 +247,5 @@
 !------------------------------------------------------------
 
-      if ( npart .ne. 4 ) then
+      if ( npart /= 4 ) then
         print *,'Error in lidar_simulator, npart should be 4, not',npart
         stop
@@ -267,5 +267,5 @@
          polpart(INDX_LSLIQ,5) =  0.0626
 !*     LS Ice coefficients: 
-      if (ice_type.eq.0) then     
+      if (ice_type==0) then
          polpart(INDX_LSICE,1) = -1.0176e-8
          polpart(INDX_LSICE,2) =  1.7615e-6
@@ -275,5 +275,5 @@
       endif
 !*     LS Ice NS coefficients: 
-      if (ice_type.eq.1) then 
+      if (ice_type==1) then
          polpart(INDX_LSICE,1) = 1.3615e-8
          polpart(INDX_LSICE,2) = -2.04206e-6
@@ -289,5 +289,5 @@
          polpart(INDX_CVLIQ,5) =  0.0626
 !*     CONV Ice coefficients: 
-      if (ice_type.eq.0) then 
+      if (ice_type==0) then
          polpart(INDX_CVICE,1) = -1.0176e-8
          polpart(INDX_CVICE,2) =  1.7615e-6
@@ -296,5 +296,5 @@
          polpart(INDX_CVICE,5) =  0.0460
       endif
-      if (ice_type.eq.1) then
+      if (ice_type==1) then
          polpart(INDX_CVICE,1) = 1.3615e-8
          polpart(INDX_CVICE,2) = -2.04206e-6
@@ -342,5 +342,5 @@
 ! polynomes kp_lidar derived from Mie theory:
       do i = 1, npart
-       where ( rad_part(:,:,i).gt.0.0)
+       where ( rad_part(:,:,i)>0.0)
          kp_part(:,:,i) = &
             polpart(i,1)*(rad_part(:,:,i)*1e6)**4 &
@@ -362,5 +362,5 @@
 ! alpha of particles in each subcolumn:
       do i = 1, npart
-        where ( rad_part(:,:,i).gt.0.0)
+        where ( rad_part(:,:,i)>0.0)
           alpha_part(:,:,i) = 3.0/4.0 * Qscat &
                  * rhoair(:,:) * qpart(:,:,i) &
@@ -404,5 +404,5 @@
        DO k= nlev-1, 1, -1
         tau_mol_lay(:) = tau_mol(:,k)-tau_mol(:,k+1) ! opt. thick. of layer k
-        WHERE (tau_mol_lay(:).GT.0.)
+        WHERE (tau_mol_lay(:)>0.)
           pmol(:,k) = beta_mol(:,k) * EXP(-2.0*tau_mol(:,k+1)) / (2.*tau_mol_lay(:)) &
             & * (1.-exp(-2.0*tau_mol_lay(:)))
@@ -434,5 +434,5 @@
       DO k= nlev-1, 1, -1
           tautot_lay(:) = tautot(:,k)-tautot(:,k+1) ! optical thickness of layer k
-        WHERE (tautot_lay(:).GT.0.)
+        WHERE (tautot_lay(:)>0.)
           pnorm(:,k) = betatot(:,k) * EXP(-2.0*tautot(:,k+1)) / (2.*tautot_lay(:)) &
                & * (1.-EXP(-2.0*tautot_lay(:)))
@@ -472,5 +472,5 @@
       DO k= nlev-1, 1, -1
           tautot_lay_ice(:) = tautot_ice(:,k)-tautot_ice(:,k+1) 
-        WHERE (tautot_lay_ice(:).GT.0.)
+        WHERE (tautot_lay_ice(:)>0.)
          pnorm_ice(:,k)=betatot_ice(:,k)*EXP(-2.0*tautot_ice(:,k+1))/(2.*tautot_lay_ice(:)) &
                & * (1.-EXP(-2.0*tautot_lay_ice(:)))
@@ -487,5 +487,5 @@
       DO k= nlev-1, 1, -1
           tautot_lay_liq(:) = tautot_liq(:,k)-tautot_liq(:,k+1) 
-        WHERE (tautot_lay_liq(:).GT.0.)
+        WHERE (tautot_lay_liq(:)>0.)
           pnorm_liq(:,k)=betatot_liq(:,k)*EXP(-2.0*tautot_liq(:,k+1))/(2.*tautot_lay_liq(:)) &
                & * (1.-EXP(-2.0*tautot_lay_liq(:)))
@@ -514,5 +514,5 @@
       DO k= nlev-1, 1, -1
         tautot_lay_ice(:) = tautot_ice(:,k)-tautot_ice(:,k+1)
-        WHERE (tautot_lay_ice(:).GT.0.)
+        WHERE (tautot_lay_ice(:)>0.)
          beta_perp_ice(:,k) = pnorm_perp_ice(:,k)/ EXP(-2.0*tautot_ice(:,k+1)) * (2.*tautot_lay_ice(:)) &
             & / (1.-exp(-2.0*tautot_lay_ice(:)))
@@ -530,5 +530,5 @@
       DO k= nlev-1, 1, -1
           tautot_lay_liq(:) = tautot_liq(:,k)-tautot_liq(:,k+1) 
-        WHERE (tautot_lay_liq(:).GT.0.)
+        WHERE (tautot_lay_liq(:)>0.)
          beta_perp_liq(:,k) = pnorm_perp_liq(:,k)/ max(seuil,EXP(-2.0*tautot_liq(:,k+1))) &
             & * (2.*tautot_lay_liq(:)) / (1.-exp(-2.0*tautot_lay_liq(:)))
@@ -547,5 +547,5 @@
 ! Computation of the total perpendicular lidar signal (ATBperp for liq+ice)
 !     Upper layer 
-    WHERE(tautot(:,nlev).GT.0)
+    WHERE(tautot(:,nlev)>0)
           pnorm_perp_tot(:,nlev) = &
               (beta_perp_ice(:,nlev)+beta_perp_liq(:,nlev)-(beta_mol(:,nlev)/(1+1/0.0284))) / (2.*tautot(:,nlev)) &
@@ -563,8 +563,8 @@
           ! We remove one contribution using 
           ! Betaperp=beta_mol(:,k)/(1+1/0.0284)) [bodhaine et al. 1999] in the following equations:
-            WHERE (pnorm(:,k).eq.0)
+            WHERE (pnorm(:,k)==0)
                   pnorm_perp_tot(:,k)=0.
                   ELSEWHERE
-                    WHERE (tautot_lay(:).GT.0.)
+                    WHERE (tautot_lay(:)>0.)
                       pnorm_perp_tot(:,k) = &
                           (beta_perp_ice(:,k)+beta_perp_liq(:,k)-(beta_mol(:,k)/(1+1/0.0284))) * &
@@ -695,5 +695,5 @@
 !        for 2 scattering phase functions: liquid spherical, ice non spherical
 
-    IF ( nrefl.GT. ntetas ) THEN
+    IF ( nrefl> ntetas ) THEN
         PRINT *,'Error in lidar_simulator, nrefl should be less then ',ntetas,' not',nrefl
         STOP
@@ -711,5 +711,5 @@
 !
 ! relative fraction of the opt. thick due to liquid or ice clouds
-    WHERE (tautot_S(:) .GT. 0.)
+    WHERE (tautot_S(:) > 0.)
         frac_taucol_liq(:) = tautot_S_liq(:) / tautot_S(:)
         frac_taucol_ice(:) = tautot_S_ice(:) / tautot_S(:)
@@ -733,5 +733,5 @@
     DO it=1,ntetas
       DO ny=1,nbtau-1
-        WHERE (tautot_S(:).GE.tau(ny).AND.tautot_S(:).LE.tau(ny+1))
+        WHERE (tautot_S(:)>=tau(ny).AND.tautot_S(:)<=tau(ny+1))
             rlumA_mod(:,it) = aA(it,ny)*tautot_S(:) + bA(it,ny)
             rlumB_mod(:,it) = aB(it,ny)*tautot_S(:) + bB(it,ny)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/math_lib.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/math_lib.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/math_lib.F90	(revision 5082)
@@ -34,12 +34,12 @@
 
 ! ----- INPUTS -----
-  real*8, intent(in) :: x
+  real(kind=8), intent(in) :: x
   
 ! ----- OUTPUTS -----
-  real*8 :: gamma
+  real(kind=8) :: gamma
 
 ! ----- INTERNAL -----  
-  real*8 :: pi,ga,z,r,gr
-  real*8 :: g(26)
+  real(kind=8) :: pi,ga,z,r,gr
+  real(kind=8) :: g(26)
   integer :: k,m1,m
        
@@ -124,15 +124,15 @@
 
 ! ----- INPUTS -----  
-  real*8, intent(in), dimension(:) :: f,s  
+  real(kind=8), intent(in), dimension(:) :: f,s
   integer, intent(in) :: i1, i2
 
 ! ---- OUTPUTS -----
-  real*8 :: path_integral  
+  real(kind=8) :: path_integral
   
 ! ----- INTERNAL -----    
-  real*8 :: sumo, deltah, val
-  integer*4 :: nelm, j
-  integer*4, dimension(i2-i1+1) :: idx
-  real*8, dimension(i2-i1+1) :: f_rev, s_rev
+  real(kind=8) :: sumo, deltah, val
+  integer(kind=4) :: nelm, j
+  integer(kind=4), dimension(i2-i1+1) :: idx
+  real(kind=8), dimension(i2-i1+1) :: f_rev, s_rev
 
   nelm = i2-i1+1
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp.F90	(revision 5082)
@@ -179,5 +179,5 @@
    minp = minval(gbx%psfc)
    maxp = maxval(gbx%psfc)
-   if (Npoints .gt. 1) seed=int((gbx%psfc-minp)/(maxp-minp)*100000) + 1
+   if (Npoints > 1) seed=int((gbx%psfc-minp)/(maxp-minp)*100000) + 1
    ! Below it's how it was done in the original implementation of the ISCCP simulator. 
    ! The one above is better for offline data, when you may have packed data 
@@ -414,7 +414,7 @@
                 if (sgx%frac_out (j,i,Nlevels+1-k) == I_LSC) frac_ls(j,k)=frac_ls(j,k)+1.
                 if (sgx%frac_out (j,i,Nlevels+1-k) == I_CVC) frac_cv(j,k)=frac_cv(j,k)+1.
-                if (sgx%prec_frac(j,i,Nlevels+1-k) .eq. 1) prec_ls(j,k)=prec_ls(j,k)+1.
-                if (sgx%prec_frac(j,i,Nlevels+1-k) .eq. 2) prec_cv(j,k)=prec_cv(j,k)+1.
-                if (sgx%prec_frac(j,i,Nlevels+1-k) .eq. 3) then
+                if (sgx%prec_frac(j,i,Nlevels+1-k) == 1) prec_ls(j,k)=prec_ls(j,k)+1.
+                if (sgx%prec_frac(j,i,Nlevels+1-k) == 2) prec_cv(j,k)=prec_cv(j,k)+1.
+                if (sgx%prec_frac(j,i,Nlevels+1-k) == 3) then
                     prec_cv(j,k)=prec_cv(j,k)+1.
                     prec_ls(j,k)=prec_ls(j,k)+1.
@@ -501,9 +501,9 @@
             do j=1,Npoints
                 !--------- Clouds -------
-                if (frac_ls(j,k) .ne. 0.) then
+                if (frac_ls(j,k) /= 0.) then
                     sghydro%mr_hydro(j,:,k,I_LSCLIQ) = sghydro%mr_hydro(j,:,k,I_LSCLIQ)/frac_ls(j,k)
                     sghydro%mr_hydro(j,:,k,I_LSCICE) = sghydro%mr_hydro(j,:,k,I_LSCICE)/frac_ls(j,k)
                 endif
-                if (frac_cv(j,k) .ne. 0.) then
+                if (frac_cv(j,k) /= 0.) then
                     sghydro%mr_hydro(j,:,k,I_CVCLIQ) = sghydro%mr_hydro(j,:,k,I_CVCLIQ)/frac_cv(j,k)
                     sghydro%mr_hydro(j,:,k,I_CVCICE) = sghydro%mr_hydro(j,:,k,I_CVCICE)/frac_cv(j,k)
@@ -511,20 +511,20 @@
                 !--------- Precip -------
                 if (gbx%use_precipitation_fluxes) then
-                    if (prec_ls(j,k) .ne. 0.) then
+                    if (prec_ls(j,k) /= 0.) then
                         gbx%rain_ls(j,k) = gbx%rain_ls(j,k)/prec_ls(j,k)
                         gbx%snow_ls(j,k) = gbx%snow_ls(j,k)/prec_ls(j,k)
                         gbx%grpl_ls(j,k) = gbx%grpl_ls(j,k)/prec_ls(j,k)
                     endif
-                    if (prec_cv(j,k) .ne. 0.) then
+                    if (prec_cv(j,k) /= 0.) then
                         gbx%rain_cv(j,k) = gbx%rain_cv(j,k)/prec_cv(j,k)
                         gbx%snow_cv(j,k) = gbx%snow_cv(j,k)/prec_cv(j,k)
                     endif
                 else
-                    if (prec_ls(j,k) .ne. 0.) then
+                    if (prec_ls(j,k) /= 0.) then
                         sghydro%mr_hydro(j,:,k,I_LSRAIN) = sghydro%mr_hydro(j,:,k,I_LSRAIN)/prec_ls(j,k)
                         sghydro%mr_hydro(j,:,k,I_LSSNOW) = sghydro%mr_hydro(j,:,k,I_LSSNOW)/prec_ls(j,k)
                         sghydro%mr_hydro(j,:,k,I_LSGRPL) = sghydro%mr_hydro(j,:,k,I_LSGRPL)/prec_ls(j,k)
                     endif
-                    if (prec_cv(j,k) .ne. 0.) then
+                    if (prec_cv(j,k) /= 0.) then
                         sghydro%mr_hydro(j,:,k,I_CVRAIN) = sghydro%mr_hydro(j,:,k,I_CVRAIN)/prec_cv(j,k)
                         sghydro%mr_hydro(j,:,k,I_CVSNOW) = sghydro%mr_hydro(j,:,k,I_CVSNOW)/prec_cv(j,k)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp_radar.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp_radar.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp_radar.F90	(revision 5082)
@@ -53,15 +53,15 @@
 
         real undef
-        real*8, dimension(nprof,ngate), intent(in) :: hgt_matrix, p_matrix, &
+        real(kind=8), dimension(nprof,ngate), intent(in) :: hgt_matrix, p_matrix, &
             t_matrix,rh_matrix
-        real*8, dimension(hp%nhclass,nprof,ngate), intent(in) :: hm_matrix
-        real*8, dimension(hp%nhclass,nprof,ngate), intent(inout) :: re_matrix
-        real*8, dimension(hp%nhclass,nprof,ngate), intent(inout) :: Np_matrix
+        real(kind=8), dimension(hp%nhclass,nprof,ngate), intent(in) :: hm_matrix
+        real(kind=8), dimension(hp%nhclass,nprof,ngate), intent(inout) :: re_matrix
+        real(kind=8), dimension(hp%nhclass,nprof,ngate), intent(inout) :: Np_matrix
 
         ! ----- OUTPUTS -----
-        real*8, dimension(nprof,ngate), intent(out) :: Ze_non,Ze_ray, &
+        real(kind=8), dimension(nprof,ngate), intent(out) :: Ze_non,Ze_ray, &
             g_to_vol,dBZe,a_to_vol
         ! ----- OPTIONAL -----
-        real*8, optional, dimension(nprof,ngate) :: &
+        real(kind=8), optional, dimension(nprof,ngate) :: &
             g_to_vol_in,g_to_vol_out
      end subroutine radar_simulator
@@ -86,8 +86,8 @@
   nsizes            ! num of discrete drop sizes
 
-  real*8, dimension(:,:), allocatable :: &
+  real(kind=8), dimension(:,:), allocatable :: &
   g_to_vol ! integrated atten due to gases, r>v (dB)
 
-  real*8, dimension(:,:), allocatable :: &
+  real(kind=8), dimension(:,:), allocatable :: &
   Ze_non, &         ! radar reflectivity withOUT attenuation (dBZ)
   Ze_ray, &         ! Rayleigh reflectivity (dBZ)
@@ -100,5 +100,5 @@
   rh_matrix                     !relative humidity (%)
 
-  real*8, dimension(:,:,:), allocatable :: &
+  real(kind=8), dimension(:,:,:), allocatable :: &
   hm_matrix, &          ! hydrometeor mixing ratio (g kg^-1)
   re_matrix, &          ! effective radius (microns).   Optional. 0 ==> use Np_matrix or defaults
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp_types.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp_types.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_cosp_types.F90	(revision 5082)
@@ -1110,5 +1110,5 @@
 
 
-    if(y%Nhydro.ne.N_HYDRO) then
+    if(y%Nhydro/=N_HYDRO) then
 
         write(*,*) 'Number of hydrometeor input to subroutine', &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_llnl_stats.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_llnl_stats.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_llnl_stats.F90	(revision 5082)
@@ -119,7 +119,7 @@
        do j=Nlevels,1,-1 !top->surf
         sc_ratio = beta_tot(pr,i,j)/beta_mol(pr,j)
-        if ((sc_ratio .le. s_att) .and. (flag_sat .eq. 0)) flag_sat = j
-        if (Ze_tot(pr,i,j) .lt. -30.) then  !radar can't detect cloud
-         if ( (sc_ratio .gt. s_cld) .or. (flag_sat .eq. j) ) then  !lidar sense cloud
+        if ((sc_ratio <= s_att) .and. (flag_sat == 0)) flag_sat = j
+        if (Ze_tot(pr,i,j) < -30.) then  !radar can't detect cloud
+         if ( (sc_ratio > s_cld) .or. (flag_sat == j) ) then  !lidar sense cloud
             lidar_only_freq_cloud(pr,j)=lidar_only_freq_cloud(pr,j)+1. !top->surf
             flag_cld=1
@@ -129,5 +129,5 @@
         endif
        enddo !levels
-       if (flag_cld .eq. 1) tcc(pr)=tcc(pr)+1.
+       if (flag_cld == 1) tcc(pr)=tcc(pr)+1.
      enddo !columns
    enddo !points
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_lmd_ipsl_stats.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_lmd_ipsl_stats.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_lmd_ipsl_stats.F90	(revision 5082)
@@ -148,5 +148,5 @@
       do ic = 1, ncol
         pnorm_c = pnorm(:,ic,:)
-        where ((pnorm_c.lt.xmax) .and. (pmol.lt.xmax) .and. (pmol.gt. 0.0 ))
+        where ((pnorm_c<xmax) .and. (pmol<xmax) .and. (pmol> 0.0 ))
             x3d_c = pnorm_c/pmol
         elsewhere
@@ -247,5 +247,5 @@
 ! c 0- Initializations
 ! c -------------------------------------------------------
-      if ( Nbins .lt. 6) return
+      if ( Nbins < 6) return
 
       srbval(1) =  S_att
@@ -275,5 +275,5 @@
                do i = 1, Npoints
                   if (x(i,k,j) /= undef) then
-                     if ((x(i,k,j).gt.srbval_ext(ib-1)).and.(x(i,k,j).le.srbval_ext(ib))) &
+                     if ((x(i,k,j)>srbval_ext(ib-1)).and.(x(i,k,j)<=srbval_ext(ib))) &
                           cfad(i,ib,j) = cfad(i,ib,j) + 1.0
                   else 
@@ -285,5 +285,5 @@
       enddo
 
-      where (cfad .ne. undef)  cfad = cfad / float(Ncolumns)
+      where (cfad /= undef)  cfad = cfad / float(Ncolumns)
 
 ! c -------------------------------------------------------
@@ -373,5 +373,5 @@
 ! ---------------------------------------------------------------
 
-      if ( Ncat .ne. 4 ) then
+      if ( Ncat /= 4 ) then
          print *,'Error in lmd_ipsl_stats.cosp_cldfrac, Ncat must be 4, not',Ncat
          stop
@@ -423,5 +423,5 @@
 
 ! cloud detection at subgrid-scale:
-         where ( (x(:,:,k).gt.S_cld) .and. (x(:,:,k).ne. undef) )
+         where ( (x(:,:,k)>S_cld) .and. (x(:,:,k)/= undef) )
            cldy(:,:,k)=1.0
          elsewhere
@@ -430,5 +430,5 @@
 
 ! number of usefull sub-columns:
-         where ( (x(:,:,k).gt.S_att) .and. (x(:,:,k).ne. undef)  )
+         where ( (x(:,:,k)>S_att) .and. (x(:,:,k)/= undef)  )
            srok(:,:,k)=1.0
          elsewhere
@@ -513,7 +513,7 @@
           ! Computation of the cloud fraction as a function of the temperature
           ! instead of height, for ice,liquid and all clouds
-          if(srok(ip,ic,k).gt.0.)then
+          if(srok(ip,ic,k)>0.)then
           do itemp=1,Ntemp
-            if( (tmp(ip,k).ge.tempmod(itemp)).and.(tmp(ip,k).lt.tempmod(itemp+1)) )then
+            if( (tmp(ip,k)>=tempmod(itemp)).and.(tmp(ip,k)<tempmod(itemp+1)) )then
               lidarcldtempind(ip,itemp)=lidarcldtempind(ip,itemp)+1.
             endif
@@ -521,7 +521,7 @@
           endif
 
-          if(cldy(ip,ic,k).eq.1.)then
+          if(cldy(ip,ic,k)==1.)then
           do itemp=1,Ntemp
-            if( (tmp(ip,k).ge.tempmod(itemp)).and.(tmp(ip,k).lt.tempmod(itemp+1)) )then
+            if( (tmp(ip,k)>=tempmod(itemp)).and.(tmp(ip,k)<tempmod(itemp+1)) )then
               lidarcldtemp(ip,itemp,1)=lidarcldtemp(ip,itemp,1)+1.
             endif
@@ -532,7 +532,7 @@
           iz=1
           p1 = pplay(ip,k)
-          if ( p1.gt.0. .and. p1.lt.(440.*100.)) then ! high clouds
+          if ( p1>0. .and. p1<(440.*100.)) then ! high clouds
             iz=3
-          else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then  ! mid clouds
+          else if(p1>=(440.*100.) .and. p1<(680.*100.)) then  ! mid clouds
             iz=2
          endif
@@ -554,5 +554,5 @@
 ! -- grid-box 3D cloud fraction
 
-      where ( nsub(:,:).gt.0.0 )
+      where ( nsub(:,:)>0.0 )
          lidarcld(:,:) = lidarcld(:,:)/nsub(:,:)
       elsewhere
@@ -573,5 +573,5 @@
        enddo
       enddo
-      where ( nsublayer(:,:).gt.0.0 )
+      where ( nsublayer(:,:)>0.0 )
          cldlayer(:,:) = cldlayer(:,:)/nsublayer(:,:)
       elsewhere
@@ -593,5 +593,5 @@
 
 ! Avoid zero values
-	if( (cldy(i,ncol,nlev).eq.1.) .and. (ATBperp(i,ncol,nlev).gt.0.) )then
+	if( (cldy(i,ncol,nlev)==1.) .and. (ATBperp(i,ncol,nlev)>0.) )then
 ! Computation of the ATBperp along the phase discrimination line
            ATBperp_tmp = (ATB(i,ncol,nlev)**5)*alpha50 + (ATB(i,ncol,nlev)**4)*beta50 + &
@@ -604,7 +604,7 @@
 !____________________________________________________________________________________________________
 !
-           if( (ATBperp(i,ncol,nlev)-ATBperp_tmp).ge.0. )then   ! Ice clouds
+           if( (ATBperp(i,ncol,nlev)-ATBperp_tmp)>=0. )then   ! Ice clouds
              ! ICE with temperature above 273,15°K = Liquid (false ice)
-            if(tmp(i,nlev).gt.273.15)then                ! Temperature above 273,15 K
+            if(tmp(i,nlev)>273.15)then                ! Temperature above 273,15 K
               ! Liquid: False ice corrected by the temperature to Liquid
                lidarcldphase(i,nlev,2)=lidarcldphase(i,nlev,2)+1.   ! false ice detection ==> added to Liquid
@@ -613,7 +613,7 @@
                                                     ! to classify the phase cloud
          	   cldlayphase(i,ncol,4,2) = 1.                         ! tot cloud
-                if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+                if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
         	   cldlayphase(i,ncol,3,2) = 1.
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,2) = 1.
 	 	else                                                    ! low cloud
@@ -621,7 +621,7 @@
                 endif
          	   cldlayphase(i,ncol,4,5) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
         	   cldlayphase(i,ncol,3,5) = 1.
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,5) = 1.
 	 	else                                                    ! low cloud
@@ -634,7 +634,7 @@
               tmpi(i,ncol,nlev)=tmp(i,nlev)
          	   cldlayphase(i,ncol,4,1) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
         	   cldlayphase(i,ncol,3,1) = 1.
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,1) = 1.
 	 	else                                                    ! low cloud
@@ -651,11 +651,11 @@
              else                                        ! Liquid clouds
               ! Liquid with temperature above 231,15°K
-            if(tmp(i,nlev).gt.231.15)then 
+            if(tmp(i,nlev)>231.15)then
                lidarcldphase(i,nlev,2)=lidarcldphase(i,nlev,2)+1.
                tmpl(i,ncol,nlev)=tmp(i,nlev)
          	   cldlayphase(i,ncol,4,2) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
          	   cldlayphase(i,ncol,3,2) = 1.  
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,2) = 1.
 	 	else                                                    ! low cloud
@@ -670,7 +670,7 @@
                                                     ! to classify the phase cloud
          	   cldlayphase(i,ncol,4,4) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
          	   cldlayphase(i,ncol,3,4) = 1.  
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,4) = 1.
 	 	else                                                    ! low cloud
@@ -678,7 +678,7 @@
 	 	endif
          	   cldlayphase(i,ncol,4,1) = 1.                         ! tot cloud
-        	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+        	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
          	   cldlayphase(i,ncol,3,1) = 1.  
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,1) = 1.
 	 	else                                                    ! low cloud
@@ -702,5 +702,5 @@
          p1 = pplay(i,nlev)
 
-	if( (cldy(i,ncol,nlev).eq.1.) .and. (ATBperp(i,ncol,nlev).gt.0.) )then
+	if( (cldy(i,ncol,nlev)==1.) .and. (ATBperp(i,ncol,nlev)>0.) )then
 ! Phase discrimination line : ATBperp = ATB^5*alpha50 + ATB^4*beta50 + ATB^3*gamma50 + ATB^2*delta50 
 !                                  + ATB*epsilon50 + zeta50
@@ -715,6 +715,6 @@
 !
             ! ICE with temperature above 273,15°K = Liquid (false ice)
-          if( (ATBperp(i,ncol,nlev)-ATBperp_tmp).ge.0. )then   ! Ice clouds
-            if(tmp(i,nlev).gt.273.15)then 
+          if( (ATBperp(i,ncol,nlev)-ATBperp_tmp)>=0. )then   ! Ice clouds
+            if(tmp(i,nlev)>273.15)then
                lidarcldphase(i,nlev,2)=lidarcldphase(i,nlev,2)+1.  ! false ice ==> liq
                tmpl(i,ncol,nlev)=tmp(i,nlev)
@@ -722,7 +722,7 @@
 
          	   cldlayphase(i,ncol,4,2) = 1.                         ! tot cloud
-               if ( p1.gt.0. .and. p1.lt.(440.*100.)) then              ! high cloud
+               if ( p1>0. .and. p1<(440.*100.)) then              ! high cloud
         	   cldlayphase(i,ncol,3,2) = 1.
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,2) = 1.
 	 	else                                                    ! low cloud
@@ -731,7 +731,7 @@
 
          	   cldlayphase(i,ncol,4,5) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
         	   cldlayphase(i,ncol,3,5) = 1.
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,5) = 1.
 	 	else                                                    ! low cloud
@@ -745,7 +745,7 @@
 
           	   cldlayphase(i,ncol,4,1) = 1.                         ! tot cloud
-        	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+        	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
         	   cldlayphase(i,ncol,3,1) = 1.
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,1) = 1.
 	 	else                                                    ! low cloud
@@ -762,12 +762,12 @@
           else  
              ! Liquid with temperature above 231,15°K
-            if(tmp(i,nlev).gt.231.15)then 
+            if(tmp(i,nlev)>231.15)then
                lidarcldphase(i,nlev,2)=lidarcldphase(i,nlev,2)+1.
                tmpl(i,ncol,nlev)=tmp(i,nlev)
 
          	   cldlayphase(i,ncol,4,2) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
          	   cldlayphase(i,ncol,3,2) = 1.  
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,2) = 1.
 	 	else                                                    ! low cloud
@@ -782,7 +782,7 @@
 
          	   cldlayphase(i,ncol,4,4) = 1.                         ! tot cloud
-         	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+         	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
          	   cldlayphase(i,ncol,3,4) = 1.  
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,4) = 1.
 	 	else                                                    ! low cloud
@@ -791,7 +791,7 @@
 
          	   cldlayphase(i,ncol,4,1) = 1.                         ! tot cloud
-        	if ( p1.gt.0. .and. p1.lt.(440.*100.)) then             ! high cloud
+        	if ( p1>0. .and. p1<(440.*100.)) then             ! high cloud
          	   cldlayphase(i,ncol,3,1) = 1.  
-         	else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then ! mid cloud
+         	else if(p1>=(440.*100.) .and. p1<(680.*100.)) then ! mid cloud
          	   cldlayphase(i,ncol,2,1) = 1.
 	 	else                                                    ! low cloud
@@ -805,5 +805,5 @@
 
            ! Find the level of the highest cloud with SR>30
-	    if(x(i,ncol,nlev).gt.S_cld_att)then	 ! SR > 30.
+	    if(x(i,ncol,nlev)>S_cld_att)then	 ! SR > 30.
       		toplvlsat=nlev-1
        		goto 99 
@@ -821,15 +821,15 @@
 !____________________________________________________________________________________________________
 !
-if(toplvlsat.ne.0)then     	
+if(toplvlsat/=0)then
       do nlev=toplvlsat,1,-1
          p1 = pplay(i,nlev)
-	if(cldy(i,ncol,nlev).eq.1.)then
+	if(cldy(i,ncol,nlev)==1.)then
            lidarcldphase(i,nlev,3)=lidarcldphase(i,nlev,3)+1.
            tmpu(i,ncol,nlev)=tmp(i,nlev)
 
          	   cldlayphase(i,ncol,4,3) = 1.                         ! tot cloud
-          if ( p1.gt.0. .and. p1.lt.(440.*100.)) then              ! high cloud
+          if ( p1>0. .and. p1<(440.*100.)) then              ! high cloud
              cldlayphase(i,ncol,3,3) = 1.
-          else if(p1.ge.(440.*100.) .and. p1.lt.(680.*100.)) then  ! mid cloud
+          else if(p1>=(440.*100.) .and. p1<(680.*100.)) then  ! mid cloud
              cldlayphase(i,ncol,2,3) = 1.
 	  else                                                     ! low cloud
@@ -857,5 +857,5 @@
 ! of the occurrences
 lidarcldphasetmp(:,:)=lidarcldphase(:,:,1)+lidarcldphase(:,:,2);
-WHERE (lidarcldphasetmp(:,:).gt. 0.)
+WHERE (lidarcldphasetmp(:,:)> 0.)
    lidarcldphase(:,:,6)=lidarcldphase(:,:,1)/lidarcldphasetmp(:,:)
 ELSEWHERE
@@ -864,5 +864,5 @@
 
 ! Compute Phase 3D Cloud Fraction
-     WHERE ( nsub(:,:).gt.0.0 )
+     WHERE ( nsub(:,:)>0.0 )
        lidarcldphase(:,:,1)=lidarcldphase(:,:,1)/nsub(:,:)
        lidarcldphase(:,:,2)=lidarcldphase(:,:,2)/nsub(:,:)
@@ -899,5 +899,5 @@
 ! Compute the Ice percentage in cloud = ice/(ice+liq)
 cldlayerphasetmp(:,:)=cldlayerphase(:,:,1)+cldlayerphase(:,:,2)
-    WHERE (cldlayerphasetmp(:,:).gt. 0.)
+    WHERE (cldlayerphasetmp(:,:)> 0.)
        cldlayerphase(:,:,6)=cldlayerphase(:,:,1)/cldlayerphasetmp(:,:)
     ELSEWHERE
@@ -906,5 +906,5 @@
 
     do i=1,Nphase-1
-      WHERE ( cldlayerphasesum(:,:).gt.0.0 )
+      WHERE ( cldlayerphasesum(:,:)>0.0 )
          cldlayerphase(:,:,i) = (cldlayerphase(:,:,i)/cldlayerphasesum(:,:)) * cldlayer(:,:) 
       ENDWHERE
@@ -917,10 +917,10 @@
           checkcldlayerphase2=0.
 
-          if (cldlayerphasesum(i,iz).gt.0.0 )then
+          if (cldlayerphasesum(i,iz)>0.0 )then
              do ic=1,Nphase-3
                 checkcldlayerphase=checkcldlayerphase+cldlayerphase(i,iz,ic)  
              enddo
              checkcldlayerphase2=cldlayer(i,iz)-checkcldlayerphase
-             if( (checkcldlayerphase2.gt.0.01).or.(checkcldlayerphase2.lt.-0.01) ) print *, checkcldlayerphase,cldlayer(i,iz)
+             if( (checkcldlayerphase2>0.01).or.(checkcldlayerphase2<-0.01) ) print *, checkcldlayerphase,cldlayer(i,iz)
 
           endif
@@ -930,5 +930,5 @@
 
     do i=1,Nphase-1
-      WHERE ( nsublayer(:,:).eq.0.0 )
+      WHERE ( nsublayer(:,:)==0.0 )
          cldlayerphase(:,:,i) = undef
       ENDWHERE
@@ -942,14 +942,14 @@
 do i=1,Npoints
 do itemp=1,Ntemp
-if(tmpi(i,ncol,nlev).gt.0.)then
-      if( (tmpi(i,ncol,nlev).ge.tempmod(itemp)).and.(tmpi(i,ncol,nlev).lt.tempmod(itemp+1)) )then
+if(tmpi(i,ncol,nlev)>0.)then
+      if( (tmpi(i,ncol,nlev)>=tempmod(itemp)).and.(tmpi(i,ncol,nlev)<tempmod(itemp+1)) )then
         lidarcldtemp(i,itemp,2)=lidarcldtemp(i,itemp,2)+1.
       endif
-elseif(tmpl(i,ncol,nlev).gt.0.)then
-      if( (tmpl(i,ncol,nlev).ge.tempmod(itemp)).and.(tmpl(i,ncol,nlev).lt.tempmod(itemp+1)) )then
+elseif(tmpl(i,ncol,nlev)>0.)then
+      if( (tmpl(i,ncol,nlev)>=tempmod(itemp)).and.(tmpl(i,ncol,nlev)<tempmod(itemp+1)) )then
         lidarcldtemp(i,itemp,3)=lidarcldtemp(i,itemp,3)+1.
       endif
-elseif(tmpu(i,ncol,nlev).gt.0.)then
-      if( (tmpu(i,ncol,nlev).ge.tempmod(itemp)).and.(tmpu(i,ncol,nlev).lt.tempmod(itemp+1)) )then
+elseif(tmpu(i,ncol,nlev)>0.)then
+      if( (tmpu(i,ncol,nlev)>=tempmod(itemp)).and.(tmpu(i,ncol,nlev)<tempmod(itemp+1)) )then
         lidarcldtemp(i,itemp,4)=lidarcldtemp(i,itemp,4)+1.
       endif
@@ -965,5 +965,5 @@
 checktemp=lidarcldtemp(i,itemp,2)+lidarcldtemp(i,itemp,3)+lidarcldtemp(i,itemp,4)
 
-	if(checktemp.NE.lidarcldtemp(i,itemp,1))then
+	if(checktemp/=lidarcldtemp(i,itemp,1))then
 	  print *, i,itemp
 	  print *, lidarcldtemp(i,itemp,1:4)
@@ -984,5 +984,5 @@
 
 do i=1,4
-  WHERE(lidarcldtempind(:,:).gt.0.)
+  WHERE(lidarcldtempind(:,:)>0.)
      lidarcldtemp(:,:,i) = lidarcldtemp(:,:,i)/lidarcldtempind(:,:)
   ELSEWHERE
@@ -1046,5 +1046,5 @@
     do k=1,Nlevels
        ! Cloud detection at subgrid-scale:
-       where ( (x(:,:,k) .gt. S_cld) .and. (x(:,:,k) .ne. undef) )
+       where ( (x(:,:,k) > S_cld) .and. (x(:,:,k) /= undef) )
           cldy(:,:,k)=1.0
        elsewhere
@@ -1052,5 +1052,5 @@
        endwhere
        ! Fully attenuated layer detection at subgrid-scale:
-       where ( (x(:,:,k) .gt. 0.0) .and. (x(:,:,k) .lt. S_att_opaq) .and. (x(:,:,k) .ne. undef) )
+       where ( (x(:,:,k) > 0.0) .and. (x(:,:,k) < S_att_opaq) .and. (x(:,:,k) /= undef) )
           cldyopaq(:,:,k)=1.0
        elsewhere
@@ -1059,5 +1059,5 @@
 
        ! Number of useful sub-column layers:
-       where ( (x(:,:,k) .gt. S_att) .and. (x(:,:,k) .ne. undef) )
+       where ( (x(:,:,k) > S_att) .and. (x(:,:,k) /= undef) )
           srok(:,:,k)=1.0
        elsewhere
@@ -1065,5 +1065,5 @@
        endwhere
        ! Number of useful sub-columns layers for z_opaque 3D fraction:
-       where ( (x(:,:,k) .gt. 0.0) .and. (x(:,:,k) .ne. undef) )
+       where ( (x(:,:,k) > 0.0) .and. (x(:,:,k) /= undef) )
           srokopaq(:,:,k)=1.0
        elsewhere
@@ -1098,5 +1098,5 @@
 
      ! Declaring non-opaque cloudy profiles as thin cloud profiles
-	   if ( (cldlay(ip,ic,4) .eq. 1.0) .and. (cldlay(ip,ic,1) .eq. 0.0) ) then
+	   if ( (cldlay(ip,ic,4) == 1.0) .and. (cldlay(ip,ic,1) == 0.0) ) then
 	      cldlay(ip,ic,2)  =  1.0
  	   endif
@@ -1105,9 +1105,9 @@
 
      ! Opaque cloud profiles
-	   if ( cldlay(ip,ic,1) .eq. 1.0 ) then
+	   if ( cldlay(ip,ic,1) == 1.0 ) then
 	      zopac = 0.0
 	      do k=2,Nlevels
      ! Declaring opaque cloud fraction and z_opaque altitude for 3D and 2D variables
-	         if ( (cldy(ip,ic,k) .eq. 1.0) .and. (zopac .eq. 0.0) ) then
+	         if ( (cldy(ip,ic,k) == 1.0) .and. (zopac == 0.0) ) then
 		    lidarcldtype(ip,k-1,3) = lidarcldtype(ip,k-1,3) + 1.0
 		    cldlay(ip,ic,3)        = vgrid_z(k-1) !z_opaque altitude
@@ -1115,5 +1115,5 @@
 		    zopac = 1.0
 		 endif
-	         if ( cldy(ip,ic,k) .eq. 1.0 ) then
+	         if ( cldy(ip,ic,k) == 1.0 ) then
 		    lidarcldtype(ip,k,1)   = lidarcldtype(ip,k,1) + 1.0
                  endif
@@ -1122,8 +1122,8 @@
 
      ! Thin cloud profiles
-	   if ( cldlay(ip,ic,2) .eq. 1.0 ) then
+	   if ( cldlay(ip,ic,2) == 1.0 ) then
 	      do k=1,Nlevels
      ! Declaring thin cloud fraction for 3D variable
-                 if ( cldy(ip,ic,k) .eq. 1.0 ) then
+                 if ( cldy(ip,ic,k) == 1.0 ) then
                     lidarcldtype(ip,k,2) = lidarcldtype(ip,k,2) + 1.0
                  endif
@@ -1135,5 +1135,5 @@
 
     ! 3D cloud types fraction (opaque=1 and thin=2)
-    where ( nsub(:,:) .gt. 0.0 )
+    where ( nsub(:,:) > 0.0 )
        lidarcldtype(:,:,1) = lidarcldtype(:,:,1)/nsub(:,:)
        lidarcldtype(:,:,2) = lidarcldtype(:,:,2)/nsub(:,:)
@@ -1143,5 +1143,5 @@
     endwhere
     ! 3D z_opaque fraction (=3)
-    where ( nsubopaq(:,:) .gt. 0.0 )
+    where ( nsubopaq(:,:) > 0.0 )
        lidarcldtype(:,:,3) = lidarcldtype(:,:,3)/nsubopaq(:,:)
     elsewhere
@@ -1152,10 +1152,10 @@
     do ip = 1, Npoints
      	do k = Nlevels-1, 1, -1
-           if ( lidarcldtype(ip,k,3) .ne. undef ) then
+           if ( lidarcldtype(ip,k,3) /= undef ) then
 	      lidarcldtype(ip,k,4) = lidarcldtype(ip,k+1,4) + lidarcldtype(ip,k,3)
            endif
 	enddo
     enddo
-    where ( nsubopaq(:,:) .eq. 0.0 )
+    where ( nsubopaq(:,:) == 0.0 )
        lidarcldtype(:,:,4) = undef
     endwhere
@@ -1169,5 +1169,5 @@
        enddo
     enddo
-    where (nsublayer(:,:) .gt. 0.0)
+    where (nsublayer(:,:) > 0.0)
        cldtype(:,:) = cldtype(:,:)/nsublayer(:,:)
     elsewhere
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_modis_sim.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_modis_sim.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/mod_modis_sim.F90	(revision 5082)
@@ -666,6 +666,6 @@
     do ij=2,nbin1+1
        do ik=2,nbin2+1
-          jointHist(ij-1,ik-1)=count(var1 .ge. bin1(ij-1) .and. var1 .lt. bin1(ij) .and. &
-               var2 .ge. bin2(ik-1) .and. var2 .lt. bin2(ik))        
+          jointHist(ij-1,ik-1)=count(var1 >= bin1(ij-1) .and. var1 < bin1(ij) .and. &
+               var2 >= bin2(ik-1) .and. var2 < bin2(ik))
        enddo
     enddo
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/pf_to_mr.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/pf_to_mr.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/pf_to_mr.F	(revision 5082)
@@ -107,6 +107,6 @@
                 mx_rain_cv(j,ibox,ilev)=0.
                 mx_snow_cv(j,ibox,ilev)=0.
-                if ((prec_frac(j,ibox,ilev) .eq. 1.) .or.
-     &              (prec_frac(j,ibox,ilev) .eq. 3.)) then 
+                if ((prec_frac(j,ibox,ilev) == 1.) .or.
+     &              (prec_frac(j,ibox,ilev) == 3.)) then
                     mx_rain_ls(j,ibox,ilev)=
      &                     (term4r_ls**(1./(1.+br/4.)))/rho
@@ -116,6 +116,6 @@
      &                     (term4g_ls**(1./(1.+bg/4.)))/rho
                 endif
-                if ((prec_frac(j,ibox,ilev) .eq. 2.) .or.
-     &              (prec_frac(j,ibox,ilev) .eq. 3.)) then 
+                if ((prec_frac(j,ibox,ilev) == 2.) .or.
+     &              (prec_frac(j,ibox,ilev) == 3.)) then
                     mx_rain_cv(j,ibox,ilev)=
      &                     (term4r_cv**(1./(1.+br/4.)))/rho
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/phys_cosp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/phys_cosp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/phys_cosp.F90	(revision 5082)
@@ -193,5 +193,5 @@
           cfg%Lrttov_sim,cfg%Lstats
 
-    if (overlaplmdz.ne.overlap) then
+    if (overlaplmdz/=overlap) then
        print*,'Attention overlaplmdz different de overlap lu dans namelist '
     endif
@@ -201,5 +201,5 @@
 
 !!! Ici on modifie les cles logiques pour les outputs selon les champs actives dans les .xml
-  if ((itap.gt.1).and.(first_write))then
+  if ((itap>1).and.(first_write))then
    
     IF (using_xios) call read_xiosfieldactive(cfg)
@@ -268,5 +268,5 @@
 
         do ip = 1, Npoints
-          if (fracTerLic(ip).ge.0.5) then
+          if (fracTerLic(ip)>=0.5) then
              gbx%land(ip) = 1.
           else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/prec_scops.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/prec_scops.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/prec_scops.F	(revision 5082)
@@ -55,5 +55,5 @@
 
       cv_col = 0.05*ncol
-      if (cv_col .eq. 0) cv_col=1
+      if (cv_col == 0) cv_col=1
  
       do ilev=1,nlev
@@ -72,15 +72,15 @@
         flag_cv=0
         do ilev=1,nlev
-          if (frac_out(j,ibox,ilev) .eq. 1) then 
+          if (frac_out(j,ibox,ilev) == 1) then
             flag_ls=1
           endif
-          if (frac_out(j,ibox,ilev) .eq. 2) then 
+          if (frac_out(j,ibox,ilev) == 2) then
             flag_cv=1
           endif
         enddo !loop over nlev
-        if (flag_ls .eq. 1) then
+        if (flag_ls == 1) then
            frac_out_ls(j,ibox)=1
         endif
-        if (flag_cv .eq. 1) then
+        if (flag_cv == 1) then
            frac_out_cv(j,ibox)=1
         endif
@@ -93,14 +93,14 @@
         flag_cv=0
     
-        if (ls_p_rate(j,1) .gt. 0.) then 
+        if (ls_p_rate(j,1) > 0.) then
             do ibox=1,ncol ! possibility ONE
-                if (frac_out(j,ibox,1) .eq. 1) then 
+                if (frac_out(j,ibox,1) == 1) then
                     prec_frac(j,ibox,1) = 1
                     flag_ls=1
                 endif
             enddo ! loop over ncol
-            if (flag_ls .eq. 0) then ! possibility THREE
+            if (flag_ls == 0) then ! possibility THREE
                 do ibox=1,ncol
-                    if (frac_out(j,ibox,2) .eq. 1) then 
+                    if (frac_out(j,ibox,2) == 1) then
                         prec_frac(j,ibox,1) = 1
                         flag_ls=1
@@ -108,7 +108,7 @@
                 enddo ! loop over ncol
             endif
-        if (flag_ls .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_ls(j,ibox) .eq. 1) then 
+        if (flag_ls == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_ls(j,ibox) == 1) then
             prec_frac(j,ibox,1) = 1
             flag_ls=1
@@ -116,5 +116,5 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Five
+        if (flag_ls == 0) then ! possibility Five
         do ibox=1,ncol
     !     prec_frac(j,1:ncol,1) = 1
@@ -125,8 +125,8 @@
        ! There is large scale precipitation
      
-        if (cv_p_rate(j,1) .gt. 0.) then 
+        if (cv_p_rate(j,1) > 0.) then
          do ibox=1,ncol ! possibility ONE
-          if (frac_out(j,ibox,1) .eq. 2) then 
-           if (prec_frac(j,ibox,1) .eq. 0) then
+          if (frac_out(j,ibox,1) == 2) then
+           if (prec_frac(j,ibox,1) == 0) then
         prec_frac(j,ibox,1) = 2
        else
@@ -136,8 +136,8 @@
       endif
         enddo ! loop over ncol
-        if (flag_cv .eq. 0) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,2) .eq. 2) then 
-                if (prec_frac(j,ibox,1) .eq. 0) then
+        if (flag_cv == 0) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,2) == 2) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -148,8 +148,8 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_cv(j,ibox) .eq. 1) then 
-                if (prec_frac(j,ibox,1) .eq. 0) then
+        if (flag_cv == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_cv(j,ibox) == 1) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -160,7 +160,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then  ! possibility Five
+        if (flag_cv == 0) then  ! possibility Five
         do ibox=1,cv_col
-                if (prec_frac(j,ibox,1) .eq. 0) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -183,16 +183,16 @@
         flag_cv=0
     
-        if (ls_p_rate(j,ilev) .gt. 0.) then 
+        if (ls_p_rate(j,ilev) > 0.) then
          do ibox=1,ncol ! possibility ONE&TWO
-          if ((frac_out(j,ibox,ilev) .eq. 1) .or. 
-     &       ((prec_frac(j,ibox,ilev-1) .eq. 1) 
-     &       .or. (prec_frac(j,ibox,ilev-1) .eq. 3))) then 
+          if ((frac_out(j,ibox,ilev) == 1) .or.
+     &       ((prec_frac(j,ibox,ilev-1) == 1)
+     &       .or. (prec_frac(j,ibox,ilev-1) == 3))) then
            prec_frac(j,ibox,ilev) = 1
            flag_ls=1
           endif
         enddo ! loop over ncol
-        if ((flag_ls .eq. 0) .and. (ilev .lt. nlev)) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,ilev+1) .eq. 1) then 
+        if ((flag_ls == 0) .and. (ilev < nlev)) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,ilev+1) == 1) then
             prec_frac(j,ibox,ilev) = 1
             flag_ls=1
@@ -200,7 +200,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_ls(j,ibox) .eq. 1) then 
+        if (flag_ls == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_ls(j,ibox) == 1) then
             prec_frac(j,ibox,ilev) = 1
             flag_ls=1
@@ -208,5 +208,5 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Five
+        if (flag_ls == 0) then ! possibility Five
         do ibox=1,ncol
 !     prec_frac(j,1:ncol,ilev) = 1
@@ -216,10 +216,10 @@
       endif ! There is large scale precipitation
     
-        if (cv_p_rate(j,ilev) .gt. 0.) then 
+        if (cv_p_rate(j,ilev) > 0.) then
          do ibox=1,ncol ! possibility ONE&TWO
-          if ((frac_out(j,ibox,ilev) .eq. 2) .or. 
-     &       ((prec_frac(j,ibox,ilev-1) .eq. 2) 
-     &       .or. (prec_frac(j,ibox,ilev-1) .eq. 3))) then 
-            if (prec_frac(j,ibox,ilev) .eq. 0) then
+          if ((frac_out(j,ibox,ilev) == 2) .or.
+     &       ((prec_frac(j,ibox,ilev-1) == 2)
+     &       .or. (prec_frac(j,ibox,ilev-1) == 3))) then
+            if (prec_frac(j,ibox,ilev) == 0) then
          prec_frac(j,ibox,ilev) = 2
         else
@@ -229,8 +229,8 @@
         endif
        enddo ! loop over ncol
-        if ((flag_cv .eq. 0) .and. (ilev .lt. nlev)) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,ilev+1) .eq. 2) then 
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+        if ((flag_cv == 0) .and. (ilev < nlev)) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,ilev+1) == 2) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
@@ -241,8 +241,8 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_cv(j,ibox) .eq. 1) then 
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+        if (flag_cv == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_cv(j,ibox) == 1) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
@@ -253,7 +253,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then  ! possibility Five 
+        if (flag_cv == 0) then  ! possibility Five
         do ibox=1,cv_col
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/predict_mom07.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/predict_mom07.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/predict_mom07.F90	(revision 5082)
@@ -7,6 +7,6 @@
             implicit none
         
-            real*8 :: a1,a2,a3,b1,b2,b3,c1,c2,c3
-            real*8 :: m2,tc,n,m,a_,b_,c_,A,B,C,n2
+            real(kind=8) :: a1,a2,a3,b1,b2,b3,c1,c2,c3
+            real(kind=8) :: m2,tc,n,m,a_,b_,c_,A,B,C,n2
         
             a1=      13.6078
@@ -30,9 +30,9 @@
             
         ! predict m from m2 and tc
-                if(m2.ne.-9999) then 
+                if(m2/=-9999) then
                 m=A*exp(B*tc)*m2**C
                 endif
         ! get m2 if mass-dimension relationship not proportional to D**2
-                if(m2.eq.-9999) then 
+                if(m2==-9999) then
                 m2=(m/(A*exp(B*tc)))**(1.0/C)    
                 endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator.F90	(revision 5082)
@@ -91,17 +91,17 @@
 
   real undef
-  real*8, dimension(nprof,ngate), intent(in) :: &
+  real(kind=8), dimension(nprof,ngate), intent(in) :: &
     hgt_matrix, p_matrix,t_matrix,rh_matrix
 
-  real*8, dimension(hp%nhclass,nprof,ngate), intent(in) :: hm_matrix
-  real*8, dimension(hp%nhclass,nprof,ngate), intent(inout) :: re_matrix
-  real*8, dimension(hp%nhclass,nprof,ngate), intent(inout)    :: Np_matrix
+  real(kind=8), dimension(hp%nhclass,nprof,ngate), intent(in) :: hm_matrix
+  real(kind=8), dimension(hp%nhclass,nprof,ngate), intent(inout) :: re_matrix
+  real(kind=8), dimension(hp%nhclass,nprof,ngate), intent(inout)    :: Np_matrix
 
 ! ----- OUTPUTS -----
-  real*8, dimension(nprof,ngate), intent(out) :: Ze_non,Ze_ray, &
+  real(kind=8), dimension(nprof,ngate), intent(out) :: Ze_non,Ze_ray, &
        g_to_vol,dBZe,a_to_vol
 
 ! ----- OPTIONAL -----
-  real*8, optional, dimension(nprof,ngate) :: &
+  real(kind=8), optional, dimension(nprof,ngate) :: &
   g_to_vol_in,g_to_vol_out ! integrated atten due to gases, r>v (dB). This allows to output and then input
                            ! the same gaseous absorption in different calls. Optional to allow compatibility
@@ -112,5 +112,5 @@
 
   real, parameter :: one_third = 1.0/3.0
-  real*8 :: t_kelvin
+  real(kind=8) :: t_kelvin
   integer :: &
   phase, & ! 0=liquid, 1=ice
@@ -118,14 +118,14 @@
 
   logical :: hydro	! true=hydrometeor in vol, false=none
-  real*8 :: &
+  real(kind=8) :: &
   rho_a, &   ! air density (kg m^-3)
   gases      ! function: 2-way gas atten (dB/km)
 
-  real*8, dimension(:), allocatable :: &
+  real(kind=8), dimension(:), allocatable :: &
   Di, Deq, &   ! discrete drop sizes (um)
   Ni, &        ! discrete concentrations (cm^-3 um^-1)
   rhoi         ! discrete densities (kg m^-3)
 
-  real*8, dimension(nprof, ngate) :: &
+  real(kind=8), dimension(nprof, ngate) :: &
   z_vol, &      ! effective reflectivity factor (mm^6/m^3)
   z_ray, &                      ! reflectivity factor, Rayleigh only (mm^6/m^3)
@@ -135,13 +135,13 @@
 
   integer,parameter :: KR8 = selected_real_kind(15,300)
-  real*8, parameter :: xx = -1.0_KR8
-  real*8,  dimension(:), allocatable :: xxa
-  real*8 :: kr, ze, zr, pi, scale_factor, tc, Re, ld, tmp1, ze2, kr2, apm, bpm
-  real*8 :: half_a_atten_current,half_a_atten_above
-  real*8 :: half_g_atten_current,half_g_atten_above
-  integer*4 :: tp, i, j, k, pr, itt, iff
-
-  real*8    step,base, Np
-  integer*4 iRe_type,n,max_bin
+  real(kind=8), parameter :: xx = -1.0_KR8
+  real(kind=8),  dimension(:), allocatable :: xxa
+  real(kind=8) :: kr, ze, zr, pi, scale_factor, tc, Re, ld, tmp1, ze2, kr2, apm, bpm
+  real(kind=8) :: half_a_atten_current,half_a_atten_above
+  real(kind=8) :: half_g_atten_current,half_g_atten_above
+  integer(kind=4) :: tp, i, j, k, pr, itt, iff
+
+  real(kind=8)    step,base, Np
+  integer(kind=4) iRe_type,n,max_bin
 
   integer   start_gate,end_gate,d_gate
@@ -207,5 +207,5 @@
             itt = infind(hp%mt_tti,t_kelvin)
           endif
-          if (re_matrix(tp,pr,k).eq.0) then
+          if (re_matrix(tp,pr,k)==0) then
             call calc_Re(hm_matrix(tp,pr,k),Np_matrix(tp,pr,k),rho_a, &
               hp%dtype(tp),hp%dmin(tp),hp%dmax(tp),hp%apm(tp),hp%bpm(tp), &
@@ -221,5 +221,5 @@
 
           iRe_type=1
-          if(Re.gt.0) then
+          if(Re>0) then
             ! determine index in to scale LUT
             !
@@ -232,5 +232,5 @@
             base=hp%base_list(n+1)
             iRe_type=Re/step
-            if (iRe_type.lt.1) iRe_type=1
+            if (iRe_type<1) iRe_type=1
 
             Re=step*(iRe_type+0.5)	! set value of Re to closest value allowed in LUT.
@@ -238,5 +238,5 @@
 
             ! make sure iRe_type is within bounds
-            if (iRe_type.ge.nRe_types) then
+            if (iRe_type>=nRe_types) then
 !               write(*,*) 'Warning: size of Re exceed value permitted ', &
 !                    'in Look-Up Table (LUT).  Will calculate. '
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator_init.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator_init.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator_init.F90	(revision 5082)
@@ -74,5 +74,5 @@
 ! ----- INTERNAL -----  
   integer :: i,j
-  real*8  :: delt, deltp
+  real(kind=8)  :: delt, deltp
         
     !
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator_types.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator_types.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/radar_simulator_types.F90	(revision 5082)
@@ -12,5 +12,5 @@
   integer, parameter ::       &
   nd = 85               ! number of discrete particles used in construction DSDs
-  real*8, parameter ::        &
+  real(kind=8), parameter ::        &
   dmin = 0.1                 ,& ! min size of discrete particle
   dmax = 10000.                 ! max size of discrete particle
@@ -36,9 +36,9 @@
   
     ! variables used to store hydrometeor "default" properties
-    real*8,  dimension(maxhclass) :: p1,p2,p3,dmin,dmax,apm,bpm,rho
+    real(kind=8),  dimension(maxhclass) :: p1,p2,p3,dmin,dmax,apm,bpm,rho
     integer, dimension(maxhclass) :: dtype,col,cp,phase
   
     ! Radar properties
-    real*8  :: freq,k2
+    real(kind=8)  :: freq,k2
     integer :: nhclass      ! number of hydrometeor classes in use
     integer :: use_gas_abs, do_ray
@@ -56,16 +56,16 @@
     logical, dimension(maxhclass,nRe_types) :: N_scale_flag
     logical, dimension(maxhclass,mt_ntt,nRe_types) :: Z_scale_flag,Z_scale_added_flag
-    real*8,  dimension(maxhclass,mt_ntt,nRe_types) :: Ze_scaled,Zr_scaled,kr_scaled
-    real*8,  dimension(maxhclass,nd,nRe_types) :: fc, rho_eff
+    real(kind=8),  dimension(maxhclass,mt_ntt,nRe_types) :: Ze_scaled,Zr_scaled,kr_scaled
+    real(kind=8),  dimension(maxhclass,nd,nRe_types) :: fc, rho_eff
 
     ! used to determine Re index
-    real*8  :: step_list(Re_MAX_BIN),base_list(Re_MAX_BIN)
+    real(kind=8)  :: step_list(Re_MAX_BIN),base_list(Re_MAX_BIN)
   
     ! used to determine temperature index
-    real*8 :: &
+    real(kind=8) :: &
         mt_ttl(cnt_liq), &  ! liquid temperatures (K)
         mt_tti(cnt_ice)     ! ice temperatures (K)
 
-    real*8 :: D(nd) ! set of discrete diameters used to represent DSDs
+    real(kind=8) :: D(nd) ! set of discrete diameters used to represent DSDs
 
   end type class_param
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/scops.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/scops.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/scops.F	(revision 5082)
@@ -133,5 +133,5 @@
       enddo
 
-      if (ncolprint.ne.0) then
+      if (ncolprint/=0) then
         write (6,'(a)') 'frac_out_pp_rev:'
           do j=1,npoints,1000
@@ -145,5 +145,5 @@
         write (6,'(I3)') ncol
       endif
-      if (ncolprint.ne.0) then
+      if (ncolprint/=0) then
         write (6,'(a)') 'last_frac_pp:'
           do j=1,npoints,1000
@@ -165,7 +165,7 @@
 !     Initialise threshold
 
-        IF (ilev.eq.1) then
+        IF (ilev==1) then
           ! If max overlap 
-          IF (overlap.eq.1) then
+          IF (overlap==1) then
             ! select pixels spread evenly
             ! across the gridbox
@@ -187,5 +187,5 @@
               enddo
             ENDIF
-            IF (ncolprint.ne.0) then
+            IF (ncolprint/=0) then
               write (6,'(a)') 'threshold_nsf2:'
                 do j=1,npoints,1000
@@ -197,5 +197,5 @@
         ENDIF
 
-        IF (ncolprint.ne.0) then
+        IF (ncolprint/=0) then
             write (6,'(a)') 'ilev:'
             write (6,'(I2)') ilev
@@ -206,5 +206,5 @@
           ! All versions
           do j=1,npoints
-            if (boxpos(j,ibox).le.conv(j,ilev)) then
+            if (boxpos(j,ibox)<=conv(j,ilev)) then
               maxocc(j,ibox) = 1
             else
@@ -214,5 +214,5 @@
 
           ! Max overlap
-          if (overlap.eq.1) then 
+          if (overlap==1) then
             do j=1,npoints
               threshold_min(j,ibox)=conv(j,ilev)
@@ -222,5 +222,5 @@
 
           ! Random overlap
-          if (overlap.eq.2) then 
+          if (overlap==2) then
             do j=1,npoints
               threshold_min(j,ibox)=conv(j,ilev)
@@ -230,11 +230,11 @@
 
           ! Max/Random overlap
-          if (overlap.eq.3) then 
+          if (overlap==3) then
             do j=1,npoints
               threshold_min(j,ibox)=max(conv(j,ilev),
      &          min(tca(j,ilev-1),tca(j,ilev)))
               if (threshold(j,ibox)
-     &          .lt.min(tca(j,ilev-1),tca(j,ilev))
-     &          .and.(threshold(j,ibox).gt.conv(j,ilev))) then
+     &          <min(tca(j,ilev-1),tca(j,ilev))
+     &          .and.(threshold(j,ibox)>conv(j,ilev))) then
                    maxosc(j,ibox)= 1
               else
@@ -276,5 +276,5 @@
            DO ibox=1,ncol
              do j=1,npoints 
-               if (tca(j,ilev).gt.threshold(j,ibox)) then
+               if (tca(j,ilev)>threshold(j,ibox)) then
                frac_out(j,ibox,ilev)=1
                else
@@ -289,5 +289,5 @@
            DO ibox=1,ncol
              do j=1,npoints 
-                if (threshold(j,ibox).le.conv(j,ilev)) then
+                if (threshold(j,ibox)<=conv(j,ilev)) then
                     ! = 2 IF threshold le conv(j)
                     frac_out(j,ibox,ilev) = 2 
@@ -302,5 +302,5 @@
 !         from last level next time round
 
-          if (ncolprint.ne.0) then
+          if (ncolprint/=0) then
 
             do j=1,npoints ,1000
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/zeff.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/zeff.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/zeff.F90	(revision 5082)
@@ -35,15 +35,15 @@
   integer, intent(in) :: ice, xr
   integer, intent(in) :: nsizes
-  real*8, intent(in) :: freq,D(nsizes),N(nsizes),tt,qe(nsizes), &
+  real(kind=8), intent(in) :: freq,D(nsizes),N(nsizes),tt,qe(nsizes), &
     qs(nsizes), rho_e(nsizes)
-  real*8, intent(inout) :: k2
+  real(kind=8), intent(inout) :: k2
   
 ! ----- OUTPUTS -----
-  real*8, intent(out) :: z_eff,z_ray,kr
+  real(kind=8), intent(out) :: z_eff,z_ray,kr
     
 ! ----- INTERNAL -----
   integer :: &
   correct_for_rho        ! correct for density flag
-  real*8, dimension(nsizes) :: &
+  real(kind=8), dimension(nsizes) :: &
   D0, &                  ! D in (m)
   N0, &                  ! N in m^-3 m^-1
@@ -53,19 +53,19 @@
   rho_ice, &             ! bulk density ice (kg m^-3)
   f                 ! ice fraction
-  real*8, dimension(nsizes) :: xtemp
-  real*8 :: &
+  real(kind=8), dimension(nsizes) :: xtemp
+  real(kind=8) :: &
   wl, &                  ! wavelength (m)
   cr                            ! kr(dB/km) = cr * kr(1/km)
-  complex*16 :: &
+  complex(kind=8) :: &
   m                 ! complex index of refraction of bulk form
-  complex*16, dimension(nsizes) :: &
+  complex(kind=8), dimension(nsizes) :: &
   m0                ! complex index of refraction
   
-  integer*4 :: i,one
-  real*8 :: pi
-  real*8 :: eta_sum, eta_mie, const, z0_eff, z0_ray, k_sum, &
+  integer(kind=4) :: i,one
+  real(kind=8) :: pi
+  real(kind=8) :: eta_sum, eta_mie, const, z0_eff, z0_ray, k_sum, &
             n_r, n_i, dqv(1), dqsc, dg, dph(1)
-  integer*4 :: err
-  complex*16 :: Xs1(1), Xs2(1)
+  integer(kind=4) :: err
+  complex(kind=8) :: Xs1(1), Xs2(1)
 
   one=1
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/MISR_simulator.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/MISR_simulator.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/MISR_simulator.F90	(revision 5082)
@@ -84,5 +84,5 @@
        do ilev=1,nlev
           ! Define location of "layer top"
-          if(ilev.eq.1 .or. ilev.eq.nlev) then
+          if(ilev==1 .or. ilev==nlev) then
              ztest=zfull(j,ilev)
           else
@@ -94,5 +94,5 @@
           iMISR_ztop=2
           do loop=2,numMISRHgtBins
-             if ( ztest .gt. 1000*misr_histHgt(loop+1) ) then
+             if ( ztest > 1000*misr_histHgt(loop+1) ) then
                 iMISR_ztop=loop+1
              endif
@@ -110,5 +110,5 @@
           do ilev=1,nlev
              ! If there a cloud, start the counter and store this height
-             if(thres_crossed_MISR .eq. 0 .and. dtau(j,ibox,ilev) .gt. 0.) then
+             if(thres_crossed_MISR == 0 .and. dtau(j,ibox,ilev) > 0.) then
                 ! First encountered a "cloud"
                 thres_crossed_MISR = 1  
@@ -116,6 +116,6 @@
              endif
 
-             if( thres_crossed_MISR .lt. 99 .and. thres_crossed_MISR .gt. 0 ) then
-                if( dtau(j,ibox,ilev) .eq. 0.) then
+             if( thres_crossed_MISR < 99 .and. thres_crossed_MISR > 0 ) then
+                if( dtau(j,ibox,ilev) == 0.) then
                    ! We have come to the end of the current cloud layer without yet 
                    ! selecting a CTH boundary. Restart cloud tau counter 
@@ -129,6 +129,6 @@
                 ! current layer cloud top to the current level then MISR will like 
                 ! see a top below the top of the current layer.
-                if( dtau(j,ibox,ilev).gt.0 .and. (cloud_dtau-dtau(j,ibox,ilev)) .lt. 1) then
-                   if(dtau(j,ibox,ilev) .lt. 1 .or. ilev.eq.1 .or. ilev.eq.nlev) then
+                if( dtau(j,ibox,ilev)>0 .and. (cloud_dtau-dtau(j,ibox,ilev)) < 1) then
+                   if(dtau(j,ibox,ilev) < 1 .or. ilev==1 .or. ilev==nlev) then
                       ! MISR will likely penetrate to some point within this layer ... the middle
                       MISR_penetration_height=zfull(j,ilev)
@@ -142,5 +142,5 @@
                 
                 ! Check for a distinctive water layer
-                if(dtau(j,ibox,ilev) .gt. 1 .and. at(j,ilev) .gt. 273 ) then
+                if(dtau(j,ibox,ilev) > 1 .and. at(j,ilev) > 273 ) then
                    ! Must be a water cloud, take this as CTH level
                    thres_crossed_MISR=99
@@ -149,5 +149,5 @@
                 ! If the total column optical depth is "large" than MISR can't see
                 ! anything else. Set current point as CTH level
-                if(sum(dtau(j,ibox,1:ilev)) .gt. 5) then
+                if(sum(dtau(j,ibox,1:ilev)) > 5) then
                    thres_crossed_MISR=99           
                 endif
@@ -157,12 +157,12 @@
           ! Check to see if there was a cloud for which we didn't 
           ! set a MISR cloud top boundary
-          if( thres_crossed_MISR .eq. 1) then
+          if( thres_crossed_MISR == 1) then
              ! If the cloud has a total optical depth of greater
              ! than ~ 0.5 MISR will still likely pick up this cloud
              ! with a height near the true cloud top
              ! otherwise there should be no CTH
-             if(sum(dtau(j,ibox,1:nlev)) .gt. 0.5) then
+             if(sum(dtau(j,ibox,1:nlev)) > 0.5) then
                 ! keep MISR detected CTH
-             elseif(sum(dtau(j,ibox,1:nlev)) .gt. 0.2) then
+             elseif(sum(dtau(j,ibox,1:nlev)) > 0.2) then
                 ! MISR may detect but wont likley have a good height
                 box_MISR_ztop(j,ibox)=-1
@@ -215,5 +215,5 @@
     ! Fill dark scenes 
     do j=1,numMISRHgtBins
-       where(sunlit .ne. 1) dist_model_layertops(1:npoints,j) = R_UNDEF
+       where(sunlit /= 1) dist_model_layertops(1:npoints,j) = R_UNDEF
     enddo
 
@@ -257,12 +257,12 @@
 
        ! Subcolumns that are cloudy(true) and not(false)
-       box_cloudy(1:ncol) = merge(.true.,.false.,tau(j,1:ncol) .gt. tauchk)
+       box_cloudy(1:ncol) = merge(.true.,.false.,tau(j,1:ncol) > tauchk)
 
        ! Fill optically thin clouds with fill value
        where(.not. box_cloudy(1:ncol)) tauWRK(j,1:ncol)  = -999._wp
-       where(box_MISR_ztopWRK(j,1:ncol) .eq. 0) box_MISR_ztopWRK(j,1:ncol)=-999._wp
+       where(box_MISR_ztopWRK(j,1:ncol) == 0) box_MISR_ztopWRK(j,1:ncol)=-999._wp
 
        ! Compute joint histogram and column quantities for points that are sunlit and cloudy
-       if (sunlit(j) .eq. 1) then 
+       if (sunlit(j) == 1) then
           ! Joint histogram
           call hist2D(tauWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol),ncol,misr_histTau,numMISRTauBins,&
@@ -272,10 +272,10 @@
 
           ! Column cloud area
-          MISR_cldarea(j)=real(count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.))/ncol
+          MISR_cldarea(j)=real(count(box_MISR_ztopWRK(j,1:ncol) /= -999.))/ncol
 
           ! Column cloud-top height
-          if ( count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.) .ne. 0 ) then
-             MISR_mean_ztop(j) = sum(box_MISR_ztopWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol) .ne. -999.)/ &
-                  count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.)
+          if ( count(box_MISR_ztopWRK(j,1:ncol) /= -999.) /= 0 ) then
+             MISR_mean_ztop(j) = sum(box_MISR_ztopWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol) /= -999.)/ &
+                  count(box_MISR_ztopWRK(j,1:ncol) /= -999.)
           else
              MISR_mean_ztop(j) = R_UNDEF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp.F90	(revision 5082)
@@ -402,5 +402,5 @@
 
     ! Set flag to deallocate rttov types (only done on final call to simulator)
-    if (size(cospOUT%isccp_meantb) .eq. stop_idx) lrttov_cleanUp = .true.    
+    if (size(cospOUT%isccp_meantb) == stop_idx) lrttov_cleanUp = .true.
     
     ! ISCCP column
@@ -563,10 +563,10 @@
        modisIN%w0        => cospIN%ss_alb
        modisIN%Nsunlit   = count(cospgridIN%sunlit > 0)
-       if (modisIN%Nsunlit .gt. 0) then
+       if (modisIN%Nsunlit > 0) then
           allocate(modisIN%sunlit(modisIN%Nsunlit),modisIN%pres(modisIN%Nsunlit,cospIN%Nlevels+1))
           modisIN%sunlit    = pack((/ (i, i = 1, Npoints ) /),mask = cospgridIN%sunlit > 0)
           modisIN%pres      = cospgridIN%phalf(int(modisIN%sunlit(:)),:)
        endif
-       if (count(cospgridIN%sunlit <= 0) .gt. 0) then
+       if (count(cospgridIN%sunlit <= 0) > 0) then
           allocate(modisIN%notSunlit(count(cospgridIN%sunlit <= 0)))
           modisIN%notSunlit = pack((/ (i, i = 1, Npoints ) /),mask = .not. cospgridIN%sunlit > 0)
@@ -1450,5 +1450,5 @@
   !         is turned off.
   !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  if (any(cospgridIN%sunlit .lt. 0)) then
+  if (any(cospgridIN%sunlit < 0)) then
      nError=nError+1
      errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%sunlit contains values out of range (0 or 1)'
@@ -1513,5 +1513,5 @@
           cospOUT%modis_Optical_Thickness_vs_ReffLIQ(:,:,:)            = R_UNDEF
   endif
-  if (any(cospgridIN%at .lt. 0)) then   
+  if (any(cospgridIN%at < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%at contains values out of range (at<0), expected units (K)'
@@ -1549,5 +1549,5 @@
        if (associated(cospOUT%radar_lidar_tcc))       cospOUT%radar_lidar_tcc(:)           = R_UNDEF       
     endif
-    if (any(cospgridIN%pfull .lt. 0)) then
+    if (any(cospgridIN%pfull < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%pfull contains values out of range'
@@ -1566,5 +1566,5 @@
        if (associated(cospOUT%isccp_fq))            cospOUT%isccp_fq(:,:,:)        = R_UNDEF      
     endif
-    if (any(cospgridIN%phalf .lt. 0)) then
+    if (any(cospgridIN%phalf < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%phalf contains values out of range'
@@ -1632,5 +1632,5 @@
        if (associated(cospOUT%calipso_lidarcldtmp))   cospOUT%calipso_lidarcldtmp(:,:,:)   = R_UNDEF      
     endif
-    if (any(cospgridIN%qv .lt. 0)) then
+    if (any(cospgridIN%qv < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%qv contains values out of range'
@@ -1649,5 +1649,5 @@
        if (associated(cospOUT%isccp_fq))            cospOUT%isccp_fq(:,:,:)        = R_UNDEF                
     endif
-    if (any(cospgridIN%hgt_matrix .lt. -300)) then
+    if (any(cospgridIN%hgt_matrix < -300)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%hgt_matrix contains values out of range'
@@ -1674,5 +1674,5 @@
        if (associated(cospOUT%radar_lidar_tcc))           cospOUT%radar_lidar_tcc(:)             = R_UNDEF       
     endif
-    if (any(cospgridIN%hgt_matrix_half .lt. -300)) then
+    if (any(cospgridIN%hgt_matrix_half < -300)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%hgt_matrix_half contains values out of range'
@@ -1693,5 +1693,5 @@
        if (associated(cospOUT%radar_lidar_tcc))       cospOUT%radar_lidar_tcc(:)           = R_UNDEF                 
     endif
-    if (any(cospgridIN%land .lt. 0)) then
+    if (any(cospgridIN%land < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%land contains values out of range'
@@ -1708,5 +1708,5 @@
        if (associated(cospOUT%parasolGrid_refl))      cospOUT%parasolGrid_refl(:,:)        = R_UNDEF
     endif
-    if (any(cospgridIN%skt .lt. 0)) then
+    if (any(cospgridIN%skt < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%skt contains values out of range'
@@ -1727,5 +1727,5 @@
 
 	! RTTOV Inputs
-    if (cospgridIN%zenang .lt. -90. .OR. cospgridIN%zenang .gt. 90) then
+    if (cospgridIN%zenang < -90. .OR. cospgridIN%zenang > 90) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%zenang contains values out of range'
@@ -1733,5 +1733,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (cospgridIN%co2 .lt. 0) then
+    if (cospgridIN%co2 < 0) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%co2 contains values out of range'
@@ -1739,5 +1739,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (cospgridIN%ch4 .lt. 0) then
+    if (cospgridIN%ch4 < 0) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%ch4 contains values out of range'
@@ -1745,5 +1745,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (cospgridIN%n2o .lt. 0) then
+    if (cospgridIN%n2o < 0) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%n2o contains values out of range'
@@ -1751,5 +1751,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (cospgridIN%co.lt. 0) then
+    if (cospgridIN%co< 0) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%co contains values out of range'
@@ -1757,5 +1757,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (any(cospgridIN%o3 .lt. 0)) then
+    if (any(cospgridIN%o3 < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%o3 contains values out of range'
@@ -1763,5 +1763,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (any(cospgridIN%emis_sfc .lt. 0. .OR. cospgridIN%emis_sfc .gt. 1)) then
+    if (any(cospgridIN%emis_sfc < 0. .OR. cospgridIN%emis_sfc > 1)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%emis_sfc contains values out of range'
@@ -1769,5 +1769,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (any(cospgridIN%u_sfc .lt. -100. .OR. cospgridIN%u_sfc .gt. 100.)) then
+    if (any(cospgridIN%u_sfc < -100. .OR. cospgridIN%u_sfc > 100.)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%u_sfc contains values out of range'
@@ -1775,5 +1775,5 @@
        Lrttov_subcolumn = .false.
     endif
-    if (any(cospgridIN%v_sfc .lt. -100. .OR. cospgridIN%v_sfc .gt. 100.)) then
+    if (any(cospgridIN%v_sfc < -100. .OR. cospgridIN%v_sfc > 100.)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%v_sfc contains values out of range'
@@ -1781,5 +1781,5 @@
        if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF       
     endif
-    if (any(cospgridIN%lat .lt. -90 .OR. cospgridIN%lat .gt. 90)) then
+    if (any(cospgridIN%lat < -90 .OR. cospgridIN%lat > 90)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%lat contains values out of range'
@@ -1789,5 +1789,5 @@
 
     ! COSP_INPUTS
-    if (cospIN%emsfc_lw .lt. 0. .OR. cospIN%emsfc_lw .gt. 1.) then
+    if (cospIN%emsfc_lw < 0. .OR. cospIN%emsfc_lw > 1.) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%emsfc_lw contains values out of range'
@@ -1805,5 +1805,5 @@
        
     endif
-    if (any(cospIN%tau_067 .lt. 0)) then
+    if (any(cospIN%tau_067 < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tau_067 contains values out of range'
@@ -1870,5 +1870,5 @@
        
     endif
-    if (any(cospIN%emiss_11 .lt. 0. .OR. cospIN%emiss_11 .gt. 1)) then
+    if (any(cospIN%emiss_11 < 0. .OR. cospIN%emiss_11 > 1)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%emiss_11 contains values out of range'
@@ -1886,5 +1886,5 @@
          
     endif
-    if (any(cospIN%asym .lt. -1. .OR. cospIN%asym .gt. 1)) then
+    if (any(cospIN%asym < -1. .OR. cospIN%asym > 1)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%asym contains values out of range'
@@ -1932,5 +1932,5 @@
             cospOUT%modis_Optical_Thickness_vs_ReffLIQ(:,:,:)            = R_UNDEF             
     endif
-    if (any(cospIN%ss_alb .lt. 0 .OR. cospIN%ss_alb .gt. 1)) then
+    if (any(cospIN%ss_alb < 0 .OR. cospIN%ss_alb > 1)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%ss_alb contains values out of range'
@@ -1978,5 +1978,5 @@
             cospOUT%modis_Optical_Thickness_vs_ReffLIQ(:,:,:)            = R_UNDEF                 
     endif
-    if (any(cospIN%betatot .lt. 0)) then
+    if (any(cospIN%betatot < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%betatot contains values out of range'
@@ -1991,5 +1991,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF
     endif
-    if (any(cospIN%betatot_liq .lt. 0)) then
+    if (any(cospIN%betatot_liq < 0)) then
        nError=nError+1
        errorMessage(nError) = ('ERROR: COSP input variable: cospIN%betatot_liq contains values out of range')
@@ -2004,5 +2004,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF       
     endif
-    if (any(cospIN%betatot_ice .lt. 0)) then
+    if (any(cospIN%betatot_ice < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%betatot_ice contains values out of range'
@@ -2017,5 +2017,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF
     endif 
-    if (any(cospIN%beta_mol .lt. 0)) then
+    if (any(cospIN%beta_mol < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%beta_mol contains values out of range'
@@ -2036,5 +2036,5 @@
        if (associated(cospOUT%radar_lidar_tcc))       cospOUT%radar_lidar_tcc(:)           = R_UNDEF          
     endif    
-    if (any(cospIN%tautot .lt. 0)) then
+    if (any(cospIN%tautot < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot contains values out of range'
@@ -2049,5 +2049,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF      
     endif
-    if (any(cospIN%tautot_liq .lt. 0)) then
+    if (any(cospIN%tautot_liq < 0)) then
        nError=nError+1
        errorMessage(nError) = ('ERROR: COSP input variable: cospIN%tautot_liq contains values out of range')
@@ -2062,5 +2062,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF       
     endif
-    if (any(cospIN%tautot_ice .lt. 0)) then
+    if (any(cospIN%tautot_ice < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_ice contains values out of range'
@@ -2075,5 +2075,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF        
     endif
-    if (any(cospIN%tau_mol .lt. 0)) then
+    if (any(cospIN%tau_mol < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tau_mol contains values out of range'
@@ -2088,5 +2088,5 @@
        if (associated(cospOUT%calipso_srbval))        cospOUT%calipso_srbval(:)            = R_UNDEF         
     endif    
-    if (any(cospIN%tautot_S_liq .lt. 0)) then
+    if (any(cospIN%tautot_S_liq < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_S_liq contains values out of range'
@@ -2096,5 +2096,5 @@
        if (associated(cospOUT%parasolGrid_refl)) cospOUT%parasolGrid_refl(:,:)  = R_UNDEF
     endif
-    if (any(cospIN%tautot_S_ice .lt. 0)) then
+    if (any(cospIN%tautot_S_ice < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_S_ice contains values out of range'
@@ -2104,5 +2104,5 @@
        if (associated(cospOUT%parasolGrid_refl)) cospOUT%parasolGrid_refl(:,:)  = R_UNDEF       
     endif    
-    if (any(cospIN%z_vol_cloudsat .lt. 0)) then
+    if (any(cospIN%z_vol_cloudsat < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%z_vol_cloudsat contains values out of range'
@@ -2116,5 +2116,5 @@
        if (associated(cospOUT%radar_lidar_tcc))           cospOUT%radar_lidar_tcc(:)             = R_UNDEF     
     endif
-    if (any(cospIN%kr_vol_cloudsat .lt. 0)) then
+    if (any(cospIN%kr_vol_cloudsat < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%kr_vol_cloudsat contains values out of range'
@@ -2128,5 +2128,5 @@
        if (associated(cospOUT%radar_lidar_tcc))           cospOUT%radar_lidar_tcc(:)             = R_UNDEF      
     endif    
-    if (any(cospIN%g_vol_cloudsat .lt. 0)) then
+    if (any(cospIN%g_vol_cloudsat < 0)) then
        nError=nError+1
        errorMessage(nError) = 'ERROR: COSP input variable: cospIN%g_vol_cloudsat contains values out of range'
@@ -2145,13 +2145,13 @@
   !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   ! ISCCP
-  if (size(cospIN%frac_out,1)  .ne. cospIN%Npoints .OR. &
-      size(cospIN%tau_067,1)   .ne. cospIN%Npoints .OR. &
-      size(cospIN%emiss_11,1)  .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%skt)     .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%qv,1)    .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%at,1)    .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%phalf,1) .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%sunlit)  .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%pfull,1) .ne. cospIN%Npoints) then
+  if (size(cospIN%frac_out,1)  /= cospIN%Npoints .OR. &
+      size(cospIN%tau_067,1)   /= cospIN%Npoints .OR. &
+      size(cospIN%emiss_11,1)  /= cospIN%Npoints .OR. &
+      size(cospgridIN%skt)     /= cospIN%Npoints .OR. &
+      size(cospgridIN%qv,1)    /= cospIN%Npoints .OR. &
+      size(cospgridIN%at,1)    /= cospIN%Npoints .OR. &
+      size(cospgridIN%phalf,1) /= cospIN%Npoints .OR. &
+      size(cospgridIN%sunlit)  /= cospIN%Npoints .OR. &
+      size(cospgridIN%pfull,1) /= cospIN%Npoints) then
       Lisccp_subcolumn = .false.
       Lisccp_column    = .false.
@@ -2159,7 +2159,7 @@
       errorMessage(nError) = 'ERROR(isccp_simulator): The number of points in the input fields are inconsistent'
   endif
-  if (size(cospIN%frac_out,2) .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%tau_067,2)  .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%emiss_11,2) .ne. cospIN%Ncolumns) then
+  if (size(cospIN%frac_out,2) /= cospIN%Ncolumns .OR. &
+      size(cospIN%tau_067,2)  /= cospIN%Ncolumns .OR. &
+      size(cospIN%emiss_11,2) /= cospIN%Ncolumns) then
       Lisccp_subcolumn = .false.
       Lisccp_column    = .false.
@@ -2167,11 +2167,11 @@
       errorMessage(nError) = 'ERROR(isccp_simulator): The number of sub-columns in the input fields are inconsistent'
   endif
-  if (size(cospIN%frac_out,3)  .ne. cospIN%Nlevels .OR. &
-      size(cospIN%tau_067,3)   .ne. cospIN%Nlevels .OR. &
-      size(cospIN%emiss_11,3)  .ne. cospIN%Nlevels .OR. &
-      size(cospgridIN%qv,2)    .ne. cospIN%Nlevels .OR. &
-      size(cospgridIN%at,2)    .ne. cospIN%Nlevels .OR. &
-      size(cospgridIN%pfull,2) .ne. cospIN%Nlevels .OR. &    
-      size(cospgridIN%phalf,2) .ne. cospIN%Nlevels+1) then
+  if (size(cospIN%frac_out,3)  /= cospIN%Nlevels .OR. &
+      size(cospIN%tau_067,3)   /= cospIN%Nlevels .OR. &
+      size(cospIN%emiss_11,3)  /= cospIN%Nlevels .OR. &
+      size(cospgridIN%qv,2)    /= cospIN%Nlevels .OR. &
+      size(cospgridIN%at,2)    /= cospIN%Nlevels .OR. &
+      size(cospgridIN%pfull,2) /= cospIN%Nlevels .OR. &
+      size(cospgridIN%phalf,2) /= cospIN%Nlevels+1) then
       Lisccp_subcolumn = .false.
       Lisccp_column    = .false.
@@ -2181,8 +2181,8 @@
       
   ! MISR
-  if (size(cospIN%tau_067,1)        .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%sunlit)       .ne. cospIN%Npoints .OR. & 
-      size(cospgridIN%hgt_matrix,1) .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%at,1)         .ne. cospIN%Npoints) then
+  if (size(cospIN%tau_067,1)        /= cospIN%Npoints .OR. &
+      size(cospgridIN%sunlit)       /= cospIN%Npoints .OR. &
+      size(cospgridIN%hgt_matrix,1) /= cospIN%Npoints .OR. &
+      size(cospgridIN%at,1)         /= cospIN%Npoints) then
       Lmisr_subcolumn = .false.
       Lmisr_column    = .false.
@@ -2190,5 +2190,5 @@
       errorMessage(nError) = 'ERROR(misr_simulator): The number of points in the input fields are inconsistent'
   endif
-  if (size(cospIN%tau_067,2) .ne. cospIN%Ncolumns) then
+  if (size(cospIN%tau_067,2) /= cospIN%Ncolumns) then
       Lmisr_subcolumn = .false.
       Lmisr_column    = .false.
@@ -2196,7 +2196,7 @@
       errorMessage(nError) = 'ERROR(misr_simulator): The number of sub-columns in the input fields are inconsistent'
   endif
-  if (size(cospIN%tau_067,3)        .ne. cospIN%Nlevels .OR. &
-      size(cospgridIN%hgt_matrix,2) .ne. cospIN%Nlevels .OR. &
-      size(cospgridIN%at,2)         .ne. cospIN%Nlevels) then
+  if (size(cospIN%tau_067,3)        /= cospIN%Nlevels .OR. &
+      size(cospgridIN%hgt_matrix,2) /= cospIN%Nlevels .OR. &
+      size(cospgridIN%at,2)         /= cospIN%Nlevels) then
       Lmisr_subcolumn = .false.
       Lmisr_column    = .false.
@@ -2206,8 +2206,8 @@
 
   ! MODIS
-  if (size(cospIN%fracLiq,1) .ne. cospIN%Npoints .OR. &
-      size(cospIN%tau_067,1) .ne. cospIN%Npoints .OR. &
-      size(cospIN%asym,1)    .ne. cospIN%Npoints .OR. &
-      size(cospIN%ss_alb,1)  .ne. cospIN%Npoints) then
+  if (size(cospIN%fracLiq,1) /= cospIN%Npoints .OR. &
+      size(cospIN%tau_067,1) /= cospIN%Npoints .OR. &
+      size(cospIN%asym,1)    /= cospIN%Npoints .OR. &
+      size(cospIN%ss_alb,1)  /= cospIN%Npoints) then
       Lmodis_subcolumn = .false.
       Lmodis_column    = .false.
@@ -2215,8 +2215,8 @@
       errorMessage(nError) = 'ERROR(modis_simulator): The number of points in the input fields are inconsistent'
   endif
-  if (size(cospIN%fracLiq,2) .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%tau_067,2) .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%asym,2)    .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%ss_alb,2)  .ne. cospIN%Ncolumns) then
+  if (size(cospIN%fracLiq,2) /= cospIN%Ncolumns .OR. &
+      size(cospIN%tau_067,2) /= cospIN%Ncolumns .OR. &
+      size(cospIN%asym,2)    /= cospIN%Ncolumns .OR. &
+      size(cospIN%ss_alb,2)  /= cospIN%Ncolumns) then
       Lmodis_subcolumn = .false.
       Lmodis_column    = .false.
@@ -2224,8 +2224,8 @@
       errorMessage(nError) = 'ERROR(modis_simulator): The number of sub-columns in the input fields are inconsistent'
   endif        
-  if (size(cospIN%fracLiq,3) .ne. cospIN%Nlevels .OR. &
-      size(cospIN%tau_067,3) .ne. cospIN%Nlevels .OR. &
-      size(cospIN%asym,3)    .ne. cospIN%Nlevels .OR. &
-      size(cospIN%ss_alb,3)  .ne. cospIN%Nlevels) then
+  if (size(cospIN%fracLiq,3) /= cospIN%Nlevels .OR. &
+      size(cospIN%tau_067,3) /= cospIN%Nlevels .OR. &
+      size(cospIN%asym,3)    /= cospIN%Nlevels .OR. &
+      size(cospIN%ss_alb,3)  /= cospIN%Nlevels) then
       Lmodis_subcolumn = .false.
       Lmodis_column    = .false.
@@ -2235,8 +2235,8 @@
   
   ! CLOUDSAT    
-  if (size(cospIN%z_vol_cloudsat,1)   .ne. cospIN%Npoints .OR. &
-      size(cospIN%kr_vol_cloudsat,1)  .ne. cospIN%Npoints .OR. &
-      size(cospIN%g_vol_cloudsat,1)   .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%hgt_matrix,1)   .ne. cospIN%Npoints) then
+  if (size(cospIN%z_vol_cloudsat,1)   /= cospIN%Npoints .OR. &
+      size(cospIN%kr_vol_cloudsat,1)  /= cospIN%Npoints .OR. &
+      size(cospIN%g_vol_cloudsat,1)   /= cospIN%Npoints .OR. &
+      size(cospgridIN%hgt_matrix,1)   /= cospIN%Npoints) then
       Lcloudsat_subcolumn = .false.
       Lcloudsat_column    = .false.
@@ -2244,7 +2244,7 @@
       errorMessage(nError) = 'ERROR(cloudsat_simulator): The number of points in the input fields are inconsistent'
   endif
-  if (size(cospIN%z_vol_cloudsat,2)  .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%kr_vol_cloudsat,2) .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%g_vol_cloudsat,2)  .ne. cospIN%Ncolumns) then
+  if (size(cospIN%z_vol_cloudsat,2)  /= cospIN%Ncolumns .OR. &
+      size(cospIN%kr_vol_cloudsat,2) /= cospIN%Ncolumns .OR. &
+      size(cospIN%g_vol_cloudsat,2)  /= cospIN%Ncolumns) then
       Lcloudsat_subcolumn = .false.
       Lcloudsat_column    = .false.
@@ -2252,8 +2252,8 @@
       errorMessage(nError) = 'ERROR(cloudsat_simulator): The number of sub-columns in the input fields are inconsistent'
   endif       
-  if (size(cospIN%z_vol_cloudsat,3)  .ne. cospIN%Nlevels .OR. &
-      size(cospIN%kr_vol_cloudsat,3) .ne. cospIN%Nlevels .OR. &
-      size(cospIN%g_vol_cloudsat,3)  .ne. cospIN%Nlevels .OR. &
-      size(cospgridIN%hgt_matrix,2)  .ne. cospIN%Nlevels) then
+  if (size(cospIN%z_vol_cloudsat,3)  /= cospIN%Nlevels .OR. &
+      size(cospIN%kr_vol_cloudsat,3) /= cospIN%Nlevels .OR. &
+      size(cospIN%g_vol_cloudsat,3)  /= cospIN%Nlevels .OR. &
+      size(cospgridIN%hgt_matrix,2)  /= cospIN%Nlevels) then
       Lcloudsat_subcolumn = .false.
       Lcloudsat_column    = .false.
@@ -2263,12 +2263,12 @@
 
   ! CALIPSO
-  if (size(cospIN%beta_mol,1)    .ne. cospIN%Npoints .OR. &
-      size(cospIN%betatot,1)     .ne. cospIN%Npoints .OR. &
-      size(cospIN%betatot_liq,1) .ne. cospIN%Npoints .OR. &
-      size(cospIN%betatot_ice,1) .ne. cospIN%Npoints .OR. &
-      size(cospIN%tau_mol,1)     .ne. cospIN%Npoints .OR. &
-      size(cospIN%tautot,1)      .ne. cospIN%Npoints .OR. &
-      size(cospIN%tautot_liq,1)  .ne. cospIN%Npoints .OR. &
-      size(cospIN%tautot_ice,1)  .ne. cospIN%Npoints) then
+  if (size(cospIN%beta_mol,1)    /= cospIN%Npoints .OR. &
+      size(cospIN%betatot,1)     /= cospIN%Npoints .OR. &
+      size(cospIN%betatot_liq,1) /= cospIN%Npoints .OR. &
+      size(cospIN%betatot_ice,1) /= cospIN%Npoints .OR. &
+      size(cospIN%tau_mol,1)     /= cospIN%Npoints .OR. &
+      size(cospIN%tautot,1)      /= cospIN%Npoints .OR. &
+      size(cospIN%tautot_liq,1)  /= cospIN%Npoints .OR. &
+      size(cospIN%tautot_ice,1)  /= cospIN%Npoints) then
       Lcalipso_subcolumn = .false.
       Lcalipso_column    = .false.
@@ -2276,10 +2276,10 @@
       errorMessage(nError) = 'ERROR(calipso_simulator): The number of points in the input fields are inconsistent'
   endif          
-   if (size(cospIN%betatot,2)     .ne. cospIN%Ncolumns .OR. &
-       size(cospIN%betatot_liq,2) .ne. cospIN%Ncolumns .OR. &
-       size(cospIN%betatot_ice,2) .ne. cospIN%Ncolumns .OR. &
-       size(cospIN%tautot,2)      .ne. cospIN%Ncolumns .OR. &
-       size(cospIN%tautot_liq,2)  .ne. cospIN%Ncolumns .OR. &
-       size(cospIN%tautot_ice,2)  .ne. cospIN%Ncolumns) then
+   if (size(cospIN%betatot,2)     /= cospIN%Ncolumns .OR. &
+       size(cospIN%betatot_liq,2) /= cospIN%Ncolumns .OR. &
+       size(cospIN%betatot_ice,2) /= cospIN%Ncolumns .OR. &
+       size(cospIN%tautot,2)      /= cospIN%Ncolumns .OR. &
+       size(cospIN%tautot_liq,2)  /= cospIN%Ncolumns .OR. &
+       size(cospIN%tautot_ice,2)  /= cospIN%Ncolumns) then
        Lcalipso_subcolumn = .false.
        Lcalipso_column    = .false.
@@ -2287,12 +2287,12 @@
       errorMessage(nError) = 'ERROR(calipso_simulator): The number of sub-columns in the input fields are inconsistent'
   endif       
-  if (size(cospIN%beta_mol,2)    .ne. cospIN%Nlevels .OR. &
-      size(cospIN%betatot,3)     .ne. cospIN%Nlevels .OR. &
-      size(cospIN%betatot_liq,3) .ne. cospIN%Nlevels .OR. &
-      size(cospIN%betatot_ice,3) .ne. cospIN%Nlevels .OR. &
-      size(cospIN%tau_mol,2)     .ne. cospIN%Nlevels .OR. &
-      size(cospIN%tautot,3)      .ne. cospIN%Nlevels .OR. &
-      size(cospIN%tautot_liq,3)  .ne. cospIN%Nlevels .OR. &
-      size(cospIN%tautot_ice,3)  .ne. cospIN%Nlevels) then
+  if (size(cospIN%beta_mol,2)    /= cospIN%Nlevels .OR. &
+      size(cospIN%betatot,3)     /= cospIN%Nlevels .OR. &
+      size(cospIN%betatot_liq,3) /= cospIN%Nlevels .OR. &
+      size(cospIN%betatot_ice,3) /= cospIN%Nlevels .OR. &
+      size(cospIN%tau_mol,2)     /= cospIN%Nlevels .OR. &
+      size(cospIN%tautot,3)      /= cospIN%Nlevels .OR. &
+      size(cospIN%tautot_liq,3)  /= cospIN%Nlevels .OR. &
+      size(cospIN%tautot_ice,3)  /= cospIN%Nlevels) then
       Lcalipso_subcolumn = .false.
       Lcalipso_column    = .false.
@@ -2302,6 +2302,6 @@
   
   ! PARASOL
-  if (size(cospIN%tautot_S_liq,1) .ne. cospIN%Npoints .OR. &
-      size(cospIN%tautot_S_ice,1) .ne. cospIN%Npoints) then
+  if (size(cospIN%tautot_S_liq,1) /= cospIN%Npoints .OR. &
+      size(cospIN%tautot_S_ice,1) /= cospIN%Npoints) then
       Lparasol_subcolumn = .false.
       Lparasol_column    = .false.
@@ -2309,6 +2309,6 @@
       errorMessage(nError) = 'ERROR(parasol_simulator): The number of points in the input fields are inconsistent'
   endif
-  if (size(cospIN%tautot_S_liq,2) .ne. cospIN%Ncolumns .OR. &
-      size(cospIN%tautot_S_ice,2) .ne. cospIN%Ncolumns) then
+  if (size(cospIN%tautot_S_liq,2) /= cospIN%Ncolumns .OR. &
+      size(cospIN%tautot_S_ice,2) /= cospIN%Ncolumns) then
       Lparasol_subcolumn = .false.
       Lparasol_column    = .false.
@@ -2318,15 +2318,15 @@
   
   ! RTTOV
-  if (size(cospgridIN%pfull,1)           .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%at,1)              .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%qv,1)              .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%hgt_matrix_half,1) .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%u_sfc)             .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%v_sfc)             .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%skt)               .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%phalf,1)           .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%qv,1)              .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%land)              .ne. cospIN%Npoints .OR. &
-      size(cospgridIN%lat)               .ne. cospIN%Npoints) then
+  if (size(cospgridIN%pfull,1)           /= cospIN%Npoints .OR. &
+      size(cospgridIN%at,1)              /= cospIN%Npoints .OR. &
+      size(cospgridIN%qv,1)              /= cospIN%Npoints .OR. &
+      size(cospgridIN%hgt_matrix_half,1) /= cospIN%Npoints .OR. &
+      size(cospgridIN%u_sfc)             /= cospIN%Npoints .OR. &
+      size(cospgridIN%v_sfc)             /= cospIN%Npoints .OR. &
+      size(cospgridIN%skt)               /= cospIN%Npoints .OR. &
+      size(cospgridIN%phalf,1)           /= cospIN%Npoints .OR. &
+      size(cospgridIN%qv,1)              /= cospIN%Npoints .OR. &
+      size(cospgridIN%land)              /= cospIN%Npoints .OR. &
+      size(cospgridIN%lat)               /= cospIN%Npoints) then
       Lrttov_subcolumn = .false.
       Lrttov_column    = .false.
@@ -2334,10 +2334,10 @@
       errorMessage(nError) = 'ERROR(rttov_simulator): The number of points in the input fields are inconsistent'
   endif      
-  if (size(cospgridIN%pfull,2)           .ne. cospIN%Nlevels   .OR. &
-      size(cospgridIN%at,2)              .ne. cospIN%Nlevels   .OR. &
-      size(cospgridIN%qv,2)              .ne. cospIN%Nlevels   .OR. &
-      size(cospgridIN%hgt_matrix_half,2) .ne. cospIN%Nlevels+1 .OR. &
-      size(cospgridIN%phalf,2)           .ne. cospIN%Nlevels+1 .OR. &
-      size(cospgridIN%qv,2)              .ne. cospIN%Nlevels) then
+  if (size(cospgridIN%pfull,2)           /= cospIN%Nlevels   .OR. &
+      size(cospgridIN%at,2)              /= cospIN%Nlevels   .OR. &
+      size(cospgridIN%qv,2)              /= cospIN%Nlevels   .OR. &
+      size(cospgridIN%hgt_matrix_half,2) /= cospIN%Nlevels+1 .OR. &
+      size(cospgridIN%phalf,2)           /= cospIN%Nlevels+1 .OR. &
+      size(cospgridIN%qv,2)              /= cospIN%Nlevels) then
       Lrttov_subcolumn = .false.
       Lrttov_column    = .false.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_interface_v1p4.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_interface_v1p4.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_interface_v1p4.F90	(revision 5082)
@@ -684,5 +684,5 @@
        ! Determine indices for "chunking" (again, if necessary)
        !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-       if (num_chunks .eq. 1) then
+       if (num_chunks == 1) then
           start_idx = 1
           end_idx   = gbx%Npoints
@@ -691,5 +691,5 @@
           start_idx = (i-1)*gbx%Npoints_it+1
           end_idx   = i*gbx%Npoints_it
-          if (end_idx .gt. gbx%Npoints) end_idx=gbx%Npoints
+          if (end_idx > gbx%Npoints) end_idx=gbx%Npoints
           Nptsperit = end_idx-start_idx+1
        endif
@@ -698,9 +698,9 @@
        ! Allocate space
        !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-       if (i .eq. 1) then
+       if (i == 1) then
           call construct_cospIN(Nptsperit,gbx%ncolumns,gbx%nlevels,cospIN)
           call construct_cospstateIN(Nptsperit,gbx%nlevels,gbx%nchan,cospstateIN)
        endif
-       if (i .eq. num_chunks) then
+       if (i == num_chunks) then
           call destroy_cospIN(cospIN)
           call destroy_cospstateIN(cospstateIN)
@@ -948,5 +948,5 @@
     cospgridIN%phalf(:,1)                               = 0._wp
     cospgridIN%phalf(:,2:gbx%Nlevels+1)                 = gbx%ph(start_idx:end_idx,gbx%Nlevels:1:-1)    
-    if (gbx%Ncolumns .gt. 1) then
+    if (gbx%Ncolumns > 1) then
        
        !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -956,5 +956,5 @@
        seed(:)=0
        seed = int(gbx%psfc)  ! In case of Npoints=1
-       if (Npoints .gt. 1) seed=int((gbx%psfc(start_idx:end_idx)-minval(gbx%psfc(start_idx:end_idx)))/      &
+       if (Npoints > 1) seed=int((gbx%psfc(start_idx:end_idx)-minval(gbx%psfc(start_idx:end_idx)))/      &
             (maxval(gbx%psfc(start_idx:end_idx))-minval(gbx%psfc(start_idx:end_idx)))*100000) + 1
        call init_rng(rngs, seed)  
@@ -964,5 +964,5 @@
        !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
        ! Call SCOPS
-       if (gbx%Ncolumns .gt. 1) then
+       if (gbx%Ncolumns > 1) then
           call scops(npoints,gbx%Nlevels,gbx%Ncolumns,rngs,                              &
                      gbx%tca(start_idx:end_idx,gbx%Nlevels:1:-1),                        &
@@ -1018,11 +1018,11 @@
                 if (sgx%frac_out(start_idx+j-1,i,gbx%Nlevels+1-k) == I_CVC)              &
                      frac_cv(j,k) = frac_cv(j,k)+1._wp
-                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) .eq. 1)               &
+                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) == 1)               &
                      prec_ls(j,k) = prec_ls(j,k)+1._wp
-                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) .eq. 2)               &
+                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) == 2)               &
                      prec_cv(j,k) = prec_cv(j,k)+1._wp
-                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) .eq. 3)               &
+                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) == 3)               &
                      prec_cv(j,k) = prec_cv(j,k)+1._wp
-                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) .eq. 3)               &
+                if (sgx%prec_frac(start_idx+j-1,i,gbx%Nlevels+1-k) == 3)               &
                      prec_ls(j,k) = prec_ls(j,k)+1._wp
              enddo
@@ -1099,9 +1099,9 @@
           do j=1,npoints
              ! Clouds
-             if (frac_ls(j,k) .ne. 0.) then
+             if (frac_ls(j,k) /= 0.) then
                 mr_hydro(j,:,k,I_LSCLIQ) = mr_hydro(j,:,k,I_LSCLIQ)/frac_ls(j,k)
                 mr_hydro(j,:,k,I_LSCICE) = mr_hydro(j,:,k,I_LSCICE)/frac_ls(j,k)
              endif
-             if (frac_cv(j,k) .ne. 0.) then
+             if (frac_cv(j,k) /= 0.) then
                 mr_hydro(j,:,k,I_CVCLIQ) = mr_hydro(j,:,k,I_CVCLIQ)/frac_cv(j,k)
                 mr_hydro(j,:,k,I_CVCICE) = mr_hydro(j,:,k,I_CVCICE)/frac_cv(j,k)
@@ -1109,20 +1109,20 @@
              ! Precipitation
              if (gbx%use_precipitation_fluxes) then
-                if (prec_ls(j,k) .ne. 0.) then
+                if (prec_ls(j,k) /= 0.) then
                    gbx%rain_ls(start_idx+j-1,k) = gbx%rain_ls(start_idx+j-1,k)/prec_ls(j,k)
                    gbx%snow_ls(start_idx+j-1,k) = gbx%snow_ls(start_idx+j-1,k)/prec_ls(j,k)
                    gbx%grpl_ls(start_idx+j-1,k) = gbx%grpl_ls(start_idx+j-1,k)/prec_ls(j,k)
                 endif
-                if (prec_cv(j,k) .ne. 0.) then
+                if (prec_cv(j,k) /= 0.) then
                    gbx%rain_cv(start_idx+j-1,k) = gbx%rain_cv(start_idx+j-1,k)/prec_cv(j,k)
                    gbx%snow_cv(start_idx+j-1,k) = gbx%snow_cv(start_idx+j-1,k)/prec_cv(j,k)
                 endif
              else
-                if (prec_ls(j,k) .ne. 0.) then
+                if (prec_ls(j,k) /= 0.) then
                    mr_hydro(j,:,k,I_LSRAIN) = mr_hydro(j,:,k,I_LSRAIN)/prec_ls(j,k)
                    mr_hydro(j,:,k,I_LSSNOW) = mr_hydro(j,:,k,I_LSSNOW)/prec_ls(j,k)
                    mr_hydro(j,:,k,I_LSGRPL) = mr_hydro(j,:,k,I_LSGRPL)/prec_ls(j,k)
                 endif
-                if (prec_cv(j,k) .ne. 0.) then
+                if (prec_cv(j,k) /= 0.) then
                    mr_hydro(j,:,k,I_CVRAIN) = mr_hydro(j,:,k,I_CVRAIN)/prec_cv(j,k)
                    mr_hydro(j,:,k,I_CVSNOW) = mr_hydro(j,:,k,I_CVSNOW)/prec_cv(j,k)
@@ -1190,5 +1190,5 @@
        Reff(:,1,:,:)     = gbx%Reff(start_idx:end_idx,:,:)
        Np(:,1,:,:)       = gbx%Np(start_idx:end_idx,:,:)
-       where(gbx%dtau_s(start_idx:end_idx,:) .gt. 0)
+       where(gbx%dtau_s(start_idx:end_idx,:) > 0)
           sgx%frac_out(start_idx:end_idx,1,:) = 1
        endwhere
@@ -1239,5 +1239,5 @@
        allocate(g_vol(nPoints,gbx%Nlevels))
        do ij=1,gbx%Ncolumns
-          if (ij .eq. 1) then
+          if (ij == 1) then
              cmpGases = .true.
              call quickbeam_optics(sd, rcfg_cloudsat,npoints,gbx%Nlevels, R_UNDEF,       &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_optics.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_optics.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_optics.F90	(revision 5082)
@@ -70,8 +70,8 @@
     varOUT(1:dim1,1:dim2,1:dim3) = 0._wp
     do j=1,dim2
-       where(flag(:,j,:) .eq. 1)
+       where(flag(:,j,:) == 1)
           varOUT(:,j,:) = varIN2
        endwhere
-       where(flag(:,j,:) .eq. 2)
+       where(flag(:,j,:) == 2)
           varOUT(:,j,:) = varIN1
        endwhere
@@ -94,8 +94,8 @@
     
     varOUT(1:dim1,1:dim2,1:dim3) = 0._wp
-   where(flag(:,:,:) .eq. 1)
+   where(flag(:,:,:) == 1)
        varOUT(:,:,:) = varIN2
     endwhere
-    where(flag(:,:,:) .eq. 2)
+    where(flag(:,:,:) == 2)
        varOUT(:,:,:) = varIN1
     endwhere
@@ -295,9 +295,9 @@
     polpart(INDX_CVLIQ,1:5) = polpartCVLIQ
     ! LS and CONV Ice water coefficients
-    if (ice_type .eq. 0) then
+    if (ice_type == 0) then
        polpart(INDX_LSICE,1:5) = polpartLSICE0
        polpart(INDX_CVICE,1:5) = polpartCVICE0
     endif
-    if (ice_type .eq. 1) then
+    if (ice_type == 1) then
        polpart(INDX_LSICE,1:5) = polpartLSICE1
        polpart(INDX_CVICE,1:5) = polpartCVICE1
@@ -350,5 +350,5 @@
     ! Polynomials kp_lidar derived from Mie theory
     do i = 1, npart
-       where (rad_part(1:npoints,1:nlev,i) .gt. 0.0)
+       where (rad_part(1:npoints,1:nlev,i) > 0.0)
           kp_part(1:npoints,1:nlev,i) = &
                polpart(i,1)*(rad_part(1:npoints,1:nlev,i)*1e6)**4 &
@@ -377,5 +377,5 @@
        ! Alpha of particles in each subcolumn:
        do i = 1, npart
-          where (rad_part(1:npoints,1:nlev,i) .gt. 0.0)
+          where (rad_part(1:npoints,1:nlev,i) > 0.0)
              alpha_part(1:npoints,icol,1:nlev,i) = 3._wp/4._wp * Qscat &
                   * rhoair(1:npoints,1:nlev) * qpart(1:npoints,1:nlev,i) &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_write_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_write_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_write_mod.F90	(revision 5082)
@@ -196,5 +196,5 @@
     do k=1,PARASOL_NREFL
      do ip=1, Npoints
-      if (stlidar%cldlayer(ip,4).gt.1.and.stlidar%parasolrefl(ip,k).ne.missing_val) then
+      if (stlidar%cldlayer(ip,4)>1.and.stlidar%parasolrefl(ip,k)/=missing_val) then
         parasolcrefl(ip,k)=(stlidar%parasolrefl(ip,k)-0.03*(1.-stlidar%cldlayer(ip,4)/100.))/ &
                              (stlidar%cldlayer(ip,4)/100.)
@@ -473,6 +473,6 @@
     CHARACTER(LEN=20) :: typeecrit
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -540,23 +540,23 @@
 
 ! Axe vertical
-      IF (nvertsave.eq.nvertp(iff)) THEN
+      IF (nvertsave==nvertp(iff)) THEN
           klevs=PARASOL_NREFL
           nam_axvert="sza"
-      ELSE IF (nvertsave.eq.nvertisccp(iff)) THEN
+      ELSE IF (nvertsave==nvertisccp(iff)) THEN
           klevs=7
           nam_axvert="pressure2"
-      ELSE IF (nvertsave.eq.nvertcol(iff)) THEN
+      ELSE IF (nvertsave==nvertcol(iff)) THEN
           klevs=Ncolout
           nam_axvert="column"
-      ELSE IF (nvertsave.eq.nverttemp(iff)) THEN
+      ELSE IF (nvertsave==nverttemp(iff)) THEN
           klevs=LIDAR_NTEMP
           nam_axvert="temp"
-      ELSE IF (nvertsave.eq.nvertmisr(iff)) THEN
+      ELSE IF (nvertsave==nvertmisr(iff)) THEN
           klevs=numMISRHgtBins
           nam_axvert="cth16"
-      ELSE IF (nvertsave.eq.nvertReffIce(iff)) THEN
+      ELSE IF (nvertsave==nvertReffIce(iff)) THEN
           klevs= numMODISReffIceBins
           nam_axvert="ReffIce"
-      ELSE IF (nvertsave.eq.nvertReffLiq(iff)) THEN
+      ELSE IF (nvertsave==nvertReffLiq(iff)) THEN
           klevs= numMODISReffLiqBins
           nam_axvert="ReffLiq"
@@ -575,6 +575,6 @@
       END IF
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -645,8 +645,8 @@
     IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d ',var%name
 
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
 !$OMP MASTER
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
       CALL conf_cospoutputs(var%name,var%cles)
       DO iff=1, 3
@@ -657,5 +657,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
   CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
@@ -742,7 +742,7 @@
                nom=var%name
       END IF
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
 !$OMP MASTER
       CALL conf_cospoutputs(var%name,var%cles)
@@ -754,5 +754,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
@@ -826,5 +826,5 @@
 
   IF(cosp_varsdefined) THEN
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)            
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_read_otputkeys.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_read_otputkeys.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_read_otputkeys.F90	(revision 5082)
@@ -657,5 +657,5 @@
   if (Lproftemp)                cfg%out_list(i) = 'proftemp'         !TIBO
     
-  if (i.gt.78) then
+  if (i>78) then
      print *, 'COSP_IO: wrong number of output diagnostics'
      print *, i,78
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_stats.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_stats.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_stats.F90	(revision 5082)
@@ -203,7 +203,7 @@
           do j=1,Nlevels
              sc_ratio = beta_tot(pr,i,j)/beta_mol(pr,j)
-             if ((sc_ratio .le. s_att) .and. (flag_sat .eq. 0)) flag_sat = j
-             if (Ze_tot(pr,i,j) .lt. -30.) then  !radar can't detect cloud
-                if ( (sc_ratio .gt. s_cld) .or. (flag_sat .eq. j) ) then  !lidar sense cloud
+             if ((sc_ratio <= s_att) .and. (flag_sat == 0)) flag_sat = j
+             if (Ze_tot(pr,i,j) < -30.) then  !radar can't detect cloud
+                if ( (sc_ratio > s_cld) .or. (flag_sat == j) ) then  !lidar sense cloud
                    lidar_only_freq_cloud(pr,j)=lidar_only_freq_cloud(pr,j)+1. !top->surf
                    flag_cld=1
@@ -213,5 +213,5 @@
              endif
           enddo !levels
-          if (flag_cld .eq. 1) tcc(pr)=tcc(pr)+1._wp
+          if (flag_cld == 1) tcc(pr)=tcc(pr)+1._wp
        enddo !columns
     enddo !points
@@ -245,6 +245,6 @@
     
     do ij=2,Nbins+1  
-       hist1D(ij-1) = count(var .ge. bins(ij-1) .and. var .lt. bins(ij))
-       if (count(var .eq. R_GROUND) .ge. 1) hist1D(ij-1)=R_UNDEF
+       hist1D(ij-1) = count(var >= bins(ij-1) .and. var < bins(ij))
+       if (count(var == R_GROUND) >= 1) hist1D(ij-1)=R_UNDEF
     enddo
     
@@ -278,6 +278,6 @@
     do ij=2,nbin1+1
        do ik=2,nbin2+1
-          jointHist(ij-1,ik-1)=count(var1 .ge. bin1(ij-1) .and. var1 .lt. bin1(ij) .and. &
-               var2 .ge. bin2(ik-1) .and. var2 .lt. bin2(ik))        
+          jointHist(ij-1,ik-1)=count(var1 >= bin1(ij-1) .and. var1 < bin1(ij) .and. &
+               var2 >= bin2(ik-1) .and. var2 < bin2(ik))
        enddo
     enddo
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/icarus.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/icarus.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/icarus.F90	(revision 5082)
@@ -134,5 +134,5 @@
     ! ##########################################################################
     
-    if (debugcol.ne.0) then
+    if (debugcol/=0) then
        do j=1,npoints,debugcol
           
@@ -140,5 +140,5 @@
           do ilev=1,nlev
              acc(ilev,1:ncol)=frac_out(j,1:ncol,ilev)*2
-             where(levmatch(j,1:ncol) .eq. ilev) acc(ilev,1:ncol)=acc(ilev,1:ncol)+1
+             where(levmatch(j,1:ncol) == ilev) acc(ilev,1:ncol)=acc(ilev,1:ncol)+1
           enddo
           
@@ -224,5 +224,5 @@
 
     ! Set tropopause values
-    if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then 
+    if (isccp_top_height == 1 .or. isccp_top_height == 3) then
        ptrop(1:npoints)     = 5000._wp
        attropmin(1:npoints) = 400._wp
@@ -232,7 +232,7 @@
 
        do ilev=1,nlev
-          where(pfull(1:npoints,ilev) .lt. 40000. .and. &
-                pfull(1:npoints,ilev) .gt.  5000. .and. &
-                at(1:npoints,ilev)    .lt. attropmin(1:npoints))
+          where(pfull(1:npoints,ilev) < 40000. .and. &
+                pfull(1:npoints,ilev) >  5000. .and. &
+                at(1:npoints,ilev)    < attropmin(1:npoints))
              ptrop(1:npoints)     = pfull(1:npoints,ilev)
              attropmin(1:npoints) = at(1:npoints,ilev)
@@ -244,9 +244,9 @@
        do ilev=1,nlev
           atmax(1:npoints) = merge(at(1:npoints,ilev),atmax(1:npoints),&
-               at(1:npoints,ilev) .gt. atmax(1:npoints) .and. ilev  .ge. itrop(1:npoints))
+               at(1:npoints,ilev) > atmax(1:npoints) .and. ilev  >= itrop(1:npoints))
        enddo
     end if
   
-    if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then
+    if (isccp_top_height == 1 .or. isccp_top_height == 3) then
        ! ############################################################################
        !                        Clear-sky radiance calculation
@@ -308,5 +308,5 @@
              dem(1:npoints,ibox) = merge(dem_wv(1:npoints,ilev), &
                                          1._wp-(1._wp-demIN(1:npoints,ibox,ilev))*(1._wp-dem_wv(1:npoints,ilev)), &
-                                         demIN(1:npoints,ibox,ilev) .eq. 0)
+                                         demIN(1:npoints,ibox,ilev) == 0)
 
              ! Increase TOA flux emitted from layer
@@ -348,7 +348,7 @@
           tauir(1:npoints)    = tau(1:npoints,ibox)/2.13_wp
           taumin(1:npoints)   = -log(max(min(transmax(1:npoints),0.9999999_wp),0.001_wp))
-          if (isccp_top_height .eq. 1) then
+          if (isccp_top_height == 1) then
              do j=1,npoints  
-                if (transmax(j) .gt. 0.001 .and.  transmax(j) .le. 0.9999999) then
+                if (transmax(j) > 0.001 .and.  transmax(j) <= 0.9999999) then
                    fluxtopinit(j) = fluxtop(j,ibox)
                    tauir(j) = tau(j,ibox)/2.13_wp
@@ -357,11 +357,11 @@
              do icycle=1,2
                 do j=1,npoints  
-                   if (tau(j,ibox) .gt. (tauchk)) then 
-                      if (transmax(j) .gt. 0.001 .and.  transmax(j) .le. 0.9999999) then
+                   if (tau(j,ibox) > (tauchk)) then
+                      if (transmax(j) > 0.001 .and.  transmax(j) <= 0.9999999) then
                          emcld(j,ibox) = 1._wp - exp(-1._wp * tauir(j)  )
                          fluxtop(j,ibox) = fluxtopinit(j) - ((1.-emcld(j,ibox))*fluxtop_clrsky(j))
                          fluxtop(j,ibox)=max(1.E-06_wp,(fluxtop(j,ibox)/emcld(j,ibox)))
                          tb(j,ibox)= 1307.27_wp / (log(1._wp + (1._wp/fluxtop(j,ibox))))
-                         if (tb(j,ibox) .gt. 260.) then
+                         if (tb(j,ibox) > 260.) then
                             tauir(j) = tau(j,ibox) / 2.56_wp
                          end if
@@ -373,7 +373,7 @@
 
           ! Cloud-top temperature
-          where(tau(1:npoints,ibox) .gt. tauchk)
+          where(tau(1:npoints,ibox) > tauchk)
              tb(1:npoints,ibox)= 1307.27_wp/ (log(1. + (1._wp/fluxtop(1:npoints,ibox))))
-             where (isccp_top_height .eq. 1 .and. tauir(1:npoints) .lt. taumin(1:npoints))
+             where (isccp_top_height == 1 .and. tauir(1:npoints) < taumin(1:npoints))
                 tb(1:npoints,ibox) = attrop(1:npoints) - 5._wp 
                 tau(1:npoints,ibox) = 2.13_wp*taumin(1:npoints)
@@ -382,5 +382,5 @@
           
           ! Clear-sky brightness temperature
-          where(tau(1:npoints,ibox) .le. tauchk) 
+          where(tau(1:npoints,ibox) <= tauchk)
              tb(1:npoints,ibox) = meantbclr(1:npoints)
           endwhere
@@ -399,16 +399,16 @@
     do ibox=1,ncol
        !segregate according to optical thickness
-       if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then  
+       if (isccp_top_height == 1 .or. isccp_top_height == 3) then
           
           ! Find level whose temperature most closely matches brightness temperature
           nmatch(1:npoints)=0
           do k1=1,nlev-1
-             ilev = merge(nlev-k1,k1,isccp_top_height_direction .eq. 2)        
+             ilev = merge(nlev-k1,k1,isccp_top_height_direction == 2)
              do j=1,npoints 
-                if (ilev           .ge. itrop(j)     .and. &
-                     ((at(j,ilev)  .ge. tb(j,ibox)   .and. &  
-                      at(j,ilev+1) .le. tb(j,ibox))  .or.  &
-                      (at(j,ilev)  .le. tb(j,ibox)   .and. &
-                      at(j,ilev+1) .ge. tb(j,ibox)))) then 
+                if (ilev           >= itrop(j)     .and. &
+                     ((at(j,ilev)  >= tb(j,ibox)   .and. &
+                      at(j,ilev+1) <= tb(j,ibox))  .or.  &
+                      (at(j,ilev)  <= tb(j,ibox)   .and. &
+                      at(j,ilev+1) >= tb(j,ibox)))) then
                    nmatch(j)=nmatch(j)+1
                    match(j,nmatch(j))=ilev
@@ -418,5 +418,5 @@
 
           do j=1,npoints 
-             if (nmatch(j) .ge. 1) then
+             if (nmatch(j) >= 1) then
                 k1 = match(j,nmatch(j))
                 k2 = k1 + 1
@@ -426,11 +426,11 @@
                 logp=logp1+(logp2-logp1)*abs(tb(j,ibox)-at(j,k1))/atd
                 ptop(j,ibox) = exp(logp)
-                levmatch(j,ibox) = merge(k1,k2,abs(pfull(j,k1)-ptop(j,ibox)) .lt. abs(pfull(j,k2)-ptop(j,ibox)))
+                levmatch(j,ibox) = merge(k1,k2,abs(pfull(j,k1)-ptop(j,ibox)) < abs(pfull(j,k2)-ptop(j,ibox)))
              else
-                if (tb(j,ibox) .le. attrop(j)) then
+                if (tb(j,ibox) <= attrop(j)) then
                    ptop(j,ibox)=ptrop(j)
                    levmatch(j,ibox)=itrop(j)
                 end if
-                if (tb(j,ibox) .ge. atmax(j)) then
+                if (tb(j,ibox) >= atmax(j)) then
                    ptop(j,ibox)=pfull(j,nlev)
                    levmatch(j,ibox)=nlev
@@ -441,5 +441,5 @@
           ptop(1:npoints,ibox)=0.
           do ilev=1,nlev
-             where((ptop(1:npoints,ibox) .eq. 0. ) .and.(frac_out(1:npoints,ibox,ilev) .ne. 0))
+             where((ptop(1:npoints,ibox) == 0. ) .and.(frac_out(1:npoints,ibox,ilev) /= 0))
                 ptop(1:npoints,ibox)=phalf(1:npoints,ilev)
                 levmatch(1:npoints,ibox)=ilev
@@ -447,5 +447,5 @@
           end do
        end if
-       where(tau(1:npoints,ibox) .le. tauchk)
+       where(tau(1:npoints,ibox) <= tauchk)
           ptop(1:npoints,ibox)=0._wp
           levmatch(1:npoints,ibox)=0._wp
@@ -460,6 +460,6 @@
     do ibox=1,ncol
        do j=1,npoints 
-          if (tau(j,ibox) .gt. (tauchk) .and. ptop(j,ibox) .gt. 0.) then
-             if (sunlit(j).eq.1 .or. isccp_top_height .eq. 3) then
+          if (tau(j,ibox) > (tauchk) .and. ptop(j,ibox) > 0.) then
+             if (sunlit(j)==1 .or. isccp_top_height == 3) then
                 boxtau(j,ibox) = tau(j,ibox)
                 boxptop(j,ibox) = ptop(j,ibox)!/100._wp
@@ -508,5 +508,5 @@
     !                           Brightness Temperature
     ! ####################################################################################
-    if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then
+    if (isccp_top_height == 1 .or. isccp_top_height == 3) then
        meantb(1:npoints)=sum(boxttop,2)/ncol
     else
@@ -535,5 +535,5 @@
        do ilev2=1,7
           do j=1,npoints ! 
-             if (sunlit(j).eq.1 .or. isccp_top_height .eq. 3) then 
+             if (sunlit(j)==1 .or. isccp_top_height == 3) then
                 fq_isccp(j,ilev,ilev2)= 0.
 	     else 
@@ -546,5 +546,5 @@
     
     ! Reset variables need for averaging cloud properties
-    where(sunlit .eq. 1 .or. isccp_top_height .eq. 3)
+    where(sunlit == 1 .or. isccp_top_height == 3)
        totalcldarea(1:npoints)  = 0._wp
        meanalbedocld(1:npoints) = 0._wp
@@ -561,8 +561,8 @@
     do j=1,npoints 
        ! Subcolumns that are cloudy(true) and not(false)
-       box_cloudy2(1:ncol) = merge(.true.,.false.,boxtau(j,1:ncol) .gt. tauchk .and. boxptop(j,1:ncol) .gt. 0.)
+       box_cloudy2(1:ncol) = merge(.true.,.false.,boxtau(j,1:ncol) > tauchk .and. boxptop(j,1:ncol) > 0.)
 
        ! Compute joint histogram and column quantities for points that are sunlit and cloudy
-       if (sunlit(j) .eq.1 .or. isccp_top_height .eq. 3) then 
+       if (sunlit(j) ==1 .or. isccp_top_height == 3) then
           ! Joint-histogram
           call hist2D(boxtau(j,1:ncol),boxptop(j,1:ncol),ncol,isccp_histTau,numISCCPTauBins, &
@@ -572,10 +572,10 @@
           
           ! Column cloud area
-          totalcldarea(j) = real(count(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin))/ncol
+          totalcldarea(j) = real(count(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) > isccp_taumin))/ncol
              
           ! Subcolumn cloud albedo
           !albedocld(j,1:ncol) = merge((boxtau(j,1:ncol)**0.895_wp)/((boxtau(j,1:ncol)**0.895_wp)+6.82_wp),&
           !     0._wp,box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin)
-          where(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin)
+          where(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) > isccp_taumin)
              albedocld(j,1:ncol) = (boxtau(j,1:ncol)**0.895_wp)/((boxtau(j,1:ncol)**0.895_wp)+6.82_wp)
           elsewhere
@@ -587,10 +587,10 @@
           
           ! Column cloud top pressure
-          meanptop(j) = sum(boxptop(j,1:ncol),box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin)/ncol
+          meanptop(j) = sum(boxptop(j,1:ncol),box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) > isccp_taumin)/ncol
        endif
     enddo
     
     ! Compute mean cloud properties. Set to mssing value in the event that totalcldarea=0
-    where(totalcldarea(1:npoints) .gt. 0)
+    where(totalcldarea(1:npoints) > 0)
        meanptop(1:npoints)      = 100._wp*meanptop(1:npoints)/totalcldarea(1:npoints)
        meanalbedocld(1:npoints) = meanalbedocld(1:npoints)/totalcldarea(1:npoints)
@@ -609,6 +609,6 @@
 
     ! Represent in percent
-    where(totalcldarea .ne. output_missing_value) totalcldarea = totalcldarea*100._wp
-    where(fq_isccp     .ne. output_missing_value) fq_isccp     = fq_isccp*100._wp
+    where(totalcldarea /= output_missing_value) totalcldarea = totalcldarea*100._wp
+    where(fq_isccp     /= output_missing_value) fq_isccp     = fq_isccp*100._wp
     
     
@@ -634,8 +634,8 @@
     varOUT(1:dim1,1:dim2,1:dim3) = 0._wp
     do j=1,dim2
-       where(flag(:,j,:) .eq. 1)
+       where(flag(:,j,:) == 1)
           varOUT(:,j,:) = varIN2
        endwhere
-       where(flag(:,j,:) .eq. 2)
+       where(flag(:,j,:) == 2)
           varOUT(:,j,:) = varIN1
        endwhere
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/lidar_simulator.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/lidar_simulator.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/lidar_simulator.F90	(revision 5082)
@@ -197,5 +197,5 @@
        ! Computation of the total perpendicular lidar signal (ATBperp for liq+ice)
        ! Upper layer
-       WHERE(tautot(1:npoints,icol,1) .gt. 0)
+       WHERE(tautot(1:npoints,icol,1) > 0)
           pnorm_perp_tot(1:npoints,icol,1) = (beta_perp_ice(1:npoints,icol,1)+           &
                beta_perp_liq(1:npoints,icol,1)-                                          &
@@ -217,8 +217,8 @@
           ! Betaperp=beta_mol(:,k)/(1+1/0.0284)) [bodhaine et al. 1999] in the following 
           ! equations:
-          WHERE (pnorm(1:npoints,icol,k) .eq. 0)
+          WHERE (pnorm(1:npoints,icol,k) == 0)
              pnorm_perp_tot(1:npoints,icol,k)=0._wp
           ELSEWHERE
-             where(tautot_lay(1:npoints) .gt. 0.)
+             where(tautot_lay(1:npoints) > 0.)
                 pnorm_perp_tot(1:npoints,icol,k) = (beta_perp_ice(1:npoints,icol,k)+     &
                    beta_perp_liq(1:npoints,icol,k)-(beta_mol(1:npoints,k)/(1._wp+1._wp/  &
@@ -318,6 +318,6 @@
        do ic = 1, ncol
           pnorm_c = pnormFlip(:,ic,:)
-          where ((pnorm_c .lt. xmax) .and. (betamolFlip(:,1,:) .lt. xmax) .and.          &
-                (betamolFlip(:,1,:) .gt. 0.0 ))
+          where ((pnorm_c < xmax) .and. (betamolFlip(:,1,:) < xmax) .and.          &
+                (betamolFlip(:,1,:) > 0.0 ))
              x3d_c = pnorm_c/betamolFlip(:,1,:)
           elsewhere
@@ -333,5 +333,5 @@
        do ic = 1, ncol
           pnorm_c = pnorm(:,ic,:)
-          where ((pnorm_c.lt.xmax) .and. (pmol.lt.xmax) .and. (pmol.gt. 0.0 ))
+          where ((pnorm_c<xmax) .and. (pmol<xmax) .and. (pmol> 0.0 ))
              x3d_c = pnorm_c/pmol
           elsewhere
@@ -354,5 +354,5 @@
           enddo
        enddo
-       where(cfad2 .ne. R_UNDEF) cfad2=cfad2/ncol
+       where(cfad2 /= R_UNDEF) cfad2=cfad2/ncol
 
     endif 
@@ -389,6 +389,6 @@
     do k=2,nlev
        tautot_lay(:) = tau(:,k)-tau(:,k-1) 
-       WHERE ( EXP(-2._wp*tau(:,k-1)) .gt. 0. )
-          WHERE (tautot_lay(:) .gt. 0.)
+       WHERE ( EXP(-2._wp*tau(:,k-1)) > 0. )
+          WHERE (tautot_lay(:) > 0.)
              pnorm(:,k) = beta(:,k)*EXP(-2._wp*tau(:,k-1)) /&
                   (2._wp*tautot_lay(:))*(1._wp-EXP(-2._wp*tautot_lay(:)))
@@ -418,6 +418,6 @@
     do k=2,nlev
        tautot_lay(:) = tau(:,k)-tau(:,k-1)       
-       WHERE ( EXP(-2._wp*tau(:,k-1)) .gt. 0. )
-          WHERE (tautot_lay(:) .gt. 0.)
+       WHERE ( EXP(-2._wp*tau(:,k-1)) > 0. )
+          WHERE (tautot_lay(:) > 0.)
              beta(:,k) = pnorm(:,k)/ EXP(-2._wp*tau(:,k-1))* &
                   (2._wp*tautot_lay(:))/(1._wp-exp(-2._wp*tautot_lay(:)))
@@ -539,5 +539,5 @@
     do k=1,Nlevels
        ! Cloud detection at subgrid-scale:
-       where ((x(:,:,k) .gt. S_cld) .and. (x(:,:,k) .ne. undef) )
+       where ((x(:,:,k) > S_cld) .and. (x(:,:,k) /= undef) )
           cldy(:,:,k)=1._wp
        elsewhere
@@ -546,5 +546,5 @@
        
        ! Number of usefull sub-columns:
-       where ((x(:,:,k) .gt. S_att) .and. (x(:,:,k) .ne. undef) )
+       where ((x(:,:,k) > S_att) .and. (x(:,:,k) /= undef) )
           srok(:,:,k)=1._wp
        elsewhere
@@ -566,7 +566,7 @@
              ! Computation of the cloud fraction as a function of the temperature instead
              ! of height, for ice,liquid and all clouds
-             if(srok(ip,ic,k).gt.0.)then
+             if(srok(ip,ic,k)>0.)then
                 do itemp=1,Ntemp
-                   if( (tmp(ip,k).ge.tempmod(itemp)).and.(tmp(ip,k).lt.tempmod(itemp+1)) )then
+                   if( (tmp(ip,k)>=tempmod(itemp)).and.(tmp(ip,k)<tempmod(itemp+1)) )then
                       lidarcldtempind(ip,itemp)=lidarcldtempind(ip,itemp)+1._wp
                    endif
@@ -574,7 +574,7 @@
              endif
              
-             if(cldy(ip,ic,k).eq.1.)then
+             if(cldy(ip,ic,k)==1.)then
                 do itemp=1,Ntemp 
-                   if( (tmp(ip,k) .ge. tempmod(itemp)).and.(tmp(ip,k) .lt. tempmod(itemp+1)) )then
+                   if( (tmp(ip,k) >= tempmod(itemp)).and.(tmp(ip,k) < tempmod(itemp+1)) )then
                       lidarcldtemp(ip,itemp,1)=lidarcldtemp(ip,itemp,1)+1._wp
                    endif
@@ -584,7 +584,7 @@
              iz=1
              p1 = pplay(ip,k)
-             if ( p1.gt.0. .and. p1.lt.(440._wp*100._wp)) then ! high clouds
+             if ( p1>0. .and. p1<(440._wp*100._wp)) then ! high clouds
                 iz=3
-             else if(p1.ge.(440._wp*100._wp) .and. p1.lt.(680._wp*100._wp)) then ! mid clouds
+             else if(p1>=(440._wp*100._wp) .and. p1<(680._wp*100._wp)) then ! mid clouds
                 iz=2
              endif
@@ -603,5 +603,5 @@
     
     ! Grid-box 3D cloud fraction
-    where ( nsub(:,:).gt.0.0 )
+    where ( nsub(:,:)>0.0 )
        lidarcld(:,:) = lidarcld(:,:)/nsub(:,:)
     elsewhere
@@ -618,5 +618,5 @@
        enddo
     enddo
-    where (nsublayer(:,:) .gt. 0.0)
+    where (nsublayer(:,:) > 0.0)
        cldlayer(:,:) = cldlayer(:,:)/nsublayer(:,:)
     elsewhere
@@ -637,5 +637,5 @@
 
              ! Avoid zero values
-             if( (cldy(i,ncol,nlev).eq.1.) .and. (ATBperp(i,ncol,nlev).gt.0.) )then
+             if( (cldy(i,ncol,nlev)==1.) .and. (ATBperp(i,ncol,nlev)>0.) )then
                 ! Computation of the ATBperp along the phase discrimination line
                 ATBperp_tmp = (ATB(i,ncol,nlev)**5)*alpha50 + (ATB(i,ncol,nlev)**4)*beta50 + &
@@ -645,8 +645,8 @@
                 ! 4.1.a) Ice: ATBperp above the phase discrimination line
                 ! ########################################################################
-                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) .ge. 0.)then ! Ice clouds
+                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) >= 0.)then ! Ice clouds
 
                    ! ICE with temperature above 273,15°K = Liquid (false ice)
-                   if(tmp(i,nlev) .gt. 273.15) then ! Temperature above 273,15 K
+                   if(tmp(i,nlev) > 273.15) then ! Temperature above 273,15 K
                      ! Liquid: False ice corrected by the temperature to Liquid
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp ! False ice detection ==> added to Liquid
@@ -656,7 +656,7 @@
                                                                               ! to classify the phase cloud
                       cldlayphase(i,ncol,4,2) = 1. ! tot cloud
-                      if (p1 .gt. 0. .and. p1.lt.(440._wp*100._wp)) then ! high cloud
+                      if (p1 > 0. .and. p1<(440._wp*100._wp)) then ! high cloud
                          cldlayphase(i,ncol,3,2) = 1._wp
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then ! mid cloud
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then ! mid cloud
                          cldlayphase(i,ncol,2,2) = 1._wp
                       else ! low cloud
@@ -665,8 +665,8 @@
                       cldlayphase(i,ncol,4,5) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then 
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,5) = 1._wp
                       ! Middle cloud
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,5) = 1._wp
                       ! Low cloud
@@ -680,8 +680,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud 
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then 
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then 
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud
@@ -695,13 +695,13 @@
                 else
                    ! Liquid with temperature above 231,15°K
-                   if(tmp(i,nlev) .gt. 231.15_wp) then
+                   if(tmp(i,nlev) > 231.15_wp) then
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp
                       tmpl(i,ncol,nlev)       = tmp(i,nlev)
                       cldlayphase(i,ncol,4,2) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,2) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,2) = 1._wp
                       ! Low cloud   
@@ -716,8 +716,8 @@
                       cldlayphase(i,ncol,4,4) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,4) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,4) = 1._wp
                       ! Low cloud
@@ -727,8 +727,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud   
@@ -748,5 +748,5 @@
              p1 = pplay(i,nlev)
 
-             if((cldy(i,ncol,nlev) .eq. 1.) .and. (ATBperp(i,ncol,nlev) .gt. 0.) )then
+             if((cldy(i,ncol,nlev) == 1.) .and. (ATBperp(i,ncol,nlev) > 0.) )then
                 ! Computation of the ATBperp of the phase discrimination line
                 ATBperp_tmp = (ATB(i,ncol,nlev)**5)*alpha50 + (ATB(i,ncol,nlev)**4)*beta50 + &
@@ -757,6 +757,6 @@
                 ! ########################################################################
                 ! ICE with temperature above 273,15°K = Liquid (false ice)
-                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) .ge. 0.)then ! Ice clouds
-                   if(tmp(i,nlev) .gt. 273.15)then
+                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) >= 0.)then ! Ice clouds
+                   if(tmp(i,nlev) > 273.15)then
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp ! false ice ==> liq
                       tmpl(i,ncol,nlev)       = tmp(i,nlev)
@@ -764,8 +764,8 @@
                       cldlayphase(i,ncol,4,2) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then 
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,2) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then 
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,2) = 1._wp
                       ! Low cloud
@@ -776,8 +776,8 @@
                       cldlayphase(i,ncol,4,5) = 1. ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,5) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,5) = 1._wp
                       ! Low cloud   
@@ -791,8 +791,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt.(680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 <(680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud   
@@ -807,13 +807,13 @@
                 else
                    ! Liquid with temperature above 231,15°K
-                   if(tmp(i,nlev) .gt. 231.15)then
+                   if(tmp(i,nlev) > 231.15)then
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp
                       tmpl(i,ncol,nlev)       = tmp(i,nlev)
                       cldlayphase(i,ncol,4,2) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,2) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,2) = 1._wp
                       ! Low cloud   
@@ -828,8 +828,8 @@
                       cldlayphase(i,ncol,4,4) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,4) = 1._wp
                       ! Middle   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,4) = 1._wp
                       ! Low cloud   
@@ -840,8 +840,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud   
@@ -855,5 +855,5 @@
                 
                 ! Find the level of the highest cloud with SR>30
-                if(x(i,ncol,nlev) .gt. S_cld_att) then ! SR > 30.
+                if(x(i,ncol,nlev) > S_cld_att) then ! SR > 30.
                     toplvlsat = nlev+1
                     goto 99
@@ -867,16 +867,16 @@
           ! see Cesana and Chepfer 2013 Sect.III.2
           ! ##############################################################################
-          if(toplvlsat.ne.0) then
+          if(toplvlsat/=0) then
              do nlev = toplvlsat,Nlevels
                 p1 = pplay(i,nlev)
-                if(cldy(i,ncol,nlev).eq.1.)then
+                if(cldy(i,ncol,nlev)==1.)then
                    lidarcldphase(i,nlev,3) = lidarcldphase(i,nlev,3)+1._wp
                    tmpu(i,ncol,nlev)       = tmp(i,nlev)
                    cldlayphase(i,ncol,4,3) = 1._wp ! tot cloud
                    ! High cloud
-                   if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                   if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                       cldlayphase(i,ncol,3,3) = 1._wp
                    ! Middle cloud   
-                   else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                   else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                       cldlayphase(i,ncol,2,3) = 1._wp
                    ! Low cloud   
@@ -897,5 +897,5 @@
     ! Compute the Ice percentage in cloud = ice/(ice+liq) as a function of the occurrences
     lidarcldphasetmp(:,:) = lidarcldphase(:,:,1)+lidarcldphase(:,:,2);
-    WHERE (lidarcldphasetmp(:,:) .gt. 0.)
+    WHERE (lidarcldphasetmp(:,:) > 0.)
        lidarcldphase(:,:,6)=lidarcldphase(:,:,1)/lidarcldphasetmp(:,:)
     ELSEWHERE
@@ -905,5 +905,5 @@
     ! Compute Phase 3D Cloud Fraction
     !WHERE (nsub(:,Nlevels:1:-1) .gt. 0.0 )
-    WHERE (nsub(:,:) .gt. 0.0 )  
+    WHERE (nsub(:,:) > 0.0 )
        lidarcldphase(:,:,1)=lidarcldphase(:,:,1)/nsub(:,:)
        lidarcldphase(:,:,2)=lidarcldphase(:,:,2)/nsub(:,:)
@@ -938,5 +938,5 @@
     ! Compute the Ice percentage in cloud = ice/(ice+liq)
     cldlayerphasetmp(:,:)=cldlayerphase(:,:,1)+cldlayerphase(:,:,2)
-    WHERE (cldlayerphasetmp(:,:).gt. 0.)
+    WHERE (cldlayerphasetmp(:,:)> 0.)
        cldlayerphase(:,:,6)=cldlayerphase(:,:,1)/cldlayerphasetmp(:,:)
     ELSEWHERE
@@ -945,5 +945,5 @@
     
     do i=1,Nphase-1
-       WHERE ( cldlayerphasesum(:,:).gt.0.0 )
+       WHERE ( cldlayerphasesum(:,:)>0.0 )
           cldlayerphase(:,:,i) = (cldlayerphase(:,:,i)/cldlayerphasesum(:,:)) * cldlayer(:,:)
        ENDWHERE
@@ -954,10 +954,10 @@
           checkcldlayerphase=0.
           checkcldlayerphase2=0.
-          if (cldlayerphasesum(i,iz) .gt. 0.0 )then
+          if (cldlayerphasesum(i,iz) > 0.0 )then
              do ic=1,Nphase-3
                 checkcldlayerphase = checkcldlayerphase+cldlayerphase(i,iz,ic)
              enddo
              checkcldlayerphase2 = cldlayer(i,iz)-checkcldlayerphase
-             if((checkcldlayerphase2 .gt. 0.01) .or. (checkcldlayerphase2 .lt. -0.01) ) print *, checkcldlayerphase,cldlayer(i,iz)
+             if((checkcldlayerphase2 > 0.01) .or. (checkcldlayerphase2 < -0.01) ) print *, checkcldlayerphase,cldlayer(i,iz)
           endif
        enddo
@@ -965,5 +965,5 @@
     
     do i=1,Nphase-1
-       WHERE (nsublayer(:,:) .eq. 0.0)
+       WHERE (nsublayer(:,:) == 0.0)
           cldlayerphase(:,:,i) = undef
        ENDWHERE
@@ -975,14 +975,14 @@
           do i=1,Npoints
              do itemp=1,Ntemp
-                if(tmpi(i,ncol,nlev).gt.0.)then
-                   if((tmpi(i,ncol,nlev) .ge. tempmod(itemp)) .and. (tmpi(i,ncol,nlev) .lt. tempmod(itemp+1)) )then
+                if(tmpi(i,ncol,nlev)>0.)then
+                   if((tmpi(i,ncol,nlev) >= tempmod(itemp)) .and. (tmpi(i,ncol,nlev) < tempmod(itemp+1)) )then
                       lidarcldtemp(i,itemp,2)=lidarcldtemp(i,itemp,2)+1._wp
                    endif
-                elseif(tmpl(i,ncol,nlev) .gt. 0.)then
-                   if((tmpl(i,ncol,nlev) .ge. tempmod(itemp)) .and. (tmpl(i,ncol,nlev) .lt. tempmod(itemp+1)) )then
+                elseif(tmpl(i,ncol,nlev) > 0.)then
+                   if((tmpl(i,ncol,nlev) >= tempmod(itemp)) .and. (tmpl(i,ncol,nlev) < tempmod(itemp+1)) )then
                       lidarcldtemp(i,itemp,3)=lidarcldtemp(i,itemp,3)+1._wp
                    endif
-                elseif(tmpu(i,ncol,nlev) .gt. 0.)then
-                   if((tmpu(i,ncol,nlev) .ge. tempmod(itemp)) .and. (tmpu(i,ncol,nlev) .lt. tempmod(itemp+1)) )then
+                elseif(tmpu(i,ncol,nlev) > 0.)then
+                   if((tmpu(i,ncol,nlev) >= tempmod(itemp)) .and. (tmpu(i,ncol,nlev) < tempmod(itemp+1)) )then
                       lidarcldtemp(i,itemp,4)=lidarcldtemp(i,itemp,4)+1._wp
                    endif
@@ -1007,5 +1007,5 @@
     ! Compute the Ice percentage in cloud = ice/(ice+liq)
     sumlidarcldtemp(:,:)=lidarcldtemp(:,:,2)+lidarcldtemp(:,:,3)    
-    WHERE(sumlidarcldtemp(:,:) .gt. 0.)
+    WHERE(sumlidarcldtemp(:,:) > 0.)
        lidarcldtemp(:,:,5)=lidarcldtemp(:,:,2)/sumlidarcldtemp(:,:)
     ELSEWHERE
@@ -1014,5 +1014,5 @@
     
     do i=1,4
-       WHERE(lidarcldtempind(:,:) .gt. 0.)
+       WHERE(lidarcldtempind(:,:) > 0.)
           lidarcldtemp(:,:,i) = lidarcldtemp(:,:,i)/lidarcldtempind(:,:)
        ELSEWHERE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/mo_rng.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/mo_rng.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/mo_rng.F90	(revision 5082)
@@ -96,5 +96,5 @@
     !          so we use sizeof(someInt) to determine wheter it is on 32 bit.
     !if ( i2_16*i2_16 .le. huge32 ) then
-    if (digits(testInt) .le. 31) then
+    if (digits(testInt) <= 31) then
     !if (sizeof(testInt) .eq. 4) then
        r=r+1
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/optics_lib.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/optics_lib.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/optics_lib.F90	(revision 5082)
@@ -558,10 +558,10 @@
        if(tk < temref(4)) tk=temref(4)
        do i=2,4
-          if(tk.ge.temref(i)) go to 12
+          if(tk>=temref(i)) go to 12
        enddo
 12     lt1 = i
        lt2 = i-1
        do i=2,nwlt
-          if(alam.le.wlt(i)) go to 14
+          if(alam<=wlt(i)) go to 14
        enddo
 14     x1  = log(wlt(i-1))
@@ -652,5 +652,5 @@
     Complex(wp) :: A1
     
-    If ((Dx.Gt.Imaxx) .Or. (InP.Gt.ImaxNP)) Then
+    If ((Dx>Imaxx) .Or. (InP>ImaxNP)) Then
        Error = 1
        Return
@@ -659,11 +659,11 @@
     Ir = 1 / Cm
     Y =  Dx * Cm
-    If (Dx.Lt.0.02) Then
+    If (Dx<0.02) Then
        NStop = 2
     Else
-       If (Dx.Le.8.0) Then
+       If (Dx<=8.0) Then
           NStop = Dx + 4.00*Dx**(1./3.) + 2.0
        Else
-          If (Dx.Lt. 4200.0) Then
+          If (Dx< 4200.0) Then
              NStop = Dx + 4.05*Dx**(1./3.) + 2.0
           Else
@@ -673,5 +673,5 @@
     End If
     NmX = Max(Real(NStop),Real(Abs(Y))) + 15.
-    If (Nmx .gt. Itermax) then
+    If (Nmx > Itermax) then
        Error = 1
        Return
@@ -726,5 +726,5 @@
 !ds       Dqxt = Tnp1 *      Dble(A + B)          + Dqxt
        Dqsc = Tnp1 * (A*Conjg(A) + B*Conjg(B)) + Dqsc
-       If (N.Gt.1) then
+       If (N>1) then
           Dg = Dg + (dN*dN - 1) * (ANM1*Conjg(A) + BNM1 * Conjg(B)) / dN + TNM1 *(ANM1*Conjg(BNM1)) / (dN*dN - dN)
 !ds          Dg = Dg + (dN*dN - 1) * Dble(ANM1*Conjg(A) + BNM1 * Conjg(B)) / dN + TNM1 * Dble(ANM1*Conjg(BNM1)) / (dN*dN - dN)
@@ -735,5 +735,5 @@
        AMB = A2 * (A - B)
        Do I = 1,Inp2
-          If (I.GT.Inp) Then
+          If (I>Inp) Then
              S(I) = -Pi1(I)
           Else
@@ -756,5 +756,5 @@
     End Do
 
-    If (Dg .GT.0) Dg = 2 * Dg / Dqsc
+    If (Dg >0) Dg = 2 * Dg / Dqsc
     Dqsc =  2 * Dqsc / Dx**2
     Dqxt =  2 * Dqxt / Dx**2
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/parasol.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/parasol.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/parasol.F90	(revision 5082)
@@ -97,5 +97,5 @@
 
     ! Relative fraction of the opt. thick due to liquid or ice clouds
-    WHERE (tautot_S(1:npoints) .gt. 0.)
+    WHERE (tautot_S(1:npoints) > 0.)
        frac_taucol_liq(1:npoints) = tautot_S_liq(1:npoints) / tautot_S(1:npoints)
        frac_taucol_ice(1:npoints) = tautot_S_ice(1:npoints) / tautot_S(1:npoints)
@@ -118,6 +118,6 @@
     DO it=1,PARASOL_NREFL
        DO ny=1,PARASOL_NTAU-1
-          WHERE (tautot_S(1:npoints) .ge. PARASOL_TAU(ny).and. &
-                 tautot_S(1:npoints) .le. PARASOL_TAU(ny+1))
+          WHERE (tautot_S(1:npoints) >= PARASOL_TAU(ny).and. &
+                 tautot_S(1:npoints) <= PARASOL_TAU(ny+1))
              rlumA_mod(1:npoints,it) = aA(it,ny)*tautot_S(1:npoints) + bA(it,ny)
              rlumB_mod(1:npoints,it) = aB(it,ny)*tautot_S(1:npoints) + bB(it,ny)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/phys_cosp2.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/phys_cosp2.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/phys_cosp2.F90	(revision 5082)
@@ -257,5 +257,5 @@
           cfg%Lrttov_sim,cfg%Lstats
 
-    if (overlaplmdz.ne.overlap) then
+    if (overlaplmdz/=overlap) then
        print*,'Attention overlaplmdz different de overlap lu dans namelist '
     endif
@@ -265,5 +265,5 @@
 
 !!! Ici on modifie les cles logiques pour les outputs selon les champs actives dans les .xml
-  if ((itap.gt.1).and.(first_write))then
+  if ((itap>1).and.(first_write))then
     
     IF (using_xios)   call read_xiosfieldactive(cfg)
@@ -331,5 +331,5 @@
 
         do ip = 1, Npoints
-          if (fracTerLic(ip).ge.0.5) then
+          if (fracTerLic(ip)>=0.5) then
              gbx%land(ip) = 1.
           else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/prec_scops.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/prec_scops.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/prec_scops.F90	(revision 5082)
@@ -64,5 +64,5 @@
 
       cv_col = scops_ccfrac*ncol
-      if (cv_col .eq. 0) cv_col=1
+      if (cv_col == 0) cv_col=1
  
       do ilev=1,nlev
@@ -81,15 +81,15 @@
         flag_cv=0
         do ilev=1,nlev
-          if (frac_out(j,ibox,ilev) .eq. 1) then 
+          if (frac_out(j,ibox,ilev) == 1) then
             flag_ls=1
           endif
-          if (frac_out(j,ibox,ilev) .eq. 2) then 
+          if (frac_out(j,ibox,ilev) == 2) then
             flag_cv=1
           endif
         enddo !loop over nlev
-        if (flag_ls .eq. 1) then
+        if (flag_ls == 1) then
            frac_out_ls(j,ibox)=1
         endif
-        if (flag_cv .eq. 1) then
+        if (flag_cv == 1) then
            frac_out_cv(j,ibox)=1
         endif
@@ -102,14 +102,14 @@
         flag_cv=0
     
-        if (ls_p_rate(j,1) .gt. 0.) then 
+        if (ls_p_rate(j,1) > 0.) then
             do ibox=1,ncol ! possibility ONE
-                if (frac_out(j,ibox,1) .eq. 1) then 
+                if (frac_out(j,ibox,1) == 1) then
                     prec_frac(j,ibox,1) = 1
                     flag_ls=1
                 endif
             enddo ! loop over ncol
-            if (flag_ls .eq. 0) then ! possibility THREE
+            if (flag_ls == 0) then ! possibility THREE
                 do ibox=1,ncol
-                    if (frac_out(j,ibox,2) .eq. 1) then 
+                    if (frac_out(j,ibox,2) == 1) then
                         prec_frac(j,ibox,1) = 1
                         flag_ls=1
@@ -117,7 +117,7 @@
                 enddo ! loop over ncol
             endif
-        if (flag_ls .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_ls(j,ibox) .eq. 1) then 
+        if (flag_ls == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_ls(j,ibox) == 1) then
             prec_frac(j,ibox,1) = 1
             flag_ls=1
@@ -125,5 +125,5 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Five
+        if (flag_ls == 0) then ! possibility Five
         do ibox=1,ncol
     !     prec_frac(j,1:ncol,1) = 1
@@ -134,8 +134,8 @@
        ! There is large scale precipitation
      
-        if (cv_p_rate(j,1) .gt. 0.) then 
+        if (cv_p_rate(j,1) > 0.) then
          do ibox=1,ncol ! possibility ONE
-          if (frac_out(j,ibox,1) .eq. 2) then 
-           if (prec_frac(j,ibox,1) .eq. 0) then
+          if (frac_out(j,ibox,1) == 2) then
+           if (prec_frac(j,ibox,1) == 0) then
         prec_frac(j,ibox,1) = 2
        else
@@ -145,8 +145,8 @@
       endif
         enddo ! loop over ncol
-        if (flag_cv .eq. 0) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,2) .eq. 2) then 
-                if (prec_frac(j,ibox,1) .eq. 0) then
+        if (flag_cv == 0) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,2) == 2) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -157,8 +157,8 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_cv(j,ibox) .eq. 1) then 
-                if (prec_frac(j,ibox,1) .eq. 0) then
+        if (flag_cv == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_cv(j,ibox) == 1) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -169,7 +169,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then  ! possibility Five
+        if (flag_cv == 0) then  ! possibility Five
         do ibox=1,cv_col
-                if (prec_frac(j,ibox,1) .eq. 0) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -192,15 +192,15 @@
         flag_cv=0
     
-        if (ls_p_rate(j,ilev) .gt. 0.) then 
+        if (ls_p_rate(j,ilev) > 0.) then
          do ibox=1,ncol ! possibility ONE&TWO
-          if ((frac_out(j,ibox,ilev) .eq. 1) .or. ((prec_frac(j,ibox,ilev-1) .eq. 1)     &
-            .or. (prec_frac(j,ibox,ilev-1) .eq. 3))) then 
+          if ((frac_out(j,ibox,ilev) == 1) .or. ((prec_frac(j,ibox,ilev-1) == 1)     &
+            .or. (prec_frac(j,ibox,ilev-1) == 3))) then
            prec_frac(j,ibox,ilev) = 1
            flag_ls=1
           endif
         enddo ! loop over ncol
-        if ((flag_ls .eq. 0) .and. (ilev .lt. nlev)) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,ilev+1) .eq. 1) then 
+        if ((flag_ls == 0) .and. (ilev < nlev)) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,ilev+1) == 1) then
             prec_frac(j,ibox,ilev) = 1
             flag_ls=1
@@ -208,7 +208,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_ls(j,ibox) .eq. 1) then 
+        if (flag_ls == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_ls(j,ibox) == 1) then
             prec_frac(j,ibox,ilev) = 1
             flag_ls=1
@@ -216,5 +216,5 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Five
+        if (flag_ls == 0) then ! possibility Five
         do ibox=1,ncol
 !     prec_frac(j,1:ncol,ilev) = 1
@@ -224,9 +224,9 @@
       endif ! There is large scale precipitation
     
-        if (cv_p_rate(j,ilev) .gt. 0.) then 
+        if (cv_p_rate(j,ilev) > 0.) then
          do ibox=1,ncol ! possibility ONE&TWO
-          if ((frac_out(j,ibox,ilev) .eq. 2) .or. ((prec_frac(j,ibox,ilev-1) .eq. 2)     &
-            .or. (prec_frac(j,ibox,ilev-1) .eq. 3))) then 
-            if (prec_frac(j,ibox,ilev) .eq. 0) then
+          if ((frac_out(j,ibox,ilev) == 2) .or. ((prec_frac(j,ibox,ilev-1) == 2)     &
+            .or. (prec_frac(j,ibox,ilev-1) == 3))) then
+            if (prec_frac(j,ibox,ilev) == 0) then
          prec_frac(j,ibox,ilev) = 2
         else
@@ -236,8 +236,8 @@
         endif
        enddo ! loop over ncol
-        if ((flag_cv .eq. 0) .and. (ilev .lt. nlev)) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,ilev+1) .eq. 2) then 
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+        if ((flag_cv == 0) .and. (ilev < nlev)) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,ilev+1) == 2) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
@@ -248,8 +248,8 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_cv(j,ibox) .eq. 1) then 
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+        if (flag_cv == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_cv(j,ibox) == 1) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
@@ -260,7 +260,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then  ! possibility Five 
+        if (flag_cv == 0) then  ! possibility Five
         do ibox=1,cv_col
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/quickbeam.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/quickbeam.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/quickbeam.F90	(revision 5082)
@@ -182,5 +182,5 @@
           
           ! Attenuation due to gaseous absorption between radar and volume
-          if ((rcfg%use_gas_abs == 1) .or. (rcfg%use_gas_abs == 2 .and. pr .eq. 1)) then
+          if ((rcfg%use_gas_abs == 1) .or. (rcfg%use_gas_abs == 2 .and. pr == 1)) then
              if (d_gate==1) then
                 if (k>1) then
@@ -270,5 +270,5 @@
           enddo
        enddo
-       where(cfad_ze .ne. R_UNDEF) cfad_ze = cfad_ze/Ncolumns
+       where(cfad_ze /= R_UNDEF) cfad_ze = cfad_ze/Ncolumns
 
     else
@@ -279,5 +279,5 @@
           enddo
        enddo
-       where(cfad_ze .ne. R_UNDEF) cfad_ze = cfad_ze/Ncolumns
+       where(cfad_ze /= R_UNDEF) cfad_ze = cfad_ze/Ncolumns
     endif   
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/quickbeam_optics.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/quickbeam_optics.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/quickbeam_optics.F90	(revision 5082)
@@ -160,5 +160,5 @@
           ! Gas attenuation (only need to do this for the first subcolumn (i.e. cmpGases=true)
           if (cmpGases) then
-             if (rcfg%use_gas_abs == 1 .or. (rcfg%use_gas_abs == 2 .and. pr .eq. 1)) then
+             if (rcfg%use_gas_abs == 1 .or. (rcfg%use_gas_abs == 2 .and. pr == 1)) then
                 g_vol(pr,k) = gases(p_matrix(pr,k),t_matrix(pr,k),sh_matrix(pr,k),rcfg%freq)
              endif
@@ -195,5 +195,5 @@
                 
                 ! Compute effective radius from number concentration and distribution parameters
-                if (Re_internal .eq. 0) then
+                if (Re_internal == 0) then
                    call calc_Re(hm_matrix(pr,k,tp),Np_matrix(pr,k,tp),rho_a, &
                         sd%dtype(tp),sd%apm(tp),sd%bpm(tp),sd%rho(tp),sd%p1(tp),sd%p2(tp),sd%p3(tp),Re)
@@ -210,5 +210,5 @@
                 ! Index into particle size dimension of scaling tables 
                 iRe_type=1
-                if(Re.gt.0) then
+                if(Re>0) then
                    ! Determine index in to scale LUT
                    ! Distance between Re points (defined by "base" and "step") for
@@ -220,10 +220,10 @@
                    base = rcfg%base_list(n+1)
                    iRe_type=Re/step
-                   if (iRe_type.lt.1) iRe_type=1
+                   if (iRe_type<1) iRe_type=1
                    Re=step*(iRe_type+0.5_wp)    ! set value of Re to closest value allowed in LUT.
                    iRe_type=iRe_type+base-int(n*Re_BIN_LENGTH/step)
                    
                    ! Make sure iRe_type is within bounds
-                   if (iRe_type.ge.nRe_types) then
+                   if (iRe_type>=nRe_types) then
                       !write(*,*) 'Warning: size of Re exceed value permitted ', &
                       !            'in Look-Up Table (LUT).  Will calculate. '
@@ -431,5 +431,5 @@
     ! Exponential is same as modified gamma with vu =1
     ! if Np is specified then we will just treat as modified gamma
-    if(dtype .eq. 2 .and. Np .gt. 0) then
+    if(dtype == 2 .and. Np > 0) then
        local_dtype = 1
        local_p3    = 1
@@ -467,9 +467,9 @@
        endif
        
-       if( Np.eq.0 .and. p2+1 > 1E-8) then     ! use default value for MEAN diameter as first default  
+       if( Np==0 .and. p2+1 > 1E-8) then     ! use default value for MEAN diameter as first default
           dm = p2             ! by definition, should have units of microns
           D0 = gamma(vu)/gamma(vu+1)*dm
        else   ! use value of Np
-          if(Np.eq.0) then
+          if(Np==0) then
              if( abs(p1+1) > 1E-8 ) then  !   use default number concentration   
                 local_Np = p1 ! total number concentration / pa --- units kg^-1
@@ -551,5 +551,5 @@
        
        ! get rg ... 
-       if( Np.eq.0 .and. (abs(p2+1) > 1E-8) ) then ! use default value of rg
+       if( Np==0 .and. (abs(p2+1) > 1E-8) ) then ! use default value of rg
           rg = p2     
        else
@@ -852,5 +852,5 @@
           log_sigma_g = p3
           tmp2 = (bpm*log_sigma_g)*(bpm*log_sigma_g)
-          if(Re.le.0) then 
+          if(Re<=0) then
              rg = p2
           else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/scops.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/scops.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/scops.F90	(revision 5082)
@@ -75,5 +75,5 @@
 
     ! Test for valid input overlap assumption
-    if (overlap .ne. 1 .and. overlap .ne. 2 .and. overlap .ne. 3) then
+    if (overlap /= 1 .and. overlap /= 2 .and. overlap /= 3) then
        overlap=default_overlap
        call errorMessage('ERROR(scops): Invalid overlap assumption provided. Using default overlap assumption (max/ran)')
@@ -92,5 +92,5 @@
     tca(1:npoints,1:nlev) = cc(1:npoints,1:nlev)
     
-    if (ncolprint.ne.0) then
+    if (ncolprint/=0) then
        write (6,'(a)') 'frac_out_pp_rev:'
        do j=1,npoints,1000
@@ -102,5 +102,5 @@
        write (6,'(I3)') ncol
     endif
-    if (ncolprint.ne.0) then
+    if (ncolprint/=0) then
        write (6,'(a)') 'last_frac_pp:'
        do j=1,npoints,1000
@@ -122,7 +122,7 @@
        
        ! Initialise threshold
-       IF (ilev.eq.1) then
+       IF (ilev==1) then
           ! If max overlap 
-          IF (overlap.eq.1) then
+          IF (overlap==1) then
              ! Select pixels spread evenly across the gridbox
              threshold(1:npoints,1:ncol)=boxpos(1:npoints,1:ncol)
@@ -137,5 +137,5 @@
              enddo
           ENDIF
-          IF (ncolprint.ne.0) then
+          IF (ncolprint/=0) then
              write (6,'(a)') 'threshold_nsf2:'
              do j=1,npoints,1000
@@ -147,5 +147,5 @@
        ENDIF
        
-       IF (ncolprint.ne.0) then
+       IF (ncolprint/=0) then
           write (6,'(a)') 'ilev:'
           write (6,'(I2)') ilev
@@ -157,5 +157,5 @@
           !maxocc(1:npoints,ibox) = merge(1,0, conv(1:npoints,ilev) .gt. boxpos(1:npoints,ibox))
           do j=1,npoints
-             if (boxpos(j,ibox).le.conv(j,ilev)) then
+             if (boxpos(j,ibox)<=conv(j,ilev)) then
                 maxocc(j,ibox) = 1
              else
@@ -165,5 +165,5 @@
           
           ! Max overlap
-          if (overlap.eq.1) then 
+          if (overlap==1) then
              threshold_min(1:npoints,ibox) = conv(1:npoints,ilev)
              maxosc(1:npoints,ibox)        = 1               
@@ -171,10 +171,10 @@
           
           ! Random overlap
-          if (overlap.eq.2) then 
+          if (overlap==2) then
              threshold_min(1:npoints,ibox) = conv(1:npoints,ilev)
              maxosc(1:npoints,ibox)        = 0
           endif
           ! Max/Random overlap
-          if (overlap.eq.3) then 
+          if (overlap==3) then
              ! DS2014 START: The bounds on tca are not valid when ilev=1.
              !threshold_min(1:npoints,ibox) = max(conv(1:npoints,ilev),min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)))
@@ -182,14 +182,14 @@
              !     min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)) .and. &
              !     (threshold(1:npoints,ibox).gt.conv(1:npoints,ilev)))
-             if (ilev .ne. 1) then
+             if (ilev /= 1) then
                 threshold_min(1:npoints,ibox) = max(conv(1:npoints,ilev),min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)))
-                maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) .lt. &
+                maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) < &
                      min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)) .and. &
-                     (threshold(1:npoints,ibox).gt.conv(1:npoints,ilev)))
+                     (threshold(1:npoints,ibox)>conv(1:npoints,ilev)))
              else
                 threshold_min(1:npoints,ibox) = max(conv(1:npoints,ilev),min(0._wp,tca(1:npoints,ilev)))
-                maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) .lt. &
+                maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) < &
                      min(0._wp,tca(1:npoints,ilev)) .and. &
-                     (threshold(1:npoints,ibox).gt.conv(1:npoints,ilev)))
+                     (threshold(1:npoints,ibox)>conv(1:npoints,ilev)))
              endif
           endif
@@ -205,13 +205,13 @@
           
           ! Fill frac_out with 1's where tca is greater than the threshold
-          frac_out(1:npoints,ibox,ilev) = merge(1,0,tca(1:npoints,ilev).gt.threshold(1:npoints,ibox))
+          frac_out(1:npoints,ibox,ilev) = merge(1,0,tca(1:npoints,ilev)>threshold(1:npoints,ibox))
           
           ! Code to partition boxes into startiform and convective parts goes here
-          where(threshold(1:npoints,ibox).le.conv(1:npoints,ilev) .and. conv(1:npoints,ilev).gt.0.) frac_out(1:npoints,ibox,ilev)=2
+          where(threshold(1:npoints,ibox)<=conv(1:npoints,ilev) .and. conv(1:npoints,ilev)>0.) frac_out(1:npoints,ibox,ilev)=2
        ENDDO ! ibox
        
        
        ! Set last_frac to tca at this level, so as to be tca from last level next time round
-       if (ncolprint.ne.0) then
+       if (ncolprint/=0) then
           do j=1,npoints ,1000
              write(6,'(a10)') 'j='
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90	(revision 5082)
@@ -84,5 +84,5 @@
        do ilev=1,nlev
           ! Define location of "layer top"
-          if(ilev.eq.1 .or. ilev.eq.nlev) then
+          if(ilev==1 .or. ilev==nlev) then
              ztest=zfull(j,ilev)
           else
@@ -94,5 +94,5 @@
           iMISR_ztop=2
           do loop=2,numMISRHgtBins
-             if ( ztest .gt. 1000*misr_histHgt(loop+1) ) then
+             if ( ztest > 1000*misr_histHgt(loop+1) ) then
                 iMISR_ztop=loop+1
              endif
@@ -110,5 +110,5 @@
           do ilev=1,nlev
              ! If there a cloud, start the counter and store this height
-             if(thres_crossed_MISR .eq. 0 .and. dtau(j,ibox,ilev) .gt. 0.) then
+             if(thres_crossed_MISR == 0 .and. dtau(j,ibox,ilev) > 0.) then
                 ! First encountered a "cloud"
                 thres_crossed_MISR = 1  
@@ -116,6 +116,6 @@
              endif
 
-             if( thres_crossed_MISR .lt. 99 .and. thres_crossed_MISR .gt. 0 ) then
-                if( dtau(j,ibox,ilev) .eq. 0.) then
+             if( thres_crossed_MISR < 99 .and. thres_crossed_MISR > 0 ) then
+                if( dtau(j,ibox,ilev) == 0.) then
                    ! We have come to the end of the current cloud layer without yet 
                    ! selecting a CTH boundary. Restart cloud tau counter 
@@ -129,6 +129,6 @@
                 ! current layer cloud top to the current level then MISR will like 
                 ! see a top below the top of the current layer.
-                if( dtau(j,ibox,ilev).gt.0 .and. (cloud_dtau-dtau(j,ibox,ilev)) .lt. 1) then
-                   if(dtau(j,ibox,ilev) .lt. 1 .or. ilev.eq.1 .or. ilev.eq.nlev) then
+                if( dtau(j,ibox,ilev)>0 .and. (cloud_dtau-dtau(j,ibox,ilev)) < 1) then
+                   if(dtau(j,ibox,ilev) < 1 .or. ilev==1 .or. ilev==nlev) then
                       ! MISR will likely penetrate to some point within this layer ... the middle
                       MISR_penetration_height=zfull(j,ilev)
@@ -142,5 +142,5 @@
                 
                 ! Check for a distinctive water layer
-                if(dtau(j,ibox,ilev) .gt. 1 .and. at(j,ilev) .gt. 273 ) then
+                if(dtau(j,ibox,ilev) > 1 .and. at(j,ilev) > 273 ) then
                    ! Must be a water cloud, take this as CTH level
                    thres_crossed_MISR=99
@@ -149,5 +149,5 @@
                 ! If the total column optical depth is "large" than MISR can't see
                 ! anything else. Set current point as CTH level
-                if(sum(dtau(j,ibox,1:ilev)) .gt. 5) then
+                if(sum(dtau(j,ibox,1:ilev)) > 5) then
                    thres_crossed_MISR=99           
                 endif
@@ -157,12 +157,12 @@
           ! Check to see if there was a cloud for which we didn't 
           ! set a MISR cloud top boundary
-          if( thres_crossed_MISR .eq. 1) then
+          if( thres_crossed_MISR == 1) then
              ! If the cloud has a total optical depth of greater
              ! than ~ 0.5 MISR will still likely pick up this cloud
              ! with a height near the true cloud top
              ! otherwise there should be no CTH
-             if(sum(dtau(j,ibox,1:nlev)) .gt. 0.5) then
+             if(sum(dtau(j,ibox,1:nlev)) > 0.5) then
                 ! keep MISR detected CTH
-             elseif(sum(dtau(j,ibox,1:nlev)) .gt. 0.2) then
+             elseif(sum(dtau(j,ibox,1:nlev)) > 0.2) then
                 ! MISR may detect but wont likley have a good height
                 box_MISR_ztop(j,ibox)=-1
@@ -215,5 +215,5 @@
     ! Fill dark scenes 
     do j=1,numMISRHgtBins
-       where(sunlit .ne. 1) dist_model_layertops(1:npoints,j) = R_UNDEF
+       where(sunlit /= 1) dist_model_layertops(1:npoints,j) = R_UNDEF
     enddo
 
@@ -257,12 +257,12 @@
 
        ! Subcolumns that are cloudy(true) and not(false)
-       box_cloudy(1:ncol) = merge(.true.,.false.,tau(j,1:ncol) .gt. tauchk)
+       box_cloudy(1:ncol) = merge(.true.,.false.,tau(j,1:ncol) > tauchk)
 
        ! Fill optically thin clouds with fill value
        where(.not. box_cloudy(1:ncol)) tauWRK(j,1:ncol)  = -999._wp
-       where(box_MISR_ztopWRK(j,1:ncol) .eq. 0) box_MISR_ztopWRK(j,1:ncol)=-999._wp
+       where(box_MISR_ztopWRK(j,1:ncol) == 0) box_MISR_ztopWRK(j,1:ncol)=-999._wp
 
        ! Compute joint histogram and column quantities for points that are sunlit and cloudy
-       if (sunlit(j) .eq. 1) then 
+       if (sunlit(j) == 1) then
           ! Joint histogram
           call hist2D(tauWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol),ncol,misr_histTau,numMISRTauBins,&
@@ -272,10 +272,10 @@
 
           ! Column cloud area
-          MISR_cldarea(j)=real(count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.))/ncol
+          MISR_cldarea(j)=real(count(box_MISR_ztopWRK(j,1:ncol) /= -999.))/ncol
 
           ! Column cloud-top height
-          if ( count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.) .ne. 0 ) then
-             MISR_mean_ztop(j) = sum(box_MISR_ztopWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol) .ne. -999.)/ &
-                  count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.)
+          if ( count(box_MISR_ztopWRK(j,1:ncol) /= -999.) /= 0 ) then
+             MISR_mean_ztop(j) = sum(box_MISR_ztopWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol) /= -999.)/ &
+                  count(box_MISR_ztopWRK(j,1:ncol) /= -999.)
           else
              MISR_mean_ztop(j) = R_UNDEF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp.F90	(revision 5082)
@@ -480,5 +480,5 @@
 
     ! Set flag to deallocate rttov types (only done on final call to simulator)
-    if (size(cospOUT%isccp_meantb) .eq. stop_idx) lrttov_cleanUp = .true.
+    if (size(cospOUT%isccp_meantb) == stop_idx) lrttov_cleanUp = .true.
 
     ! ISCCP column
@@ -687,10 +687,10 @@
        modisIN%w0        => cospIN%ss_alb
        modisIN%Nsunlit   = count(cospgridIN%sunlit > 0)
-       if (modisIN%Nsunlit .gt. 0) then
+       if (modisIN%Nsunlit > 0) then
           allocate(modisIN%sunlit(modisIN%Nsunlit),modisIN%pres(modisIN%Nsunlit,cospIN%Nlevels+1))
           modisIN%sunlit    = pack((/ (i, i = 1, Npoints ) /),mask = cospgridIN%sunlit > 0)
           modisIN%pres      = cospgridIN%phalf(int(modisIN%sunlit(:)),:)
        endif
-       if (count(cospgridIN%sunlit <= 0) .gt. 0) then
+       if (count(cospgridIN%sunlit <= 0) > 0) then
           allocate(modisIN%notSunlit(count(cospgridIN%sunlit <= 0)))
           modisIN%notSunlit = pack((/ (i, i = 1, Npoints ) /),mask = .not. cospgridIN%sunlit > 0)
@@ -2430,5 +2430,5 @@
     !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     if (any([Lisccp_subcolumn, Lisccp_column, Lmisr_subcolumn, Lmisr_column, Lmodis_subcolumn, Lmodis_column])) then
-       if (any(cospgridIN%sunlit .lt. 0)) then
+       if (any(cospgridIN%sunlit < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%sunlit contains values out of range (0 or 1)'
@@ -2498,5 +2498,5 @@
          Lcalipso_column, Lcloudsat_column, Lradar_lidar_tcc,Llidar_only_freq_cloud, &
          Lcloudsat_tcc, Lcloudsat_tcc2])) then
-       if (any(cospgridIN%at .lt. 0)) then
+       if (any(cospgridIN%at < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%at contains values out of range (at<0), expected units (K)'
@@ -2546,5 +2546,5 @@
     endif
     if (any([Lisccp_subcolumn, Lisccp_column, Lrttov_column])) then
-       if (any(cospgridIN%pfull .lt. 0)) then
+       if (any(cospgridIN%pfull < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%pfull contains values out of range'
@@ -2566,5 +2566,5 @@
     if (any([Lisccp_subcolumn,Lisccp_column,Lmodis_subcolumn,Lmodis_column,Lcalipso_column,Lrttov_column,&
              LgrLidar532_column,Latlid_column])) then
-       if (any(cospgridIN%phalf .lt. 0)) then
+       if (any(cospgridIN%phalf < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%phalf contains values out of range'
@@ -2648,5 +2648,5 @@
     endif
     if (any([Lisccp_subcolumn,Lisccp_column,Lrttov_column])) then
-       if (any(cospgridIN%qv .lt. 0)) then
+       if (any(cospgridIN%qv < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%qv contains values out of range'
@@ -2668,5 +2668,5 @@
     if (any([Lmisr_subcolumn,Lmisr_column,Lcloudsat_subcolumn,Lcloudsat_column,Lcalipso_column,Lradar_lidar_tcc,&
          Llidar_only_freq_cloud,LgrLidar532_column,Latlid_column,Lcloudsat_tcc, Lcloudsat_tcc2])) then
-       if (any(cospgridIN%hgt_matrix .lt. -300)) then
+       if (any(cospgridIN%hgt_matrix < -300)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%hgt_matrix contains values out of range'
@@ -2714,5 +2714,5 @@
     if (any([Lrttov_column,Lcloudsat_column,Lcalipso_column,Lradar_lidar_tcc,Llidar_only_freq_cloud, &
              LgrLidar532_column, Latlid_column, Lcloudsat_tcc, Lcloudsat_tcc2])) then
-       if (any(cospgridIN%hgt_matrix_half .lt. -300)) then
+       if (any(cospgridIN%hgt_matrix_half < -300)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%hgt_matrix_half contains values out of range'
@@ -2753,5 +2753,5 @@
     endif
     if (any([Lrttov_column,Lcalipso_column,Lparasol_column])) then
-       if (any(cospgridIN%land .lt. 0)) then
+       if (any(cospgridIN%land < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%land contains values out of range'
@@ -2776,5 +2776,5 @@
     endif
     if (any([Lisccp_subcolumn,Lisccp_column,Lrttov_column])) then
-       if (any(cospgridIN%skt .lt. 0)) then
+       if (any(cospgridIN%skt < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%skt contains values out of range'
@@ -2797,5 +2797,5 @@
     ! RTTOV Inputs
     if (Lrttov_column) then
-       if (cospgridIN%zenang .lt. -90. .OR. cospgridIN%zenang .gt. 90) then
+       if (cospgridIN%zenang < -90. .OR. cospgridIN%zenang > 90) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%zenang contains values out of range'
@@ -2803,5 +2803,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (cospgridIN%co2 .lt. 0) then
+       if (cospgridIN%co2 < 0) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%co2 contains values out of range'
@@ -2809,5 +2809,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (cospgridIN%ch4 .lt. 0) then
+       if (cospgridIN%ch4 < 0) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%ch4 contains values out of range'
@@ -2815,5 +2815,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (cospgridIN%n2o .lt. 0) then
+       if (cospgridIN%n2o < 0) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%n2o contains values out of range'
@@ -2821,5 +2821,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (cospgridIN%co.lt. 0) then
+       if (cospgridIN%co< 0) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%co contains values out of range'
@@ -2827,5 +2827,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (any(cospgridIN%o3 .lt. 0)) then
+       if (any(cospgridIN%o3 < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%o3 contains values out of range'
@@ -2833,5 +2833,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (any(cospgridIN%emis_sfc .lt. 0. .OR. cospgridIN%emis_sfc .gt. 1)) then
+       if (any(cospgridIN%emis_sfc < 0. .OR. cospgridIN%emis_sfc > 1)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospgridIN%emis_sfc contains values out of range'
@@ -2839,5 +2839,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (any(cospgridIN%u_sfc .lt. -100. .OR. cospgridIN%u_sfc .gt. 100.)) then
+       if (any(cospgridIN%u_sfc < -100. .OR. cospgridIN%u_sfc > 100.)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%u_sfc contains values out of range'
@@ -2845,5 +2845,5 @@
           Lrttov_column = .false.
        endif
-       if (any(cospgridIN%v_sfc .lt. -100. .OR. cospgridIN%v_sfc .gt. 100.)) then
+       if (any(cospgridIN%v_sfc < -100. .OR. cospgridIN%v_sfc > 100.)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%v_sfc contains values out of range'
@@ -2851,5 +2851,5 @@
           if (associated(cospOUT%rttov_tbs)) cospOUT%rttov_tbs(:,:) = R_UNDEF
        endif
-       if (any(cospgridIN%lat .lt. -90 .OR. cospgridIN%lat .gt. 90)) then
+       if (any(cospgridIN%lat < -90 .OR. cospgridIN%lat > 90)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%lat contains values out of range'
@@ -2861,5 +2861,5 @@
     ! COSP_INPUTS
     if (any([Lisccp_subcolumn,Lisccp_column])) then
-       if (cospIN%emsfc_lw .lt. 0. .OR. cospIN%emsfc_lw .gt. 1.) then
+       if (cospIN%emsfc_lw < 0. .OR. cospIN%emsfc_lw > 1.) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%emsfc_lw contains values out of range'
@@ -2878,5 +2878,5 @@
     endif
     if (any([Lisccp_subcolumn,Lisccp_column,Lmisr_subcolumn,Lmisr_column,Lmodis_subcolumn,Lmodis_column])) then
-       if (any(cospIN%tau_067 .lt. 0)) then
+       if (any(cospIN%tau_067 < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tau_067 contains values out of range'
@@ -2943,5 +2943,5 @@
     endif
     if (any([Lisccp_subcolumn,Lisccp_column])) then
-       if (any(cospIN%emiss_11 .lt. 0. .OR. cospIN%emiss_11 .gt. 1)) then
+       if (any(cospIN%emiss_11 < 0. .OR. cospIN%emiss_11 > 1)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%emiss_11 contains values out of range'
@@ -2960,5 +2960,5 @@
     endif
     if (any([Lmodis_subcolumn,Lmodis_column])) then
-       if (any(cospIN%asym .lt. -1. .OR. cospIN%asym .gt. 1)) then
+       if (any(cospIN%asym < -1. .OR. cospIN%asym > 1)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%asym contains values out of range'
@@ -3006,5 +3006,5 @@
                cospOUT%modis_Optical_Thickness_vs_ReffLIQ(:,:,:)            = R_UNDEF
        endif
-       if (any(cospIN%ss_alb .lt. 0 .OR. cospIN%ss_alb .gt. 1)) then
+       if (any(cospIN%ss_alb < 0 .OR. cospIN%ss_alb > 1)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%ss_alb contains values out of range'
@@ -3054,5 +3054,5 @@
     endif
     if (any([Latlid_subcolumn,Latlid_column])) then
-       if (any(cospIN%betatot_atlid .lt. 0)) then
+       if (any(cospIN%betatot_atlid < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%betatot_atlid contains values out of range'
@@ -3065,5 +3065,5 @@
           if (associated(cospOUT%atlid_beta_mol))      cospOUT%atlid_beta_mol(:,:)   = R_UNDEF
        endif
-       if (any(cospIN%beta_mol_atlid .lt. 0)) then
+       if (any(cospIN%beta_mol_atlid < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%beta_mol_atlid contains values out of range'
@@ -3076,5 +3076,5 @@
           if (associated(cospOUT%atlid_beta_mol))      cospOUT%atlid_beta_mol(:,:)   = R_UNDEF
        endif
-       if (any(cospIN%tautot_atlid .lt. 0)) then
+       if (any(cospIN%tautot_atlid < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_atlid contains values out of range'
@@ -3087,5 +3087,5 @@
           if (associated(cospOUT%atlid_beta_mol))      cospOUT%atlid_beta_mol(:,:)   = R_UNDEF
        endif
-       if (any(cospIN%tau_mol_atlid .lt. 0)) then
+       if (any(cospIN%tau_mol_atlid < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tau_mol_atlid contains values out of range'
@@ -3101,5 +3101,5 @@
     
     if (any([LgrLidar532_subcolumn,LgrLidar532_column])) then
-       if (any(cospIN%betatot_grLidar532 .lt. 0)) then
+       if (any(cospIN%betatot_grLidar532 < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%betatot_grLidar532 contains values out of range'
@@ -3112,5 +3112,5 @@
           if (associated(cospOUT%grLidar532_beta_mol))      cospOUT%grLidar532_beta_mol(:,:)   = R_UNDEF
        endif
-       if (any(cospIN%beta_mol_grLidar532 .lt. 0)) then
+       if (any(cospIN%beta_mol_grLidar532 < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%beta_mol_grLidar532 contains values out of range'
@@ -3123,5 +3123,5 @@
           if (associated(cospOUT%grLidar532_beta_mol))      cospOUT%grLidar532_beta_mol(:,:)   = R_UNDEF
        endif
-       if (any(cospIN%tautot_grLidar532 .lt. 0)) then
+       if (any(cospIN%tautot_grLidar532 < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_grLidar532 contains values out of range'
@@ -3134,5 +3134,5 @@
           if (associated(cospOUT%grLidar532_beta_mol))      cospOUT%grLidar532_beta_mol(:,:)   = R_UNDEF
        endif
-       if (any(cospIN%tau_mol_grLidar532 .lt. 0)) then
+       if (any(cospIN%tau_mol_grLidar532 < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tau_mol_grLidar532 contains values out of range'
@@ -3148,5 +3148,5 @@
 
     if (any([Lcalipso_subcolumn,Lcalipso_column])) then
-       if (any(cospIN%betatot_calipso .lt. 0)) then
+       if (any(cospIN%betatot_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%betatot_calipso contains values out of range'
@@ -3167,5 +3167,5 @@
           if (associated(cospOUT%calipso_cldthinemis))   cospOUT%calipso_cldthinemis(:)       = R_UNDEF
        endif
-       if (any(cospIN%betatot_liq_calipso .lt. 0)) then
+       if (any(cospIN%betatot_liq_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = ('ERROR: COSP input variable: cospIN%betatot_liq_calipso contains values out of range')
@@ -3186,5 +3186,5 @@
           if (associated(cospOUT%calipso_cldthinemis))   cospOUT%calipso_cldthinemis(:)       = R_UNDEF
        endif
-       if (any(cospIN%betatot_ice_calipso .lt. 0)) then
+       if (any(cospIN%betatot_ice_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%betatot_ice_calipso contains values out of range'
@@ -3205,5 +3205,5 @@
           if (associated(cospOUT%calipso_cldthinemis))   cospOUT%calipso_cldthinemis(:)       = R_UNDEF
        endif
-       if (any(cospIN%tautot_calipso .lt. 0)) then
+       if (any(cospIN%tautot_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_calipso contains values out of range'
@@ -3224,5 +3224,5 @@
           if (associated(cospOUT%calipso_cldthinemis))   cospOUT%calipso_cldthinemis(:)       = R_UNDEF
        endif
-       if (any(cospIN%tautot_liq_calipso .lt. 0)) then
+       if (any(cospIN%tautot_liq_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = ('ERROR: COSP input variable: cospIN%tautot_liq_calipso contains values out of range')
@@ -3243,5 +3243,5 @@
           if (associated(cospOUT%calipso_cldthinemis))   cospOUT%calipso_cldthinemis(:)       = R_UNDEF
        endif
-       if (any(cospIN%tautot_ice_calipso .lt. 0)) then
+       if (any(cospIN%tautot_ice_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_ice_calipso contains values out of range'
@@ -3262,5 +3262,5 @@
           if (associated(cospOUT%calipso_cldthinemis))   cospOUT%calipso_cldthinemis(:)       = R_UNDEF
        endif
-       if (any(cospIN%tau_mol_calipso .lt. 0)) then
+       if (any(cospIN%tau_mol_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tau_mol_calipso contains values out of range'
@@ -3284,5 +3284,5 @@
     if (any([Lcalipso_subcolumn,Lcalipso_column,Lcloudsat_column,Lradar_lidar_tcc,       &
         Llidar_only_freq_cloud, Lcloudsat_tcc, Lcloudsat_tcc2])) then
-       if (any(cospIN%beta_mol_calipso .lt. 0)) then
+       if (any(cospIN%beta_mol_calipso < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%beta_mol_calipso contains values out of range'
@@ -3315,5 +3315,5 @@
     endif
     if (any([Lparasol_subcolumn,Lparasol_column])) then
-       if (any(cospIN%tautot_S_liq .lt. 0)) then
+       if (any(cospIN%tautot_S_liq < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_S_liq contains values out of range'
@@ -3323,5 +3323,5 @@
           if (associated(cospOUT%parasolGrid_refl)) cospOUT%parasolGrid_refl(:,:)  = R_UNDEF
        endif
-       if (any(cospIN%tautot_S_ice .lt. 0)) then
+       if (any(cospIN%tautot_S_ice < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%tautot_S_ice contains values out of range'
@@ -3334,5 +3334,5 @@
     if (any([Lcloudsat_subcolumn,Lcloudsat_column,Lradar_lidar_tcc,Llidar_only_freq_cloud, &
         Lcloudsat_tcc, Lcloudsat_tcc2])) then
-       if (any(cospIN%z_vol_cloudsat .lt. 0)) then
+       if (any(cospIN%z_vol_cloudsat < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%z_vol_cloudsat contains values out of range'
@@ -3350,5 +3350,5 @@
           if (associated(cospOUT%cloudsat_tcc2)) cospOUT%cloudsat_tcc2(:) = R_UNDEF
        endif
-       if (any(cospIN%kr_vol_cloudsat .lt. 0)) then
+       if (any(cospIN%kr_vol_cloudsat < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%kr_vol_cloudsat contains values out of range'
@@ -3366,5 +3366,5 @@
           if (associated(cospOUT%cloudsat_tcc2)) cospOUT%cloudsat_tcc2(:) = R_UNDEF
        endif
-       if (any(cospIN%g_vol_cloudsat .lt. 0)) then
+       if (any(cospIN%g_vol_cloudsat < 0)) then
           nError=nError+1
           errorMessage(nError) = 'ERROR: COSP input variable: cospIN%g_vol_cloudsat contains values out of range'
@@ -3389,13 +3389,13 @@
     ! ISCCP
     if (Lisccp_subcolumn .or. Lisccp_column) then
-       if (size(cospIN%frac_out,1)  .ne. cospIN%Npoints .OR. &
-           size(cospIN%tau_067,1)   .ne. cospIN%Npoints .OR. &
-           size(cospIN%emiss_11,1)  .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%skt)     .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%qv,1)    .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%at,1)    .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%phalf,1) .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%sunlit)  .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%pfull,1) .ne. cospIN%Npoints) then
+       if (size(cospIN%frac_out,1)  /= cospIN%Npoints .OR. &
+           size(cospIN%tau_067,1)   /= cospIN%Npoints .OR. &
+           size(cospIN%emiss_11,1)  /= cospIN%Npoints .OR. &
+           size(cospgridIN%skt)     /= cospIN%Npoints .OR. &
+           size(cospgridIN%qv,1)    /= cospIN%Npoints .OR. &
+           size(cospgridIN%at,1)    /= cospIN%Npoints .OR. &
+           size(cospgridIN%phalf,1) /= cospIN%Npoints .OR. &
+           size(cospgridIN%sunlit)  /= cospIN%Npoints .OR. &
+           size(cospgridIN%pfull,1) /= cospIN%Npoints) then
           Lisccp_subcolumn = .false.
           Lisccp_column    = .false.
@@ -3403,7 +3403,7 @@
           errorMessage(nError) = 'ERROR(isccp_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%frac_out,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tau_067,2)  .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%emiss_11,2) .ne. cospIN%Ncolumns) then
+       if (size(cospIN%frac_out,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%tau_067,2)  /= cospIN%Ncolumns .OR. &
+           size(cospIN%emiss_11,2) /= cospIN%Ncolumns) then
           Lisccp_subcolumn = .false.
           Lisccp_column    = .false.
@@ -3411,11 +3411,11 @@
           errorMessage(nError) = 'ERROR(isccp_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%frac_out,3)  .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tau_067,3)   .ne. cospIN%Nlevels .OR. &
-           size(cospIN%emiss_11,3)  .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%qv,2)    .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%at,2)    .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%pfull,2) .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%phalf,2) .ne. cospIN%Nlevels+1) then
+       if (size(cospIN%frac_out,3)  /= cospIN%Nlevels .OR. &
+           size(cospIN%tau_067,3)   /= cospIN%Nlevels .OR. &
+           size(cospIN%emiss_11,3)  /= cospIN%Nlevels .OR. &
+           size(cospgridIN%qv,2)    /= cospIN%Nlevels .OR. &
+           size(cospgridIN%at,2)    /= cospIN%Nlevels .OR. &
+           size(cospgridIN%pfull,2) /= cospIN%Nlevels .OR. &
+           size(cospgridIN%phalf,2) /= cospIN%Nlevels+1) then
           Lisccp_subcolumn = .false.
           Lisccp_column    = .false.
@@ -3427,8 +3427,8 @@
     ! MISR
     if (Lmisr_subcolumn .or. Lmisr_column) then
-       if (size(cospIN%tau_067,1)        .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%sunlit)       .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%hgt_matrix,1) .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%at,1)         .ne. cospIN%Npoints) then
+       if (size(cospIN%tau_067,1)        /= cospIN%Npoints .OR. &
+           size(cospgridIN%sunlit)       /= cospIN%Npoints .OR. &
+           size(cospgridIN%hgt_matrix,1) /= cospIN%Npoints .OR. &
+           size(cospgridIN%at,1)         /= cospIN%Npoints) then
           Lmisr_subcolumn = .false.
           Lmisr_column    = .false.
@@ -3436,5 +3436,5 @@
           errorMessage(nError) = 'ERROR(misr_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%tau_067,2) .ne. cospIN%Ncolumns) then
+       if (size(cospIN%tau_067,2) /= cospIN%Ncolumns) then
           Lmisr_subcolumn = .false.
           Lmisr_column    = .false.
@@ -3442,7 +3442,7 @@
           errorMessage(nError) = 'ERROR(misr_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%tau_067,3)        .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%hgt_matrix,2) .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%at,2)         .ne. cospIN%Nlevels) then
+       if (size(cospIN%tau_067,3)        /= cospIN%Nlevels .OR. &
+           size(cospgridIN%hgt_matrix,2) /= cospIN%Nlevels .OR. &
+           size(cospgridIN%at,2)         /= cospIN%Nlevels) then
           Lmisr_subcolumn = .false.
           Lmisr_column    = .false.
@@ -3454,8 +3454,8 @@
     ! MODIS
     if (Lmodis_subcolumn .or. Lmodis_column) then
-       if (size(cospIN%fracLiq,1) .ne. cospIN%Npoints .OR. &
-           size(cospIN%tau_067,1) .ne. cospIN%Npoints .OR. &
-           size(cospIN%asym,1)    .ne. cospIN%Npoints .OR. &
-           size(cospIN%ss_alb,1)  .ne. cospIN%Npoints) then
+       if (size(cospIN%fracLiq,1) /= cospIN%Npoints .OR. &
+           size(cospIN%tau_067,1) /= cospIN%Npoints .OR. &
+           size(cospIN%asym,1)    /= cospIN%Npoints .OR. &
+           size(cospIN%ss_alb,1)  /= cospIN%Npoints) then
           Lmodis_subcolumn = .false.
           Lmodis_column    = .false.
@@ -3463,8 +3463,8 @@
           errorMessage(nError) = 'ERROR(modis_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%fracLiq,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tau_067,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%asym,2)    .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%ss_alb,2)  .ne. cospIN%Ncolumns) then
+       if (size(cospIN%fracLiq,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%tau_067,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%asym,2)    /= cospIN%Ncolumns .OR. &
+           size(cospIN%ss_alb,2)  /= cospIN%Ncolumns) then
           Lmodis_subcolumn = .false.
           Lmodis_column    = .false.
@@ -3472,8 +3472,8 @@
           errorMessage(nError) = 'ERROR(modis_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%fracLiq,3) .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tau_067,3) .ne. cospIN%Nlevels .OR. &
-           size(cospIN%asym,3)    .ne. cospIN%Nlevels .OR. &
-           size(cospIN%ss_alb,3)  .ne. cospIN%Nlevels) then
+       if (size(cospIN%fracLiq,3) /= cospIN%Nlevels .OR. &
+           size(cospIN%tau_067,3) /= cospIN%Nlevels .OR. &
+           size(cospIN%asym,3)    /= cospIN%Nlevels .OR. &
+           size(cospIN%ss_alb,3)  /= cospIN%Nlevels) then
           Lmodis_subcolumn = .false.
           Lmodis_column    = .false.
@@ -3485,8 +3485,8 @@
     ! CLOUDSAT
     if (Lcloudsat_subcolumn .or. Lcloudsat_column) then
-       if (size(cospIN%z_vol_cloudsat,1)   .ne. cospIN%Npoints .OR. &
-           size(cospIN%kr_vol_cloudsat,1)  .ne. cospIN%Npoints .OR. &
-           size(cospIN%g_vol_cloudsat,1)   .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%hgt_matrix,1)   .ne. cospIN%Npoints) then
+       if (size(cospIN%z_vol_cloudsat,1)   /= cospIN%Npoints .OR. &
+           size(cospIN%kr_vol_cloudsat,1)  /= cospIN%Npoints .OR. &
+           size(cospIN%g_vol_cloudsat,1)   /= cospIN%Npoints .OR. &
+           size(cospgridIN%hgt_matrix,1)   /= cospIN%Npoints) then
           Lcloudsat_subcolumn = .false.
           Lcloudsat_column    = .false.
@@ -3494,7 +3494,7 @@
           errorMessage(nError) = 'ERROR(cloudsat_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%z_vol_cloudsat,2)  .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%kr_vol_cloudsat,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%g_vol_cloudsat,2)  .ne. cospIN%Ncolumns) then
+       if (size(cospIN%z_vol_cloudsat,2)  /= cospIN%Ncolumns .OR. &
+           size(cospIN%kr_vol_cloudsat,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%g_vol_cloudsat,2)  /= cospIN%Ncolumns) then
           Lcloudsat_subcolumn = .false.
           Lcloudsat_column    = .false.
@@ -3502,8 +3502,8 @@
           errorMessage(nError) = 'ERROR(cloudsat_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%z_vol_cloudsat,3)  .ne. cospIN%Nlevels .OR. &
-           size(cospIN%kr_vol_cloudsat,3) .ne. cospIN%Nlevels .OR. &
-           size(cospIN%g_vol_cloudsat,3)  .ne. cospIN%Nlevels .OR. &
-           size(cospgridIN%hgt_matrix,2)  .ne. cospIN%Nlevels) then
+       if (size(cospIN%z_vol_cloudsat,3)  /= cospIN%Nlevels .OR. &
+           size(cospIN%kr_vol_cloudsat,3) /= cospIN%Nlevels .OR. &
+           size(cospIN%g_vol_cloudsat,3)  /= cospIN%Nlevels .OR. &
+           size(cospgridIN%hgt_matrix,2)  /= cospIN%Nlevels) then
           Lcloudsat_subcolumn = .false.
           Lcloudsat_column    = .false.
@@ -3515,8 +3515,8 @@
     ! GROUND LIDAR @ 532nm
     if (LgrLidar532_subcolumn .or. LgrLidar532_column) then
-       if (size(cospIN%beta_mol_grLidar532,1)    .ne. cospIN%Npoints .OR. & 
-           size(cospIN%betatot_grLidar532,1)     .ne. cospIN%Npoints .OR. &
-           size(cospIN%tau_mol_grLidar532,1)     .ne. cospIN%Npoints .OR. &
-           size(cospIN%tautot_grLidar532,1)      .ne. cospIN%Npoints) then
+       if (size(cospIN%beta_mol_grLidar532,1)    /= cospIN%Npoints .OR. &
+           size(cospIN%betatot_grLidar532,1)     /= cospIN%Npoints .OR. &
+           size(cospIN%tau_mol_grLidar532,1)     /= cospIN%Npoints .OR. &
+           size(cospIN%tautot_grLidar532,1)      /= cospIN%Npoints) then
           LgrLidar532_subcolumn = .false.
           LgrLidar532_column    = .false.
@@ -3524,6 +3524,6 @@
           errorMessage(nError) = 'ERROR(grLidar532_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%betatot_grLidar532,2)    .ne. cospIN%Ncolumns .OR. & 
-           size(cospIN%tautot_grLidar532,2)     .ne. cospIN%Ncolumns) then 
+       if (size(cospIN%betatot_grLidar532,2)    /= cospIN%Ncolumns .OR. &
+           size(cospIN%tautot_grLidar532,2)     /= cospIN%Ncolumns) then
           LgrLidar532_subcolumn = .false. 
           LgrLidar532_column    = .false. 
@@ -3531,8 +3531,8 @@
           errorMessage(nError) = 'ERROR(grLidar532_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%beta_mol_grLidar532,2)    .ne. cospIN%Nlevels .OR. &
-           size(cospIN%betatot_grLidar532,3)     .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tau_mol_grLidar532,2)     .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tautot_grLidar532,3)      .ne. cospIN%Nlevels) then
+       if (size(cospIN%beta_mol_grLidar532,2)    /= cospIN%Nlevels .OR. &
+           size(cospIN%betatot_grLidar532,3)     /= cospIN%Nlevels .OR. &
+           size(cospIN%tau_mol_grLidar532,2)     /= cospIN%Nlevels .OR. &
+           size(cospIN%tautot_grLidar532,3)      /= cospIN%Nlevels) then
           LgrLidar532_subcolumn = .false. 
           LgrLidar532_column    = .false. 
@@ -3544,8 +3544,8 @@
     ! ATLID
     if (Latlid_subcolumn .or. Latlid_column) then
-       if (size(cospIN%beta_mol_atlid,1)    .ne. cospIN%Npoints .OR. &
-           size(cospIN%betatot_atlid,1)     .ne. cospIN%Npoints .OR. &
-           size(cospIN%tau_mol_atlid,1)     .ne. cospIN%Npoints .OR. & 
-           size(cospIN%tautot_atlid,1)      .ne. cospIN%Npoints) then 
+       if (size(cospIN%beta_mol_atlid,1)    /= cospIN%Npoints .OR. &
+           size(cospIN%betatot_atlid,1)     /= cospIN%Npoints .OR. &
+           size(cospIN%tau_mol_atlid,1)     /= cospIN%Npoints .OR. &
+           size(cospIN%tautot_atlid,1)      /= cospIN%Npoints) then
           Latlid_subcolumn = .false. 
           Latlid_column    = .false. 
@@ -3553,6 +3553,6 @@
           errorMessage(nError) = 'ERROR(atlid_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%betatot_atlid,2)    .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tautot_atlid,2)     .ne. cospIN%Ncolumns) then 
+       if (size(cospIN%betatot_atlid,2)    /= cospIN%Ncolumns .OR. &
+           size(cospIN%tautot_atlid,2)     /= cospIN%Ncolumns) then
           Latlid_subcolumn = .false.
           Latlid_column    = .false.
@@ -3560,8 +3560,8 @@
           errorMessage(nError) = 'ERROR(atlid_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%beta_mol_atlid,2)    .ne. cospIN%Nlevels .OR. &
-           size(cospIN%betatot_atlid,3)     .ne. cospIN%Nlevels .OR. & 
-           size(cospIN%tau_mol_atlid,2)     .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tautot_atlid,3)      .ne. cospIN%Nlevels) then 
+       if (size(cospIN%beta_mol_atlid,2)    /= cospIN%Nlevels .OR. &
+           size(cospIN%betatot_atlid,3)     /= cospIN%Nlevels .OR. &
+           size(cospIN%tau_mol_atlid,2)     /= cospIN%Nlevels .OR. &
+           size(cospIN%tautot_atlid,3)      /= cospIN%Nlevels) then
           Latlid_subcolumn = .false.
           Latlid_column    = .false. 
@@ -3573,12 +3573,12 @@
     ! CALIPSO
     if (Lcalipso_subcolumn .or. Lcalipso_column) then
-       if (size(cospIN%beta_mol_calipso,1)    .ne. cospIN%Npoints .OR. &
-           size(cospIN%betatot_calipso,1)     .ne. cospIN%Npoints .OR. &
-           size(cospIN%betatot_liq_calipso,1) .ne. cospIN%Npoints .OR. &
-           size(cospIN%betatot_ice_calipso,1) .ne. cospIN%Npoints .OR. &
-           size(cospIN%tau_mol_calipso,1)     .ne. cospIN%Npoints .OR. &
-           size(cospIN%tautot_calipso,1)      .ne. cospIN%Npoints .OR. &
-           size(cospIN%tautot_liq_calipso,1)  .ne. cospIN%Npoints .OR. &
-           size(cospIN%tautot_ice_calipso,1)  .ne. cospIN%Npoints) then
+       if (size(cospIN%beta_mol_calipso,1)    /= cospIN%Npoints .OR. &
+           size(cospIN%betatot_calipso,1)     /= cospIN%Npoints .OR. &
+           size(cospIN%betatot_liq_calipso,1) /= cospIN%Npoints .OR. &
+           size(cospIN%betatot_ice_calipso,1) /= cospIN%Npoints .OR. &
+           size(cospIN%tau_mol_calipso,1)     /= cospIN%Npoints .OR. &
+           size(cospIN%tautot_calipso,1)      /= cospIN%Npoints .OR. &
+           size(cospIN%tautot_liq_calipso,1)  /= cospIN%Npoints .OR. &
+           size(cospIN%tautot_ice_calipso,1)  /= cospIN%Npoints) then
           Lcalipso_subcolumn = .false.
           Lcalipso_column    = .false.
@@ -3586,10 +3586,10 @@
           errorMessage(nError) = 'ERROR(calipso_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%betatot_calipso,2)     .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%betatot_liq_calipso,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%betatot_ice_calipso,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tautot_calipso,2)      .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tautot_liq_calipso,2)  .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tautot_ice_calipso,2)  .ne. cospIN%Ncolumns) then
+       if (size(cospIN%betatot_calipso,2)     /= cospIN%Ncolumns .OR. &
+           size(cospIN%betatot_liq_calipso,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%betatot_ice_calipso,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%tautot_calipso,2)      /= cospIN%Ncolumns .OR. &
+           size(cospIN%tautot_liq_calipso,2)  /= cospIN%Ncolumns .OR. &
+           size(cospIN%tautot_ice_calipso,2)  /= cospIN%Ncolumns) then
           Lcalipso_subcolumn = .false.
           Lcalipso_column    = .false.
@@ -3597,12 +3597,12 @@
           errorMessage(nError) = 'ERROR(calipso_simulator): The number of sub-columns in the input fields are inconsistent'
        endif
-       if (size(cospIN%beta_mol_calipso,2)    .ne. cospIN%Nlevels .OR. &
-           size(cospIN%betatot_calipso,3)     .ne. cospIN%Nlevels .OR. &
-           size(cospIN%betatot_liq_calipso,3) .ne. cospIN%Nlevels .OR. &
-           size(cospIN%betatot_ice_calipso,3) .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tau_mol_calipso,2)     .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tautot_calipso,3)      .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tautot_liq_calipso,3)  .ne. cospIN%Nlevels .OR. &
-           size(cospIN%tautot_ice_calipso,3)  .ne. cospIN%Nlevels) then
+       if (size(cospIN%beta_mol_calipso,2)    /= cospIN%Nlevels .OR. &
+           size(cospIN%betatot_calipso,3)     /= cospIN%Nlevels .OR. &
+           size(cospIN%betatot_liq_calipso,3) /= cospIN%Nlevels .OR. &
+           size(cospIN%betatot_ice_calipso,3) /= cospIN%Nlevels .OR. &
+           size(cospIN%tau_mol_calipso,2)     /= cospIN%Nlevels .OR. &
+           size(cospIN%tautot_calipso,3)      /= cospIN%Nlevels .OR. &
+           size(cospIN%tautot_liq_calipso,3)  /= cospIN%Nlevels .OR. &
+           size(cospIN%tautot_ice_calipso,3)  /= cospIN%Nlevels) then
           Lcalipso_subcolumn = .false.
           Lcalipso_column    = .false.
@@ -3614,6 +3614,6 @@
     ! PARASOL
     if (Lparasol_subcolumn .or. Lparasol_column) then
-       if (size(cospIN%tautot_S_liq,1) .ne. cospIN%Npoints .OR. &
-           size(cospIN%tautot_S_ice,1) .ne. cospIN%Npoints) then
+       if (size(cospIN%tautot_S_liq,1) /= cospIN%Npoints .OR. &
+           size(cospIN%tautot_S_ice,1) /= cospIN%Npoints) then
           Lparasol_subcolumn = .false.
           Lparasol_column    = .false.
@@ -3621,6 +3621,6 @@
           errorMessage(nError) = 'ERROR(parasol_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospIN%tautot_S_liq,2) .ne. cospIN%Ncolumns .OR. &
-           size(cospIN%tautot_S_ice,2) .ne. cospIN%Ncolumns) then
+       if (size(cospIN%tautot_S_liq,2) /= cospIN%Ncolumns .OR. &
+           size(cospIN%tautot_S_ice,2) /= cospIN%Ncolumns) then
           Lparasol_subcolumn = .false.
           Lparasol_column    = .false.
@@ -3632,25 +3632,25 @@
     ! RTTOV
     if (Lrttov_column) then
-       if (size(cospgridIN%pfull,1)           .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%at,1)              .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%qv,1)              .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%hgt_matrix_half,1) .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%u_sfc)             .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%v_sfc)             .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%skt)               .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%phalf,1)           .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%qv,1)              .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%land)              .ne. cospIN%Npoints .OR. &
-           size(cospgridIN%lat)               .ne. cospIN%Npoints) then
+       if (size(cospgridIN%pfull,1)           /= cospIN%Npoints .OR. &
+           size(cospgridIN%at,1)              /= cospIN%Npoints .OR. &
+           size(cospgridIN%qv,1)              /= cospIN%Npoints .OR. &
+           size(cospgridIN%hgt_matrix_half,1) /= cospIN%Npoints .OR. &
+           size(cospgridIN%u_sfc)             /= cospIN%Npoints .OR. &
+           size(cospgridIN%v_sfc)             /= cospIN%Npoints .OR. &
+           size(cospgridIN%skt)               /= cospIN%Npoints .OR. &
+           size(cospgridIN%phalf,1)           /= cospIN%Npoints .OR. &
+           size(cospgridIN%qv,1)              /= cospIN%Npoints .OR. &
+           size(cospgridIN%land)              /= cospIN%Npoints .OR. &
+           size(cospgridIN%lat)               /= cospIN%Npoints) then
           Lrttov_column    = .false.
           nError=nError+1
           errorMessage(nError) = 'ERROR(rttov_simulator): The number of points in the input fields are inconsistent'
        endif
-       if (size(cospgridIN%pfull,2)           .ne. cospIN%Nlevels   .OR. &
-           size(cospgridIN%at,2)              .ne. cospIN%Nlevels   .OR. &
-           size(cospgridIN%qv,2)              .ne. cospIN%Nlevels   .OR. &
-           size(cospgridIN%hgt_matrix_half,2) .ne. cospIN%Nlevels+1 .OR. &
-           size(cospgridIN%phalf,2)           .ne. cospIN%Nlevels+1 .OR. &
-           size(cospgridIN%qv,2)              .ne. cospIN%Nlevels) then
+       if (size(cospgridIN%pfull,2)           /= cospIN%Nlevels   .OR. &
+           size(cospgridIN%at,2)              /= cospIN%Nlevels   .OR. &
+           size(cospgridIN%qv,2)              /= cospIN%Nlevels   .OR. &
+           size(cospgridIN%hgt_matrix_half,2) /= cospIN%Nlevels+1 .OR. &
+           size(cospgridIN%phalf,2)           /= cospIN%Nlevels+1 .OR. &
+           size(cospgridIN%qv,2)              /= cospIN%Nlevels) then
           Lrttov_column    = .false.
           nError=nError+1
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_stats.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_stats.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_stats.F90	(revision 5082)
@@ -210,5 +210,5 @@
           ! look for j_1km from bottom to top
           j = 1
-          do while (Ze_tot(pr,i,j) .eq. R_GROUND)
+          do while (Ze_tot(pr,i,j) == R_GROUND)
              j = j+1
           enddo
@@ -217,7 +217,7 @@
           do j=1,Nlevels
              sc_ratio = beta_tot(pr,i,j)/beta_mol(pr,j)
-             if ((sc_ratio .le. s_att) .and. (flag_sat .eq. 0)) flag_sat = j
-             if (Ze_tot(pr,i,j) .lt. -30.) then  !radar can't detect cloud
-                if ( (sc_ratio .gt. s_cld) .or. (flag_sat .eq. j) ) then  !lidar sense cloud
+             if ((sc_ratio <= s_att) .and. (flag_sat == 0)) flag_sat = j
+             if (Ze_tot(pr,i,j) < -30.) then  !radar can't detect cloud
+                if ( (sc_ratio > s_cld) .or. (flag_sat == j) ) then  !lidar sense cloud
                    lidar_only_freq_cloud(pr,j)=lidar_only_freq_cloud(pr,j)+1. !top->surf
                    flag_cld=1
@@ -226,10 +226,10 @@
                 flag_cld=1
                 flag_radarcld=1
-                if (j .gt. j_1km) flag_radarcld_no1km=1              
+                if (j > j_1km) flag_radarcld_no1km=1
              endif
           enddo !levels
-          if (flag_cld .eq. 1) tcc(pr)=tcc(pr)+1._wp
-          if (flag_radarcld .eq. 1) radar_tcc(pr)=radar_tcc(pr)+1.
-          if (flag_radarcld_no1km .eq. 1) radar_tcc2(pr)=radar_tcc2(pr)+1.        
+          if (flag_cld == 1) tcc(pr)=tcc(pr)+1._wp
+          if (flag_radarcld == 1) radar_tcc(pr)=radar_tcc(pr)+1.
+          if (flag_radarcld_no1km == 1) radar_tcc2(pr)=radar_tcc2(pr)+1.
        enddo !columns
     enddo !points
@@ -267,6 +267,6 @@
     
     do ij=2,Nbins+1  
-       hist1D(ij-1) = count(var .ge. bins(ij-1) .and. var .lt. bins(ij))
-       if (count(var .eq. R_GROUND) .ge. 1) hist1D(ij-1)=R_UNDEF
+       hist1D(ij-1) = count(var >= bins(ij-1) .and. var < bins(ij))
+       if (count(var == R_GROUND) >= 1) hist1D(ij-1)=R_UNDEF
     enddo
     
@@ -300,6 +300,6 @@
     do ij=2,nbin1+1
        do ik=2,nbin2+1
-          jointHist(ij-1,ik-1)=count(var1 .ge. bin1(ij-1) .and. var1 .lt. bin1(ij) .and. &
-               var2 .ge. bin2(ik-1) .and. var2 .lt. bin2(ik))        
+          jointHist(ij-1,ik-1)=count(var1 >= bin1(ij-1) .and. var1 < bin1(ij) .and. &
+               var2 >= bin2(ik-1) .and. var2 < bin2(ik))
        enddo
     enddo
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/icarus.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/icarus.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/icarus.F90	(revision 5082)
@@ -134,5 +134,5 @@
     ! ##########################################################################
     
-    if (debugcol.ne.0) then
+    if (debugcol/=0) then
        do j=1,npoints,debugcol
           
@@ -140,5 +140,5 @@
           do ilev=1,nlev
              acc(ilev,1:ncol)=frac_out(j,1:ncol,ilev)*2
-             where(levmatch(j,1:ncol) .eq. ilev) acc(ilev,1:ncol)=acc(ilev,1:ncol)+1
+             where(levmatch(j,1:ncol) == ilev) acc(ilev,1:ncol)=acc(ilev,1:ncol)+1
           enddo
           
@@ -224,5 +224,5 @@
 
     ! Set tropopause values
-    if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then 
+    if (isccp_top_height == 1 .or. isccp_top_height == 3) then
        ptrop(1:npoints)     = 5000._wp
        attropmin(1:npoints) = 400._wp
@@ -232,7 +232,7 @@
 
        do ilev=1,nlev
-          where(pfull(1:npoints,ilev) .lt. 40000. .and. &
-                pfull(1:npoints,ilev) .gt.  5000. .and. &
-                at(1:npoints,ilev)    .lt. attropmin(1:npoints))
+          where(pfull(1:npoints,ilev) < 40000. .and. &
+                pfull(1:npoints,ilev) >  5000. .and. &
+                at(1:npoints,ilev)    < attropmin(1:npoints))
              ptrop(1:npoints)     = pfull(1:npoints,ilev)
              attropmin(1:npoints) = at(1:npoints,ilev)
@@ -244,9 +244,9 @@
        do ilev=1,nlev
           atmax(1:npoints) = merge(at(1:npoints,ilev),atmax(1:npoints),&
-               at(1:npoints,ilev) .gt. atmax(1:npoints) .and. ilev  .ge. itrop(1:npoints))
+               at(1:npoints,ilev) > atmax(1:npoints) .and. ilev  >= itrop(1:npoints))
        enddo
     end if
   
-    if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then
+    if (isccp_top_height == 1 .or. isccp_top_height == 3) then
        ! ############################################################################
        !                        Clear-sky radiance calculation
@@ -308,5 +308,5 @@
              dem(1:npoints,ibox) = merge(dem_wv(1:npoints,ilev), &
                                          1._wp-(1._wp-demIN(1:npoints,ibox,ilev))*(1._wp-dem_wv(1:npoints,ilev)), &
-                                         demIN(1:npoints,ibox,ilev) .eq. 0)
+                                         demIN(1:npoints,ibox,ilev) == 0)
 
              ! Increase TOA flux emitted from layer
@@ -348,7 +348,7 @@
           tauir(1:npoints)    = tau(1:npoints,ibox)/2.13_wp
           taumin(1:npoints)   = -log(max(min(transmax(1:npoints),0.9999999_wp),0.001_wp))
-          if (isccp_top_height .eq. 1) then
+          if (isccp_top_height == 1) then
              do j=1,npoints  
-                if (transmax(j) .gt. 0.001 .and.  transmax(j) .le. 0.9999999) then
+                if (transmax(j) > 0.001 .and.  transmax(j) <= 0.9999999) then
                    fluxtopinit(j) = fluxtop(j,ibox)
                    tauir(j) = tau(j,ibox)/2.13_wp
@@ -357,11 +357,11 @@
              do icycle=1,2
                 do j=1,npoints  
-                   if (tau(j,ibox) .gt. (tauchk)) then 
-                      if (transmax(j) .gt. 0.001 .and.  transmax(j) .le. 0.9999999) then
+                   if (tau(j,ibox) > (tauchk)) then
+                      if (transmax(j) > 0.001 .and.  transmax(j) <= 0.9999999) then
                          emcld(j,ibox) = 1._wp - exp(-1._wp * tauir(j)  )
                          fluxtop(j,ibox) = fluxtopinit(j) - ((1.-emcld(j,ibox))*fluxtop_clrsky(j))
                          fluxtop(j,ibox)=max(1.E-06_wp,(fluxtop(j,ibox)/emcld(j,ibox)))
                          tb(j,ibox)= 1307.27_wp / (log(1._wp + (1._wp/fluxtop(j,ibox))))
-                         if (tb(j,ibox) .gt. 260.) then
+                         if (tb(j,ibox) > 260.) then
                             tauir(j) = tau(j,ibox) / 2.56_wp
                          end if
@@ -373,7 +373,7 @@
 
           ! Cloud-top temperature
-          where(tau(1:npoints,ibox) .gt. tauchk)
+          where(tau(1:npoints,ibox) > tauchk)
              tb(1:npoints,ibox)= 1307.27_wp/ (log(1. + (1._wp/fluxtop(1:npoints,ibox))))
-             where (isccp_top_height .eq. 1 .and. tauir(1:npoints) .lt. taumin(1:npoints))
+             where (isccp_top_height == 1 .and. tauir(1:npoints) < taumin(1:npoints))
                 tb(1:npoints,ibox) = attrop(1:npoints) - 5._wp 
                 tau(1:npoints,ibox) = 2.13_wp*taumin(1:npoints)
@@ -382,5 +382,5 @@
           
           ! Clear-sky brightness temperature
-          where(tau(1:npoints,ibox) .le. tauchk) 
+          where(tau(1:npoints,ibox) <= tauchk)
              tb(1:npoints,ibox) = meantbclr(1:npoints)
           endwhere
@@ -399,16 +399,16 @@
     do ibox=1,ncol
        !segregate according to optical thickness
-       if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then  
+       if (isccp_top_height == 1 .or. isccp_top_height == 3) then
           
           ! Find level whose temperature most closely matches brightness temperature
           nmatch(1:npoints)=0
           do k1=1,nlev-1
-             ilev = merge(nlev-k1,k1,isccp_top_height_direction .eq. 2)        
+             ilev = merge(nlev-k1,k1,isccp_top_height_direction == 2)
              do j=1,npoints 
-                if (ilev           .ge. itrop(j)     .and. &
-                     ((at(j,ilev)  .ge. tb(j,ibox)   .and. &  
-                      at(j,ilev+1) .le. tb(j,ibox))  .or.  &
-                      (at(j,ilev)  .le. tb(j,ibox)   .and. &
-                      at(j,ilev+1) .ge. tb(j,ibox)))) then 
+                if (ilev           >= itrop(j)     .and. &
+                     ((at(j,ilev)  >= tb(j,ibox)   .and. &
+                      at(j,ilev+1) <= tb(j,ibox))  .or.  &
+                      (at(j,ilev)  <= tb(j,ibox)   .and. &
+                      at(j,ilev+1) >= tb(j,ibox)))) then
                    nmatch(j)=nmatch(j)+1
                    match(j,nmatch(j))=ilev
@@ -418,5 +418,5 @@
 
           do j=1,npoints 
-             if (nmatch(j) .ge. 1) then
+             if (nmatch(j) >= 1) then
                 k1 = match(j,nmatch(j))
                 k2 = k1 + 1
@@ -426,11 +426,11 @@
                 logp=logp1+(logp2-logp1)*abs(tb(j,ibox)-at(j,k1))/atd
                 ptop(j,ibox) = exp(logp)
-                levmatch(j,ibox) = merge(k1,k2,abs(pfull(j,k1)-ptop(j,ibox)) .lt. abs(pfull(j,k2)-ptop(j,ibox)))
+                levmatch(j,ibox) = merge(k1,k2,abs(pfull(j,k1)-ptop(j,ibox)) < abs(pfull(j,k2)-ptop(j,ibox)))
              else
-                if (tb(j,ibox) .le. attrop(j)) then
+                if (tb(j,ibox) <= attrop(j)) then
                    ptop(j,ibox)=ptrop(j)
                    levmatch(j,ibox)=itrop(j)
                 end if
-                if (tb(j,ibox) .ge. atmax(j)) then
+                if (tb(j,ibox) >= atmax(j)) then
                    ptop(j,ibox)=pfull(j,nlev)
                    levmatch(j,ibox)=nlev
@@ -441,5 +441,5 @@
           ptop(1:npoints,ibox)=0.
           do ilev=1,nlev
-             where((ptop(1:npoints,ibox) .eq. 0. ) .and.(frac_out(1:npoints,ibox,ilev) .ne. 0))
+             where((ptop(1:npoints,ibox) == 0. ) .and.(frac_out(1:npoints,ibox,ilev) /= 0))
                 ptop(1:npoints,ibox)=phalf(1:npoints,ilev)
                 levmatch(1:npoints,ibox)=ilev
@@ -447,5 +447,5 @@
           end do
        end if
-       where(tau(1:npoints,ibox) .le. tauchk)
+       where(tau(1:npoints,ibox) <= tauchk)
           ptop(1:npoints,ibox)=0._wp
           levmatch(1:npoints,ibox)=0._wp
@@ -460,6 +460,6 @@
     do ibox=1,ncol
        do j=1,npoints 
-          if (tau(j,ibox) .gt. (tauchk) .and. ptop(j,ibox) .gt. 0.) then
-             if (sunlit(j).eq.1 .or. isccp_top_height .eq. 3) then
+          if (tau(j,ibox) > (tauchk) .and. ptop(j,ibox) > 0.) then
+             if (sunlit(j)==1 .or. isccp_top_height == 3) then
                 boxtau(j,ibox) = tau(j,ibox)
                 boxptop(j,ibox) = ptop(j,ibox)!/100._wp
@@ -508,5 +508,5 @@
     !                           Brightness Temperature
     ! ####################################################################################
-    if (isccp_top_height .eq. 1 .or. isccp_top_height .eq. 3) then
+    if (isccp_top_height == 1 .or. isccp_top_height == 3) then
        meantb(1:npoints)=sum(boxttop,2)/ncol
     else
@@ -535,5 +535,5 @@
        do ilev2=1,7
           do j=1,npoints ! 
-             if (sunlit(j).eq.1 .or. isccp_top_height .eq. 3) then 
+             if (sunlit(j)==1 .or. isccp_top_height == 3) then
                 fq_isccp(j,ilev,ilev2)= 0.
 	     else 
@@ -546,5 +546,5 @@
     
     ! Reset variables need for averaging cloud properties
-    where(sunlit .eq. 1 .or. isccp_top_height .eq. 3)
+    where(sunlit == 1 .or. isccp_top_height == 3)
        totalcldarea(1:npoints)  = 0._wp
        meanalbedocld(1:npoints) = 0._wp
@@ -561,8 +561,8 @@
     do j=1,npoints 
        ! Subcolumns that are cloudy(true) and not(false)
-       box_cloudy2(1:ncol) = merge(.true.,.false.,boxtau(j,1:ncol) .gt. tauchk .and. boxptop(j,1:ncol) .gt. 0.)
+       box_cloudy2(1:ncol) = merge(.true.,.false.,boxtau(j,1:ncol) > tauchk .and. boxptop(j,1:ncol) > 0.)
 
        ! Compute joint histogram and column quantities for points that are sunlit and cloudy
-       if (sunlit(j) .eq.1 .or. isccp_top_height .eq. 3) then 
+       if (sunlit(j) ==1 .or. isccp_top_height == 3) then
           ! Joint-histogram
           call hist2D(boxtau(j,1:ncol),boxptop(j,1:ncol),ncol,isccp_histTau,numISCCPTauBins, &
@@ -572,10 +572,10 @@
           
           ! Column cloud area
-          totalcldarea(j) = real(count(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin))/ncol
+          totalcldarea(j) = real(count(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) > isccp_taumin))/ncol
              
           ! Subcolumn cloud albedo
           !albedocld(j,1:ncol) = merge((boxtau(j,1:ncol)**0.895_wp)/((boxtau(j,1:ncol)**0.895_wp)+6.82_wp),&
           !     0._wp,box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin)
-          where(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin)
+          where(box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) > isccp_taumin)
              albedocld(j,1:ncol) = (boxtau(j,1:ncol)**0.895_wp)/((boxtau(j,1:ncol)**0.895_wp)+6.82_wp)
           elsewhere
@@ -587,10 +587,10 @@
           
           ! Column cloud top pressure
-          meanptop(j) = sum(boxptop(j,1:ncol),box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) .gt. isccp_taumin)/ncol
+          meanptop(j) = sum(boxptop(j,1:ncol),box_cloudy2(1:ncol) .and. boxtau(j,1:ncol) > isccp_taumin)/ncol
        endif
     enddo
     
     ! Compute mean cloud properties. Set to mssing value in the event that totalcldarea=0
-    where(totalcldarea(1:npoints) .gt. 0)
+    where(totalcldarea(1:npoints) > 0)
        meanptop(1:npoints)      = 100._wp*meanptop(1:npoints)/totalcldarea(1:npoints)
        meanalbedocld(1:npoints) = meanalbedocld(1:npoints)/totalcldarea(1:npoints)
@@ -609,6 +609,6 @@
 
     ! Represent in percent
-    where(totalcldarea .ne. output_missing_value) totalcldarea = totalcldarea*100._wp
-    where(fq_isccp     .ne. output_missing_value) fq_isccp     = fq_isccp*100._wp
+    where(totalcldarea /= output_missing_value) totalcldarea = totalcldarea*100._wp
+    where(fq_isccp     /= output_missing_value) fq_isccp     = fq_isccp*100._wp
     
     
@@ -634,8 +634,8 @@
     varOUT(1:dim1,1:dim2,1:dim3) = 0._wp
     do j=1,dim2
-       where(flag(:,j,:) .eq. 1)
+       where(flag(:,j,:) == 1)
           varOUT(:,j,:) = varIN2
        endwhere
-       where(flag(:,j,:) .eq. 2)
+       where(flag(:,j,:) == 2)
           varOUT(:,j,:) = varIN1
        endwhere
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lidar_simulator.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lidar_simulator.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lidar_simulator.F90	(revision 5082)
@@ -231,5 +231,5 @@
           ! Computation of the total perpendicular lidar signal (ATBperp for liq+ice)
           ! Upper layer
-          WHERE(tautot(1:npoints,icol,1) .gt. 0)
+          WHERE(tautot(1:npoints,icol,1) > 0)
              pnorm_perp_tot(1:npoints,icol,1) = (beta_perp_ice(1:npoints,icol,1)+           &
                   beta_perp_liq(1:npoints,icol,1)-                                          &
@@ -251,8 +251,8 @@
              ! Betaperp=beta_mol(:,k)/(1+1/0.0284)) [bodhaine et al. 1999] in the following 
              ! equations:
-             WHERE (pnorm(1:npoints,icol,k) .eq. 0)
+             WHERE (pnorm(1:npoints,icol,k) == 0)
                 pnorm_perp_tot(1:npoints,icol,k)=0._wp
              ELSEWHERE
-                where(tautot_lay(1:npoints) .gt. 0.)
+                where(tautot_lay(1:npoints) > 0.)
                    pnorm_perp_tot(1:npoints,icol,k) = (beta_perp_ice(1:npoints,icol,k)+     &
                         beta_perp_liq(1:npoints,icol,k)-(beta_mol(1:npoints,k)/(1._wp+1._wp/  &
@@ -358,7 +358,7 @@
     latlid = .false.
     lgrlidar532 = .false.
-    if (platform .eq. 'calipso') lcalipso=.true.
-    if (platform .eq. 'atlid') latlid=.true.
-    if (platform .eq. 'grlidar532') lgrlidar532=.true.
+    if (platform == 'calipso') lcalipso=.true.
+    if (platform == 'atlid') latlid=.true.
+    if (platform == 'grlidar532') lgrlidar532=.true.
         
     ! Vertically regrid input data
@@ -400,6 +400,6 @@
        do ic = 1, ncol
           pnorm_c = pnormFlip(:,ic,:)
-          where ((pnorm_c .lt. xmax) .and. (betamolFlip(:,1,:) .lt. xmax) .and.          &
-                (betamolFlip(:,1,:) .gt. 0.0 ))
+          where ((pnorm_c < xmax) .and. (betamolFlip(:,1,:) < xmax) .and.          &
+                (betamolFlip(:,1,:) > 0.0 ))
              x3d_c = pnorm_c/betamolFlip(:,1,:)
           elsewhere
@@ -429,5 +429,5 @@
        do ic = 1, ncol
           pnorm_c = pnorm(:,ic,:)
-          where ((pnorm_c.lt.xmax) .and. (pmol.lt.xmax) .and. (pmol.gt. 0.0 ))
+          where ((pnorm_c<xmax) .and. (pmol<xmax) .and. (pmol> 0.0 ))
              x3d_c = pnorm_c/pmol
           elsewhere
@@ -463,5 +463,5 @@
           enddo
        enddo
-       where(cfad2 .ne. R_UNDEF) cfad2=cfad2/ncol
+       where(cfad2 /= R_UNDEF) cfad2=cfad2/ncol
     endif 
     
@@ -501,5 +501,5 @@
     do k=2,nlev
        tautot_lay(:) = tau(:,k)-tau(:,k-1) 
-       WHERE (tautot_lay(:) .gt. 0.)
+       WHERE (tautot_lay(:) > 0.)
           pnorm(:,k) = beta(:,k)*EXP(-2._wp*tau(:,k-1)) /&
                (2._wp*tautot_lay(:))*(1._wp-EXP(-2._wp*tautot_lay(:)))
@@ -529,6 +529,6 @@
     do k=2,nlev
        tautot_lay(:) = tau(:,k)-tau(:,k-1)       
-       WHERE ( EXP(-2._wp*tau(:,k-1)) .gt. epsrealwp )
-          WHERE (tautot_lay(:) .gt. 0.)
+       WHERE ( EXP(-2._wp*tau(:,k-1)) > epsrealwp )
+          WHERE (tautot_lay(:) > 0.)
              beta(:,k) = pnorm(:,k)/ EXP(-2._wp*tau(:,k-1))* &
                   (2._wp*tautot_lay(:))/(1._wp-exp(-2._wp*tautot_lay(:)))
@@ -650,5 +650,5 @@
     do k=1,Nlevels
        ! Cloud detection at subgrid-scale:
-       where ((x(:,:,k) .gt. S_cld) .and. (x(:,:,k) .ne. undef) )
+       where ((x(:,:,k) > S_cld) .and. (x(:,:,k) /= undef) )
           cldy(:,:,k)=1._wp
        elsewhere
@@ -657,5 +657,5 @@
        
        ! Number of usefull sub-columns:
-       where ((x(:,:,k) .gt. S_att) .and. (x(:,:,k) .ne. undef) )
+       where ((x(:,:,k) > S_att) .and. (x(:,:,k) /= undef) )
           srok(:,:,k)=1._wp
        elsewhere
@@ -677,7 +677,7 @@
              ! Computation of the cloud fraction as a function of the temperature instead
              ! of height, for ice,liquid and all clouds
-             if(srok(ip,ic,k).gt.0.)then
+             if(srok(ip,ic,k)>0.)then
                 do itemp=1,Ntemp
-                   if( (tmp(ip,k).ge.tempmod(itemp)).and.(tmp(ip,k).lt.tempmod(itemp+1)) )then
+                   if( (tmp(ip,k)>=tempmod(itemp)).and.(tmp(ip,k)<tempmod(itemp+1)) )then
                       lidarcldtempind(ip,itemp)=lidarcldtempind(ip,itemp)+1._wp
                    endif
@@ -685,7 +685,7 @@
              endif
              
-             if(cldy(ip,ic,k).eq.1.)then
+             if(cldy(ip,ic,k)==1.)then
                 do itemp=1,Ntemp 
-                   if( (tmp(ip,k) .ge. tempmod(itemp)).and.(tmp(ip,k) .lt. tempmod(itemp+1)) )then
+                   if( (tmp(ip,k) >= tempmod(itemp)).and.(tmp(ip,k) < tempmod(itemp+1)) )then
                       lidarcldtemp(ip,itemp,1)=lidarcldtemp(ip,itemp,1)+1._wp
                    endif
@@ -695,7 +695,7 @@
              iz=1
              p1 = pplay(ip,k)
-             if ( p1.gt.0. .and. p1.lt.(440._wp*100._wp)) then ! high clouds
+             if ( p1>0. .and. p1<(440._wp*100._wp)) then ! high clouds
                 iz=3
-             else if(p1.ge.(440._wp*100._wp) .and. p1.lt.(680._wp*100._wp)) then ! mid clouds
+             else if(p1>=(440._wp*100._wp) .and. p1<(680._wp*100._wp)) then ! mid clouds
                 iz=2
              endif
@@ -714,5 +714,5 @@
     
     ! Grid-box 3D cloud fraction
-    where ( nsub(:,:).gt.0.0 )
+    where ( nsub(:,:)>0.0 )
        lidarcld(:,:) = lidarcld(:,:)/nsub(:,:)
     elsewhere
@@ -729,5 +729,5 @@
        enddo
     enddo
-    where (nsublayer(:,:) .gt. 0.0)
+    where (nsublayer(:,:) > 0.0)
        cldlayer(:,:) = cldlayer(:,:)/nsublayer(:,:)
     elsewhere
@@ -748,5 +748,5 @@
 
              ! Avoid zero values
-             if( (cldy(i,ncol,nlev).eq.1.) .and. (ATBperp(i,ncol,nlev).gt.0.) )then
+             if( (cldy(i,ncol,nlev)==1.) .and. (ATBperp(i,ncol,nlev)>0.) )then
                 ! Computation of the ATBperp along the phase discrimination line
                 ATBperp_tmp = (ATB(i,ncol,nlev)**5)*alpha50 + (ATB(i,ncol,nlev)**4)*beta50 + &
@@ -756,8 +756,8 @@
                 ! 4.1.a) Ice: ATBperp above the phase discrimination line
                 ! ########################################################################
-                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) .ge. 0.)then ! Ice clouds
+                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) >= 0.)then ! Ice clouds
 
                    ! ICE with temperature above 273,15°K = Liquid (false ice)
-                   if(tmp(i,nlev) .gt. 273.15) then ! Temperature above 273,15 K
+                   if(tmp(i,nlev) > 273.15) then ! Temperature above 273,15 K
                      ! Liquid: False ice corrected by the temperature to Liquid
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp ! False ice detection ==> added to Liquid
@@ -767,7 +767,7 @@
                                                                               ! to classify the phase cloud
                       cldlayphase(i,ncol,4,2) = 1. ! tot cloud
-                      if (p1 .gt. 0. .and. p1.lt.(440._wp*100._wp)) then ! high cloud
+                      if (p1 > 0. .and. p1<(440._wp*100._wp)) then ! high cloud
                          cldlayphase(i,ncol,3,2) = 1._wp
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then ! mid cloud
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then ! mid cloud
                          cldlayphase(i,ncol,2,2) = 1._wp
                       else ! low cloud
@@ -776,8 +776,8 @@
                       cldlayphase(i,ncol,4,5) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then 
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,5) = 1._wp
                       ! Middle cloud
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,5) = 1._wp
                       ! Low cloud
@@ -791,8 +791,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud 
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then 
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then 
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud
@@ -806,13 +806,13 @@
                 else
                    ! Liquid with temperature above 231,15°K
-                   if(tmp(i,nlev) .gt. 231.15_wp) then
+                   if(tmp(i,nlev) > 231.15_wp) then
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp
                       tmpl(i,ncol,nlev)       = tmp(i,nlev)
                       cldlayphase(i,ncol,4,2) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,2) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,2) = 1._wp
                       ! Low cloud   
@@ -827,8 +827,8 @@
                       cldlayphase(i,ncol,4,4) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,4) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,4) = 1._wp
                       ! Low cloud
@@ -838,8 +838,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud   
@@ -859,5 +859,5 @@
              p1 = pplay(i,nlev)
 
-             if((cldy(i,ncol,nlev) .eq. 1.) .and. (ATBperp(i,ncol,nlev) .gt. 0.) )then
+             if((cldy(i,ncol,nlev) == 1.) .and. (ATBperp(i,ncol,nlev) > 0.) )then
                 ! Computation of the ATBperp of the phase discrimination line
                 ATBperp_tmp = (ATB(i,ncol,nlev)**5)*alpha50 + (ATB(i,ncol,nlev)**4)*beta50 + &
@@ -868,6 +868,6 @@
                 ! ########################################################################
                 ! ICE with temperature above 273,15°K = Liquid (false ice)
-                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) .ge. 0.)then ! Ice clouds
-                   if(tmp(i,nlev) .gt. 273.15)then
+                if((ATBperp(i,ncol,nlev)-ATBperp_tmp) >= 0.)then ! Ice clouds
+                   if(tmp(i,nlev) > 273.15)then
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp ! false ice ==> liq
                       tmpl(i,ncol,nlev)       = tmp(i,nlev)
@@ -875,8 +875,8 @@
                       cldlayphase(i,ncol,4,2) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then 
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,2) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then 
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,2) = 1._wp
                       ! Low cloud
@@ -887,8 +887,8 @@
                       cldlayphase(i,ncol,4,5) = 1. ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,5) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,5) = 1._wp
                       ! Low cloud   
@@ -902,8 +902,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt.(680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 <(680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud   
@@ -918,13 +918,13 @@
                 else
                    ! Liquid with temperature above 231,15°K
-                   if(tmp(i,nlev) .gt. 231.15)then
+                   if(tmp(i,nlev) > 231.15)then
                       lidarcldphase(i,nlev,2) = lidarcldphase(i,nlev,2)+1._wp
                       tmpl(i,ncol,nlev)       = tmp(i,nlev)
                       cldlayphase(i,ncol,4,2) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,2) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,2) = 1._wp
                       ! Low cloud   
@@ -939,8 +939,8 @@
                       cldlayphase(i,ncol,4,4) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,4) = 1._wp
                       ! Middle   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,4) = 1._wp
                       ! Low cloud   
@@ -951,8 +951,8 @@
                       cldlayphase(i,ncol,4,1) = 1._wp ! tot cloud
                       ! High cloud
-                      if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                      if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                          cldlayphase(i,ncol,3,1) = 1._wp
                       ! Middle cloud   
-                      else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                      else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                          cldlayphase(i,ncol,2,1) = 1._wp
                       ! Low cloud   
@@ -966,5 +966,5 @@
                 
                 ! Find the level of the highest cloud with SR>30
-                if(x(i,ncol,nlev) .gt. S_cld_att) then ! SR > 30.
+                if(x(i,ncol,nlev) > S_cld_att) then ! SR > 30.
                     toplvlsat = nlev+1
                     goto 99
@@ -978,16 +978,16 @@
           ! see Cesana and Chepfer 2013 Sect.III.2
           ! ##############################################################################
-          if(toplvlsat.ne.0) then
+          if(toplvlsat/=0) then
              do nlev = toplvlsat,Nlevels
                 p1 = pplay(i,nlev)
-                if(cldy(i,ncol,nlev).eq.1.)then
+                if(cldy(i,ncol,nlev)==1.)then
                    lidarcldphase(i,nlev,3) = lidarcldphase(i,nlev,3)+1._wp
                    tmpu(i,ncol,nlev)       = tmp(i,nlev)
                    cldlayphase(i,ncol,4,3) = 1._wp ! tot cloud
                    ! High cloud
-                   if (p1 .gt. 0. .and. p1 .lt. (440._wp*100._wp)) then
+                   if (p1 > 0. .and. p1 < (440._wp*100._wp)) then
                       cldlayphase(i,ncol,3,3) = 1._wp
                    ! Middle cloud   
-                   else if(p1 .ge. (440._wp*100._wp) .and. p1 .lt. (680._wp*100._wp)) then
+                   else if(p1 >= (440._wp*100._wp) .and. p1 < (680._wp*100._wp)) then
                       cldlayphase(i,ncol,2,3) = 1._wp
                    ! Low cloud   
@@ -1008,5 +1008,5 @@
     ! Compute the Ice percentage in cloud = ice/(ice+liq) as a function of the occurrences
     lidarcldphasetmp(:,:) = lidarcldphase(:,:,1)+lidarcldphase(:,:,2);
-    WHERE (lidarcldphasetmp(:,:) .gt. 0.)
+    WHERE (lidarcldphasetmp(:,:) > 0.)
        lidarcldphase(:,:,6)=lidarcldphase(:,:,1)/lidarcldphasetmp(:,:)
     ELSEWHERE
@@ -1016,5 +1016,5 @@
     ! Compute Phase 3D Cloud Fraction
     !WHERE (nsub(:,Nlevels:1:-1) .gt. 0.0 )
-    WHERE (nsub(:,:) .gt. 0.0 )  
+    WHERE (nsub(:,:) > 0.0 )
        lidarcldphase(:,:,1)=lidarcldphase(:,:,1)/nsub(:,:)
        lidarcldphase(:,:,2)=lidarcldphase(:,:,2)/nsub(:,:)
@@ -1049,5 +1049,5 @@
     ! Compute the Ice percentage in cloud = ice/(ice+liq)
     cldlayerphasetmp(:,:)=cldlayerphase(:,:,1)+cldlayerphase(:,:,2)
-    WHERE (cldlayerphasetmp(:,:).gt. 0.)
+    WHERE (cldlayerphasetmp(:,:)> 0.)
        cldlayerphase(:,:,6)=cldlayerphase(:,:,1)/cldlayerphasetmp(:,:)
     ELSEWHERE
@@ -1056,5 +1056,5 @@
     
     do i=1,Nphase-1
-       WHERE ( cldlayerphasesum(:,:).gt.0.0 )
+       WHERE ( cldlayerphasesum(:,:)>0.0 )
           cldlayerphase(:,:,i) = (cldlayerphase(:,:,i)/cldlayerphasesum(:,:)) * cldlayer(:,:)
        ENDWHERE
@@ -1065,10 +1065,10 @@
           checkcldlayerphase=0.
           checkcldlayerphase2=0.
-          if (cldlayerphasesum(i,iz) .gt. 0.0 )then
+          if (cldlayerphasesum(i,iz) > 0.0 )then
              do ic=1,Nphase-3
                 checkcldlayerphase = checkcldlayerphase+cldlayerphase(i,iz,ic)
              enddo
              checkcldlayerphase2 = cldlayer(i,iz)-checkcldlayerphase
-             if((checkcldlayerphase2 .gt. 0.01) .or. (checkcldlayerphase2 .lt. -0.01) ) print *, checkcldlayerphase,cldlayer(i,iz)
+             if((checkcldlayerphase2 > 0.01) .or. (checkcldlayerphase2 < -0.01) ) print *, checkcldlayerphase,cldlayer(i,iz)
           endif
        enddo
@@ -1076,5 +1076,5 @@
     
     do i=1,Nphase-1
-       WHERE (nsublayer(:,:) .eq. 0.0)
+       WHERE (nsublayer(:,:) == 0.0)
           cldlayerphase(:,:,i) = undef
        ENDWHERE
@@ -1086,14 +1086,14 @@
           do i=1,Npoints
              do itemp=1,Ntemp
-                if(tmpi(i,ncol,nlev).gt.0.)then
-                   if((tmpi(i,ncol,nlev) .ge. tempmod(itemp)) .and. (tmpi(i,ncol,nlev) .lt. tempmod(itemp+1)) )then
+                if(tmpi(i,ncol,nlev)>0.)then
+                   if((tmpi(i,ncol,nlev) >= tempmod(itemp)) .and. (tmpi(i,ncol,nlev) < tempmod(itemp+1)) )then
                       lidarcldtemp(i,itemp,2)=lidarcldtemp(i,itemp,2)+1._wp
                    endif
-                elseif(tmpl(i,ncol,nlev) .gt. 0.)then
-                   if((tmpl(i,ncol,nlev) .ge. tempmod(itemp)) .and. (tmpl(i,ncol,nlev) .lt. tempmod(itemp+1)) )then
+                elseif(tmpl(i,ncol,nlev) > 0.)then
+                   if((tmpl(i,ncol,nlev) >= tempmod(itemp)) .and. (tmpl(i,ncol,nlev) < tempmod(itemp+1)) )then
                       lidarcldtemp(i,itemp,3)=lidarcldtemp(i,itemp,3)+1._wp
                    endif
-                elseif(tmpu(i,ncol,nlev) .gt. 0.)then
-                   if((tmpu(i,ncol,nlev) .ge. tempmod(itemp)) .and. (tmpu(i,ncol,nlev) .lt. tempmod(itemp+1)) )then
+                elseif(tmpu(i,ncol,nlev) > 0.)then
+                   if((tmpu(i,ncol,nlev) >= tempmod(itemp)) .and. (tmpu(i,ncol,nlev) < tempmod(itemp+1)) )then
                       lidarcldtemp(i,itemp,4)=lidarcldtemp(i,itemp,4)+1._wp
                    endif
@@ -1118,5 +1118,5 @@
     ! Compute the Ice percentage in cloud = ice/(ice+liq)
     sumlidarcldtemp(:,:)=lidarcldtemp(:,:,2)+lidarcldtemp(:,:,3)    
-    WHERE(sumlidarcldtemp(:,:) .gt. 0.)
+    WHERE(sumlidarcldtemp(:,:) > 0.)
        lidarcldtemp(:,:,5)=lidarcldtemp(:,:,2)/sumlidarcldtemp(:,:)
     ELSEWHERE
@@ -1125,5 +1125,5 @@
     
     do i=1,4
-       WHERE(lidarcldtempind(:,:) .gt. 0.)
+       WHERE(lidarcldtempind(:,:) > 0.)
           lidarcldtemp(:,:,i) = lidarcldtemp(:,:,i)/lidarcldtempind(:,:)
        ELSEWHERE
@@ -1193,5 +1193,5 @@
     do k=1,Nlevels
        ! Cloud detection at subgrid-scale:
-       where ((x(:,:,k) .gt. S_cld) .and. (x(:,:,k) .ne. undef) )
+       where ((x(:,:,k) > S_cld) .and. (x(:,:,k) /= undef) )
           cldy(:,:,k)=1._wp
        elsewhere
@@ -1200,5 +1200,5 @@
        
        ! Number of usefull sub-columns:
-       where ((x(:,:,k) .gt. S_att) .and. (x(:,:,k) .ne. undef) )
+       where ((x(:,:,k) > S_att) .and. (x(:,:,k) /= undef) )
           srok(:,:,k)=1._wp
        elsewhere
@@ -1216,7 +1216,7 @@
              iz=1
              p1 = pplay(ip,k)
-             if ( p1.gt.0. .and. p1.lt.(440._wp*100._wp)) then ! high clouds
+             if ( p1>0. .and. p1<(440._wp*100._wp)) then ! high clouds
                 iz=3
-             else if(p1.ge.(440._wp*100._wp) .and. p1.lt.(680._wp*100._wp)) then ! mid clouds
+             else if(p1>=(440._wp*100._wp) .and. p1<(680._wp*100._wp)) then ! mid clouds
                 iz=2
              endif
@@ -1235,5 +1235,5 @@
     
     ! Grid-box 3D cloud fraction
-    where ( nsub(:,:).gt.0.0 )
+    where ( nsub(:,:)>0.0 )
        lidarcld(:,:) = lidarcld(:,:)/nsub(:,:)
     elsewhere
@@ -1250,5 +1250,5 @@
        enddo
     enddo
-    where (nsublayer(:,:) .gt. 0.0)
+    where (nsublayer(:,:) > 0.0)
        cldlayer(:,:) = cldlayer(:,:)/nsublayer(:,:)
     elsewhere
@@ -1344,5 +1344,5 @@
     do k=1,Nlevels
        ! Cloud detection at subgrid-scale:
-       where ( (x(:,:,k) .gt. S_cld) .and. (x(:,:,k) .ne. undef) )
+       where ( (x(:,:,k) > S_cld) .and. (x(:,:,k) /= undef) )
           cldy(:,:,k)=1._wp
        elsewhere
@@ -1350,5 +1350,5 @@
        endwhere
        ! Fully attenuated layer detection at subgrid-scale:
-       where ( (x(:,:,k) .lt. S_att_opaq) .and. (x(:,:,k) .ge. 0.) .and. (x(:,:,k) .ne. undef) ) !DEBUG
+       where ( (x(:,:,k) < S_att_opaq) .and. (x(:,:,k) >= 0.) .and. (x(:,:,k) /= undef) ) !DEBUG
           cldyopaq(:,:,k)=1._wp
        elsewhere
@@ -1358,5 +1358,5 @@
 
        ! Number of usefull sub-column layers:
-       where ( (x(:,:,k) .gt. S_att) .and. (x(:,:,k) .ne. undef) )
+       where ( (x(:,:,k) > S_att) .and. (x(:,:,k) /= undef) )
           srok(:,:,k)=1._wp
        elsewhere
@@ -1364,5 +1364,5 @@
        endwhere
        ! Number of usefull sub-columns layers for z_opaque 3D fraction:
-       where ( (x(:,:,k) .ge. 0.) .and. (x(:,:,k) .ne. undef) ) !DEBUG
+       where ( (x(:,:,k) >= 0.) .and. (x(:,:,k) /= undef) ) !DEBUG
           srokopaq(:,:,k)=1._wp
        elsewhere
@@ -1397,5 +1397,5 @@
 
      ! Declaring non-opaque cloudy profiles as thin cloud profiles
-	   if ( cldlay(ip,ic,4).gt. 0. .and. cldlay(ip,ic,1) .eq. 0. ) then
+	   if ( cldlay(ip,ic,4)> 0. .and. cldlay(ip,ic,1) == 0. ) then
 	      cldlay(ip,ic,2)  =  1._wp
  	   endif
@@ -1404,5 +1404,5 @@
 
      ! Opaque cloud profiles
-	   if ( cldlay(ip,ic,1) .eq. 1. ) then
+	   if ( cldlay(ip,ic,1) == 1. ) then
 	      zopac = 0._wp
 	      z_top = 0._wp
@@ -1410,5 +1410,5 @@
      ! Declaring z_opaque altitude and opaque cloud fraction for 3D and 2D variables
      ! From SFC-2-TOA ( actually from vgrid_z(SFC+1) = vgrid_z(Nlevels-1) )
-	         if ( cldy(ip,ic,Nlevels-k) .eq. 1. .and. zopac .eq. 0. ) then
+	         if ( cldy(ip,ic,Nlevels-k) == 1. .and. zopac == 0. ) then
 		    lidarcldtype(ip,Nlevels-k + 1,3) = lidarcldtype(ip,Nlevels-k + 1,3) + 1._wp
 		    cldlay(ip,ic,3)                  = vgrid_z(Nlevels-k+1)      ! z_opaque altitude
@@ -1416,5 +1416,5 @@
 		    zopac = Nlevels-k+1                        ! z_opaque vertical index on vgrid_z
 		 endif
-	         if ( cldy(ip,ic,Nlevels-k) .eq. 1. ) then
+	         if ( cldy(ip,ic,Nlevels-k) == 1. ) then
 		    lidarcldtype(ip,Nlevels-k ,1)    = lidarcldtype(ip,Nlevels-k ,1) + 1._wp
 		    z_top = Nlevels-k    ! top cloud layer vertical index on vgrid_z
@@ -1423,5 +1423,5 @@
      ! Summing opaque cloud mean temperatures and altitudes
      ! as defined in Vaillant de Guelis et al. 2017a, AMT
-              if (zopac .ne. 0) then 
+              if (zopac /= 0) then
                  cldtypetemp(ip,1) = cldtypetemp(ip,1) + ( tmp(ip,zopac) + tmp(ip,z_top) )/2.
                  cldtypetemp(ip,3) = cldtypetemp(ip,3) + tmp(ip,zopac)                 ! z_opaque
@@ -1435,5 +1435,5 @@
 
      ! Thin cloud profiles
-	   if ( cldlay(ip,ic,2) .eq. 1. ) then
+	   if ( cldlay(ip,ic,2) == 1. ) then
 	      topcloud = 0._wp
 	      z_top = 0._wp
@@ -1442,9 +1442,9 @@
      ! Declaring thin cloud fraction for 3D variable
      ! From TOA-2-SFC
-                 if ( cldy(ip,ic,k) .eq. 1. .and. topcloud .eq. 1. ) then
+                 if ( cldy(ip,ic,k) == 1. .and. topcloud == 1. ) then
                     lidarcldtype(ip,k,2) = lidarcldtype(ip,k,2) + 1._wp
 		    z_base = k ! bottom cloud layer
                  endif
-	         if ( cldy(ip,ic,k) .eq. 1. .and. topcloud .eq. 0. ) then
+	         if ( cldy(ip,ic,k) == 1. .and. topcloud == 0. ) then
                     lidarcldtype(ip,k,2) = lidarcldtype(ip,k,2) + 1._wp
 		    z_top = k  ! top cloud layer
@@ -1458,5 +1458,5 @@
 	      cloudemis = 0._wp
      	      do k=z_base+1,Nlevels
-	         if (  (x(ip,ic,k) .gt. S_att_opaq) .and. (x(ip,ic,k) .lt. 1.0) .and. (x(ip,ic,k) .ne. undef)  ) then
+	         if (  (x(ip,ic,k) > S_att_opaq) .and. (x(ip,ic,k) < 1.0) .and. (x(ip,ic,k) /= undef)  ) then
 		    srmean = srmean + x(ip,ic,k)
 		    srcount = srcount + 1.
@@ -1464,5 +1464,5 @@
 	      enddo
 	      ! If clear sky layers exist below bottom cloud layer
-	      if ( srcount .gt. 0. ) then
+	      if ( srcount > 0. ) then
 	      	 trans2 = srmean/srcount              ! thin cloud transmittance**2
 	      	 tau_app = -(log(trans2))/2.          ! apparent cloud optical depth
@@ -1484,5 +1484,5 @@
 
     ! 3D cloud types fraction (opaque=1 and thin=2 clouds)
-    where ( nsub(:,:) .gt. 0. )
+    where ( nsub(:,:) > 0. )
        lidarcldtype(:,:,1) = lidarcldtype(:,:,1)/nsub(:,:)
        lidarcldtype(:,:,2) = lidarcldtype(:,:,2)/nsub(:,:)
@@ -1492,5 +1492,5 @@
     endwhere
     ! 3D z_opaque fraction (=3)
-    where ( nsubopaq(:,:) .gt. 0. )
+    where ( nsubopaq(:,:) > 0. )
        lidarcldtype(:,:,3) = lidarcldtype(:,:,3)/nsubopaq(:,:)
     elsewhere
@@ -1502,5 +1502,5 @@
     do ip = 1, Npoints
      	do k = 2, Nlevels
-            if ( (lidarcldtype(ip,k,3) .ne. undef) .and. (lidarcldtype(ip,k-1,4) .ne. undef) ) then
+            if ( (lidarcldtype(ip,k,3) /= undef) .and. (lidarcldtype(ip,k-1,4) /= undef) ) then
 	        lidarcldtype(ip,k,4) = lidarcldtype(ip,k,3) + lidarcldtype(ip,k-1,4)
 	    else
@@ -1520,5 +1520,5 @@
 
     ! Mean temperature and altitude
-    where (cldtype(:,1) .gt. 0.)
+    where (cldtype(:,1) > 0.)
        cldtypetemp(:,1) = cldtypetemp(:,1)/cldtype(:,1) ! opaque cloud temp
        cldtypetemp(:,3) = cldtypetemp(:,3)/cldtype(:,1) ! z_opaque
@@ -1534,5 +1534,5 @@
     endwhere
 
-    where (cldtype(:,2) .gt. 0.) ! thin cloud
+    where (cldtype(:,2) > 0.) ! thin cloud
        cldtypetemp(:,2) = cldtypetemp(:,2)/cldtype(:,2)
        cldtypemeanz(:,2) = cldtypemeanz(:,2)/cldtype(:,2)
@@ -1545,5 +1545,5 @@
 
     ! Mean thin cloud emissivity
-    where (count_emis(:) .gt. 0.) ! thin cloud
+    where (count_emis(:) > 0.) ! thin cloud
        cldthinemis(:) = cldthinemis(:)/count_emis(:)
     elsewhere
@@ -1551,5 +1551,5 @@
     endwhere
 
-    where (nsublayer(:,:) .gt. 0.)
+    where (nsublayer(:,:) > 0.)
        cldtype(:,:) = cldtype(:,:)/nsublayer(:,:)
     elsewhere
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_interface.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_interface.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_interface.F90	(revision 5082)
@@ -275,5 +275,5 @@
         cfg%Lisccp, cfg%Lmisr, cfg%Lmodis, cfg%Lrttov
 
-    if (overlaplmdz.ne.overlap) then
+    if (overlaplmdz/=overlap) then
        print*,'Attention overlaplmdz different de overlap lu dans namelist '
     endif
@@ -282,5 +282,5 @@
    print*,'On passe par using_xios'
  ELSE
-   if (cosp_init_flag .eq. 0) then
+   if (cosp_init_flag == 0) then
 
       ! Initialize the distributional parameters for hydrometeors in radar simulator.
@@ -311,9 +311,9 @@
 
 !!! Ici on modifie les cles logiques pour les outputs selon les champs actives dans les .xml
-  if ((itap.ge.1).and.(first_write))then
+  if ((itap>=1).and.(first_write))then
     IF (using_xios) call read_xiosfieldactive(cfg)
     first_write=.false.
 
-if (cosp_init_flag .eq. 0) then
+if (cosp_init_flag == 0) then
 
     ! Initialize the distributional parameters for hydrometeors in radar simulator.
@@ -384,5 +384,5 @@
 ! 3) Masque terre/mer a partir de la variable fracTerLic
         do ip = 1, Npoints
-          if (fracTerLic(ip).ge.0.5) then
+          if (fracTerLic(ip)>=0.5) then
              land(ip) = 1.
           else
@@ -424,5 +424,5 @@
 
 
-if (cosp_init_flag .eq. 1) then      ! cosp_init_flag = 1
+if (cosp_init_flag == 1) then      ! cosp_init_flag = 1
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -538,5 +538,5 @@
       endif ! debut_cosp
 
-if (cosp_init_flag .eq. 1) then
+if (cosp_init_flag == 1) then
 
 !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90	(revision 5082)
@@ -669,6 +669,6 @@
     CHARACTER(LEN=20) :: typeecrit
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -730,23 +730,23 @@
 
 ! Axe vertical
-      IF (nvertsave.eq.nvertp(iff)) THEN
+      IF (nvertsave==nvertp(iff)) THEN
           klevs=PARASOL_NREFL
           nam_axvert="sza"
-      ELSE IF (nvertsave.eq.nvertisccp(iff)) THEN
+      ELSE IF (nvertsave==nvertisccp(iff)) THEN
           klevs=7
           nam_axvert="pressure2"
-      ELSE IF (nvertsave.eq.nvertcol(iff)) THEN
+      ELSE IF (nvertsave==nvertcol(iff)) THEN
           klevs=Ncolout
           nam_axvert="column"
-      ELSE IF (nvertsave.eq.nverttemp(iff)) THEN
+      ELSE IF (nvertsave==nverttemp(iff)) THEN
           klevs=LIDAR_NTEMP
           nam_axvert="temp"
-      ELSE IF (nvertsave.eq.nvertmisr(iff)) THEN
+      ELSE IF (nvertsave==nvertmisr(iff)) THEN
           klevs=numMISRHgtBins
           nam_axvert="cth16"
-      ELSE IF (nvertsave.eq.nvertReffIce(iff)) THEN
+      ELSE IF (nvertsave==nvertReffIce(iff)) THEN
           klevs= numMODISReffIceBins
           nam_axvert="ReffIce"
-      ELSE IF (nvertsave.eq.nvertReffLiq(iff)) THEN
+      ELSE IF (nvertsave==nvertReffLiq(iff)) THEN
           klevs= numMODISReffLiqBins
           nam_axvert="ReffLiq"
@@ -765,6 +765,6 @@
       END IF
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -827,9 +827,9 @@
     IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d ',var%name
 
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
 !$OMP MASTER
       print*,'var, cosp_varsdefined dans cosp_varsdefined ',var%name, cosp_varsdefined
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
       CALL conf_cospoutputs(var%name,var%cles)
       DO iff=1, 3
@@ -840,5 +840,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
   CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
@@ -921,7 +921,7 @@
                nom=var%name
       END IF
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
 !$OMP MASTER
       CALL conf_cospoutputs(var%name,var%cles)
@@ -933,5 +933,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
@@ -1000,5 +1000,5 @@
 
   IF(cosp_varsdefined) THEN
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)            
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_read_outputkeys.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_read_outputkeys.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_read_outputkeys.F90	(revision 5082)
@@ -896,5 +896,5 @@
 !  i = i+1 !si on laisse, 108 au lieu de 107
 
-  if (i.gt.107) then
+  if (i>107) then
      print *, 'COSP_IO: wrong number of output diagnostics'
      print *, i,107
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90	(revision 5082)
@@ -98,5 +98,5 @@
     logical :: cmpGases=.true.
 
-    if (Ncolumns .gt. 1) then
+    if (Ncolumns > 1) then
        !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
        ! Generate subcolumns for clouds (SCOPS) and precipitation type (PREC_SCOPS)
@@ -107,5 +107,5 @@
        seed = int(cospstateIN%phalf(:,Nlevels+1))  ! In case of NPoints=1
        ! *NOTE* Chunking will change the seed
-       if (NPoints .gt. 1) seed=int((cospstateIN%phalf(:,Nlevels+1)-minval(cospstateIN%phalf(:,Nlevels+1)))/      &
+       if (NPoints > 1) seed=int((cospstateIN%phalf(:,Nlevels+1)-minval(cospstateIN%phalf(:,Nlevels+1)))/      &
             (maxval(cospstateIN%phalf(:,Nlevels+1))-minval(cospstateIN%phalf(:,Nlevels+1)))*100000) + 1
        call init_rng(rngs, seed)
@@ -145,10 +145,10 @@
           do k=1,nLevels
              do i=1,nColumns
-                if (cospIN%frac_out(j,i,k)  .eq. 1)  frac_ls(j,k) = frac_ls(j,k)+1._wp
-                if (cospIN%frac_out(j,i,k)  .eq. 2)  frac_cv(j,k) = frac_cv(j,k)+1._wp
-                if (frac_prec(j,i,k) .eq. 1)  prec_ls(j,k) = prec_ls(j,k)+1._wp
-                if (frac_prec(j,i,k) .eq. 2)  prec_cv(j,k) = prec_cv(j,k)+1._wp
-                if (frac_prec(j,i,k) .eq. 3)  prec_cv(j,k) = prec_cv(j,k)+1._wp
-                if (frac_prec(j,i,k) .eq. 3)  prec_ls(j,k) = prec_ls(j,k)+1._wp
+                if (cospIN%frac_out(j,i,k)  == 1)  frac_ls(j,k) = frac_ls(j,k)+1._wp
+                if (cospIN%frac_out(j,i,k)  == 2)  frac_cv(j,k) = frac_cv(j,k)+1._wp
+                if (frac_prec(j,i,k) == 1)  prec_ls(j,k) = prec_ls(j,k)+1._wp
+                if (frac_prec(j,i,k) == 2)  prec_cv(j,k) = prec_cv(j,k)+1._wp
+                if (frac_prec(j,i,k) == 3)  prec_cv(j,k) = prec_cv(j,k)+1._wp
+                if (frac_prec(j,i,k) == 3)  prec_ls(j,k) = prec_ls(j,k)+1._wp
              enddo
              frac_ls(j,k)=frac_ls(j,k)/nColumns
@@ -217,9 +217,9 @@
           do j=1,nPoints
              ! In-cloud mixing ratios.
-             if (frac_ls(j,k) .ne. 0.) then
+             if (frac_ls(j,k) /= 0.) then
                 mr_hydro(j,:,k,I_LSCLIQ) = mr_hydro(j,:,k,I_LSCLIQ)/frac_ls(j,k)
                 mr_hydro(j,:,k,I_LSCICE) = mr_hydro(j,:,k,I_LSCICE)/frac_ls(j,k)
              endif
-             if (frac_cv(j,k) .ne. 0.) then
+             if (frac_cv(j,k) /= 0.) then
                 mr_hydro(j,:,k,I_CVCLIQ) = mr_hydro(j,:,k,I_CVCLIQ)/frac_cv(j,k)
                 mr_hydro(j,:,k,I_CVCICE) = mr_hydro(j,:,k,I_CVCICE)/frac_cv(j,k)
@@ -227,20 +227,20 @@
              ! Precipitation
              if (use_precipitation_fluxes) then
-                if (prec_ls(j,k) .ne. 0.) then
+                if (prec_ls(j,k) /= 0.) then
                    fl_lsrain(j,k) = fl_lsrainIN(j,k)/prec_ls(j,k)
                    fl_lssnow(j,k) = fl_lssnowIN(j,k)/prec_ls(j,k)
                    fl_lsgrpl(j,k) = fl_lsgrplIN(j,k)/prec_ls(j,k)
                 endif
-                if (prec_cv(j,k) .ne. 0.) then
+                if (prec_cv(j,k) /= 0.) then
                    fl_ccrain(j,k) = fl_ccrainIN(j,k)/prec_cv(j,k)
                    fl_ccsnow(j,k) = fl_ccsnowIN(j,k)/prec_cv(j,k)
                 endif
              else
-                if (prec_ls(j,k) .ne. 0.) then
+                if (prec_ls(j,k) /= 0.) then
                    mr_hydro(j,:,k,I_LSRAIN) = mr_hydro(j,:,k,I_LSRAIN)/prec_ls(j,k)
                    mr_hydro(j,:,k,I_LSSNOW) = mr_hydro(j,:,k,I_LSSNOW)/prec_ls(j,k)
                    mr_hydro(j,:,k,I_LSGRPL) = mr_hydro(j,:,k,I_LSGRPL)/prec_ls(j,k)
                 endif
-                if (prec_cv(j,k) .ne. 0.) then
+                if (prec_cv(j,k) /= 0.) then
                    mr_hydro(j,:,k,I_CVRAIN) = mr_hydro(j,:,k,I_CVRAIN)/prec_cv(j,k)
                    mr_hydro(j,:,k,I_CVSNOW) = mr_hydro(j,:,k,I_CVSNOW)/prec_cv(j,k)
@@ -361,5 +361,5 @@
        do i=1,nPoints
           do j=1,nLevels
-             if (cospIN%rcfg_cloudsat%use_gas_abs == 1 .or. (cospIN%rcfg_cloudsat%use_gas_abs == 2 .and. j .eq. 1)) then
+             if (cospIN%rcfg_cloudsat%use_gas_abs == 1 .or. (cospIN%rcfg_cloudsat%use_gas_abs == 2 .and. j == 1)) then
                 g_vol(i,j) = gases(cospstateIN%pfull(i,j), cospstateIN%at(i,j),cospstateIN%qv(i,j),cospIN%rcfg_cloudsat%freq)
              endif
@@ -379,7 +379,7 @@
           
           ! At each model level, what fraction of the precipitation is frozen?
-          where(mr_hydro(:,k,:,I_LSRAIN) .gt. 0 .or. mr_hydro(:,k,:,I_LSSNOW) .gt. 0 .or. &
-                mr_hydro(:,k,:,I_CVRAIN) .gt. 0 .or. mr_hydro(:,k,:,I_CVSNOW) .gt. 0 .or. &
-                mr_hydro(:,k,:,I_LSGRPL) .gt. 0)
+          where(mr_hydro(:,k,:,I_LSRAIN) > 0 .or. mr_hydro(:,k,:,I_LSSNOW) > 0 .or. &
+                mr_hydro(:,k,:,I_CVRAIN) > 0 .or. mr_hydro(:,k,:,I_CVSNOW) > 0 .or. &
+                mr_hydro(:,k,:,I_LSGRPL) > 0)
              fracPrecipIce(:,k,:) = (mr_hydro(:,k,:,I_LSSNOW) + mr_hydro(:,k,:,I_CVSNOW) + &
                   mr_hydro(:,k,:,I_LSGRPL)) / &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mo_rng.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mo_rng.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/mo_rng.F90	(revision 5082)
@@ -96,5 +96,5 @@
     !          so we use sizeof(someInt) to determine wheter it is on 32 bit.
     !if ( i2_16*i2_16 .le. huge32 ) then
-    if (digits(testInt) .le. 31) then
+    if (digits(testInt) <= 31) then
     !if (sizeof(testInt) .eq. 4) then
        r=r+1
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/parasol.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/parasol.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/parasol.F90	(revision 5082)
@@ -97,5 +97,5 @@
 
     ! Relative fraction of the opt. thick due to liquid or ice clouds
-    WHERE (tautot_S(1:npoints) .gt. 0.)
+    WHERE (tautot_S(1:npoints) > 0.)
        frac_taucol_liq(1:npoints) = tautot_S_liq(1:npoints) / tautot_S(1:npoints)
        frac_taucol_ice(1:npoints) = tautot_S_ice(1:npoints) / tautot_S(1:npoints)
@@ -118,6 +118,6 @@
     DO it=1,PARASOL_NREFL
        DO ny=1,PARASOL_NTAU-1
-          WHERE (tautot_S(1:npoints) .ge. PARASOL_TAU(ny).and. &
-                 tautot_S(1:npoints) .le. PARASOL_TAU(ny+1))
+          WHERE (tautot_S(1:npoints) >= PARASOL_TAU(ny).and. &
+                 tautot_S(1:npoints) <= PARASOL_TAU(ny+1))
              rlumA_mod(1:npoints,it) = aA(it,ny)*tautot_S(1:npoints) + bA(it,ny)
              rlumB_mod(1:npoints,it) = aB(it,ny)*tautot_S(1:npoints) + bB(it,ny)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/prec_scops.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/prec_scops.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/prec_scops.F90	(revision 5082)
@@ -64,5 +64,5 @@
 
       cv_col = scops_ccfrac*ncol
-      if (cv_col .eq. 0) cv_col=1
+      if (cv_col == 0) cv_col=1
  
       do ilev=1,nlev
@@ -81,15 +81,15 @@
         flag_cv=0
         do ilev=1,nlev
-          if (frac_out(j,ibox,ilev) .eq. 1) then 
+          if (frac_out(j,ibox,ilev) == 1) then
             flag_ls=1
           endif
-          if (frac_out(j,ibox,ilev) .eq. 2) then 
+          if (frac_out(j,ibox,ilev) == 2) then
             flag_cv=1
           endif
         enddo !loop over nlev
-        if (flag_ls .eq. 1) then
+        if (flag_ls == 1) then
            frac_out_ls(j,ibox)=1
         endif
-        if (flag_cv .eq. 1) then
+        if (flag_cv == 1) then
            frac_out_cv(j,ibox)=1
         endif
@@ -102,14 +102,14 @@
         flag_cv=0
     
-        if (ls_p_rate(j,1) .gt. 0.) then 
+        if (ls_p_rate(j,1) > 0.) then
             do ibox=1,ncol ! possibility ONE
-                if (frac_out(j,ibox,1) .eq. 1) then 
+                if (frac_out(j,ibox,1) == 1) then
                     prec_frac(j,ibox,1) = 1
                     flag_ls=1
                 endif
             enddo ! loop over ncol
-            if (flag_ls .eq. 0) then ! possibility THREE
+            if (flag_ls == 0) then ! possibility THREE
                 do ibox=1,ncol
-                    if (frac_out(j,ibox,2) .eq. 1) then 
+                    if (frac_out(j,ibox,2) == 1) then
                         prec_frac(j,ibox,1) = 1
                         flag_ls=1
@@ -117,7 +117,7 @@
                 enddo ! loop over ncol
             endif
-        if (flag_ls .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_ls(j,ibox) .eq. 1) then 
+        if (flag_ls == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_ls(j,ibox) == 1) then
             prec_frac(j,ibox,1) = 1
             flag_ls=1
@@ -125,5 +125,5 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Five
+        if (flag_ls == 0) then ! possibility Five
         do ibox=1,ncol
     !     prec_frac(j,1:ncol,1) = 1
@@ -134,8 +134,8 @@
        ! There is large scale precipitation
      
-        if (cv_p_rate(j,1) .gt. 0.) then 
+        if (cv_p_rate(j,1) > 0.) then
          do ibox=1,ncol ! possibility ONE
-          if (frac_out(j,ibox,1) .eq. 2) then 
-           if (prec_frac(j,ibox,1) .eq. 0) then
+          if (frac_out(j,ibox,1) == 2) then
+           if (prec_frac(j,ibox,1) == 0) then
         prec_frac(j,ibox,1) = 2
        else
@@ -145,8 +145,8 @@
       endif
         enddo ! loop over ncol
-        if (flag_cv .eq. 0) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,2) .eq. 2) then 
-                if (prec_frac(j,ibox,1) .eq. 0) then
+        if (flag_cv == 0) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,2) == 2) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -157,8 +157,8 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_cv(j,ibox) .eq. 1) then 
-                if (prec_frac(j,ibox,1) .eq. 0) then
+        if (flag_cv == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_cv(j,ibox) == 1) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -169,7 +169,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then  ! possibility Five
+        if (flag_cv == 0) then  ! possibility Five
         do ibox=1,cv_col
-                if (prec_frac(j,ibox,1) .eq. 0) then
+                if (prec_frac(j,ibox,1) == 0) then
             prec_frac(j,ibox,1) = 2
             else
@@ -192,15 +192,15 @@
         flag_cv=0
     
-        if (ls_p_rate(j,ilev) .gt. 0.) then 
+        if (ls_p_rate(j,ilev) > 0.) then
          do ibox=1,ncol ! possibility ONE&TWO
-          if ((frac_out(j,ibox,ilev) .eq. 1) .or. ((prec_frac(j,ibox,ilev-1) .eq. 1)     &
-            .or. (prec_frac(j,ibox,ilev-1) .eq. 3))) then 
+          if ((frac_out(j,ibox,ilev) == 1) .or. ((prec_frac(j,ibox,ilev-1) == 1)     &
+            .or. (prec_frac(j,ibox,ilev-1) == 3))) then
            prec_frac(j,ibox,ilev) = 1
            flag_ls=1
           endif
         enddo ! loop over ncol
-        if ((flag_ls .eq. 0) .and. (ilev .lt. nlev)) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,ilev+1) .eq. 1) then 
+        if ((flag_ls == 0) .and. (ilev < nlev)) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,ilev+1) == 1) then
             prec_frac(j,ibox,ilev) = 1
             flag_ls=1
@@ -208,7 +208,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_ls(j,ibox) .eq. 1) then 
+        if (flag_ls == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_ls(j,ibox) == 1) then
             prec_frac(j,ibox,ilev) = 1
             flag_ls=1
@@ -216,5 +216,5 @@
         enddo ! loop over ncol
         endif
-        if (flag_ls .eq. 0) then ! possibility Five
+        if (flag_ls == 0) then ! possibility Five
         do ibox=1,ncol
 !     prec_frac(j,1:ncol,ilev) = 1
@@ -224,9 +224,9 @@
       endif ! There is large scale precipitation
     
-        if (cv_p_rate(j,ilev) .gt. 0.) then 
+        if (cv_p_rate(j,ilev) > 0.) then
          do ibox=1,ncol ! possibility ONE&TWO
-          if ((frac_out(j,ibox,ilev) .eq. 2) .or. ((prec_frac(j,ibox,ilev-1) .eq. 2)     &
-            .or. (prec_frac(j,ibox,ilev-1) .eq. 3))) then 
-            if (prec_frac(j,ibox,ilev) .eq. 0) then
+          if ((frac_out(j,ibox,ilev) == 2) .or. ((prec_frac(j,ibox,ilev-1) == 2)     &
+            .or. (prec_frac(j,ibox,ilev-1) == 3))) then
+            if (prec_frac(j,ibox,ilev) == 0) then
          prec_frac(j,ibox,ilev) = 2
         else
@@ -236,8 +236,8 @@
         endif
        enddo ! loop over ncol
-        if ((flag_cv .eq. 0) .and. (ilev .lt. nlev)) then ! possibility THREE
-        do ibox=1,ncol
-        if (frac_out(j,ibox,ilev+1) .eq. 2) then 
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+        if ((flag_cv == 0) .and. (ilev < nlev)) then ! possibility THREE
+        do ibox=1,ncol
+        if (frac_out(j,ibox,ilev+1) == 2) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
@@ -248,8 +248,8 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then ! possibility Four
-        do ibox=1,ncol
-        if (frac_out_cv(j,ibox) .eq. 1) then 
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+        if (flag_cv == 0) then ! possibility Four
+        do ibox=1,ncol
+        if (frac_out_cv(j,ibox) == 1) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
@@ -260,7 +260,7 @@
         enddo ! loop over ncol
         endif
-        if (flag_cv .eq. 0) then  ! possibility Five 
+        if (flag_cv == 0) then  ! possibility Five
         do ibox=1,cv_col
-                if (prec_frac(j,ibox,ilev) .eq. 0) then
+                if (prec_frac(j,ibox,ilev) == 0) then
             prec_frac(j,ibox,ilev) = 2
             else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cv30_routines.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cv30_routines.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cv30_routines.F90	(revision 5082)
@@ -3082,5 +3082,5 @@
 
   ! fraction deau condensee dans les melanges convertie en precip : epm
-  ! et eau condensée précipitée dans masse d'air saturé : l_m*dM_m/dzdz.dzdz
+  ! et eau condens�e pr�cipit�e dans masse d'air satur� : l_m*dM_m/dzdz.dzdz
   DO j = 1, nam1
     DO k = 1, j - 1
@@ -3277,7 +3277,7 @@
 
         ! On fait varier epmax en fn de la cape
-        ! Il faut donc recalculer ep, et hp qui a déjà été calculé et
-        ! qui en dépend
-        ! Toutes les autres variables fn de ep sont calculées plus bas.
+        ! Il faut donc recalculer ep, et hp qui a d�j� �t� calcul� et
+        ! qui en d�pend
+        ! Toutes les autres variables fn de ep sont calcul�es plus bas.
 
         INCLUDE "cvthermo.h"
@@ -3304,5 +3304,5 @@
         ! on recalcule ep et hp
         
-        if (coef_epmax_cape.gt.1e-12) then
+        if (coef_epmax_cape>1e-12) then
         do i=1,ncum
            epmax_diag(i)=epmax-coef_epmax_cape*sqrt(cape(i))
@@ -3327,5 +3327,5 @@
       do k=minorig+1,nl
        do i=1,ncum
-        if((k.ge.icb(i)).and.(k.le.inb(i)))then
+        if((k>=icb(i)).and.(k<=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
@@ -3335,5 +3335,5 @@
       do i=1,ncum  
        do k=1,nl
-        if (abs(hp_bak(i,k)-hp(i,k)).gt.0.01) then
+        if (abs(hp_bak(i,k)-hp(i,k))>0.01) then
            write(*,*) 'i,k=',i,k
            write(*,*) 'coef_epmax_cape=',coef_epmax_cape
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_buoy.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_buoy.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_buoy.F90	(revision 5082)
@@ -142,8 +142,8 @@
 !CR:Correction of buoy for what comes next
 !keep flag or to modify in all cases?
-  IF (iflag_mix_adiab.eq.1) THEN
+  IF (iflag_mix_adiab==1) THEN
   DO k = 1, nl 
     DO il = 1, ncum
-       IF ((k>=kmx(il)) .AND. (k<=inb(il)) .AND. (buoy(il,k).lt.0.)) THEN
+       IF ((k>=kmx(il)) .AND. (k<=inb(il)) .AND. (buoy(il,k)<0.)) THEN
           buoy(il,k)=buoy(il,k-1)
        END IF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90	(revision 5082)
@@ -539,5 +539,5 @@
     END DO
   ENDIF
-  IF (prt_level .GE. 10) THEN
+  IF (prt_level >= 10) THEN
     print *,'cv3_feed : iflag(1), pfeed(1), plcl(1), wghti(1,k) ', &
                         iflag(1), pfeed(1), plcl(1), (wghti(1,k),k=1,10)
@@ -1101,5 +1101,5 @@
 
 !JAM--------------------------------------------------------------------
-! Calcul de la quantité d'eau sous forme de glace
+! Calcul de la quantit� d'eau sous forme de glace
 ! --------------------------------------------------------------------
   INTEGER nl, len
@@ -1329,5 +1329,5 @@
           IF (k>=(icbs(i)+1)) THEN                                ! convect3
             tg = tp(i, k)
-            IF (tg .gt. Tx) THEN
+            IF (tg > Tx) THEN
               es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
               qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1356,9 +1356,9 @@
             coefx = aa
             coefm = aa + dd
-            IF (tg .gt. Tx) THEN
+            IF (tg > Tx) THEN
               Zx = ahg            + coefx*(Tx - tg)
               Zm = ahg - ddelta   + coefm*(Tm - tg)
             ELSE
-              IF (tg .gt. Tm) THEN
+              IF (tg > Tm) THEN
                 Zx = ahg          + (coefx +fp*ddelta)*(Tx - Tg)
                 Zm = ahg          + (coefm +fp*ddelta)*(Tm - Tg)
@@ -1373,5 +1373,5 @@
             U = (1. - Um)*(1. - Ux)
 ! Compute the updated parcell temperature Tp : 3 cases depending on tg value
-            IF (tg .gt. Tx) THEN
+            IF (tg > Tx) THEN
               discr = bb*bb - 4*dd*fp*(ah0(i) - ahg + ddelta*fp*(Tx-tg))
               Tp(i,k) = tg + &
@@ -1379,5 +1379,5 @@
                   U *2*(ah0(i) - ahg + ddelta*fp*(Tx-tg))/(bb + sqrt(discr)) + &
                   Ux*  (ah0(i) - ahg)                    /aa
-            ELSEIF (tg .gt. Tm) THEN
+            ELSEIF (tg > Tm) THEN
               discr = bb*bb - 4*dd*fp*(ah0(i) - ahg)
               Tp(i,k) = tg + &
@@ -1401,5 +1401,5 @@
         IF (k>=(icbs(i)+1)) THEN                                ! convect3
           tg = tp(i, k)
-          IF (tg .gt. Tx) THEN
+          IF (tg > Tx) THEN
             es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
             qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1437,5 +1437,5 @@
           IF (k>=(icbs(i)+1)) THEN                                ! convect3
             tg = tp(i, k)
-            IF (tg .gt. Tx .OR. .NOT.cvflag_ice) THEN
+            IF (tg > Tx .OR. .NOT.cvflag_ice) THEN
               es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
               qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1462,5 +1462,5 @@
         IF (k>=(icbs(i)+1)) THEN                                ! convect3
           tg = tp(i, k)
-          IF (tg .gt. Tx .OR. .NOT.cvflag_ice) THEN
+          IF (tg > Tx .OR. .NOT.cvflag_ice) THEN
             es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
             qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1852,5 +1852,5 @@
 !CR fix computation of inb
 !keep flag or modify in all cases?
-  IF (iflag_mix_adiab.eq.1) THEN
+  IF (iflag_mix_adiab==1) THEN
   DO i = 1, ncum
      cape(i)=0.
@@ -1863,5 +1863,5 @@
        deltap = min(plcl(i), ph(i,k-1)) - min(plcl(i), ph(i,k))
        cape(i) = cape(i) + rrd*buoy(i, k-1)*deltap/p(i, k-1)
-       IF (cape(i).gt.0.) THEN
+       IF (cape(i)>0.) THEN
         inb(i) = max(inb(i), k)
        END IF
@@ -2777,5 +2777,5 @@
 
 ! ------------------------------------------------------
-IF (prt_level .GE. 10) print *,' ->cv3_unsat, iflag(1) ', iflag(1)
+IF (prt_level >= 10) print *,' ->cv3_unsat, iflag(1) ', iflag(1)
 
 smallestreal=tiny(smallestreal)
@@ -3072,5 +3072,5 @@
 !!---end jyg---
 
-! --------retour à la formulation originale d'Emanuel.
+! --------retour � la formulation originale d'Emanuel.
         IF (cvflag_ice) THEN
 
@@ -3082,7 +3082,7 @@
 
 !JAM  Attention: evap=sigt*E
-!    Modification: evap devient l'évaporation en milieu de couche
-!    car nécessaire dans cv3_yield
-!    Du coup, il faut modifier pas mal d'équations...
+!    Modification: evap devient l'�vaporation en milieu de couche
+!    car n�cessaire dans cv3_yield
+!    Du coup, il faut modifier pas mal d'�quations...
 !    et l'expression de afac qui devient afac1
 !    revap=sqrt((prec(i+1)+prec(i))/2)
@@ -3103,5 +3103,5 @@
 !JYG    Dans sa formulation originale, Emanuel calcule l'evaporation par:
 ! c             evap(il,i)=sigt*afac*revap
-! ce qui n'est pas correct. Dans cv_routines, la formulation a été modifiee.
+! ce qui n'est pas correct. Dans cv_routines, la formulation a �t� modifiee.
 ! Ici,l'evaporation evap est simplement calculee par l'equation de
 ! conservation.
@@ -3226,5 +3226,5 @@
 
       END IF !(i.le.inb(il) .and. lwork(il) .and. i.ne.1)
-      IF (prt_level .GE. 20) THEN
+      IF (prt_level >= 20) THEN
         PRINT *,'cv3_unsat, mp hydrostatic ', i, mp(il,i)
       ENDIF
@@ -3275,5 +3275,5 @@
           END IF
           mp(il, i) = max(0.0, mp(il,i))
-          IF (prt_level .GE. 20) THEN
+          IF (prt_level >= 20) THEN
             PRINT *,'cv3_unsat, mp cubic ', i, mp(il,i)
           ENDIF
@@ -3515,5 +3515,5 @@
       REAL, DIMENSION (nloc, nd), INTENT (OUT)           :: qcondc                      ! cld
       REAL, DIMENSION (nloc, nd), INTENT (OUT)           :: qtc, sigt                   ! cld
-      REAL, DIMENSION (nloc, nd), INTENT (OUT)           :: detrain                     ! Louis : pour le calcul de Klein du terme de variance qui dÃ©traine dans lenvironnement
+      REAL, DIMENSION (nloc, nd), INTENT (OUT)           :: detrain                     ! Louis : pour le calcul de Klein du terme de variance qui détraine dans lenvironnement
       REAL, DIMENSION (nloc), INTENT (OUT)               :: wd                          ! gust
       REAL, DIMENSION (nloc), INTENT (OUT)               :: cbmf
@@ -4556,5 +4556,5 @@
   END DO
 !
-    IF (prt_level .GE. 5) THEN
+    IF (prt_level >= 5) THEN
       print *,' CV3_YIELD : alpha_qpos ',alpha_qpos(1)
     ENDIF
@@ -4897,10 +4897,10 @@
         IF  (k<=inb(il) .AND. i<=inb(il) .AND. iflag(il)<=1) THEN   ! cld
           sument(il) =sument(il) + abs(ment(il,k,i))
-          detrain(il,i) = detrain(il,i) + abs(ment(il,k,i))*(qdet(il,k,i) - rr(il,i))*(qdet(il,k,i) - rr(il,i)) ! Louis terme de dÃ©trainement dans le bilan de variance
+          detrain(il,i) = detrain(il,i) + abs(ment(il,k,i))*(qdet(il,k,i) - rr(il,i))*(qdet(il,k,i) - rr(il,i)) ! Louis terme de détrainement dans le bilan de variance
         ENDIF
       ENDDO     ! il
     ENDDO       ! k
 
-! 14/01/15 AJ delta n'a rien à faire là...                                                 
+! 14/01/15 AJ delta n'a rien � faire l�...                                                 
     DO il = 1, ncum                                                  ! cld
 !!      IF (wa(il,i)>0.0 .AND. iflag(il)<=1) &                         ! cld
@@ -4918,5 +4918,5 @@
 
 ! IM cf. FH 
-! 14/01/15 AJ ne correspond pas à ce qui a été codé par JYG et SB           
+! 14/01/15 AJ ne correspond pas � ce qui a �t� cod� par JYG et SB           
                                                          
       IF (iflag_clw==0) THEN                                         ! cld
@@ -4991,5 +4991,5 @@
 
 ! fraction deau condensee dans les melanges convertie en precip : epm
-! et eau condensée précipitée dans masse d'air saturé : l_m*dM_m/dzdz.dzdz
+! et eau condens�e pr�cipit�e dans masse d'air satur� : l_m*dM_m/dzdz.dzdz
   DO j = 1, nl
     DO k = 1, nl
@@ -5141,7 +5141,7 @@
 
         ! On fait varier epmax en fn de la cape
-        ! Il faut donc recalculer ep, et hp qui a déjà été calculé et
-        ! qui en dépend
-        ! Toutes les autres variables fn de ep sont calculées plus bas.
+        ! Il faut donc recalculer ep, et hp qui a d�j� �t� calcul� et
+        ! qui en d�pend
+        ! Toutes les autres variables fn de ep sont calcul�es plus bas.
 
   include "cvthermo.h"
@@ -5175,8 +5175,8 @@
       real cape(nloc)
         
-        if (coef_epmax_cape.gt.1e-12) then
+        if (coef_epmax_cape>1e-12) then
 
         ! il faut calculer la cape: on fait un calcule simple car tant qu'on ne
-        ! connait pas ep, on ne connait pas les mélanges, ddfts etc... qui sont
+        ! connait pas ep, on ne connait pas les m�langes, ddfts etc... qui sont
         ! necessaires au calcul de la cape dans la nouvelle physique
         
@@ -5229,5 +5229,5 @@
       do k=minorig+1,nl
        do i=1,ncum
-        if((k.ge.icb(i)).and.(k.le.inb(i)))then
+        if((k>=icb(i)).and.(k<=inb(i)))then
           hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k)+frac(i,k)*lf(i,k))* &
                               ep(i, k)*clw(i, k)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p1_closure.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p1_closure.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p1_closure.F90	(revision 5082)
@@ -449,5 +449,5 @@
 
       IF ((k>=(icb(il)+1)) .AND. (k<=inb(il))) THEN
-        IF (iflag_mix_adiab.eq.1) THEN
+        IF (iflag_mix_adiab==1) THEN
 !CR:computation of cape from LCL: keep flag or to modify in all cases?
         deltap = min(plcl(il), ph(il,k-1)) - min(plcl(il), ph(il,k))
@@ -555,5 +555,5 @@
   DO k=1,nl
      DO il=1,ncum
-        if ((plfc(il).lt.ph(il,k)).and.(plfc(il).ge.ph(il,k+1))) then
+        if ((plfc(il)<ph(il,k)).and.(plfc(il)>=ph(il,k+1))) then
            klfc(il)=k
         endif
@@ -568,5 +568,5 @@
 !CR: Add large-scale component to the mass-flux
 !encore connu sous le nom "Experience du tube de dentifrice"
-    if ((coef_clos_ls.gt.0.).and.(plfc(il).gt.0.)) then 
+    if ((coef_clos_ls>0.).and.(plfc(il)>0.)) then
        cbmf1(il) = cbmf1(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc(il)))
     endif
@@ -627,5 +627,5 @@
 !CR: new erosion of adiabatic ascent: modification of m
 !computation of the sum of ascending fluxes 
-  IF (iflag_mix_adiab.eq.1) THEN
+  IF (iflag_mix_adiab==1) THEN
 
 !Verification sum(me)=sum(m)
@@ -657,5 +657,5 @@
   DO k = 1, nl
     DO il = 1, ncum
-       IF ((k>=(icb(il)+1)) .AND. (k<=inb(il)) .AND. (mlim(il,k).gt.0.)) THEN     
+       IF ((k>=(icb(il)+1)) .AND. (k<=inb(il)) .AND. (mlim(il,k)>0.)) THEN
 !          print*,"beta_coef",il,k,icb(il),inb(il),buoy(il,k),tv(il,k),wlim(il,k),wlim(il,k+1)
           beta_coef(il,k)=RG*coef_peel*buoy(il,k)/tv(il,k)/((wlim(il,k)+wlim(il,k+1))/2.)**2
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p2_closure.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p2_closure.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p2_closure.F90	(revision 5082)
@@ -517,5 +517,5 @@
       IF ((k>=(icb(il)+1)) .AND. (k<=inb(il))) THEN
 
-        IF (iflag_mix_adiab.eq.1) THEN
+        IF (iflag_mix_adiab==1) THEN
 !CR:computation of cape from LCL: keep flag or to modify in all cases?
         deltap = min(plcl(il), ph(il,k-1)) - min(plcl(il), ph(il,k))
@@ -625,5 +625,5 @@
   DO k=1,nl
      DO il=1,ncum
-        if ((plfc(il).lt.ph(il,k)).and.(plfc(il).ge.ph(il,k+1))) then
+        if ((plfc(il)<ph(il,k)).and.(plfc(il)>=ph(il,k+1))) then
            klfc(il)=k
         endif
@@ -638,5 +638,5 @@
 !CR: Add large-scale component to the mass-flux
 !encore connu sous le nom "Experience du tube de dentifrice"
-    if ((coef_clos_ls.gt.0.).and.(plfc(il).gt.0.)) then 
+    if ((coef_clos_ls>0.).and.(plfc(il)>0.)) then
        cbmfalp(il) = cbmfalp(il) - coef_clos_ls*min(0.,1./RG*omega(il,klfc(il)))
     endif
@@ -709,5 +709,5 @@
 !CR: new erosion of adiabatic ascent: modification of m
 !computation of the sum of ascending fluxes 
-  IF (iflag_mix_adiab.eq.1) THEN
+  IF (iflag_mix_adiab==1) THEN
 
 !Verification sum(me)=sum(m)
@@ -739,5 +739,5 @@
   DO k = 1, nl
     DO il = 1, ncum
-       IF ((k>=(icb(il)+1)) .AND. (k<=inb(il)) .AND. (mlim(il,k).gt.0.)) THEN     
+       IF ((k>=(icb(il)+1)) .AND. (k<=inb(il)) .AND. (mlim(il,k)>0.)) THEN
 !          print*,"beta_coef",il,k,icb(il),inb(il),buoy(il,k),tv(il,k),wlim(il,k),wlim(il,k+1)
           beta_coef(il,k)=RG*coef_peel*buoy(il,k)/tv(il,k)/((wlim(il,k)+wlim(il,k+1))/2.)**2
@@ -820,5 +820,5 @@
   IF (ok_convstop) THEN
     DO il = 1, ncum
-      IF (dtminmax(il) .LE. 0.) THEN
+      IF (dtminmax(il) <= 0.) THEN
         iflag(il) = 4
       END IF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p_mixing.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p_mixing.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cv3p_mixing.F90	(revision 5082)
@@ -237,5 +237,5 @@
     IF (prt_level >= 10) THEN
       print *,'cv3p_mixing i, nent(i), icb, inb ',i, nent(igout,i), icb(igout), inb(igout)
-      IF (nent(igout,i) .gt. 0) THEN
+      IF (nent(igout,i) > 0) THEN
         print *,'i,(j,Sij(i,j),j=icb-1,inb) ',i,(j,Sij(igout,i,j),j=icb(igout)-1,inb(igout))
       ENDIF
@@ -258,5 +258,5 @@
         uent(il, i, i) = unk(il)
         vent(il, i, i) = vnk(il)
-        IF (fl_cor_ebil .GE. 2) THEN
+        IF (fl_cor_ebil >= 2) THEN
           hent(il, i, i) = hp(il,i)
         ENDIF
@@ -522,5 +522,5 @@
     cpm = cpd+Qent(il,i,j)*(cpv-cpd)
 !
-    IF (cvflag_ice .and. frac(il,j) .gt. 0.) THEN
+    IF (cvflag_ice .and. frac(il,j) > 0.) THEN
             elij(il, i, j) = Qent(il, i, j) - rs(il, j)
             elij(il, i, j) = elij(il, i, j) + &
@@ -557,5 +557,5 @@
 !            hent(il, i, j) = hent(il, i, j) + (lv(il,j)+(cpd-cpv)*t(il,j))*awat
 ! Mixed draught temperature at level j
-    IF (cvflag_ice .and. frac(il,j) .gt. 0.) THEN
+    IF (cvflag_ice .and. frac(il,j) > 0.) THEN
           Tm = t(il,j) + (Qent(il,i,j)-elij(il,i,j)-rs(il,j))*rrv*t(il,j)*t(il,j)/(lv(il,j)*rs(il,j))
           hent(il, i, j) = hent(il, i, j) + (lv(il,j)+frac(il,j)*lf(il,j)+(cpd-cpv)*Tm)*awat
@@ -674,5 +674,5 @@
         vent(il, i, i) = vnk(il)
         elij(il, i, i) = clw(il, i)*(1.-ep(il,i))
-        IF (fl_cor_ebil .GE. 2) THEN
+        IF (fl_cor_ebil >= 2) THEN
           hent(il, i, i) = hp(il,i)
           Sigij(il, i, i) = 0.0
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr.F90	(revision 5082)
@@ -49,9 +49,9 @@
   REAL,DIMENSION(klon,klev,klev),INTENT(IN) :: sij        ! fraction dair de lenv
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: wght_cvfd  ! weights of the layers feeding convection
-  REAL,DIMENSION(klon,klev,klev),INTENT(IN) :: elij       ! contenu en eau condensée spécifique/conc deau condensée massique
+  REAL,DIMENSION(klon,klev,klev),INTENT(IN) :: elij       ! contenu en eau condens�e sp�cifique/conc deau condens�e massique
   REAL,DIMENSION(klon,klev,klev),INTENT(IN) :: epmlmMm    ! eau condensee precipitee dans mel masse dair sat
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: eplaMm    ! eau condensee precipitee dans aa masse dair sat
 
-  REAL,DIMENSION(klon,klev),INTENT(IN)      :: clw        ! contenu en eau condensée dans lasc adiab
+  REAL,DIMENSION(klon,klev),INTENT(IN)      :: clw        ! contenu en eau condens�e dans lasc adiab
   REAL,DIMENSION(klon),INTENT(IN)           :: sigd
   INTEGER,DIMENSION(klon),INTENT(IN)        :: icb,inb
@@ -80,5 +80,5 @@
 
 ! RomP ! les variables sont nettoyees des valeurs aberrantes
-  REAL,DIMENSION(klon,klev)         :: Pa, Pm  ! pluie AA et mélanges, var temporaire
+  REAL,DIMENSION(klon,klev)         :: Pa, Pm  ! pluie AA et m�langes, var temporaire
   REAL,DIMENSION(klon,klev)         :: pmflxs,pmflxr ! pmflxrIN,pmflxsIN sans valeur aberante
   REAL,DIMENSION(klon,klev)         :: mp            ! flux de masse
@@ -155,8 +155,8 @@
 ! On prend la moyenne des precip entre le niveau i+1 et i
 ! I=3/4* (P(1+1)+P(i))/2 / (sigd*r*rho_l)
-!  1000kg/m3= densité de l'eau
+!  1000kg/m3= densit� de l'eau
 ! 0.75e-3 = 3/4 /1000
-! Par la suite, I est tout le temps multiplié par sig_d pour avoir l'impaction sur la surface de la maille
-! on le néglige ici pour simplifier le code
+! Par la suite, I est tout le temps multipli� par sig_d pour avoir l'impaction sur la surface de la maille
+! on le n�glige ici pour simplifier le code
   do j=1,klev-1
    do i=1,klon
@@ -201,5 +201,5 @@
   END DO
 
-! suppression des valeurs très faibles (~1e-320)
+! suppression des valeurs tr�s faibles (~1e-320)
 ! multiplication de levaporation pour lavoir par unite de temps
 ! et par unite de surface de la maille
@@ -207,5 +207,5 @@
   DO j=1,klev
    DO i=1,klon
-    if(ev(i,j).lt.1.e-16) then
+    if(ev(i,j)<1.e-16) then
      evap(i,j)=0.
     else
@@ -217,6 +217,6 @@
   DO j=1,klev
    DO i=1,klon
-   if(j.lt.klev) then
-    if(epIN(i,j).lt.1.e-32) then
+   if(j<klev) then
+    if(epIN(i,j)<1.e-32) then
      ep(i,j)=0.
     else
@@ -226,25 +226,25 @@
     ep(i,j)=epmax
    endif
-    if(mpIN(i,j).lt.1.e-32) then
+    if(mpIN(i,j)<1.e-32) then
      mp(i,j)=0.
     else
      mp(i,j)=mpIN(i,j)
     endif
-    if(pmflxsIN(i,j).lt.1.e-32) then
+    if(pmflxsIN(i,j)<1.e-32) then
      pmflxs(i,j)=0.
     else
      pmflxs(i,j)=pmflxsIN(i,j)
     endif
-    if(pmflxrIN(i,j).lt.1.e-32) then
+    if(pmflxrIN(i,j)<1.e-32) then
      pmflxr(i,j)=0.
     else
      pmflxr(i,j)=pmflxrIN(i,j)
     endif
-    if(wdtrainA(i,j).lt.1.e-32) then
+    if(wdtrainA(i,j)<1.e-32) then
      Pa(i,j)=0.
     else
      Pa(i,j)=wdtrainA(i,j)
     endif
-    if(wdtrainM(i,j).lt.1.e-32) then
+    if(wdtrainM(i,j)<1.e-32) then
      Pm(i,j)=0.
     else
@@ -257,6 +257,6 @@
   DO j = klev-1,1,-1
    DO i = 1,klon
-     NO_precip(i,j) = (pmflxr(i,j+1)+pmflxs(i,j+1)).lt.1.e-10&
-                    .and.Pa(i,j).lt.1.e-10.and.Pm(i,j).lt.1.e-10
+     NO_precip(i,j) = (pmflxr(i,j+1)+pmflxs(i,j+1))<1.e-10&
+                    .and.Pa(i,j)<1.e-10.and.Pm(i,j)<1.e-10
    END DO
   END DO
@@ -285,5 +285,5 @@
      DO j=k-1,1,-1
         DO i=1,klon
-           if(mp(i,j+1).gt.1.e-10) then
+           if(mp(i,j+1)>1.e-10) then
               zmd(i,j,k)=zmd(i,j+1,k)*min(1.,mp(i,j)/mp(i,j+1)) !det ~ mk(j)=mk(j+1)*mp(i,j)/mp(i,j+1)
            ENDif
@@ -302,5 +302,5 @@
      DO j=1,klev-1
         DO i=1,klon
-        if(mp(i,j+1).gt.1.e-10) then
+        if(mp(i,j+1)>1.e-10) then
           qTrdi(i,j+1,it)=qTrdi(i,j+1,it)+(zmd(i,j+1,k)/mp(i,j+1))*tr(i,k,it)
         else
@@ -397,6 +397,6 @@
   DO j=1,klev
      DO i=1,klon
-        if(j.ge.icb(i).and.j.le.inb(i)) then
-          if(clw(i,j).gt.1.e-16) then
+        if(j>=icb(i).and.j<=inb(i)) then
+          if(clw(i,j)>1.e-16) then
            qPa(i,j,it)=ccntrAA_coef*tr(i,1,it)/clw(i,j)
           else
@@ -413,7 +413,7 @@
       DO k=1,j-1
         DO i=1,klon
-        if(k.ge.icb(i).and.k.le.inb(i).and.& 
-           j.le.inb(i)) then
-            if(elij(i,k,j).gt.1.e-16) then
+        if(k>=icb(i).and.k<=inb(i).and.&
+           j<=inb(i)) then
+            if(elij(i,k,j)>1.e-16) then
              qMeltmp(i,j,it)=((1-ep(i,k))*ccntrAA_coef*tr(i,1,it)&
                          *(1.-sij(i,k,j))  +ccntrENV_coef&
@@ -431,5 +431,5 @@
      DO j=1,klev
         DO i=1,klon
-          if(Mint(i,j).gt.1.e-16) then
+          if(Mint(i,j)>1.e-16) then
            qMel(i,j,it)=qpmMint(i,j,it)/Mint(i,j)
           else
@@ -442,11 +442,11 @@
    DO j=klev-1,1,-1
     DO i=1,klon
-     if(mp(i,j+1).gt.mp(i,j).and.mp(i,j+1).gt.1.e-10) then  ! detrainement
+     if(mp(i,j+1)>mp(i,j).and.mp(i,j+1)>1.e-10) then  ! detrainement
        kappa(i,j)=((pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                 (-mp(i,j+1)-imp(i,j)/RG*dxpres(i,j))&
                 + (imp(i,j)/RG*dxpres(i,j))*(evap(i,j)/RG*dxpres(i,j)))
              
-     elseif(mp(i,j).gt.mp(i,j+1).and.mp(i,j).gt.1.e-10) then! entrainement
-       if(j.eq.1) then
+     elseif(mp(i,j)>mp(i,j+1).and.mp(i,j)>1.e-10) then! entrainement
+       if(j==1) then
         kappa(i,j)=((pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                  (-mp(i,2)-imp(i,j)/RG*dxpres(i,j))&
@@ -465,11 +465,11 @@
   DO j=klev-1,1,-1
    DO i=1,klon
-    if (abs(kappa(i,j)).lt.1.e-25) then    !si denominateur nul (il peut y avoir des mp!=0)
+    if (abs(kappa(i,j))<1.e-25) then    !si denominateur nul (il peut y avoir des mp!=0)
      kappa(i,j)=1.
-     if(j.eq.1) then
-       qDi(i,j,it)=qDi(i,j+1,it) !orig tr(i,j,it)   ! mp(1)=0 donc tout vient de la couche supérieure
-     elseif(mp(i,j+1).gt.mp(i,j).and.mp(i,j+1).gt.1.e-10) then
+     if(j==1) then
+       qDi(i,j,it)=qDi(i,j+1,it) !orig tr(i,j,it)   ! mp(1)=0 donc tout vient de la couche sup�rieure
+     elseif(mp(i,j+1)>mp(i,j).and.mp(i,j+1)>1.e-10) then
        qDi(i,j,it)=qDi(i,j+1,it)
-     elseif(mp(i,j).gt.mp(i,j+1).and.mp(i,j).gt.1.e-10) then! entrainement
+     elseif(mp(i,j)>mp(i,j+1).and.mp(i,j)>1.e-10) then! entrainement
        qDi(i,j,it)=(-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it))/(-mp(i,j))
      else  ! si  mp (i)=0 et mp(j+1)=0
@@ -490,11 +490,11 @@
 !!jyg  (20130119) correction pour le sommet du nuage
 !!     if(j.ge.inb(i)) then       !au-dessus du nuage, sommet inclu
-     if(j.gt.inb(i)) then       !au-dessus du nuage
+     if(j>inb(i)) then       !au-dessus du nuage
        qDi(i,j,it)=tr(i,j,it)   ! pas de descente => environnement = descente insaturee
        qPr(i,j,it)=0.
 
 !  vvv premiere couche du modele ou mp(1)=0  ! det tout le temps  vvv
-     elseif(j.eq.1) then 
-      if(mp(i,2).gt.1.e-10) then !mp(2) non nul -> detrainement (car mp(1) = 0) !ent pas possible
+     elseif(j==1) then
+      if(mp(i,2)>1.e-10) then !mp(2) non nul -> detrainement (car mp(1) = 0) !ent pas possible
        if(NO_precip(i,j)) then !pas de precip en (i)
         qDi(i,j,it)=qDi(i,j+1,it)
@@ -530,5 +530,5 @@
      else 
 !------------------------------------------------------------- detrainement 
-      if(mp(i,j+1).gt.mp(i,j).and.mp(i,j+1).gt.1.e-10) then !mp(i,j).gt.1.e-10) then
+      if(mp(i,j+1)>mp(i,j).and.mp(i,j+1)>1.e-10) then !mp(i,j).gt.1.e-10) then
          if(NO_precip(i,j)) then 
           qDi(i,j,it)=qDi(i,j+1,it)
@@ -548,5 +548,5 @@
          endif !precip
 !------------------------------------------------------------- entrainement 
-      elseif(mp(i,j).gt.mp(i,j+1).and.mp(i,j).gt.1.e-10) then 
+      elseif(mp(i,j)>mp(i,j+1).and.mp(i,j)>1.e-10) then
          if(NO_precip(i,j)) then
           qDi(i,j,it)=(-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it))/(-mp(i,j))
@@ -614,7 +614,7 @@
                -zmfdam(i,k,it)*ccntrAA_coef
 ! lessivage courants insatures
-   if(k.le.inb(i).and.k.gt.1) then   ! tendances dans le nuage
+   if(k<=inb(i).and.k>1) then   ! tendances dans le nuage
 !------------------------------------------------------------- detrainement
-      if(mp(i,k+1).gt.mp(i,k).and.mp(i,k+1).gt.1.e-10) then
+      if(mp(i,k+1)>mp(i,k).and.mp(i,k+1)>1.e-10) then
         uscavtrac= (-mp(i,k)+mp(i,k+1))*(qDi(i,k,it)-tr(i,k,it))&
                    + mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
@@ -625,5 +625,5 @@
 !                    'mp',mp(i,k)
 !------------------------------------------------------------- entrainement 
-      elseif(mp(i,k).gt.mp(i,k+1).and.mp(i,k).gt.1.e-10) then
+      elseif(mp(i,k)>mp(i,k+1).and.mp(i,k)>1.e-10) then
          uscavtrac= mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
 !
@@ -641,6 +641,6 @@
       endif  ! mp/det/ent
 !------------------------------------------------------------- premiere couche 
-   elseif(k.eq.1) then  !                                      mp(1)=0.
-      if(mp(i,2).gt.1.e-10) then  !detrainement
+   elseif(k==1) then  !                                      mp(1)=0.
+      if(mp(i,2)>1.e-10) then  !detrainement
          uscavtrac= (-0.+mp(i,2))*(qDi(i,k,it)-tr(i,k,it)) !&
 !                   + mp(i,2)*(0.-tr(i,k,it))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_scav.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_scav.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_scav.F90	(revision 5082)
@@ -184,5 +184,5 @@
   DO j=1,klev
      DO i=1,klon
-        IF(ev(i,j).lt.1.e-16) THEN
+        IF(ev(i,j)<1.e-16) THEN
            evap(i,j)=0.
         ELSE
@@ -194,6 +194,6 @@
   DO j=1,klev
      DO i=1,klon
-        IF(j.LT.klev) THEN
-           IF(epIN(i,j).LT.1.e-32) THEN
+        IF(j<klev) THEN
+           IF(epIN(i,j)<1.e-32) THEN
               ep(i,j)=0.
            ELSE
@@ -203,25 +203,25 @@
            ep(i,j)=epmax
         ENDIF
-        IF(mpIN(i,j).LT.1.e-32) THEN
+        IF(mpIN(i,j)<1.e-32) THEN
            mp(i,j)=0.
         ELSE
            mp(i,j)=mpIN(i,j)
         ENDIF
-        IF(pmflxsIN(i,j).LT.1.e-32) THEN
+        IF(pmflxsIN(i,j)<1.e-32) THEN
            pmflxs(i,j)=0.
         ELSE
            pmflxs(i,j)=pmflxsIN(i,j)
         ENDIF
-        IF(pmflxrIN(i,j).LT.1.e-32) THEN
+        IF(pmflxrIN(i,j)<1.e-32) THEN
            pmflxr(i,j)=0.
         ELSE
            pmflxr(i,j)=pmflxrIN(i,j)
         ENDIF
-        IF(wdtrainA(i,j).LT.1.e-32) THEN
+        IF(wdtrainA(i,j)<1.e-32) THEN
            Pa(i,j)=0.
         ELSE
            Pa(i,j)=wdtrainA(i,j)
         ENDIF
-        IF(wdtrainM(i,j).LT.1.e-32) THEN
+        IF(wdtrainM(i,j)<1.e-32) THEN
            Pm(i,j)=0.
         ELSE
@@ -234,6 +234,6 @@
   DO j = klev-1,1,-1
      DO i = 1,klon
-        NO_precip(i,j) = (pmflxr(i,j+1)+pmflxs(i,j+1)).LT.1.e-10&
-             .AND.Pa(i,j).LT.1.e-10.AND.Pm(i,j).LT.1.e-10
+        NO_precip(i,j) = (pmflxr(i,j+1)+pmflxs(i,j+1))<1.e-10&
+             .AND.Pa(i,j)<1.e-10.AND.Pm(i,j)<1.e-10
      END DO
   END DO
@@ -282,5 +282,5 @@
      DO j=k-1,1,-1
         DO i=1,klon
-           IF(mp(i,j+1).GT.1.e-10) THEN
+           IF(mp(i,j+1)>1.e-10) THEN
               zmd(i,j,k)=zmd(i,j+1,k)*min(1.,mp(i,j)/mp(i,j+1)) !det ~ mk(j)=mk(j+1)*mp(i,j)/mp(i,j+1)
            ENDIF
@@ -299,5 +299,5 @@
      DO j=1,klev-1
         DO i=1,klon
-           IF(mp(i,j+1).GT.1.e-10) THEN
+           IF(mp(i,j+1)>1.e-10) THEN
               qTrdi(i,j+1,it)=qTrdi(i,j+1,it)+(zmd(i,j+1,k)/mp(i,j+1))*tr(i,k,it)
            ELSE
@@ -393,6 +393,6 @@
   DO j=1,klev
      DO i=1,klon
-        IF(j.GE.icb(i).AND.j.LE.inb(i)) THEN
-           IF(clw(i,j).GT.1.e-16) THEN
+        IF(j>=icb(i).AND.j<=inb(i)) THEN
+           IF(clw(i,j)>1.e-16) THEN
               !JE           qPa(i,j,it)=ccntrAA_coef*tr(i,1,it)/clw(i,j)
               qPa(i,j,it)=ccntrAA_3d(i,j)*tr(i,1,it)/clw(i,j)
@@ -410,7 +410,7 @@
      DO k=1,j-1
         DO i=1,klon
-           IF(k.GE.icb(i).AND.k.LE.inb(i).AND.& 
-                j.LE.inb(i)) THEN
-              IF(elij(i,k,j).GT.1.e-16) THEN
+           IF(k>=icb(i).AND.k<=inb(i).AND.&
+                j<=inb(i)) THEN
+              IF(elij(i,k,j)>1.e-16) THEN
                  !JE             qMeltmp(i,j,it)=((1-ep(i,k))*ccntrAA_coef*tr(i,1,it)&
                  !JE                         *(1.-sij(i,k,j))  +ccntrENV_coef&
@@ -431,5 +431,5 @@
   DO j=1,klev
      DO i=1,klon
-        IF(Mint(i,j).GT.1.e-16) THEN
+        IF(Mint(i,j)>1.e-16) THEN
            qMel(i,j,it)=qpmMint(i,j,it)/Mint(i,j)
         ELSE
@@ -442,11 +442,11 @@
   DO j=klev-1,1,-1
      DO i=1,klon
-        IF(mp(i,j+1).GT.mp(i,j).AND.mp(i,j+1).GT.1.e-10) THEN  ! detrainement
+        IF(mp(i,j+1)>mp(i,j).AND.mp(i,j+1)>1.e-10) THEN  ! detrainement
            kappa(i,j)=((pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                 (-mp(i,j+1)-imp(i,j)/RG*dxpres(i,j))&
                 + (imp(i,j)/RG*dxpres(i,j))*(evap(i,j)/RG*dxpres(i,j)))
 
-        ELSEIF(mp(i,j).GT.mp(i,j+1).AND.mp(i,j).GT.1.e-10) THEN! entrainement
-           IF(j.eq.1) THEN
+        ELSEIF(mp(i,j)>mp(i,j+1).AND.mp(i,j)>1.e-10) THEN! entrainement
+           IF(j==1) THEN
               kappa(i,j)=((pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                    (-mp(i,2)-imp(i,j)/RG*dxpres(i,j))&
@@ -465,11 +465,11 @@
   DO j=klev-1,1,-1
      DO i=1,klon
-        IF (abs(kappa(i,j)).LT.1.e-25) THEN    !si denominateur nul (il peut y avoir des mp!=0)
+        IF (abs(kappa(i,j))<1.e-25) THEN    !si denominateur nul (il peut y avoir des mp!=0)
            kappa(i,j)=1.
-           IF(j.eq.1) THEN
+           IF(j==1) THEN
               qDi(i,j,it)=qDi(i,j+1,it) !orig tr(i,j,it)   ! mp(1)=0 donc tout vient de la couche supérieure
-           ELSEIF(mp(i,j+1).GT.mp(i,j).AND.mp(i,j+1).GT.1.e-10) THEN
+           ELSEIF(mp(i,j+1)>mp(i,j).AND.mp(i,j+1)>1.e-10) THEN
               qDi(i,j,it)=qDi(i,j+1,it)
-           ELSEIF(mp(i,j).GT.mp(i,j+1).AND.mp(i,j).GT.1.e-10) THEN! entrainement
+           ELSEIF(mp(i,j)>mp(i,j+1).AND.mp(i,j)>1.e-10) THEN! entrainement
               qDi(i,j,it)=(-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it))/(-mp(i,j))
            ELSE  ! si  mp (i)=0 et mp(j+1)=0
@@ -490,11 +490,11 @@
            !!jyg  (20130119) correction pour le sommet du nuage
            !!     if(j.GE.inb(i)) THEN       !au-dessus du nuage, sommet inclu
-           if(j.GT.inb(i)) THEN       !au-dessus du nuage
+           if(j>inb(i)) THEN       !au-dessus du nuage
               qDi(i,j,it)=tr(i,j,it)   ! pas de descente => environnement = descente insaturee
               qPr(i,j,it)=0.
 
               !  vvv premiere couche du modele ou mp(1)=0  ! det tout le temps  vvv
-           ELSEIF(j.eq.1) THEN 
-              if(mp(i,2).GT.1.e-10) THEN !mp(2) non nul -> detrainement (car mp(1) = 0) !ent pas possible
+           ELSEIF(j==1) THEN
+              if(mp(i,2)>1.e-10) THEN !mp(2) non nul -> detrainement (car mp(1) = 0) !ent pas possible
                  if(NO_precip(i,j)) THEN !pas de precip en (i)
                     qDi(i,j,it)=qDi(i,j+1,it)
@@ -530,5 +530,5 @@
            ELSE 
               !------------------------------------------------------------- detrainement 
-              if(mp(i,j+1).GT.mp(i,j).AND.mp(i,j+1).GT.1.e-10) THEN !mp(i,j).GT.1.e-10) THEN
+              if(mp(i,j+1)>mp(i,j).AND.mp(i,j+1)>1.e-10) THEN !mp(i,j).GT.1.e-10) THEN
                  if(NO_precip(i,j)) THEN 
                     qDi(i,j,it)=qDi(i,j+1,it)
@@ -548,5 +548,5 @@
                  ENDIF !precip
                  !------------------------------------------------------------- entrainement 
-              ELSEIF(mp(i,j).GT.mp(i,j+1).AND.mp(i,j).GT.1.e-10) THEN 
+              ELSEIF(mp(i,j)>mp(i,j+1).AND.mp(i,j)>1.e-10) THEN
                  if(NO_precip(i,j)) THEN
                     qDi(i,j,it)=(-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it))/(-mp(i,j))
@@ -617,7 +617,7 @@
              -zmfdam(i,k,it)*ccntrAA_3d(i,k)
         ! lessivage courants insatures
-        if(k.LE.inb(i).AND.k.GT.1) THEN   ! tendances dans le nuage
+        if(k<=inb(i).AND.k>1) THEN   ! tendances dans le nuage
            !------------------------------------------------------------- detrainement
-           if(mp(i,k+1).GT.mp(i,k).AND.mp(i,k+1).GT.1.e-10) THEN
+           if(mp(i,k+1)>mp(i,k).AND.mp(i,k+1)>1.e-10) THEN
               uscavtrac= (-mp(i,k)+mp(i,k+1))*(qDi(i,k,it)-tr(i,k,it))&
                    + mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
@@ -628,5 +628,5 @@
               !                    'mp',mp(i,k)
               !------------------------------------------------------------- entrainement 
-           ELSEIF(mp(i,k).GT.mp(i,k+1).AND.mp(i,k).GT.1.e-10) THEN
+           ELSEIF(mp(i,k)>mp(i,k+1).AND.mp(i,k)>1.e-10) THEN
               uscavtrac= mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
               !
@@ -652,6 +652,6 @@
            ENDIF  ! mp/det/ent
            !------------------------------------------------------------- premiere couche 
-        ELSEIF(k.eq.1) THEN  !                                      mp(1)=0.
-           if(mp(i,2).GT.1.e-10) THEN  !detrainement
+        ELSEIF(k==1) THEN  !                                      mp(1)=0.
+           if(mp(i,2)>1.e-10) THEN  !detrainement
               uscavtrac= (-0.+mp(i,2))*(qDi(i,k,it)-tr(i,k,it)) !&
               !                   + mp(i,2)*(0.-tr(i,k,it))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_spl.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_spl.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_spl.F90	(revision 5082)
@@ -252,5 +252,5 @@
   DO j=1,klev
    DO i=1,klon
-    if(ev(i,j).lt.1.e-16) then
+    if(ev(i,j)<1.e-16) then
      evap(i,j)=0.
     else
@@ -262,6 +262,6 @@
   DO j=1,klev
    DO i=1,klon
-   if(j.lt.klev) then
-    if(epIN(i,j).lt.1.e-32) then
+   if(j<klev) then
+    if(epIN(i,j)<1.e-32) then
      ep(i,j)=0.
     else
@@ -271,25 +271,25 @@
     ep(i,j)=epmax
    endif
-    if(mpIN(i,j).lt.1.e-32) then
+    if(mpIN(i,j)<1.e-32) then
      mp(i,j)=0.
     else
      mp(i,j)=mpIN(i,j)
     endif
-    if(pmflxsIN(i,j).lt.1.e-32) then
+    if(pmflxsIN(i,j)<1.e-32) then
      pmflxs(i,j)=0.
     else
      pmflxs(i,j)=pmflxsIN(i,j)
     endif
-    if(pmflxrIN(i,j).lt.1.e-32) then
+    if(pmflxrIN(i,j)<1.e-32) then
      pmflxr(i,j)=0.
     else
      pmflxr(i,j)=pmflxrIN(i,j)
     endif
-    if(wdtrainA(i,j).lt.1.e-32) then
+    if(wdtrainA(i,j)<1.e-32) then
      Pa(i,j)=0.
     else
      Pa(i,j)=wdtrainA(i,j)
     endif
-    if(wdtrainM(i,j).lt.1.e-32) then
+    if(wdtrainM(i,j)<1.e-32) then
      Pm(i,j)=0.
     else
@@ -302,6 +302,6 @@
   DO j = klev-1,1,-1
    DO i = 1,klon
-     NO_precip(i,j) = (pmflxr(i,j+1)+pmflxs(i,j+1)).lt.1.e-10&
-                    .and.Pa(i,j).lt.1.e-10.and.Pm(i,j).lt.1.e-10
+     NO_precip(i,j) = (pmflxr(i,j+1)+pmflxs(i,j+1))<1.e-10&
+                    .and.Pa(i,j)<1.e-10.and.Pm(i,j)<1.e-10
    END DO
   END DO
@@ -340,5 +340,5 @@
 ! Gas precursor: Henry's law
 
-IF (it .EQ. id_prec) THEN
+IF (it == id_prec) THEN
       DO k=1, klev
       DO i=1, klon
@@ -416,5 +416,5 @@
      DO j=k-1,1,-1
         DO i=1,klon
-           if(mp(i,j+1).gt.1.e-10) then
+           if(mp(i,j+1)>1.e-10) then
               zmd(i,j,k)=zmd(i,j+1,k)*min(1.,mp(i,j)/mp(i,j+1)) !det ~ mk(j)=mk(j+1)*mp(i,j)/mp(i,j+1)
            ENDif
@@ -433,5 +433,5 @@
      DO j=1,klev-1
         DO i=1,klon
-        if(mp(i,j+1).gt.1.e-10) then
+        if(mp(i,j+1)>1.e-10) then
           qTrdi(i,j+1,it)=qTrdi(i,j+1,it)+(zmd(i,j+1,k)/mp(i,j+1))*tr(i,k,it)
         else
@@ -527,6 +527,6 @@
   DO j=1,klev
      DO i=1,klon
-        if(j.ge.icb(i).and.j.le.inb(i)) then
-          if(clw(i,j).gt.1.e-16) then
+        if(j>=icb(i).and.j<=inb(i)) then
+          if(clw(i,j)>1.e-16) then
 !           qPa(i,j,it)=ccntrAA_coef*tr(i,1,it)/clw(i,j)
            qPa(i,j,it)=ccntrAA_coef3d(i,j)*tr(i,1,it)/clw(i,j)
@@ -544,7 +544,7 @@
       DO k=1,j-1
         DO i=1,klon
-        if(k.ge.icb(i).and.k.le.inb(i).and.& 
-           j.le.inb(i)) then
-            if(elij(i,k,j).gt.1.e-16) then
+        if(k>=icb(i).and.k<=inb(i).and.&
+           j<=inb(i)) then
+            if(elij(i,k,j)>1.e-16) then
 !JE             qMeltmp(i,j,it)=((1-ep(i,k))*ccntrAA_coef*tr(i,1,it)&
 !JE                         *(1.-sij(i,k,j))  +ccntrENV_coef&
@@ -565,5 +565,5 @@
      DO j=1,klev
         DO i=1,klon
-          if(Mint(i,j).gt.1.e-16) then
+          if(Mint(i,j)>1.e-16) then
            qMel(i,j,it)=qpmMint(i,j,it)/Mint(i,j)
           else
@@ -576,11 +576,11 @@
    DO j=klev-1,1,-1
     DO i=1,klon
-     if(mp(i,j+1).gt.mp(i,j).and.mp(i,j+1).gt.1.e-10) then  ! detrainement
+     if(mp(i,j+1)>mp(i,j).and.mp(i,j+1)>1.e-10) then  ! detrainement
        kappa(i,j)=((pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                 (-mp(i,j+1)-imp(i,j)/RG*dxpres(i,j))&
                 + (imp(i,j)/RG*dxpres(i,j))*(evap(i,j)/RG*dxpres(i,j)))
              
-     elseif(mp(i,j).gt.mp(i,j+1).and.mp(i,j).gt.1.e-10) then! entrainement
-       if(j.eq.1) then
+     elseif(mp(i,j)>mp(i,j+1).and.mp(i,j)>1.e-10) then! entrainement
+       if(j==1) then
         kappa(i,j)=((pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                  (-mp(i,2)-imp(i,j)/RG*dxpres(i,j))&
@@ -599,11 +599,11 @@
   DO j=klev-1,1,-1
    DO i=1,klon
-    if (abs(kappa(i,j)).lt.1.e-25) then    !si denominateur nul (il peut y avoir des mp!=0)
+    if (abs(kappa(i,j))<1.e-25) then    !si denominateur nul (il peut y avoir des mp!=0)
      kappa(i,j)=1.
-     if(j.eq.1) then
+     if(j==1) then
        qDi(i,j,it)=qDi(i,j+1,it) !orig tr(i,j,it)   ! mp(1)=0 donc tout vient de la couche supérieure
-     elseif(mp(i,j+1).gt.mp(i,j).and.mp(i,j+1).gt.1.e-10) then
+     elseif(mp(i,j+1)>mp(i,j).and.mp(i,j+1)>1.e-10) then
        qDi(i,j,it)=qDi(i,j+1,it)
-     elseif(mp(i,j).gt.mp(i,j+1).and.mp(i,j).gt.1.e-10) then! entrainement
+     elseif(mp(i,j)>mp(i,j+1).and.mp(i,j)>1.e-10) then! entrainement
        qDi(i,j,it)=(-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it))/(-mp(i,j))
      else  ! si  mp (i)=0 et mp(j+1)=0
@@ -624,11 +624,11 @@
 !!jyg  (20130119) correction pour le sommet du nuage
 !!     if(j.ge.inb(i)) then       !au-dessus du nuage, sommet inclu
-     if(j.gt.inb(i)) then       !au-dessus du nuage
+     if(j>inb(i)) then       !au-dessus du nuage
        qDi(i,j,it)=tr(i,j,it)   ! pas de descente => environnement = descente insaturee
        qPr(i,j,it)=0.
 
 !  vvv premiere couche du modele ou mp(1)=0  ! det tout le temps  vvv
-     elseif(j.eq.1) then 
-      if(mp(i,2).gt.1.e-10) then !mp(2) non nul -> detrainement (car mp(1) = 0) !ent pas possible
+     elseif(j==1) then
+      if(mp(i,2)>1.e-10) then !mp(2) non nul -> detrainement (car mp(1) = 0) !ent pas possible
        if(NO_precip(i,j)) then !pas de precip en (i)
         qDi(i,j,it)=qDi(i,j+1,it)
@@ -664,5 +664,5 @@
      else 
 !------------------------------------------------------------- detrainement 
-      if(mp(i,j+1).gt.mp(i,j).and.mp(i,j+1).gt.1.e-10) then !mp(i,j).gt.1.e-10) then
+      if(mp(i,j+1)>mp(i,j).and.mp(i,j+1)>1.e-10) then !mp(i,j).gt.1.e-10) then
          if(NO_precip(i,j)) then 
           qDi(i,j,it)=qDi(i,j+1,it)
@@ -682,5 +682,5 @@
          endif !precip
 !------------------------------------------------------------- entrainement 
-      elseif(mp(i,j).gt.mp(i,j+1).and.mp(i,j).gt.1.e-10) then 
+      elseif(mp(i,j)>mp(i,j+1).and.mp(i,j)>1.e-10) then
          if(NO_precip(i,j)) then
           qDi(i,j,it)=(-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it))/(-mp(i,j))
@@ -751,7 +751,7 @@
                -zmfdam(i,k,it)*ccntrAA_coef3d(i,k)
 ! lessivage courants insatures
-   if(k.le.inb(i).and.k.gt.1) then   ! tendances dans le nuage
+   if(k<=inb(i).and.k>1) then   ! tendances dans le nuage
 !------------------------------------------------------------- detrainement
-      if(mp(i,k+1).gt.mp(i,k).and.mp(i,k+1).gt.1.e-10) then
+      if(mp(i,k+1)>mp(i,k).and.mp(i,k+1)>1.e-10) then
         uscavtrac= (-mp(i,k)+mp(i,k+1))*(qDi(i,k,it)-tr(i,k,it))&
                    + mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
@@ -762,5 +762,5 @@
 !                    'mp',mp(i,k)
 !------------------------------------------------------------- entrainement 
-      elseif(mp(i,k).gt.mp(i,k+1).and.mp(i,k).gt.1.e-10) then
+      elseif(mp(i,k)>mp(i,k+1).and.mp(i,k)>1.e-10) then
          uscavtrac= mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
 !
@@ -786,6 +786,6 @@
       endif  ! mp/det/ent
 !------------------------------------------------------------- premiere couche 
-   elseif(k.eq.1) then  !                                      mp(1)=0.
-      if(mp(i,2).gt.1.e-10) then  !detrainement
+   elseif(k==1) then  !                                      mp(1)=0.
+      if(mp(i,2)>1.e-10) then  !detrainement
          uscavtrac= (-0.+mp(i,2))*(qDi(i,k,it)-tr(i,k,it)) !&
 !                   + mp(i,2)*(0.-tr(i,k,it))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltrorig.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltrorig.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/cvltrorig.F90	(revision 5082)
@@ -79,5 +79,5 @@
      DO j=k-1,1,-1
         DO i=1,klon
-           if(mp(i,j+1).ne.0) then
+           if(mp(i,j+1)/=0) then
               zmd(i,j,k)=zmd(i,j+1,k)*min(1.,mp(i,j)/mp(i,j+1))
            ENDif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/replay1d.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/replay1d.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/replay1d.F90	(revision 5082)
@@ -114,5 +114,5 @@
       call getin_dump
 !
-      if (ierr .eq. 0) then
+      if (ierr == 0) then
         write(*,*) 'Everything is cool'
       else
@@ -142,5 +142,5 @@
 !   -------
  
-      IF(ngrid.NE.2+(jm-2)*(im-1).AND.ngrid.NE.1)                          &
+      IF(ngrid/=2+(jm-2)*(im-1).AND.ngrid/=1)                          &
      &    STOP 'probleme de dim'
 !   traitement des poles
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/scm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/scm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/scm.F90	(revision 5082)
@@ -292,5 +292,5 @@
      jcode = iflag_nudge
      do i = 1,nudge_max
-       nudge(i) = mod(jcode,10) .ge. 1
+       nudge(i) = mod(jcode,10) >= 1
        jcode = jcode/10
      enddo
@@ -417,5 +417,5 @@
       call phys_state_var_init(read_climoz)
 
-      if (ngrid.ne.klon) then
+      if (ngrid/=klon) then
          print*,'stop in inifis'
          print*,'Probleme de dimensions :'
@@ -470,10 +470,10 @@
       zlay=-rd*300.*log(play/psurf)/rg ! moved after reading profiles. 
 
-      IF (forcing_type .eq. 59) THEN
+      IF (forcing_type == 59) THEN
 ! pour forcing_sandu, on cherche l'indice le plus proche de 700hpa#3000m
       write(*,*) '***********************'
       do l = 1, llm
        write(*,*) 'l,play(l),presnivs(l): ',l,play(l),presnivs(l)
-       if (trouve_700 .and. play(l).le.70000) then
+       if (trouve_700 .and. play(l)<=70000) then
          llm700=l
          print *,'llm700,play=',llm700,play(l)/100.
@@ -590,20 +590,20 @@
         print*,'avant phyredem'
         pctsrf(1,:)=0.
-          if (nat_surf.eq.0.) then
+          if (nat_surf==0.) then
           pctsrf(1,is_oce)=1.
           pctsrf(1,is_ter)=0.
           pctsrf(1,is_lic)=0.
           pctsrf(1,is_sic)=0.
-        else if (nat_surf .eq. 1) then 
+        else if (nat_surf == 1) then
           pctsrf(1,is_oce)=0.
           pctsrf(1,is_ter)=1.
           pctsrf(1,is_lic)=0.
           pctsrf(1,is_sic)=0.
-        else if (nat_surf .eq. 2) then 
+        else if (nat_surf == 2) then
           pctsrf(1,is_oce)=0.
           pctsrf(1,is_ter)=0.
           pctsrf(1,is_lic)=1.
           pctsrf(1,is_sic)=0.
-        else if (nat_surf .eq. 3) then 
+        else if (nat_surf == 3) then
           pctsrf(1,is_oce)=0.
           pctsrf(1,is_ter)=0.
@@ -780,7 +780,7 @@
       endif
 !======================  end restart =================================
-      IF (ecrit_slab_oc.eq.1) then
+      IF (ecrit_slab_oc==1) then
          open(97,file='div_slab.dat',STATUS='UNKNOWN')
-       elseif (ecrit_slab_oc.eq.0) then
+       elseif (ecrit_slab_oc==0) then
          open(97,file='div_slab.dat',STATUS='OLD')
        endif
@@ -796,12 +796,12 @@
            
       it_end = nint(fnday*day_step)
-      do while(it.le.it_end)
-
-       if (prt_level.ge.1) then
+      do while(it<=it_end)
+
+       if (prt_level>=1) then
          print*,'XXXXXXXXXXXXXXXXXXX ITAP,day,time=',                       &
      &             it,day,time,it_end,day_step
          print*,'PAS DE TEMPS ',timestep
        endif
-       if (it.eq.it_end) lastcall=.True.
+       if (it==it_end) lastcall=.True.
 
 !---------------------------------------------------------------------
@@ -946,5 +946,5 @@
       DO l=1,llm
 
-         IF (nudging_u .LT. 0) THEN
+         IF (nudging_u < 0) THEN
               
              d_u_nudge(l)=(u_nudg_mod_cas(l)-u(l))*invtau_u_nudg_mod_cas(l)
@@ -958,5 +958,5 @@
 
 
-         IF (nudging_v .LT. 0) THEN
+         IF (nudging_v < 0) THEN
               
              d_v_nudge(l)=(v_nudg_mod_cas(l)-v(l))*invtau_v_nudg_mod_cas(l)
@@ -971,5 +971,5 @@
 
 
-         IF (nudging_t .LT. 0) THEN
+         IF (nudging_t < 0) THEN
               
              d_t_nudge(l)=(temp_nudg_mod_cas(l)-temp(l))*invtau_temp_nudg_mod_cas(l)
@@ -984,5 +984,5 @@
 
 
-         IF (nudging_qv .LT. 0) THEN
+         IF (nudging_qv < 0) THEN
               
              d_q_nudge(l,1)=(qv_nudg_mod_cas(l)-q(l,1))*invtau_qv_nudg_mod_cas(l)
@@ -1033,5 +1033,5 @@
      &               +d_q_nudge(1:mxcalc,:) )
 
-        if (prt_level.ge.3) then
+        if (prt_level>=3) then
           print *,                                                          &
      &    'physiq-> temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1) ',         &
@@ -1105,5 +1105,5 @@
       enddo
 
-      if (ecrit_slab_oc.ne.-1) close(97)
+      if (ecrit_slab_oc/=-1) close(97)
 
 !Al1 Call to 1D equivalent of dynredem (an,mois,jour,heure ?)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/radiation_scheme.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/radiation_scheme.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/radiation_scheme.F90	(revision 5082)
@@ -654,5 +654,5 @@
 ! Compute UV fluxes as weighted sum of appropriate shortwave bands
 !AI ATTENTION
-if (0.eq.1) then
+if (0==1) then
 PFLUX_UV       (KIDIA:KFDIA) = 0.0_JPRB
 DO JBAND = 1,NWEIGHT_UV
@@ -690,5 +690,5 @@
 !AI ATTENTION
 !IF (YRERAD%LAPPROXSWUPDATE) THEN
-if (0.eq.1) then
+if (0==1) then
 IF (rad_config%do_surface_sw_spectral_flux) THEN
   PSWDIFFUSEBAND(KIDIA:KFDIA,:) = 0.0_JPRB
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/readaerosol_optic_ecrad.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/readaerosol_optic_ecrad.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/readaerosol_optic_ecrad.F90	(revision 5082)
@@ -161,5 +161,5 @@
      !
      ! Read and interpolate sulfate
-     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF ( flag_aerosol == 1 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfacc, sulfacc_pi,loadso4)
@@ -170,5 +170,5 @@
 
      ! Read and interpolate bcsol and bcins
-     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF ( flag_aerosol == 2 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         ! Get bc aerosol distribution 
@@ -183,5 +183,5 @@
 
      ! Read and interpolate pomsol and pomins
-     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
+     IF ( flag_aerosol == 3 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
@@ -195,5 +195,5 @@
 
      ! Read and interpolate csssm, ssssm, assssm
-     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol == 4 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
@@ -212,5 +212,5 @@
 
      ! Read and interpolate cidustm
-     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol == 5 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust) 
@@ -222,5 +222,5 @@
      !
      ! Read and interpolate asno3m, csno3m, cino3m
-     IF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, & 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90	(revision 5082)
@@ -73,5 +73,5 @@
    DO k = 1, klev
    DO i = 1, klon
-     IF (fl_cor_ebil .GT. 0) then
+     IF (fl_cor_ebil > 0) then
        ZRCPD = RCPD*(1.0+RVTMP2*(pqn(i,k)+pqln(i,k)+pqsn(i,k)))
      ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/evappot.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/evappot.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/evappot.F90	(revision 5082)
@@ -22,5 +22,5 @@
 DO nsrf = 1, nbsrf
    DO i = 1, klon
-      IF (ftsol(i,nsrf).LT.t_coup) THEN
+      IF (ftsol(i,nsrf)<t_coup) THEN
          qsat_ftsol(i,nsrf) = qsats(ftsol(i,nsrf))/pplay(i)
       ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/flott_gwd_rando_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/flott_gwd_rando_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/flott_gwd_rando_m.F90	(revision 5082)
@@ -303,5 +303,5 @@
                     CMAX*2.*(RAN_NUM_3 -0.5)*SQRT(3.)/SQRT(NA*1.)
                 END DO
-                IF (CPHA.LT.0.)  THEN
+                IF (CPHA<0.)  THEN
                    CPHA = -1.*CPHA
                    ZP(JW,II) = ZP(JW,II) + RPI
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/freinage.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/freinage.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/freinage.F90	(revision 5082)
@@ -97,16 +97,16 @@
 
 !      if  ( (height(i,jv) .gt. yzlay(i,k)) .AND. (height(i,jv) .gt. 0.1) .and. LAI(i,jv).gt.0. ) then                     
-      if  ( (height(i,jv) .gt. yzlay(i,k)) .AND. (height(i,jv) .gt. 0.1) ) then                     
+      if  ( (height(i,jv) > yzlay(i,k)) .AND. (height(i,jv) > 0.1) ) then
 !FC attention veut on le test sur le LAI ?
-         if (ifl_pbltree.eq.1) then
+         if (ifl_pbltree==1) then
       drag_pro(i,k)= drag_pro(i,k)+ &
       veget(i,jv)
-          elseif (ifl_pbltree.eq.2) then
+          elseif (ifl_pbltree==2) then
       drag_pro(i,k)= drag_pro(i,k)+ &
       6*LAI(i,jv)*veget(i,jv)*( yzlay(i,k)*(height(i,jv)-yzlay(i,k))/(height(i,jv)*height(i,jv)+ 0.01))
-          elseif (ifl_pbltree.eq.3) then
+          elseif (ifl_pbltree==3) then
       drag_pro(i,k)= drag_pro(i,k)+ &
       veget(i,jv)*( yzlay(i,k)*(height(i,jv)-yzlay(i,k))/(height(i,jv)*height(i,jv)+ 0.01))
-          elseif (ifl_pbltree.eq.0) then
+          elseif (ifl_pbltree==0) then
           drag_pro(i,k)=0.0
            endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/global_mean.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/global_mean.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/global_mean.F90	(revision 5082)
@@ -29,5 +29,5 @@
    END DO
    if (laire) THEN
-    if(airetot.NE.0.) THEN
+    if(airetot/=0.) THEN
      mfield=sumtmp/airetot
     endif
@@ -45,5 +45,5 @@
   if (laire) THEN
 !  print*,'gmean airetot=',airetot
-   if(airetot.NE.0.) THEN
+   if(airetot/=0.) THEN
     mfield=sumtmp/airetot
 !  else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/icefrac_lsc_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/icefrac_lsc_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/icefrac_lsc_mod.F90	(revision 5082)
@@ -33,9 +33,9 @@
 
   DO ip=1,np
-     IF (iflag_t_glace.EQ.1) THEN
+     IF (iflag_t_glace==1) THEN
        ! Transition to ice close to surface for T<Tmax
        ! w=1 at the surface and 0 for sig < sig0
        www=(max(sig(ip)-sig0,0.))/(1.-sig0) 
-     ELSEIF (iflag_t_glace.GE.2) THEN
+     ELSEIF (iflag_t_glace>=2) THEN
        ! No convertion to ice close to surface
        www = 0.
@@ -44,5 +44,5 @@
      liqfrac_tmp=  (temp(ip)-tmin_tmp) / (t_glace_max-tmin_tmp)
      liqfrac_tmp = MIN(MAX(liqfrac_tmp,0.0),1.0)
-     IF (iflag_t_glace.GE.3) THEN
+     IF (iflag_t_glace>=3) THEN
        icefrac(ip) = 1.0-liqfrac_tmp**exposant_glace
      ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/infotrac_phy.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/infotrac_phy.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/infotrac_phy.F90	(revision 5082)
@@ -197,7 +197,7 @@
 
    lerr=strParse(type_trac, '|', types_trac, n=nt)
-   IF (nt .GT. 1) THEN
-      IF (nt .GT. 2) CALL abort_physic(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
-      IF (nt .EQ. 2) type_trac=types_trac(2)
+   IF (nt > 1) THEN
+      IF (nt > 2) CALL abort_physic(modname, 'you need to modify type_trac, this version is not supported by lmdz', 1)
+      IF (nt == 2) type_trac=types_trac(2)
    ENDIF
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/iniradia.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/iniradia.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/iniradia.F90	(revision 5082)
@@ -24,5 +24,5 @@
   ! print*,'Physiq: apres suphel '
 #if CPP_RRTM
-  if (iflag_rrtm .eq. 1) then 
+  if (iflag_rrtm == 1) then
      CALL suinit(klon, klev)
      PRINT *, 'iniradia: apres suinit '
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/init_be.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/init_be.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/init_be.F90	(revision 5082)
@@ -62,5 +62,5 @@
   WRITE(*,*)'PASSAGE init_be ...'
 
-! la source est maintenant définie independemment de la valeur de klev.
+! la source est maintenant d�finie independemment de la valeur de klev.
 !!! Source actuellement definie pour klev = 19 et klev >= 39
 !!  IF (klev /= 19 .AND. klev<39) CALL abort_physic("init_be","Source du be7 necessite klev=19 ou klev>=39",1)
@@ -93,5 +93,5 @@
   DO i = 1,klon
      masktr(i) = 0.
-     IF ( NINT(pctsrf(i,1)) .EQ. 1 ) masktr(i) = 1.
+     IF ( NINT(pctsrf(i,1)) == 1 ) masktr(i) = 1.
   END DO
 
@@ -118,6 +118,6 @@
      qcos=qcos+cos(glt)*cos(latitude(i))*cos(longitude(i)-glg)
 !!jyg end
-     IF ( qcos .LT. -1.) qcos = -1.
-     IF ( qcos .GT. 1.)  qcos = 1.
+     IF ( qcos < -1.) qcos = -1.
+     IF ( qcos > 1.)  qcos = 1.
      rlatgeo(i)=rpi/2.-acos(qcos)
   ENDDO
@@ -290,254 +290,254 @@
       kref = 1
       DO k2 = 1,nref
-        IF (pref(k2) .GT. pplay(i,k)) kref=k2
+        IF (pref(k2) > pplay(i,k)) kref=k2
       ENDDO
 !!!
            latgeo=(180./rpi)*abs(rlatgeo(i))
-           IF ( kref .LE. 4 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.07
-           END IF
-           IF ( kref .EQ. 5 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.1
-              IF (latgeo.GE.20.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.09
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.07
-           END IF
-           IF ( kref .EQ. 6 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.14
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.12
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.1
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.09
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.07
-           END IF
-           IF ( kref .EQ. 7 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.16
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.16
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.14
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.12
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.1
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.09
-           END IF
-           IF ( kref .EQ. 8 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.175
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.16
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.14
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.12
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.1
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.1
-           END IF
-           IF ( kref .EQ. 9 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.245
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.21
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.175
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.14
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.12
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.12
-           END IF
-           IF ( kref .EQ. 10 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.31
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.28
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.245
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.21
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.16
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.14
-           END IF
-           IF ( kref .EQ. 11 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.35
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.3
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.3
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.2
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.18
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.16
-           END IF
-           IF ( kref .EQ. 12 ) THEN
-              IF (latgeo.GE.40.0) srcbe(i,k)=0.5
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.4
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.35
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.3
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.25
-           END IF
-           IF ( kref .EQ. 13 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=0.8
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=0.7
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.6
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.5
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.4
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.35
-           END IF
-           IF ( kref .EQ. 14 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=1.2
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=1.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=0.75
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.6
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.4
-           END IF
-           IF ( kref .EQ. 15 ) THEN
-              IF (latgeo.GE.60.0) srcbe(i,k)=1.75
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=1.8 
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=1.6
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=1.4
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=0.9
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=0.75
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.65
-           END IF
-           IF ( kref .EQ. 16 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=3.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=2.5
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=1.8
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=1.5
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=1.2
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=0.9
-           END IF
-           IF ( kref .EQ. 17 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=4.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=3.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=2.5
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=2.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=1.6
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=1.4
-           END IF
-           IF ( kref .EQ. 18 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=7.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=6.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=4.5
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=3.5
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=3.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=2.
-           END IF
-           IF ( kref .EQ. 19 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=8.5
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=8.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=7.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=4.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=3.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=3.
-           END IF
-           IF ( kref .EQ. 20 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=12.5
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=12.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=8.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=6.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=4.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=3.5
-           END IF
-           IF ( kref .EQ. 21 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=16.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=13.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=10.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=7.5
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=4.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=4.
-           END IF
-           IF ( kref .EQ. 22 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=20.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=17.5
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=12.5
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=9.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=6.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=4.5
-           END IF
-           IF ( kref .EQ. 23 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=25.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=22.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=15.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=10.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=7.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=6.
-           END IF
-           IF ( kref .EQ. 24 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=28.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=26.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=18.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=12.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=8.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=7.
-           END IF
-           IF ( kref .EQ. 25 ) THEN
-              IF (latgeo.GE.50.0) srcbe(i,k)=33.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=28.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=20.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=14.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=10.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=8.5
-           END IF
-           IF ( kref .EQ. 26 ) THEN
-              IF (latgeo.GE.60.0) srcbe(i,k)=38.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=36.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=32.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=24.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=15.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=11.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=10.
+           IF ( kref <= 4 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.07
+           END IF
+           IF ( kref == 5 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.1
+              IF (latgeo>=20.0 .and. latgeo<50.0) srcbe(i,k)=0.09
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.07
+           END IF
+           IF ( kref == 6 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.14
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.12
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.1
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.09
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.07
+           END IF
+           IF ( kref == 7 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.16
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.16
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.14
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.12
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.1
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.09
+           END IF
+           IF ( kref == 8 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.175
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.16
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.14
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.12
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.1
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.1
+           END IF
+           IF ( kref == 9 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.245
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.21
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.175
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.14
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.12
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.12
+           END IF
+           IF ( kref == 10 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.31
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.28
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.245
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.21
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.16
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.14
+           END IF
+           IF ( kref == 11 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.35
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.3
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.3
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.2
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.18
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.16
+           END IF
+           IF ( kref == 12 ) THEN
+              IF (latgeo>=40.0) srcbe(i,k)=0.5
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.4
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.35
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.3
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.25
+           END IF
+           IF ( kref == 13 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=0.8
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=0.7
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.6
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.5
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.4
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.35
+           END IF
+           IF ( kref == 14 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=1.2
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=1.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=0.75
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.6
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.4
+           END IF
+           IF ( kref == 15 ) THEN
+              IF (latgeo>=60.0) srcbe(i,k)=1.75
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=1.8
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=1.6
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=1.4
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=0.9
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=0.75
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.65
+           END IF
+           IF ( kref == 16 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=3.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=2.5
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=1.8
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=1.5
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=1.2
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=0.9
+           END IF
+           IF ( kref == 17 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=4.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=3.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=2.5
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=2.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=1.6
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=1.4
+           END IF
+           IF ( kref == 18 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=7.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=6.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=4.5
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=3.5
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=3.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=2.
+           END IF
+           IF ( kref == 19 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=8.5
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=8.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=7.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=4.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=3.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=3.
+           END IF
+           IF ( kref == 20 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=12.5
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=12.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=8.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=6.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=4.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=3.5
+           END IF
+           IF ( kref == 21 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=16.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=13.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=10.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=7.5
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=4.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=4.
+           END IF
+           IF ( kref == 22 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=20.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=17.5
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=12.5
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=9.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=6.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=4.5
+           END IF
+           IF ( kref == 23 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=25.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=22.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=15.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=10.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=7.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=6.
+           END IF
+           IF ( kref == 24 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=28.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=26.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=18.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=12.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=8.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=7.
+           END IF
+           IF ( kref == 25 ) THEN
+              IF (latgeo>=50.0) srcbe(i,k)=33.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=28.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=20.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=14.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=10.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=8.5
+           END IF
+           IF ( kref == 26 ) THEN
+              IF (latgeo>=60.0) srcbe(i,k)=38.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=36.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=32.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=24.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=15.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=11.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=10.
 !!jyg
 !!              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=6.
 !!jyg end
            END IF
-           IF ( kref .EQ. 27 ) THEN
-              IF (latgeo.GE.60.0) srcbe(i,k)=46.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=44.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=35.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=25.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=16.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=12.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=10.
-           END IF
-           IF ( kref .EQ. 28 ) THEN
-              IF (latgeo.GE.60.0) srcbe(i,k)=53.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=48.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=37.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=25.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=16.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=12.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=10.
-           END IF
-           IF ( kref .EQ. 29 ) THEN
-              IF (latgeo.GE.70.0) srcbe(i,k)=58.
-              IF (latgeo.GE.60.0 .and. latgeo.LT.70.0) srcbe(i,k)=56.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=50.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=36.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=24.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=15.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=11.5
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=10.
-           END IF
-           IF ( kref .EQ. 30 ) THEN
-              IF (latgeo.GE.70.0) srcbe(i,k)=65.
-              IF (latgeo.GE.60.0 .and. latgeo.LT.70.0) srcbe(i,k)=60.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=50.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=35.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=22.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=14.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=10.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=9.
-           END IF
-           IF ( kref .EQ. 31 ) THEN
-              IF (latgeo.GE.70.0) srcbe(i,k)=70.
-              IF (latgeo.GE.60.0 .and. latgeo.LT.70.0) srcbe(i,k)=62.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=48.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=32.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=21.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=13.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=9.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=7.6
-           END IF
-           IF ( kref .EQ. 32 ) THEN
-              IF (latgeo.GE.70.0) srcbe(i,k)=80.
-              IF (latgeo.GE.60.0 .and. latgeo.LT.70.0) srcbe(i,k)=60.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=46.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=30.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=17.5
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=11.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=8.
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=7.4
-           END IF
-           IF ( kref .GE. 33 ) THEN
-              IF (latgeo.GE.70.0) srcbe(i,k)=80.
-              IF (latgeo.GE.60.0 .and. latgeo.LT.70.0) srcbe(i,k)=70.
-              IF (latgeo.GE.50.0 .and. latgeo.LT.60.0) srcbe(i,k)=45.
-              IF (latgeo.GE.40.0 .and. latgeo.LT.50.0) srcbe(i,k)=27.
-              IF (latgeo.GE.30.0 .and. latgeo.LT.40.0) srcbe(i,k)=15.
-              IF (latgeo.GE.20.0 .and. latgeo.LT.30.0) srcbe(i,k)=10.
-              IF (latgeo.GE.10.0 .and. latgeo.LT.20.0) srcbe(i,k)=7.6
-              IF (latgeo.GE.0.0 .and. latgeo.LT.10.0) srcbe(i,k)=7.
+           IF ( kref == 27 ) THEN
+              IF (latgeo>=60.0) srcbe(i,k)=46.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=44.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=35.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=25.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=16.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=12.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=10.
+           END IF
+           IF ( kref == 28 ) THEN
+              IF (latgeo>=60.0) srcbe(i,k)=53.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=48.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=37.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=25.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=16.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=12.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=10.
+           END IF
+           IF ( kref == 29 ) THEN
+              IF (latgeo>=70.0) srcbe(i,k)=58.
+              IF (latgeo>=60.0 .and. latgeo<70.0) srcbe(i,k)=56.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=50.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=36.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=24.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=15.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=11.5
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=10.
+           END IF
+           IF ( kref == 30 ) THEN
+              IF (latgeo>=70.0) srcbe(i,k)=65.
+              IF (latgeo>=60.0 .and. latgeo<70.0) srcbe(i,k)=60.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=50.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=35.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=22.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=14.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=10.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=9.
+           END IF
+           IF ( kref == 31 ) THEN
+              IF (latgeo>=70.0) srcbe(i,k)=70.
+              IF (latgeo>=60.0 .and. latgeo<70.0) srcbe(i,k)=62.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=48.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=32.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=21.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=13.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=9.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=7.6
+           END IF
+           IF ( kref == 32 ) THEN
+              IF (latgeo>=70.0) srcbe(i,k)=80.
+              IF (latgeo>=60.0 .and. latgeo<70.0) srcbe(i,k)=60.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=46.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=30.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=17.5
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=11.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=8.
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=7.4
+           END IF
+           IF ( kref >= 33 ) THEN
+              IF (latgeo>=70.0) srcbe(i,k)=80.
+              IF (latgeo>=60.0 .and. latgeo<70.0) srcbe(i,k)=70.
+              IF (latgeo>=50.0 .and. latgeo<60.0) srcbe(i,k)=45.
+              IF (latgeo>=40.0 .and. latgeo<50.0) srcbe(i,k)=27.
+              IF (latgeo>=30.0 .and. latgeo<40.0) srcbe(i,k)=15.
+              IF (latgeo>=20.0 .and. latgeo<30.0) srcbe(i,k)=10.
+              IF (latgeo>=10.0 .and. latgeo<20.0) srcbe(i,k)=7.6
+              IF (latgeo>=0.0 .and. latgeo<10.0) srcbe(i,k)=7.
            END IF
         END DO
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/initrrnpb.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/initrrnpb.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/initrrnpb.F90	(revision 5082)
@@ -62,5 +62,5 @@
      DO i = 1,klon
         masktr(i,it) = 0.
-        IF ( NINT(pctsrf(i,1)) .EQ. 1 ) masktr(i,it) = 1.
+        IF ( NINT(pctsrf(i,1)) == 1 ) masktr(i,it) = 1.
         fshtr(i,it) = s * masktr(i,it)
      END DO
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/inlandsis.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/inlandsis.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/inlandsis.F	(revision 5082)
@@ -409,6 +409,6 @@
         IF (BloMod) THEN
  
-        if (klonv.eq.1) then
-          if(isnoSV(1).ge.2                   .and.
+        if (klonv==1) then
+          if(isnoSV(1)>=2                   .and.
      .         TsisSV(1,max(1,isnoSV(1)))<273.  .and.
      .         ro__SV(1,max(1,isnoSV(1)))<500.  .and.
@@ -518,5 +518,5 @@
 C +     Gallee et al., 2001    eq 5, p5
  
-          if (usth_param .eq. "gal") then
+          if (usth_param == "gal") then
             Salt_us   =   (log(2.868) - log(1 + SaltMo)) * rCd10n/0.085
             Salt_us   = Salt_us * Fac_Mo
@@ -525,5 +525,5 @@
           endif
  
-          if (usth_param .eq. "lis") then !Liston et al. 2007
+          if (usth_param == "lis") then !Liston et al. 2007
             if(ro__SV(ikl,isn)>300.) then
               Salt_us   = 0.005*exp(0.013*ro__SV(ikl,isn))
@@ -607,10 +607,10 @@
         hSalSV(ikl) = 8.436e-2  * us__SV(ikl)**SblPom
  
-        if (qsalt_param .eq. "pom") then
+        if (qsalt_param == "pom") then
           qSalSV(ikl) = (us__SV(ikl)**2 - usthSV(ikl)**2) *signus
      .               / (hSalSV(ikl) * gravit * us__SV(ikl) * 3.25)
         endif
  
-        if (qsalt_param .eq. "bin") then
+        if (qsalt_param == "bin") then
           qSalSV(ikl) = (us__SV(ikl) * us__SV(ikl)
      .                -usthSV(ikl) * usthSV(ikl))*signus
@@ -668,5 +668,5 @@
 C + ...         [ A compromise between
 C + ...           Kotlyakov (1961) and Lenaerts (2012, JGR, Part1) ]
-                if (tt_tmp.ge.-10) then
+                if (tt_tmp>=-10) then
                   BufPro   =  max( rosMin,
      .            104. *sqrt( max( vv_tmp-6.0,0.0))) ! Kotlyakov (1961)
@@ -894,7 +894,7 @@
 
           
-      if (discret_xf.AND.klonv.eq.1) then
-
-       if(isnoSV(1).ge.1.or.NLaysv(1).ge.1) then
+      if (discret_xf.AND.klonv==1) then
+
+       if(isnoSV(1)>=1.or.NLaysv(1)>=1) then
 C +          **********
          call SISVAT_zSn
@@ -1081,5 +1081,5 @@
 
 
-      if (iflag_temp_inlandsis .eq. 0) then
+      if (iflag_temp_inlandsis == 0) then
 
        call SISVAT_TSo
@@ -1198,9 +1198,9 @@
 ! ^^^^^^^^^^^^^^^^^^^^
 
-          IF (iflag_tsurf_inlandsis .EQ. 0) THEN   
+          IF (iflag_tsurf_inlandsis == 0) THEN
 
             Tsrfsv(ikl) =TsisSV(ikl,isnoSV(ikl))
 
-          ELSE IF (iflag_tsurf_inlandsis .GT. 0) THEN
+          ELSE IF (iflag_tsurf_inlandsis > 0) THEN
 ! Etienne: extrapolation from the two uppermost levels:
 
@@ -1208,5 +1208,5 @@
            zm1=-dzsnSV(ikl,isnoSV(ikl))/2.
            zm2=-(dzsnSV(ikl,isnoSV(ikl)) + dzsnSV(ikl,isnoSV(ikl)-1)/2.)
-         else if (isnoSV(ikl) .EQ. 1) then
+         else if (isnoSV(ikl) == 1) then
            zm1=-dzsnSV(ikl,isnoSV(ikl))/2.
            zm2=-(dzsnSV(ikl,isnoSV(ikl))+dz_dSV(0)/2.)
@@ -1236,6 +1236,6 @@
       IF (SnoMod)                                                 THEN
 
-      if (discret_xf .AND. klonv.eq.1) then
-      if(isnoSV(1).ge.1) then
+      if (discret_xf .AND. klonv==1) then
+      if(isnoSV(1)>=1) then
 C +          **********
       call SISVAT_GSn
@@ -1305,13 +1305,13 @@
 ! Calculation of snow roughness length
 !=====================================
-          IF (iflag_z0m_snow .EQ. 0) THEN
+          IF (iflag_z0m_snow == 0) THEN
 
           Z0m_Sn=prescribed_z0m_snow
 
-          ELSE IF (iflag_z0m_snow .EQ. 1) THEN
+          ELSE IF (iflag_z0m_snow == 1) THEN
 
           Z0m_Sn=Z0enSV(ikl) 
 
-          ELSE IF (iflag_z0m_snow .EQ. 2) THEN                             
+          ELSE IF (iflag_z0m_snow == 2) THEN
 
 C +--Rough   Snow Surface Roughness Length (Variable Sastrugi Height)
@@ -1336,9 +1336,9 @@
           coefd = log(z03)-coefc*ta3
 
-          if (TaT_SV(ikl) .lt. ta1) then
+          if (TaT_SV(ikl) < ta1) then
             Z0_obs = z01
-          else if (TaT_SV(ikl).ge.ta1 .and. TaT_SV(ikl).lt.ta2) then
+          else if (TaT_SV(ikl)>=ta1 .and. TaT_SV(ikl)<ta2) then
             Z0_obs = exp(coefa*TaT_SV(ikl) + coefb)
-          else if (TaT_SV(ikl).ge.ta2 .and. TaT_SV(ikl).lt.ta3) then
+          else if (TaT_SV(ikl)>=ta2 .and. TaT_SV(ikl)<ta3) then
             ! if st > 0, melting induce smooth surface
             Z0_obs = exp(coefc*TaT_SV(ikl) + coefd)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_gsn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_gsn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_gsn.F	(revision 5082)
@@ -805,17 +805,17 @@
         DO ikl=1,knonv
         DO isn=iiceSV(ikl),isnoSV(ikl)
-          IF  (G1snSV(ikl,isn).ge.0.)                               THEN
-            IF(G1snSV(ikl,isn).lt.vsphe4.and.istoSV(ikl,isn).eq.0)  THEN
+          IF  (G1snSV(ikl,isn)>=0.)                               THEN
+            IF(G1snSV(ikl,isn)<vsphe4.and.istoSV(ikl,isn)==0)  THEN
                    istoSV(ikl,isn)=istdSV(1)
-            ELSEIF(G1_dSV-G1snSV(ikl,isn)         .lt.vsphe4.and.
-     .             etaSno(ikl,isn)/dzsnSV(ikl,isn).gt.vtelv1)       THEN
-              IF  (istoSV(ikl,isn).eq.0)
+            ELSEIF(G1_dSV-G1snSV(ikl,isn)         <vsphe4.and.
+     .             etaSno(ikl,isn)/dzsnSV(ikl,isn)>vtelv1)       THEN
+              IF  (istoSV(ikl,isn)==0)
      .             istoSV(ikl,isn)=   istdSV(2)
-              IF  (istoSV(ikl,isn).eq.istdSV(1))
+              IF  (istoSV(ikl,isn)==istdSV(1))
      .             istoSV(ikl,isn)=   istdSV(3)
-            ELSEIF(TsisSV(ikl,isn).lt.TfSnow)                       THEN
-              IF  (istoSV(ikl,isn).eq.istdSV(2))
+            ELSEIF(TsisSV(ikl,isn)<TfSnow)                       THEN
+              IF  (istoSV(ikl,isn)==istdSV(2))
      .             istoSV(ikl,isn)=   istdSV(4)
-              IF  (istoSV(ikl,isn).eq.istdSV(3))
+              IF  (istoSV(ikl,isn)==istdSV(3))
      .             istoSV(ikl,isn)=   istdSV(5)
             END IF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_qsn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_qsn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_qsn.F	(revision 5082)
@@ -438,5 +438,5 @@
       END DO
 
-      IF  (isnitr.GT.0)                                       GO TO 1000
+      IF  (isnitr>0)                                       GO TO 1000
  
  
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_sno_albedo.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_sno_albedo.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_sno_albedo.F	(revision 5082)
@@ -218,5 +218,5 @@
 
 
-          IF (iflag_albcalc .GE. 1) THEN  ! Albedo calculation according to Kokhanovsky and Zege 2004
+          IF (iflag_albcalc >= 1) THEN  ! Albedo calculation according to Kokhanovsky and Zege 2004
 
           dalbed = 0.0
@@ -752,6 +752,6 @@
           alb30 = exp(-(alpha**0.5)* 3.0 / 7.0 * (1.0 + 20 * cos30))
 
-          IF ((wavelengths(i).GE.lambdamin).AND.
-     .       (wavelengths(i).LT.lambdamax)) THEN
+          IF ((wavelengths(i)>=lambdamin).AND.
+     .       (wavelengths(i)<lambdamax)) THEN
           albint=albint+R*Pas  ! rectangle integration -> can be improved with trapezintegration
           norm=norm+Pas
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_ts2.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_ts2.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_ts2.F	(revision 5082)
@@ -207,6 +207,6 @@
 
       DO ig=1,knonv    
-        IF (isnoSV(ig).GT.0) THEN
-          IF (isnoSV(ig).GT.1) THEN
+        IF (isnoSV(ig)>0) THEN
+          IF (isnoSV(ig)>1) THEN
            mug(ig)=1./(1.+dzsnSV(ig,isnoSV(ig)-1)/dzsnSV(ig,isnoSV(ig))) !mu
           ELSE
@@ -217,8 +217,8 @@
         ENDIF
 
-        IF (mug(ig)  .LE. 0.05) THEN
+        IF (mug(ig)  <= 0.05) THEN
          write(*,*)'Attention mu low', mug(ig)
         ENDIF
-        IF (mug(ig)  .GE. 0.98) THEN
+        IF (mug(ig)  >= 0.98) THEN
          write(*,*)'Attention mu high', mug(ig)
         ENDIF
@@ -331,25 +331,25 @@
 
       DO ig = 1,knonv
-        IF (ps__SV(ig).LT.1.) THEN
+        IF (ps__SV(ig)<1.) THEN
 !          write(*,*)'ig',ig,'ps',ps__SV(ig)
           ps__SV(ig)=max(ps__SV(ig),1.e-8)
         ENDIF
-        IF (p1l_SV(ig).LT.1.) THEN
+        IF (p1l_SV(ig)<1.) THEN
 !          write(*,*)'ig',ig,'p1l',p1l_SV(ig)
           p1l_SV(ig)=max(p1l_SV(ig),1.e-8)
         ENDIF
-        IF (TaT_SV(ig).LT.180.) THEN
+        IF (TaT_SV(ig)<180.) THEN
 !          write(*,*)'ig',ig,'TaT',TaT_SV(ig)
           TaT_SV(ig)=max(TaT_SV(ig),180.)
         ENDIF
-        IF (QaT_SV(ig).LT.1.e-8) THEN
+        IF (QaT_SV(ig)<1.e-8) THEN
 !          write(*,*)'ig',ig,'QaT',QaT_SV(ig)
           QaT_SV(ig)=max(QaT_SV(ig),1.e-8)
         ENDIF
-        IF (Tsf_SV(ig).LT.100.) THEN
+        IF (Tsf_SV(ig)<100.) THEN
 !          write(*,*)'ig',ig,'Tsf',Tsf_SV(ig)
           Tsf_SV(ig)=max(Tsf_SV(ig),180.)
         ENDIF
-        IF (Tsf_SV(ig).GT.500.) THEN
+        IF (Tsf_SV(ig)>500.) THEN
 !          write(*,*)'ig',ig,'Tsf',Tsf_SV(ig)
           Tsf_SV(ig)=min(Tsf_SV(ig),400.)
@@ -359,5 +359,5 @@
 !           Tsrf(ig)=max(Tsrf(ig),TaT_SV(ig)-20.)
 !         ENDIF
-         IF (cdH_SV(ig).LT.1.e-10) THEN
+         IF (cdH_SV(ig)<1.e-10) THEN
 !           IF (ig.le.3)   write(*,*)'ig',ig,'cdH',cdH_SV(ig)
            cdH_SV(ig)=.5
@@ -380,5 +380,5 @@
      &          /LhvH2O / zx_pkh(ig)
         ELSE
-          IF (Tsf_SV(ig).LT.t_coup) THEN
+          IF (Tsf_SV(ig)<t_coup) THEN
              zx_qs = qsats(Tsf_SV(ig)) / ps__SV(ig)
              zx_dq_s_dh = dqsats(Tsf_SV(ig),zx_qs)/LhvH2O               &
@@ -408,5 +408,5 @@
       DO ig = 1,knonv
         zx_sl(ig) = LhvH2O
-        IF (Tsf_SV(ig) .LT. RTT) zx_sl(ig) = LhsH2O
+        IF (Tsf_SV(ig) < RTT) zx_sl(ig) = LhsH2O
         zx_k1(ig) = zx_coef(ig)
       ENDDO
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_weq.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_weq.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_weq.F	(revision 5082)
@@ -58,5 +58,5 @@
  
            ikl   = 1
-      IF          (isnoSV(ikl).gt.iiceSV(ikl))                      THEN
+      IF          (isnoSV(ikl)>iiceSV(ikl))                      THEN
  
           SnoWEQ = 0.
@@ -71,5 +71,5 @@
 C +  =====================
  
-      IF        (iiceSV(1).gt.0)                                    THEN
+      IF        (iiceSV(1)>0)                                    THEN
  
           IceWEQ = 0.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_zsn.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_zsn.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_zsn.F	(revision 5082)
@@ -459,5 +459,5 @@
       DO isn=nsno,2,-1
       DO ikl=1,knonv
-        IF (Agrege(ikl).gt.0..AND.i_thin(ikl).lt.isnoSV(ikl))       THEN
+        IF (Agrege(ikl)>0..AND.i_thin(ikl)<isnoSV(ikl))       THEN
           staggr          =  min(1,max(0,isn-i_thin(ikl)    -1))
      .                    *  min(1,max(0,    isnoSV(ikl)-isn+2))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/iophy.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/iophy.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/iophy.F90	(revision 5082)
@@ -328,16 +328,16 @@
      plon_bounds(i,1)=rlon_glo(tabij(i)-1)
      plon_bounds(i,2)=rlon_glo(tabij(i)+1)
-     IF (plon_bounds(i,2).LE.0..AND.plon_bounds(i,1).GE.0.) THEN
-      IF (rlon_glo(tabij(i)).GE.0.) THEN
+     IF (plon_bounds(i,2)<=0..AND.plon_bounds(i,1)>=0.) THEN
+      IF (rlon_glo(tabij(i))>=0.) THEN
        plon_bounds(i,2)=-1*plon_bounds(i,2)
       ENDIF
      ENDIF
-     IF (plon_bounds(i,2).GE.0..AND.plon_bounds(i,1).LE.0.) THEN
-      IF (rlon_glo(tabij(i)).LE.0.) THEN
+     IF (plon_bounds(i,2)>=0..AND.plon_bounds(i,1)<=0.) THEN
+      IF (rlon_glo(tabij(i))<=0.) THEN
        plon_bounds(i,2)=-1*plon_bounds(i,2)
       ENDIF
      ENDIF
 !
-     IF ( tabij(i).LE.nbp_lon) THEN
+     IF ( tabij(i)<=nbp_lon) THEN
       plat_bounds(i,1)=rlat_glo(tabij(i))
      ELSE
@@ -361,5 +361,5 @@
 
        CALL grid1dTo2d_glo(rlon_glo,zx_lon)
-       IF ((nbp_lon*nbp_lat).GT.1) THEN
+       IF ((nbp_lon*nbp_lat)>1) THEN
        DO i = 1, nbp_lon
          zx_lon(i,1) = rlon_glo(i+1)
@@ -375,10 +375,10 @@
      plon_bounds(i,2)=zx_lon(ipt(i)+1,jpt(i))
 
-     IF (ipt(i).EQ.1) THEN
+     IF (ipt(i)==1) THEN
       plon_bounds(i,1)=zx_lon(nbp_lon,jpt(i))
       plon_bounds(i,2)=360.+zx_lon(ipt(i)+1,jpt(i))
      ENDIF
  
-     IF (ipt(i).EQ.nbp_lon) THEN
+     IF (ipt(i)==nbp_lon) THEN
       plon_bounds(i,2)=360.+zx_lon(1,jpt(i))
      ENDIF
@@ -387,10 +387,10 @@
      plat_bounds(i,2)=zx_lat(ipt(i),jpt(i)+1)
 
-     IF (jpt(i).EQ.1) THEN
+     IF (jpt(i)==1) THEN
       plat_bounds(i,1)=zx_lat(ipt(i),1)+0.001
       plat_bounds(i,2)=zx_lat(ipt(i),1)-0.001
      ENDIF
  
-     IF (jpt(i).EQ.nbp_lat) THEN
+     IF (jpt(i)==nbp_lat) THEN
       plat_bounds(i,1)=zx_lat(ipt(i),nbp_lat)+0.001
       plat_bounds(i,2)=zx_lat(ipt(i),nbp_lat)-0.001
@@ -412,5 +412,5 @@
       tabprocbeg=klon_mpi_begin
       tabprocend=klon_mpi_end
-      IF(tabij(ip).GE.tabprocbeg.AND.tabij(ip).LE.tabprocend) THEN
+      IF(tabij(ip)>=tabprocbeg.AND.tabij(ip)<=tabprocend) THEN
        npproc=npproc+1
        npstn=npproc
@@ -425,5 +425,5 @@
      npproc=0
      DO ip=1, pim
-      IF(tabij(ip).GE.tabprocbeg.AND.tabij(ip).LE.tabprocend) THEN
+      IF(tabij(ip)>=tabprocbeg.AND.tabij(ip)<=tabprocend) THEN
        npproc=npproc+1
        nptabij(npproc)=tabij(ip)
@@ -852,6 +852,6 @@
       DO ip=1, npstn
 !     print*,'histwrite2d is_sequential npstn ip name nptabij',npstn,ip,name,nptabij(ip)
-       IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-          nptabij(ip).LE.klon_mpi_end) THEN
+       IF(nptabij(ip)>=klon_mpi_begin.AND. &
+          nptabij(ip)<=klon_mpi_end) THEN
          fieldok(ip)=buffer_omp(nptabij(ip)-klon_mpi_begin+1)
        ENDIF
@@ -923,6 +923,6 @@
         DO n=1, nlev
         DO ip=1, npstn
-          IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-           nptabij(ip).LE.klon_mpi_end) THEN
+          IF(nptabij(ip)>=klon_mpi_begin.AND. &
+           nptabij(ip)<=klon_mpi_end) THEN
            fieldok(ip,n)=buffer_omp(nptabij(ip)-klon_mpi_begin+1,n)
           ENDIF
@@ -1127,6 +1127,6 @@
                               DO ip=1, npstn
                                 write(lunout,*)'histwrite2d_phy is_sequential npstn ip namenptabij',npstn,ip,var%name,nptabij(ip)
-                                     IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-                                        nptabij(ip).LE.klon_mpi_end) THEN
+                                     IF(nptabij(ip)>=klon_mpi_begin.AND. &
+                                        nptabij(ip)<=klon_mpi_end) THEN
                                        fieldok(ip)=buffer_omp(nptabij(ip)-klon_mpi_begin+1)
                                      ENDIF
@@ -1331,6 +1331,6 @@
                               DO n=1, nlev
                                     DO ip=1, npstn
-                                                IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-                                                      nptabij(ip).LE.klon_mpi_end) THEN
+                                                IF(nptabij(ip)>=klon_mpi_begin.AND. &
+                                                      nptabij(ip)<=klon_mpi_end) THEN
                                                 fieldok(ip,n)=buffer_omp(nptabij(ip)-klon_mpi_begin+1,n)
                                           ENDIF
@@ -1420,6 +1420,6 @@
                 DO ip=1, npstn
                     PRINT*,'histwrite2d_xios is_sequential npstn ip namenptabij',npstn,ip,field_name,nptabij(ip)
-                    IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-                    nptabij(ip).LE.klon_mpi_end) THEN
+                    IF(nptabij(ip)>=klon_mpi_begin.AND. &
+                    nptabij(ip)<=klon_mpi_end) THEN
                         fieldok(ip)=buffer_omp(nptabij(ip)-klon_mpi_begin+1)
                     ENDIF
@@ -1510,6 +1510,6 @@
                 DO n=1, nlev
                     DO ip=1, npstn
-                        IF(nptabij(ip).GE.klon_mpi_begin.AND. &
-                        nptabij(ip).LE.klon_mpi_end) THEN
+                        IF(nptabij(ip)>=klon_mpi_begin.AND. &
+                        nptabij(ip)<=klon_mpi_end) THEN
                             fieldok(ip,n)=buffer_omp(nptabij(ip)-klon_mpi_begin+1,n)
                         ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_ecrit.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_ecrit.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_ecrit.F90	(revision 5082)
@@ -40,6 +40,6 @@
 ! Local variables:
 
-      real*4 date
-      real*4 zx(imjmax*llm)
+      real(kind=4) date
+      real(kind=4) zx(imjmax*llm)
 
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_atke_exchange_coeff.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_atke_exchange_coeff.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_atke_exchange_coeff.F90	(revision 5082)
@@ -182,5 +182,5 @@
             Prandtl(igrid,ilay) = pr_neut*exp(-pr_slope/pr_neut*Ri(igrid,ilay)+Ri(igrid,ilay)/pr_neut) &
                                 + Ri(igrid,ilay) * pr_slope
-            IF (Ri(igrid,ilay) .GE. Prandtl(igrid,ilay)) THEN
+            IF (Ri(igrid,ilay) >= Prandtl(igrid,ilay)) THEN
                 call abort_physic("atke_compute_km_kh", &
                 'Ri>=Pr in stable conditions -> violates energy conservation principles, change pr_neut or slope', 1)
@@ -198,10 +198,10 @@
 
 
-IF (iflag_atke_lmix .EQ. 1 ) THEN
+IF (iflag_atke_lmix == 1 ) THEN
     ! Blackadar formulation (~kappa l) + buoyancy length scale (Deardoff 1980) for very stable conditions
         DO ilay=2,nlay
             DO igrid=1,ngrid
                 l_exchange(igrid,ilay) = kappa*l0*z_interf(igrid,ilay) / (kappa*z_interf(igrid,ilay) + l0)
-                IF (N2(igrid,ilay) .GT. 0.) THEN
+                IF (N2(igrid,ilay) > 0.) THEN
                     lstrat=clmix*sqrt(tke(igrid,ilay))/sqrt(N2(igrid,ilay))
                     lstrat=max(lstrat,lmin)
@@ -212,5 +212,5 @@
         ENDDO
 
-    ELSE IF (iflag_atke_lmix .EQ. 2 ) THEN
+    ELSE IF (iflag_atke_lmix == 2 ) THEN
     ! add effect of wind shear on lstrat following grisogono and belusic 2008, qjrms
     ! implies 2 tuning coefficients clmix and clmixshear
@@ -218,5 +218,5 @@
         DO igrid=1,ngrid
             l_exchange(igrid,ilay) = kappa*l0*z_interf(igrid,ilay) / (kappa*z_interf(igrid,ilay) + l0)
-            IF (N2(igrid,ilay) .GT. 0. .AND. shear2(igrid,ilay) .GT. 0.) THEN
+            IF (N2(igrid,ilay) > 0. .AND. shear2(igrid,ilay) > 0.) THEN
                 lstrat=min(clmix*sqrt(tke(igrid,ilay))/sqrt(N2(igrid,ilay)), &
                     clmixshear*sqrt(tke(igrid,ilay))/sqrt(shear2(igrid,ilay)))
@@ -228,5 +228,5 @@
     ENDDO
 
-    ELSE IF (iflag_atke_lmix .EQ. 3 ) THEN
+    ELSE IF (iflag_atke_lmix == 3 ) THEN
     ! add effect of wind shear on lstrat following grisogono 2010, qjrms
     ! keeping a single tuning coefficient clmix
@@ -234,5 +234,5 @@
         DO igrid=1,ngrid
             l_exchange(igrid,ilay) = kappa*l0*z_interf(igrid,ilay) / (kappa*z_interf(igrid,ilay) + l0)
-            IF (N2(igrid,ilay) .GT. 0. .AND. shear2(igrid,ilay) .GT. 0.) THEN
+            IF (N2(igrid,ilay) > 0. .AND. shear2(igrid,ilay) > 0.) THEN
                 lstrat=clmix*sqrt(tke(igrid,ilay))/sqrt(shear2(igrid,ilay))*(1.0+Ri(igrid,ilay)/(2.*Prandtl(igrid,ilay)))
                 lstrat=max(lstrat,lmin)
@@ -323,5 +323,5 @@
             tke_buoy(igrid,ilay)=-l_exchange(igrid,ilay)*Sm(igrid,ilay)*qq/sqrt(2.)*shear2(igrid,ilay) &
                                 *(Ri(igrid,ilay) / Prandtl(igrid,ilay))
-            IF (Ri(igrid,ilay) .LT. 0.) THEN
+            IF (Ri(igrid,ilay) < 0.) THEN
                 netloss=qq/(2.*sqrt(2.)*cepsilon*l_exchange(igrid,ilay))
                 netsource=l_exchange(igrid,ilay)*Sm(igrid,ilay)/sqrt(2.)*shear2(igrid,ilay)*(1.-Ri(igrid,ilay)/Prandtl(igrid,ilay))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_atke_turbulence_ini.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_atke_turbulence_ini.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_atke_turbulence_ini.F90	(revision 5082)
@@ -80,5 +80,5 @@
       CALL getin_p('iflag_atke_lmix',iflag_atke_lmix)
 
-      if (iflag_atke .eq. 0 .and. iflag_atke_lmix>0) then
+      if (iflag_atke == 0 .and. iflag_atke_lmix>0) then
             call abort_physic("atke_turbulence_ini", &
             'stationary scheme must use mixing length formulation not depending on tke', 1)
@@ -120,5 +120,5 @@
       CALL getin_p('atke_cinffac',cinffac)
       cinf=cinffac*cn
-      if (cinf .le. cn) then
+      if (cinf <= cn) then
             call abort_physic("atke_turbulence_ini", &
             'cinf cannot be lower than cn', 1)
@@ -133,5 +133,5 @@
       pr_slope=5.0 ! default value from Zilitinkevich et al. 2005
       CALL getin_p('atke_pr_slope',pr_slope)
-      if (pr_slope .le. 1) then
+      if (pr_slope <= 1) then
             call abort_physic("atke_turbulence_ini", &
             'pr_slope has to be greater than 1 for consistency of the tke scheme', 1)
@@ -145,5 +145,5 @@
       pr_asym=0.4
       CALL getin_p('atke_pr_asym',pr_asym)
-      if (pr_asym .ge. pr_neut) then
+      if (pr_asym >= pr_neut) then
             call abort_physic("atke_turbulence_ini", &
             'pr_asym must be be lower than pr_neut', 1)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_blowing_snow_sublim_sedim.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_blowing_snow_sublim_sedim.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_blowing_snow_sublim_sedim.F90	(revision 5082)
@@ -89,5 +89,5 @@
 !----------------------
 
-IF (iflag_sedim_bs .GT. 0) THEN
+IF (iflag_sedim_bs > 0) THEN
 ! begin of top-down loop
 DO k = nlay, 1, -1
@@ -103,5 +103,5 @@
 
     ! thermalization of blowing snow precip coming from above     
-    IF (k.LE.nlay-1) THEN
+    IF (k<=nlay-1) THEN
 
         DO i = 1, ngrid
@@ -164,5 +164,5 @@
 ! Sublimation and melting
 !++++++++++++++++++++++++++++++++++++++++++++++
-IF (iflag_sublim_bs .GT. 0) THEN
+IF (iflag_sublim_bs > 0) THEN
 
 DO k = 1, nlay
@@ -189,5 +189,5 @@
 
 
-          IF (ztemp(i) .GT. RTT) THEN
+          IF (ztemp(i) > RTT) THEN
 
              ! if temperature is positive, we assume that part of the blowing snow 
@@ -226,5 +226,5 @@
  
               ! we do not consider deposition, only sublimation
-              IF (zqv(i) .LT. qsi(i)) THEN
+              IF (zqv(i) < qsi(i)) THEN
                  rhoair=zpres(i)/ztemp(i)/RD
                  Dv=0.0001*0.211*(p0/zpres(i))*((ztemp(i)/RTT)**1.94) ! water vapor diffusivity in air, SI
@@ -256,7 +256,7 @@
           ! see Gerber et al. 2023, JGR Atmos for the choice of qbmin
 
-          IF (zqb(i) .LT. qbmin) THEN
+          IF (zqb(i) < qbmin) THEN
               zqv(i) = zqv(i)+zqb(i)
-              IF (ztemp(i) .LT. RTT) THEN
+              IF (ztemp(i) < RTT) THEN
                  ztemp(i) = ztemp(i) - zqb(i) * RLSTT/RCPD/(1.0+RVTMP2*(zqv(i)))
               ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_atke.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_atke.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_atke.F90	(revision 5082)
@@ -65,5 +65,5 @@
 
                                
-if (iflag_num_atke .EQ. 1) then
+if (iflag_num_atke == 1) then
    !! In this case, we make an explicit prediction of the wind shear to calculate the tke in a
    !! forward backward way
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_cloud_optics_prop.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_cloud_optics_prop.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_cloud_optics_prop.F90	(revision 5082)
@@ -95,5 +95,5 @@
   REAL :: dzfice(klon, klev)
 
-  IF (iflag_t_glace .EQ. 0) THEN
+  IF (iflag_t_glace == 0) THEN
      icefrac_optics(:, :) = 0.
   ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloud_optics_prop.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloud_optics_prop.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloud_optics_prop.F90	(revision 5082)
@@ -175,5 +175,5 @@
   reice_pi = 0.
 
-  IF (iflag_t_glace.EQ.0) THEN
+  IF (iflag_t_glace==0) THEN
     DO k = 1, klev
       DO i = 1, klon
@@ -245,5 +245,5 @@
     !--flag_aerosol=7 => MACv2SP climatology 
     !--in this case there is an enhancement factor
-    IF (flag_aerosol .EQ. 7) THEN 
+    IF (flag_aerosol == 7) THEN
 
       !--present-day
@@ -300,5 +300,5 @@
           zfiwp_var = 1000.*icefrac_optics(i, k)*radocond(i, k)/pclc(i, k)*rhodz(i, k)
           ! Calculation of ice cloud effective radius in micron
-          IF (iflag_rei .EQ. 1) THEN
+          IF (iflag_rei == 1) THEN
             ! when we account for precipitation in the radiation scheme,
             ! It is recommended to use the rei formula from Sun and Rikkus 1999 with a revision
@@ -407,5 +407,5 @@
 
 
-        IF (iflag_rei .GT. 0) THEN
+        IF (iflag_rei > 0) THEN
 
             ! when we account for precipitation in the radiation scheme,
@@ -600,6 +600,6 @@
       reffclwtop(i) = 0.
       cldncl(i) = 0.
-      IF (novlp.EQ.3 .OR. novlp.EQ.1) tcc(i) = 1.
-      IF (novlp.EQ.2) tcc(i) = 0.
+      IF (novlp==3 .OR. novlp==1) tcc(i) = 1.
+      IF (novlp==2) tcc(i) = 0.
     ENDDO
 
@@ -612,5 +612,5 @@
         IF (pcltau(i,k)>thres_tau .AND. pclc(i,k)>thres_neb) THEN
 
-          IF (novlp.EQ.2) THEN
+          IF (novlp==2) THEN
             IF (first) THEN
               WRITE (*, *) 'Hypothese de recouvrement: MAXIMUM'
@@ -621,5 +621,5 @@
           ENDIF
 
-          IF (novlp.EQ.3) THEN
+          IF (novlp==3) THEN
             IF (first) THEN
               WRITE (*, *) 'Hypothese de recouvrement: RANDOM'
@@ -630,5 +630,5 @@
           ENDIF
 
-          IF (novlp.EQ.1) THEN
+          IF (novlp==1) THEN
             IF (first) THEN
               WRITE (*, *) 'Hypothese de recouvrement: MAXIMUM_ &
@@ -655,5 +655,5 @@
       ENDDO ! loop over k
 
-      IF (novlp.EQ.3 .OR. novlp.EQ.1) tcc(i) = 1. - tcc(i)
+      IF (novlp==3 .OR. novlp==1) tcc(i) = 1. - tcc(i)
 
     ENDDO ! loop over i
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90	(revision 5082)
@@ -79,5 +79,5 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      IF (iflag_cloudth_vert.GE.1) THEN
+      IF (iflag_cloudth_vert>=1) THEN
       CALL cloudth_vert(ngrid,klev,ind2,  &
      &           ztv,po,zqta,fraca, & 
@@ -117,5 +117,5 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then 
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2))
@@ -186,5 +186,5 @@
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      if (ctot(ind1,ind2).lt.1.e-10) then
+      if (ctot(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -227,5 +227,5 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt(2.)*cenv(ind1,ind2))
       
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -347,5 +347,5 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then 
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2))
@@ -510,5 +510,5 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      if (cenv(ind1,ind2).lt.1.e-10.or.cth(ind1,ind2).lt.1.e-10) then
+      if (cenv(ind1,ind2)<1.e-10.or.cth(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -554,5 +554,5 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt(2.)*cenv(ind1,ind2))
       
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -651,5 +651,5 @@
       INTEGER :: ind1,l, ig
 
-      IF (iflag_cloudth_vert.GE.1) THEN
+      IF (iflag_cloudth_vert>=1) THEN
       CALL cloudth_vert_v3(ngrid,klev,ind2,  &
      &           ztv,po,zqta,fraca, & 
@@ -694,5 +694,5 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then 
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2))
@@ -759,5 +759,5 @@
       qltot(ind1,ind2)=fraca(ind1,ind2)*qlth(ind1,ind2)+(1.-1.*fraca(ind1,ind2))*qlenv(ind1,ind2)
 
-      if (ctot(ind1,ind2).lt.1.e-10) then
+      if (ctot(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -790,5 +790,5 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt2*cenv(ind1,ind2))
 
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2)
@@ -926,5 +926,5 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then !Thermal and environnement
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then !Thermal and environnement
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2)) !qt = a*qtth + (1-a)*qtenv
@@ -978,5 +978,5 @@
       ENDIF
       sigma1s = sigma1s_fraca + sigma1s_ratqs
-      IF (iflag_ratqs.eq.11) then
+      IF (iflag_ratqs==11) then
          sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
       ENDIF
@@ -1073,5 +1073,5 @@
       IntJ=0.5*senv*(1-erf(xenv2))+(sigma1s/sqrt2pi)*exp_xenv2
       IntJ_CF=0.5*(1.-1.*erf(xenv2))
-      if (deltasenv .lt. 1.e-10) then 
+      if (deltasenv < 1.e-10) then
       qlenv(ind1,ind2)=IntJ
       cenv_vol(ind1,ind2)=IntJ_CF
@@ -1089,5 +1089,5 @@
       IntJ=0.5*sth*(1-erf(xth2))+(sigma2s/sqrt2pi)*exp_xth2
       IntJ_CF=0.5*(1.-1.*erf(xth2))
-      if (deltasth .lt. 1.e-10) then
+      if (deltasth < 1.e-10) then
       qlth(ind1,ind2)=IntJ
       cth_vol(ind1,ind2)=IntJ_CF
@@ -1158,5 +1158,5 @@
 
 !      if (ctot(ind1,ind2).lt.1.e-10) then
-      if (cenv(ind1,ind2).lt.1.e-10.or.cth(ind1,ind2).lt.1.e-10) then
+      if (cenv(ind1,ind2)<1.e-10.or.cth(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       ctot_vol(ind1,ind2)=0.
@@ -1201,5 +1201,5 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt(2.)*cenv(ind1,ind2))
       
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2)
@@ -1338,5 +1338,5 @@
 !Both thermal and environment in the gridbox
 !-------------------------------------------------------------------------------
-      IF ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) THEN
+      IF ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) THEN
         !--------------------------------------------
         !calcul de qsat_env
@@ -1409,5 +1409,5 @@
         !Incloud Condensed water qcloud
         !--------------------------------------------
-      if (ctot_surf(ind1,ind2) .lt. 1.e-10) then
+      if (ctot_surf(ind1,ind2) < 1.e-10) then
       ctot_vol(ind1,ind2)=0.
       ctot_surf(ind1,ind2)=0.
@@ -1470,5 +1470,5 @@
         !Incloud Condensed water qcloud
         !--------------------------------------------
-      if (ctot_surf(ind1,ind2) .lt. 1.e-8) then
+      if (ctot_surf(ind1,ind2) < 1.e-8) then
       ctot_vol(ind1,ind2)=0.
       ctot_surf(ind1,ind2)=0.
@@ -1623,7 +1623,7 @@
 
       DO ind1=1,klon
-            IF ((temp(ind1) .LT. RTT) .AND. (temp(ind1) .GT. temp_nowater) &
+            IF ((temp(ind1) < RTT) .AND. (temp(ind1) > temp_nowater) &
             .AND. (ind2<=klev-2)  &
-            .AND. (frac_th(ind1).GT.min_frac_th_cld)) THEN
+            .AND. (frac_th(ind1)>min_frac_th_cld)) THEN
                 mpc_bl_points(ind1,ind2)=1
             ELSE
@@ -1661,5 +1661,5 @@
 
 
-    IF (frac_th(ind1).GT.min_frac_th_cld) THEN !Thermal and environnement
+    IF (frac_th(ind1)>min_frac_th_cld) THEN !Thermal and environnement
 
 ! unlike in the other cloudth routine, 
@@ -1700,5 +1700,5 @@
  
            sigma1s = sigma1s_fraca + sigma1s_ratqs
-           IF (iflag_ratqs.eq.11) then
+           IF (iflag_ratqs==11) then
               sigma1s = ratqs(ind1)*qt(ind1)*aenv
            ENDIF
@@ -1732,5 +1732,5 @@
             IntJ_CF=0.5*(1.-1.*erf(xenv2))
 
-            IF (deltasenv .LT. 1.e-10) THEN 
+            IF (deltasenv < 1.e-10) THEN
               qcenv(ind1)=IntJ
               cenv_vol(ind1)=IntJ_CF
@@ -1743,5 +1743,5 @@
               qcenv(ind1)=IntJ+IntI1+IntI2+IntI3
               cenv_vol(ind1)=IntJ_CF+IntI1_CF+IntI3_CF
-              IF (Tbefenv(ind1) .LT. temp_nowater) THEN
+              IF (Tbefenv(ind1) < temp_nowater) THEN
                   ! freeze all droplets in cirrus temperature regime
                   icefracenv(ind1)=1. 
@@ -1756,5 +1756,5 @@
             IntJ_CF=0.5*(1.-1.*erf(xth2))
      
-            IF (deltasth .LT. 1.e-10) THEN
+            IF (deltasth < 1.e-10) THEN
               qcth(ind1)=IntJ
               cth_vol(ind1)=IntJ_CF
@@ -1767,5 +1767,5 @@
               qcth(ind1)=IntJ+IntI1+IntI2+IntI3
               cth_vol(ind1)=IntJ_CF+IntI1_CF+IntI3_CF
-              IF (Tbefth(ind1) .LT. temp_nowater) THEN
+              IF (Tbefth(ind1) < temp_nowater) THEN
                   ! freeze all droplets in cirrus temperature regime
                   icefracth(ind1)=1.
@@ -1777,5 +1777,5 @@
             ctot_vol(ind1)=frac_th(ind1)*cth_vol(ind1)+(1.-1.*frac_th(ind1))*cenv_vol(ind1)
 
-            IF (cenv(ind1).LT.min_neb_th.and.cth(ind1).LT.min_neb_th) THEN
+            IF (cenv(ind1)<min_neb_th.and.cth(ind1)<min_neb_th) THEN
                 ctot(ind1)=0.
                 ctot_vol(ind1)=0.
@@ -1786,5 +1786,5 @@
                 qcloud(ind1)=qctot(ind1)/ctot(ind1)+qslenv(ind1)
                 qincloud(ind1)=qctot(ind1)/ctot(ind1)
-                IF (qctot(ind1) .GT. 0) THEN
+                IF (qctot(ind1) > 0) THEN
                   icefrac(ind1)=(frac_th(ind1)*qcth(ind1)*icefracth(ind1)+(1.-1.*frac_th(ind1))*qcenv(ind1)*icefracenv(ind1))/qctot(ind1)
                   icefrac(ind1)=max(min(1.,icefrac(ind1)), 0.)
@@ -1812,5 +1812,5 @@
 
 
-        IF (ctot(ind1).LT.min_neb_th) THEN
+        IF (ctot(ind1)<min_neb_th) THEN
           ctot(ind1)=0.
           qcloud(ind1)=qslenv(ind1)
@@ -2178,5 +2178,5 @@
 
 
-    IF (iflag_topthermals .GT. 0) THEN ! uppermost thermals levels
+    IF (iflag_topthermals > 0) THEN ! uppermost thermals levels
 
     Dv=0.0001*0.211*(p0/pres(ind2))*((temp(ind2)/T0)**1.94) ! water vapor diffusivity in air, SI
@@ -2231,5 +2231,5 @@
     fp2=0.
     fp1=0.
-    IF (fraca(ind2p1) .GT. 0.) THEN
+    IF (fraca(ind2p1) > 0.) THEN
     fp2=-qith(ind2p2)*rho(ind2p2)*vith(ind2p2)*fraca(ind2p2)! flux defined positive upward
     fp1=-qith(ind2p1)*rho(ind2p1)*vith(ind2p1)*fraca(ind2p1)
@@ -2240,5 +2240,5 @@
     ! Calculation in a top-to-bottom loop
 
-    IF (fm_therm(ind1,ind2p1) .GT. 0.) THEN
+    IF (fm_therm(ind1,ind2p1) > 0.) THEN
           qi= 1./fm_therm(ind1,ind2p1)* &
               (deltazlev(ind2p1)*(-rim_term-dep_term-det_term-precip_term) + &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp.F90	(revision 5082)
@@ -312,5 +312,5 @@
 
 
-IF (iflag_fisrtilp_qsat .LT. 0) THEN
+IF (iflag_fisrtilp_qsat < 0) THEN
     abort_message = 'lscp cannot be used with iflag_fisrtilp<0'
     CALL abort_physic(modname,abort_message,1)
@@ -418,5 +418,5 @@
 DO k = klev, 1, -1
 
-    IF (k.LE.klev-1) THEN
+    IF (k<=klev-1) THEN
        iftop=.false. 
     ELSE 
@@ -507,5 +507,5 @@
     ! --------------------------------------------------------------------
     
-    IF (iflag_evap_prec.GE.1) THEN 
+    IF (iflag_evap_prec>=1) THEN
 
         ! Calculation of saturation specific humidity
@@ -520,15 +520,15 @@
 
             ! if precipitation
-            IF (zrfl(i)+zifl(i).GT.0.) THEN
+            IF (zrfl(i)+zifl(i)>0.) THEN
 
             ! LudoTP: we only account for precipitation evaporation in the clear-sky (iflag_evap_prec>=4).
             ! c_iso: likely important to distinguish cs from neb isotope precipitation
 
-                IF (iflag_evap_prec.GE.4) THEN
+                IF (iflag_evap_prec>=4) THEN
                     zrfl(i) = zrflclr(i)
                     zifl(i) = ziflclr(i)
                 ENDIF
 
-                IF (iflag_evap_prec.EQ.1) THEN
+                IF (iflag_evap_prec==1) THEN
                     znebprecip(i)=zneb(i)
                 ELSE
@@ -536,9 +536,9 @@
                 ENDIF
 
-                IF (iflag_evap_prec.GT.4) THEN
+                IF (iflag_evap_prec>4) THEN
                 ! Max evaporation not to saturate the clear sky precip fraction
                 ! i.e. the fraction where evaporation occurs
                     zqev0 = MAX(0.0, (zqs(i)-zq(i))*znebprecipclr(i))
-                ELSEIF (iflag_evap_prec .EQ. 4) THEN
+                ELSEIF (iflag_evap_prec == 4) THEN
                 ! Max evaporation not to saturate the whole mesh
                 ! Pay attention -> lead to unrealistic and excessive evaporation
@@ -554,9 +554,9 @@
                 ! LTP: evaporation only in the clear sky part (iflag_evap_prec>=4)
 
-                IF (iflag_evap_prec.EQ.3) THEN
+                IF (iflag_evap_prec==3) THEN
                     zqevt = znebprecip(i)*coef_eva*(1.0-zq(i)/qsl(i)) &
                     *SQRT(zrfl(i)/max(1.e-4,znebprecip(i)))        &
                     *(paprs(i,k)-paprs(i,k+1))/pplay(i,k)*zt(i)*RD/RG
-                ELSE IF (iflag_evap_prec.GE.4) THEN
+                ELSE IF (iflag_evap_prec>=4) THEN
                      zqevt = znebprecipclr(i)*coef_eva*(1.0-zq(i)/qsl(i)) &
                     *SQRT(zrfl(i)/max(1.e-8,znebprecipclr(i))) &
@@ -571,9 +571,9 @@
 
                 ! sublimation of the solid precipitation coming from above
-                IF (iflag_evap_prec.EQ.3) THEN
+                IF (iflag_evap_prec==3) THEN
                     zqevti = znebprecip(i)*coef_sub*(1.0-zq(i)/qsi(i)) &
                     *SQRT(zifl(i)/max(1.e-4,znebprecip(i))) &
                     *(paprs(i,k)-paprs(i,k+1))/pplay(i,k)*zt(i)*RD/RG
-                ELSE IF (iflag_evap_prec.GE.4) THEN
+                ELSE IF (iflag_evap_prec>=4) THEN
                      zqevti = znebprecipclr(i)*coef_sub*(1.0-zq(i)/qsi(i)) &
                     *SQRT(zifl(i)/max(1.e-8,znebprecipclr(i))) &
@@ -593,5 +593,5 @@
                 ! redistribute zqev0 conserving the ratio liquid/ice 
 
-                IF (zqevt+zqevti.GT.zqev0) THEN
+                IF (zqevt+zqevti>zqev0) THEN
                     zqev=zqev0*zqevt/(zqevt+zqevti)
                     zqevi=zqev0*zqevti/(zqevt+zqevti)
@@ -633,8 +633,8 @@
                                            
 
-                IF (iflag_evap_prec.GE.4) THEN
+                IF (iflag_evap_prec>=4) THEN
                     zrflclr(i) = zrfl(i)
                     ziflclr(i) = zifl(i)
-                    IF(zrflclr(i) + ziflclr(i).LE.0) THEN
+                    IF(zrflclr(i) + ziflclr(i)<=0) THEN
                         znebprecipclr(i) = 0.0
                     ENDIF
@@ -651,5 +651,5 @@
 
                 ! update of rainfall and snowfall due to melting
-                IF (iflag_evap_prec.GE.4) THEN
+                IF (iflag_evap_prec>=4) THEN
                     zrflclr(i)=zrflclr(i)+zmelt*ziflclr(i)
                     zrflcld(i)=zrflcld(i)+zmelt*ziflcld(i)
@@ -667,5 +667,5 @@
                 *RLMLT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
                
-                IF (iflag_evap_prec.GE.4) THEN
+                IF (iflag_evap_prec>=4) THEN
                     ziflclr(i)=ziflclr(i)*(1.-zmelt)
                     ziflcld(i)=ziflcld(i)*(1.-zmelt)
@@ -699,5 +699,5 @@
             zdelta = MAX(0.,SIGN(1.,RTT-zt(i)))
             zdqsdT_raw(i) = zdqs(i)*RCPD*(1.0+RVTMP2*zq(i)) / (RLVTT*(1.-zdelta) + RLSTT*zdelta)
-            IF (zq(i) .LT. 1.e-15) THEN
+            IF (zq(i) < 1.e-15) THEN
                 ncoreczq=ncoreczq+1
                 zq(i)=1.e-15
@@ -727,10 +727,10 @@
         qincloud_mpc(:)=0.
 
-        IF (iflag_cld_th.GE.5) THEN
+        IF (iflag_cld_th>=5) THEN
                ! Cloud cover and content in meshes affected by shallow convection, 
                ! are retrieved from a bi-gaussian distribution of the saturation deficit
                ! following Jam et al. 2013
 
-               IF (iflag_cloudth_vert.LE.2) THEN
+               IF (iflag_cloudth_vert<=2) THEN
                   ! Old version of Arnaud Jam
 
@@ -742,5 +742,5 @@
 
 
-                ELSEIF (iflag_cloudth_vert.GE.3 .AND. iflag_cloudth_vert.LE.5) THEN
+                ELSEIF (iflag_cloudth_vert>=3 .AND. iflag_cloudth_vert<=5) THEN
                    ! Default version of Arnaud Jam
                         
@@ -752,5 +752,5 @@
 
 
-                ELSEIF (iflag_cloudth_vert.EQ.6) THEN
+                ELSEIF (iflag_cloudth_vert==6) THEN
                    ! Jean Jouhaud's version, with specific separation between surface and volume
                    ! cloud fraction Decembre 2018 
@@ -762,5 +762,5 @@
                          cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
 
-                ELSEIF (iflag_cloudth_vert .EQ. 7) THEN
+                ELSEIF (iflag_cloudth_vert == 7) THEN
                    ! Updated version of Arnaud Jam (correction by E. Vignon) + adapted treatment
                    ! for boundary-layer mixed phase clouds 
@@ -781,10 +781,10 @@
         ENDIF
 
-        IF (iflag_cld_th .LE. 4) THEN
+        IF (iflag_cld_th <= 4) THEN
             
                 ! lognormal 
             lognormale(:) = .TRUE.
 
-        ELSEIF (iflag_cld_th .GE. 6) THEN
+        ELSEIF (iflag_cld_th >= 6) THEN
             
                 ! lognormal distribution when no thermals 
@@ -815,7 +815,7 @@
 
                     ! keepgoing = .true. while convergence is not satisfied
-                    keepgoing(i)=ABS(DT(i)).GT.DDT0
-
-                    IF ((keepgoing(i) .OR. (n_i(i) .EQ. 0)) .AND. lognormale(i)) THEN
+                    keepgoing(i)=ABS(DT(i))>DDT0
+
+                    IF ((keepgoing(i) .OR. (n_i(i) == 0)) .AND. lognormale(i)) THEN
 
                         ! if not convergence:
@@ -845,5 +845,5 @@
                   zdqs(:) = gammasat(:)*zdqs(:)+zqs(:)*dgammasatdt(:)
                   ! cloud phase determination
-                  IF (iflag_t_glace.GE.4) THEN
+                  IF (iflag_t_glace>=4) THEN
                   ! For iflag_t_glace GE 4 the phase partition function dependends on temperature AND distance to cloud top
                        CALL distance_to_cloud_top(klon,klev,k,temp,pplay,paprs,rneb,zdistcltop,ztemp_cltop)
@@ -854,5 +854,5 @@
                   DO i=1,klon !todoan : check if loop in i is needed
 
-                      IF ((keepgoing(i) .OR. (n_i(i) .EQ. 0)) .AND. lognormale(i)) THEN
+                      IF ((keepgoing(i) .OR. (n_i(i) == 0)) .AND. lognormale(i)) THEN
 
                         zpdf_sig(i)=ratqs(i,k)*zq(i)
@@ -868,7 +868,7 @@
                         zpdf_e2(i)=1.-erf(zpdf_e2(i))
 
-                        IF ((.NOT.ok_ice_sursat).OR.(Tbef(i).GT.t_glace_min)) THEN
-
-                          IF (zpdf_e1(i).LT.1.e-10) THEN
+                        IF ((.NOT.ok_ice_sursat).OR.(Tbef(i)>t_glace_min)) THEN
+
+                          IF (zpdf_e1(i)<1.e-10) THEN
                               rneb(i,k)=0.
                               zqn(i)=gammasat(i)*zqs(i)
@@ -897,5 +897,5 @@
 
                         ! If vertical heterogeneity, change fraction by volume as well
-                        IF (iflag_cloudth_vert.GE.3) THEN
+                        IF (iflag_cloudth_vert>=3) THEN
                             ctot_vol(i,k)=rneb(i,k)
                             rneblsvol(i,k)=ctot_vol(i,k)
@@ -910,5 +910,5 @@
 
                 
-                        IF (zfice(i).LT.1) THEN
+                        IF (zfice(i)<1) THEN
                             cste=RLVTT
                         ELSE
@@ -946,5 +946,5 @@
 
         ! For iflag_t_glace GE 4 the phase partition function dependends on temperature AND distance to cloud top
-        IF (iflag_t_glace.GE.4) THEN
+        IF (iflag_t_glace>=4) THEN
            CALL distance_to_cloud_top(klon,klev,k,temp,pplay,paprs,rneb,zdistcltop,ztemp_cltop)
            distcltop(:,k)=zdistcltop(:)
@@ -956,5 +956,5 @@
 
         ! Partition function depending on tke for non shallow-convective clouds 
-        IF (iflag_icefrac .GE. 1) THEN
+        IF (iflag_icefrac >= 1) THEN
 
            CALL icefrac_lscp_turb(klon, dtime, Tbef, pplay(:,k), paprs(:,k), paprs(:,k+1), qice_save(:,k), ziflcld, zqn, &
@@ -967,5 +967,5 @@
             ! Overwrite phase partitioning in boundary layer mixed phase clouds when the 
             ! iflag_cloudth_vert=7 and specific param is activated
-            IF (mpc_bl_points(i,k) .GT. 0) THEN
+            IF (mpc_bl_points(i,k) > 0) THEN
                 zcond(i) = MAX(0.0,qincloud_mpc(i))*rneb(i,k)
                 ! following line is very strange and probably wrong
@@ -976,10 +976,10 @@
             ELSE
                 ! Checks on rneb, rhcl and zqn
-                IF (rneb(i,k) .LE. 0.0) THEN
+                IF (rneb(i,k) <= 0.0) THEN
                     zqn(i) = 0.0
                     rneb(i,k) = 0.0
                     zcond(i) = 0.0
                     rhcl(i,k)=zq(i)/zqs(i)
-                ELSE IF (rneb(i,k) .GE. 1.0) THEN
+                ELSE IF (rneb(i,k) >= 1.0) THEN
                     zqn(i) = zq(i)
                     rneb(i,k) = 1.0
@@ -991,5 +991,5 @@
                     rhcl(i,k)=(zqs(i)+zq(i))/2./zqs(i)
                     ! Overwrite partitioning for non shallow-convective clouds if iflag_icefrac>1 (icefrac turb param) 
-                    IF (iflag_icefrac .GE. 1) THEN
+                    IF (iflag_icefrac >= 1) THEN
                         IF (lognormale(i)) THEN  
                            zcond(i)  = zqliq(i) + zqice(i)
@@ -1015,5 +1015,5 @@
 
         ! If vertical heterogeneity, change volume fraction 
-        IF (iflag_cloudth_vert .GE. 3) THEN
+        IF (iflag_cloudth_vert >= 3) THEN
           ctot_vol(1:klon,k)=min(max(ctot_vol(1:klon,k),0.),1.)
           rneblsvol(1:klon,k)=ctot_vol(1:klon,k)
@@ -1046,5 +1046,5 @@
       DO i = 1, klon
         zoliq(i) = zoliql(i) + zoliqi(i)
-        IF ( zoliq(i) .GT. 0. ) THEN 
+        IF ( zoliq(i) > 0. ) THEN
                 zfice(i) = zoliqi(i)/zoliq(i) 
         ELSE  
@@ -1068,5 +1068,5 @@
 
     ! LTP:
-    IF (iflag_evap_prec .GE. 4) THEN
+    IF (iflag_evap_prec >= 4) THEN
 
         !Partitionning between precipitation coming from clouds and that coming from CS
@@ -1084,5 +1084,5 @@
                 !1) Cloudy to clear air
                 d_znebprecip_cld_clr(i) = znebprecipcld(i) - min(rneb(i,k),znebprecipcld(i)) 
-                IF (znebprecipcld(i) .GT. 0.) THEN
+                IF (znebprecipcld(i) > 0.) THEN
                         d_zrfl_cld_clr(i) = d_znebprecip_cld_clr(i)/znebprecipcld(i)*zrflcld(i) 
                         d_zifl_cld_clr(i) = d_znebprecip_cld_clr(i)/znebprecipcld(i)*ziflcld(i) 
@@ -1094,5 +1094,5 @@
                 !2) Clear to cloudy air
                 d_znebprecip_clr_cld(i) = max(0., min(znebprecipclr(i), rneb(i,k) - d_tot_zneb(i) - zneb(i)))
-                IF (znebprecipclr(i) .GT. 0) THEN
+                IF (znebprecipclr(i) > 0) THEN
                         d_zrfl_clr_cld(i) = d_znebprecip_clr_cld(i)/znebprecipclr(i)*zrflclr(i) 
                         d_zifl_clr_cld(i) = d_znebprecip_clr_cld(i)/znebprecipclr(i)*ziflclr(i)
@@ -1139,5 +1139,5 @@
 
         DO i=1,klon
-            IF (rneb(i,k).GT.0.0) THEN
+            IF (rneb(i,k)>0.0) THEN
                 iwc(i) = zrho(i,k) * zoliqi(i) / zneb(i) ! in-cloud ice condensate content
             ENDIF
@@ -1148,5 +1148,5 @@
         DO i = 1, klon
 
-            IF (rneb(i,k).GT.0.0) THEN
+            IF (rneb(i,k)>0.0) THEN
 
                 ! Initialization of zrain, zsnow and zprecip:
@@ -1156,5 +1156,5 @@
                 ! c_iso same init for isotopes. Externalisation?
 
-                IF (zneb(i).EQ.seuil_neb) THEN
+                IF (zneb(i)==seuil_neb) THEN
                     zprecip = 0.0
                     zsnow = 0.0
@@ -1183,5 +1183,5 @@
                     ! dqliq/dt=-qliq/tau*(1-exp(-qcin/clw)**2)
                     !.........................................................
-                    IF ((iflag_cloudth_vert.GE.3).AND.(iflag_rain_incloud_vol.EQ.1)) THEN
+                    IF ((iflag_cloudth_vert>=3).AND.(iflag_rain_incloud_vol==1)) THEN
 
                     ! if vertical heterogeneity is taken into account, we use
@@ -1195,5 +1195,5 @@
 
 
-                    IF (iflag_autoconversion .EQ. 2) THEN
+                    IF (iflag_autoconversion == 2) THEN
                     ! two-steps resolution with niter_lscp=1 sufficient
                     ! we first treat the second term (with exponential) in an explicit way
@@ -1211,8 +1211,8 @@
                     ! dqice/dt=1/rho*d(rho*wice*qice)/dz
                     !....................................
-                    IF (iflag_autoconversion .EQ. 2) THEN
+                    IF (iflag_autoconversion == 2) THEN
                     ! exact resolution, niter_lscp=1 is sufficient but works only
                     ! with iflag_vice=0
-                       IF (zoliqi(i) .GT. 0.) THEN
+                       IF (zoliqi(i) > 0.) THEN
                           zfroi=(zoliqi(i)-((zoliqi(i)**(-dice_velo)) & 
                           +dice_velo*dtime/REAL(niter_lscp)*cice_velo/zdz(i)*ffallv)**(-1./dice_velo))
@@ -1231,5 +1231,5 @@
                 ENDIF
 
-                IF (iflag_autoconversion .GE. 1) THEN
+                IF (iflag_autoconversion >= 1) THEN
                    ! debugged version with phase conservation through the autoconversion process
                    zoliql(i) = MAX(zoliql(i)-1.*zrain  , 0.0)
@@ -1259,5 +1259,5 @@
     DO i = 1, klon
             
-            IF (iflag_evap_prec.GE.4) THEN
+            IF (iflag_evap_prec>=4) THEN
                 ziflprev(i)=ziflcld(i)
             ELSE
@@ -1265,5 +1265,5 @@
             ENDIF
 
-            IF (rneb(i,k) .GT. 0.0) THEN
+            IF (rneb(i,k) > 0.0) THEN
 
                ! CR&JYG: We account for the Wegener-Findeisen-Bergeron process in the precipitation flux:
@@ -1301,5 +1301,5 @@
                     ! c_iso : mv here condensation of isotopes + redispatchage en precip 
 
-                IF (iflag_evap_prec.GE.4) THEN
+                IF (iflag_evap_prec>=4) THEN
                     zrflcld(i) = zrflcld(i)+zqprecl(i) &
                     *(paprs(i,k)-paprs(i,k+1))/(RG*dtime)
@@ -1323,9 +1323,9 @@
     ! LTP: limit of surface cloud fraction covered by precipitation when the local intensity of the flux is below rain_int_min
     ! if iflag_evap_prec>=4
-    IF (iflag_evap_prec.GE.4) THEN
+    IF (iflag_evap_prec>=4) THEN
 
         DO i=1,klon
 
-            IF ((zrflclr(i) + ziflclr(i)) .GT. 0. ) THEN
+            IF ((zrflclr(i) + ziflclr(i)) > 0. ) THEN
                 znebprecipclr(i) = min(znebprecipclr(i),max(zrflclr(i)/ &
                 (MAX(znebprecipclr(i),seuil_neb)*rain_int_min), ziflclr(i)/(MAX(znebprecipclr(i),seuil_neb)*rain_int_min)))
@@ -1334,5 +1334,5 @@
             ENDIF
 
-            IF ((zrflcld(i) + ziflcld(i)) .GT. 0.) THEN
+            IF ((zrflcld(i) + ziflcld(i)) > 0.) THEN
                 znebprecipcld(i) = min(znebprecipcld(i), max(zrflcld(i)/ &
                 (MAX(znebprecipcld(i),seuil_neb)*rain_int_min), ziflcld(i)/(MAX(znebprecipcld(i),seuil_neb)*rain_int_min)))
@@ -1364,5 +1364,5 @@
     ! TODO: for the moment, we deactivate this option when ok_poprecip=.true.
 
-    IF ((ok_radocond_snow) .AND. (k .LT. klev) .AND. (.NOT. ok_poprecip)) THEN
+    IF ((ok_radocond_snow) .AND. (k < klev) .AND. (.NOT. ok_poprecip)) THEN
         ! for the solid phase (crystals + snowflakes)
         ! we recalculate radocondi by summing
@@ -1371,5 +1371,5 @@
         ! from the overlying layer
         DO i=1,klon
-           IF (ziflprev(i) .NE. 0.0) THEN
+           IF (ziflprev(i) /= 0.0) THEN
               radocondi(i,k)=zoliq(i)*zfice(i)+zqpreci(i)+ziflprev(i)/zrho(i,k+1)/velo(i,k+1)
            ELSE
@@ -1382,5 +1382,5 @@
     ! caculate the percentage of ice in "radocond" so cloud+precip seen by the radiation scheme
     DO i=1,klon
-        IF (radocond(i,k) .GT. 0.) THEN
+        IF (radocond(i,k) > 0.) THEN
             radicefrac(i,k)=MIN(MAX(radocondi(i,k)/radocond(i,k),0.),1.)
         ENDIF
@@ -1395,5 +1395,5 @@
     DO i = 1,klon
         
-        IF(zcond(i).GT.zoliq(i)+1.e-10) THEN
+        IF(zcond(i)>zoliq(i)+1.e-10) THEN
             beta(i,k) = (zcond(i)-zoliq(i))/zcond(i)/dtime
         ELSE
@@ -1403,7 +1403,7 @@
         zprec_cond(i) = MAX(zcond(i)-zoliq(i),0.0)*(paprs(i,k)-paprs(i,k+1))/RG
 
-        IF (rneb(i,k).GT.0.0.AND.zprec_cond(i).GT.0.) THEN
-
-            IF (temp(i,k) .GE. t_glace_min) THEN
+        IF (rneb(i,k)>0.0.AND.zprec_cond(i)>0.) THEN
+
+            IF (temp(i,k) >= t_glace_min) THEN
                 zalpha_tr = a_tr_sca(3)
             ELSE
@@ -1427,7 +1427,7 @@
         DO i = 1, klon
 
-            IF (rneb(i,k).GT.0.0.AND.zprec_cond(i).GT.0.) THEN
-
-                IF (temp(i,kk) .GE. t_glace_min) THEN
+            IF (rneb(i,k)>0.0.AND.zprec_cond(i)>0.) THEN
+
+                IF (temp(i,kk) >= t_glace_min) THEN
                     zalpha_tr = a_tr_sca(1)
                 ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_ini.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_ini.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_ini.F90	(revision 5082)
@@ -409,5 +409,5 @@
 
     ! check for precipitation sub-time steps
-    IF (ABS(dtime/REAL(niter_lscp)-360.0).GT.0.001) THEN
+    IF (ABS(dtime/REAL(niter_lscp)-360.0)>0.001) THEN
         WRITE(lunout,*) 'lscp: it is not expected, see Z.X.Li', dtime
         WRITE(lunout,*) 'I would prefer a 6 min sub-timestep'
@@ -417,6 +417,6 @@
     ! and other options
    
-    IF (iflag_autoconversion .EQ. 2) THEN
-        IF ((iflag_vice .NE. 0) .OR. (niter_lscp .GT. 1)) THEN
+    IF (iflag_autoconversion == 2) THEN
+        IF ((iflag_vice /= 0) .OR. (niter_lscp > 1)) THEN
            abort_message = 'in lscp, iflag_autoconversion=2 requires iflag_vice=0 and niter_lscp=1'
            CALL abort_physic (modname,abort_message,1) 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90	(revision 5082)
@@ -213,5 +213,5 @@
 !>LTP
 
-  ice_thermo = (iflag_ice_thermo .EQ. 1).OR.(iflag_ice_thermo .GE. 3)
+  ice_thermo = (iflag_ice_thermo == 1).OR.(iflag_ice_thermo >= 3)
   zdelq=0.0
   ctot_vol(1:klon,1:klev)=0.0
@@ -224,5 +224,5 @@
      WRITE(lunout,*) 'FISRTILP VERSION LUDO'
      
-     IF (ABS(dtime/REAL(ninter)-360.0).GT.0.001) THEN
+     IF (ABS(dtime/REAL(ninter)-360.0)>0.001) THEN
         WRITE(lunout,*) 'fisrtilp: Ce n est pas prevu, voir Z.X.Li', dtime
         WRITE(lunout,*) 'Je prefere un sous-intervalle de 6 minutes'
@@ -251,5 +251,5 @@
   !
 !CR: on est oblige de definir des valeurs fisrt car les valeurs de newmicro ne sont pas les memes par defaut
-  IF (iflag_t_glace.EQ.0) THEN
+  IF (iflag_t_glace==0) THEN
 !   ztglace = RTT - 15.0
     t_glace_min_old = RTT - 15.0
@@ -352,5 +352,5 @@
      !   - zmqc: masse de precip qui doit etre thermalisee
      !
-     IF(k.LE.klev-1) THEN         
+     IF(k<=klev-1) THEN
         DO i = 1, klon
            !IM
@@ -359,5 +359,5 @@
            zcpair=RCPD*(1.0+RVTMP2*zq(i))
            zcpeau=RCPD*RVTMP2
-         if (fl_cor_ebil .GT. 0) then
+         if (fl_cor_ebil > 0) then
            ! zmqc: masse de precip qui doit etre thermalisee avec l'air de la couche atm 
            ! pour s'assurer que la precip arrivant au sol aura bien la temperature de la 
@@ -394,5 +394,5 @@
         DO i = 1, klon
 !          S'il y a des precipitations
-           IF (zrfl(i)+zifl(i).GT.0.) THEN
+           IF (zrfl(i)+zifl(i)>0.) THEN
               ! Calcul du qsat
               IF (thermcep) THEN
@@ -403,5 +403,5 @@
                  zqs(i)=zqs(i)*zcor
               ELSE
-                 IF (zt(i) .LT. t_coup) THEN
+                 IF (zt(i) < t_coup) THEN
                     zqs(i) = qsats(zt(i)) / pplay(i,k)
                  ELSE
@@ -416,5 +416,5 @@
         DO i = 1, klon
 !          S'il y a des precipitations
-           IF (zrfl(i)+zifl(i).GT.0.) THEN
+           IF (zrfl(i)+zifl(i)>0.) THEN
                 ! Evap max pour ne pas saturer la fraction sous le nuage
                 ! Evap max jusqu'à atteindre la saturation dans la partie
@@ -425,5 +425,5 @@
              ! Ajout de la prise en compte des precip a thermiser
              ! avec petite reecriture 
-             if  (fl_cor_ebil .GT. 0) then ! nouveau
+             if  (fl_cor_ebil > 0) then ! nouveau
                 ! Calcul de l'evaporation du flux de precip herite
                 !   d'au-dessus
@@ -437,5 +437,5 @@
                 zrfln(i) = zrfl(i) - zqev*zmair(i)/dtime
                 ! Aucun flux liquide pour T < t_coup, on reevapore tout.
-                IF (zt(i) .LT. t_coup.and.reevap_ice) THEN
+                IF (zt(i) < t_coup.and.reevap_ice) THEN
                   zrfln(i)=0.
                   zqev = (zrfl(i)-zrfln(i))/zmair(i)*dtime
@@ -461,5 +461,5 @@
                      /RG/dtime
                 ! Aucun flux liquide pour T < t_coup
-                IF (zt(i) .LT. t_coup.and.reevap_ice) zrfln(i)=0.
+                IF (zt(i) < t_coup.and.reevap_ice) zrfln(i)=0.
                 ! Nouvelle vapeur 
                 zq(i) = zq(i) - (zrfln(i)-zrfl(i)) &
@@ -485,5 +485,5 @@
 !AJ<
 !        S'il y a des precipitations
-         IF (zrfl(i)+zifl(i).GT.0.) THEN
+         IF (zrfl(i)+zifl(i)>0.) THEN
 
         !LTP<
@@ -574,5 +574,5 @@
         ! en conservant la proportion liquide / glace
      
-         IF (zqevt+zqevti.GT.zqev0) THEN
+         IF (zqevt+zqevti>zqev0) THEN
             zqev=zqev0*zqevt/(zqevt+zqevti)
             zqevi=zqev0*zqevti/(zqevt+zqevti)
@@ -583,5 +583,5 @@
 !            zqev=zqevt
 !            zqevi=zqevti
-             IF (zqevt+zqevti.GT.0.) THEN
+             IF (zqevt+zqevti>0.) THEN
                 zqev=MIN(zqev0*zqevt/(zqevt+zqevti),zqevt)
                 zqevi=MIN(zqev0*zqevti/(zqevt+zqevti),zqevti)
@@ -601,5 +601,5 @@
          zq(i) = zq(i) - (zrfln(i)+zifln(i)-zrfl(i)-zifl(i)) &
                   * (RG/(paprs(i,k)-paprs(i,k+1)))*dtime
-       if (fl_cor_ebil .GT. 0) then ! avec correction thermalisation des precips
+       if (fl_cor_ebil > 0) then ! avec correction thermalisation des precips
          zmqc(i) = zmqc(i) + (zrfln(i)+zifln(i)-zrfl(i)-zifl(i)) &
                   * (RG/(paprs(i,k)-paprs(i,k+1)))*dtime
@@ -626,5 +626,5 @@
                 zrflclr(i) = zrfl(i)
                 ziflclr(i) = zifl(i)    
-                IF(zrflclr(i) + ziflclr(i) .LE. 0) THEN
+                IF(zrflclr(i) + ziflclr(i) <= 0) THEN
                         znebprecipclr(i) = 0.
                 ENDIF   
@@ -652,5 +652,5 @@
                    zrfl(i)=zrfl(i)+zmelt*zifl(i)
            ENDIF
-           if (fl_cor_ebil .LE. 0) then
+           if (fl_cor_ebil <= 0) then
              ! the following line should not be here. Indeed, if zifl is modified
              ! now, zifl(i)*zmelt is no more the amount of ice that has melt
@@ -659,5 +659,5 @@
            end if
            ! Chaleur latente de fusion
-        if (fl_cor_ebil .GT. 0) then ! avec correction thermalisation des precips
+        if (fl_cor_ebil > 0) then ! avec correction thermalisation des precips
            zt(i)=zt(i)-zifl(i)*zmelt*(RG*dtime)/(paprs(i,k)-paprs(i,k+1)) &
                       *RLMLT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
@@ -666,5 +666,5 @@
                       *RLMLT/RCPD/(1.0+RVTMP2*zq(i))
         end if
-           if (fl_cor_ebil .GT. 0) then ! correction bug, deplacement ligne precedente
+           if (fl_cor_ebil > 0) then ! correction bug, deplacement ligne precedente
 !<LTP
              IF (iflag_evap_prec==4) THEN
@@ -698,5 +698,5 @@
            zdelta = MAX(0.,SIGN(1.,RTT-zt(i)))
            zcvm5 = R5LES*RLVTT*(1.-zdelta) + R5IES*RLSTT*zdelta
-       if  (fl_cor_ebil .GT. 0) then ! nouveau
+       if  (fl_cor_ebil > 0) then ! nouveau
            zcvm5 = zcvm5 /RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
        else    
@@ -713,5 +713,5 @@
      ELSE
         DO i = 1, klon
-           IF (zt(i).LT.t_coup) THEN
+           IF (zt(i)<t_coup) THEN
               zqs(i) = qsats(zt(i))/pplay(i,k)
               zdqs(i) = dqsats(zt(i),zqs(i))
@@ -761,5 +761,5 @@
         ! P2.A.0> Calcul des grandeurs nuageuses une pdf en creneau
         ! ----------------------------------------------------------------
-        if (iflag_pdf.eq.0) then
+        if (iflag_pdf==0) then
 
            ! version creneau de (Li, 1998)
@@ -776,5 +776,5 @@
            ! ----------------------------------------------------------------
            do i=1,klon
-              if(zq(i).lt.1.e-15) then
+              if(zq(i)<1.e-15) then
                  ncoreczq=ncoreczq+1
                  zq(i)=1.e-15
@@ -851,5 +851,5 @@
 
 !Boucle iterative: ATTENTION, l'option -1 n'est plus activable ici
-           if (iflag_fisrtilp_qsat.ge.0) then
+           if (iflag_fisrtilp_qsat>=0) then
              ! Iteration pour condensation avec variation de qsat(T) 
              ! -----------------------------------------------------
@@ -860,6 +860,6 @@
                  ! !! convergence = .true. tant que l'on n'a pas converge !!
                  ! ------------------------------
-                 convergence(i)=abs(DT(i)).gt.DDT0
-                 if ((convergence(i).or.(n_i(i).eq.0)).and.lognormale(i)) then
+                 convergence(i)=abs(DT(i))>DDT0
+                 if ((convergence(i).or.(n_i(i)==0)).and.lognormale(i)) then
                  ! si on n'a pas converge
                  !
@@ -876,8 +876,8 @@
                     zdelta = MAX(0.,SIGN(1.,RTT-Tbef(i)))
                  else
-                    if (iflag_t_glace.eq.0) then
+                    if (iflag_t_glace==0) then
                     zdelta = MAX(0.,SIGN(1.,t_glace_min_old-Tbef(i)))
-                    else if (iflag_t_glace.ge.1) then
-                       if (iflag_oldbug_fisrtilp.EQ.0) then
+                    else if (iflag_t_glace>=1) then
+                       if (iflag_oldbug_fisrtilp==0) then
                           zdelta = MAX(0.,SIGN(1.,t_glace_max-Tbef(i)))
                        else
@@ -889,5 +889,5 @@
                  ! Calcul de rneb, qzn et zcond pour les PDF lognormales
                  zcvm5 = R5LES*RLVTT*(1.-zdelta) + R5IES*RLSTT*zdelta
-               if (fl_cor_ebil .GT. 0) then
+               if (fl_cor_ebil > 0) then
                  zcvm5 = zcvm5 /RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
                else
@@ -911,5 +911,5 @@
                  zpdf_e2(i)=1.-erf(zpdf_e2(i))
              
-                 if (zpdf_e1(i).lt.1.e-10) then
+                 if (zpdf_e1(i)<1.e-10) then
                     rneb(i,k)=0.
                     zqn(i)=zqs(i)
@@ -938,8 +938,8 @@
                  ! --------------------------
                  do i=1,klon
-                 if ((convergence(i).or.(n_i(i).eq.0)).and.lognormale(i)) then
+                 if ((convergence(i).or.(n_i(i)==0)).and.lognormale(i)) then
 
                  qlbef(i)=max(0.,zqn(i)-zqs(i))
-               if (fl_cor_ebil .GT. 0) then
+               if (fl_cor_ebil > 0) then
                  num=-Tbef(i)+zt(i)+rneb(i,k)*RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))*qlbef(i)
                else
@@ -954,12 +954,12 @@
                  else ! if (.not. ice_thermo)
                  ! --------------------------
-                 if (iflag_t_glace.ge.1) then
+                 if (iflag_t_glace>=1) then
                  CALL icefrac_lsc(klon,zt(:),pplay(:,k)/paprs(:,1),zfice(:))
                  endif
 
                  do i=1,klon
-                 if ((convergence(i).or.(n_i(i).eq.0)).and.lognormale(i)) then
+                 if ((convergence(i).or.(n_i(i)==0)).and.lognormale(i)) then
                  
-                 if (iflag_t_glace.eq.0) then
+                 if (iflag_t_glace==0) then
                     zfice(i) = 1.0 - (Tbef(i)-t_glace_min_old) / (RTT-t_glace_min_old)
                     zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
@@ -969,14 +969,14 @@
                  endif
                  
-                 if (iflag_t_glace.ge.1.and.zfice(i)>0.) then
+                 if (iflag_t_glace>=1.and.zfice(i)>0.) then
                  dzfice(i)= exposant_glace * zfice(i)**(exposant_glace-1) &
           &                    / (t_glace_min - t_glace_max)
                  endif
                
-                 if ((zfice(i).eq.0).or.(zfice(i).eq.1)) then
+                 if ((zfice(i)==0).or.(zfice(i)==1)) then
                     dzfice(i)=0.
                  endif
 
-                 if (zfice(i).lt.1) then
+                 if (zfice(i)<1) then
                     cste=RLVTT
                  else
@@ -985,5 +985,5 @@
 
                  qlbef(i)=max(0.,zqn(i)-zqs(i))
-               if (fl_cor_ebil .GT. 0) then
+               if (fl_cor_ebil > 0) then
                  num = -Tbef(i)+zt(i)+rneb(i,k)*((1-zfice(i))*RLVTT &
            &          +zfice(i)*RLSTT)/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))*qlbef(i)
@@ -1020,12 +1020,12 @@
 ! pour la re-activer, prendre iflag_fisrtilp_qsat=0 et
 ! activer les lignes suivantes: 
-       IF (1.eq.0) THEN 
+       IF (1==0) THEN
        DO i=1,klon
-           IF (rneb(i,k) .LE. 0.0) THEN
+           IF (rneb(i,k) <= 0.0) THEN
               zqn(i) = 0.0
               rneb(i,k) = 0.0
               zcond(i) = 0.0
               rhcl(i,k)=zq(i)/zqs(i)
-           ELSE IF (rneb(i,k) .GE. 1.0) THEN
+           ELSE IF (rneb(i,k) >= 1.0) THEN
               zqn(i) = zq(i)
               rneb(i,k) = 1.0                 
@@ -1055,10 +1055,10 @@
         ! et de l'humidite relative ciel-clair (rhcl)
         DO i=1,klon
-           IF (rneb(i,k) .LE. 0.0) THEN
+           IF (rneb(i,k) <= 0.0) THEN
               zqn(i) = 0.0
               rneb(i,k) = 0.0
               zcond(i) = 0.0
               rhcl(i,k)=zq(i)/zqs(i)
-           ELSE IF (rneb(i,k) .GE. 1.0) THEN
+           ELSE IF (rneb(i,k) >= 1.0) THEN
               zqn(i) = zq(i)
               rneb(i,k) = 1.0
@@ -1086,5 +1086,5 @@
         ! note JLD: attention, rhcl non calcule. Ca peut avoir des consequences?
         DO i = 1, klon
-           IF (zq(i).GT.zqs(i)) THEN
+           IF (zq(i)>zqs(i)) THEN
               rneb(i,k) = 1.0
            ELSE
@@ -1109,11 +1109,11 @@
      !
      IF (.NOT. ice_thermo) THEN
-        if (iflag_fisrtilp_qsat.lt.1) then
+        if (iflag_fisrtilp_qsat<1) then
            DO i = 1, klon
              zt(i) = zt(i) + zcond(i) * RLVTT/RCPD/(1.0+RVTMP2*zq(i))
            ENDDO
-        else if (iflag_fisrtilp_qsat.gt.0) then
+        else if (iflag_fisrtilp_qsat>0) then
            DO i= 1, klon
-    if (fl_cor_ebil .GT. 0) then
+    if (fl_cor_ebil > 0) then
              zt(i) = zt(i) + zcond(i) * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i)))
     else
@@ -1123,13 +1123,13 @@
         endif
      ELSE
-         if (iflag_t_glace.ge.1) then
+         if (iflag_t_glace>=1) then
             CALL icefrac_lsc(klon,zt(:),pplay(:,k)/paprs(:,1),zfice(:))
          endif
-         if (iflag_fisrtilp_qsat.lt.1) then
+         if (iflag_fisrtilp_qsat<1) then
            DO i = 1, klon
 ! JBM: icefrac_lsc is now a function contained in icefrac_lsc_mod
 !              zfice(i) = icefrac_lsc(zt(i), t_glace_min, &
 !                                     t_glace_max, exposant_glace)
-              if (iflag_t_glace.eq.0) then
+              if (iflag_t_glace==0) then
                     zfice(i) = 1.0 - (zt(i)-t_glace_min_old) / (RTT-t_glace_min_old)
                     zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
@@ -1144,10 +1144,10 @@
 !              zfice(i) = icefrac_lsc(zt(i), t_glace_min, &
 !                                     t_glace_max, exposant_glace)
-              if (iflag_t_glace.eq.0) then
+              if (iflag_t_glace==0) then
                     zfice(i) = 1.0 - (zt(i)-t_glace_min_old) / (RTT-t_glace_min_old)
                     zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
                     zfice(i) = zfice(i)**exposant_glace_old
               endif
-        if (fl_cor_ebil .GT. 0) then
+        if (fl_cor_ebil > 0) then
               zt(i) = zt(i) + (1.-zfice(i))*zcond(i) & 
            &             * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i))) &
@@ -1188,5 +1188,5 @@
                 !1) Cloudy to clear air
                 d_znebprecip_cld_clr(i) = znebprecipcld(i) - min(rneb(i,k),znebprecipcld(i)) 
-                IF (znebprecipcld(i) .GT. 0) THEN
+                IF (znebprecipcld(i) > 0) THEN
                         d_zrfl_cld_clr(i) = d_znebprecip_cld_clr(i)/znebprecipcld(i)*zrflcld(i) 
                         d_zifl_cld_clr(i) = d_znebprecip_cld_clr(i)/znebprecipcld(i)*ziflcld(i) 
@@ -1199,5 +1199,5 @@
                 d_znebprecip_clr_cld(i) = max(0., min(znebprecipclr(i), rneb(i,k) &
                         - d_tot_zneb(i) - zneb(i)))
-                IF (znebprecipclr(i) .GT. 0) THEN
+                IF (znebprecipclr(i) > 0) THEN
                         d_zrfl_clr_cld(i) = d_znebprecip_clr_cld(i)/znebprecipclr(i)*zrflclr(i) 
                         d_zifl_clr_cld(i) = d_znebprecip_clr_cld(i)/znebprecipclr(i)*ziflclr(i)
@@ -1224,5 +1224,5 @@
      ! Initialisation de zoliq (eau condensee moyenne dans la maille)
      DO i = 1, klon
-        IF (rneb(i,k).GT.0.0) THEN
+        IF (rneb(i,k)>0.0) THEN
            zoliq(i) = zcond(i)
            zrho(i) = pplay(i,k) / zt(i) / RD
@@ -1232,7 +1232,7 @@
 !AJ<
      IF (.NOT. ice_thermo) THEN
-       IF (iflag_t_glace.EQ.0) THEN
+       IF (iflag_t_glace==0) THEN
          DO i = 1, klon
-            IF (rneb(i,k).GT.0.0) THEN
+            IF (rneb(i,k)>0.0) THEN
                zfice(i) = 1.0 - (zt(i)-t_glace_min_old) / (273.13-t_glace_min_old)
                zfice(i) = MIN(MAX(zfice(i),0.0),1.0)
@@ -1261,5 +1261,5 @@
      ! ----------------------------------------------------------------
      DO i = 1, klon
-        IF (rneb(i,k).GT.0.0) THEN
+        IF (rneb(i,k)>0.0) THEN
            zneb(i) = MAX(rneb(i,k), seuil_neb)
      !      zt(i) = zt(i)+zcond(i)*zfice(i)*RLMLT/RCPD/(1.0+RVTMP2*zq(i))  
@@ -1272,10 +1272,10 @@
      DO n = 1, ninter
         DO i = 1, klon
-           IF (rneb(i,k).GT.0.0) THEN
+           IF (rneb(i,k)>0.0) THEN
               zrhol(i) = zrho(i) * zoliq(i) / zneb(i)
               ! Initialization of zpluie and zice:
               zpluie=0
               zice=0
-              IF (zneb(i).EQ.seuil_neb) THEN
+              IF (zneb(i)==seuil_neb) THEN
                  ztot = 0.0
               ELSE
@@ -1337,5 +1337,5 @@
      IF (.NOT. ice_thermo) THEN
        DO i = 1, klon
-         IF (rneb(i,k).GT.0.0) THEN
+         IF (rneb(i,k)>0.0) THEN
            d_ql(i,k) = zoliq(i)
            zrfl(i) = zrfl(i)+ MAX(zcond(i)-zoliq(i),0.0) &
@@ -1356,10 +1356,10 @@
 ! La vapeur d'eau est augmentee.
 !
-       IF ((iflag_bergeron .EQ. 2)) THEN
+       IF ((iflag_bergeron == 2)) THEN
          DO i = 1, klon
-           IF (rneb(i,k) .GT. 0.0) THEN
+           IF (rneb(i,k) > 0.0) THEN
              zqpreci(i)=(zcond(i)-zoliq(i))*zfice(i)
              zqprecl(i)=(zcond(i)-zoliq(i))*(1.-zfice(i))
-           if (fl_cor_ebil .GT. 0) then
+           if (fl_cor_ebil > 0) then
              zcp=RCPD*(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i)))
              coef1 = rneb(i,k)*RLSTT/zcp*zdqsdT_raw(i)
@@ -1395,5 +1395,5 @@
          ENDDO
          DO i = 1, klon
-           IF (rneb(i,k).GT.0.0) THEN
+           IF (rneb(i,k)>0.0) THEN
              d_ql(i,k) = (1-zfice(i))*zoliq(i)
              d_qi(i,k) = zfice(i)*zoliq(i)
@@ -1423,5 +1423,5 @@
 !!
        DO i = 1, klon
-         IF (rneb(i,k).GT.0.0) THEN
+         IF (rneb(i,k)>0.0) THEN
 !CR on prend en compte la phase glace
 !JLD inutile car on ne passe jamais ici si .not.ice_thermo
@@ -1456,5 +1456,5 @@
 
 !CR : on prend en compte l'effet Bergeron dans les flux de precipitation
-           IF ((iflag_bergeron .EQ. 1) .AND. (zt(i) .LT. 273.15)) THEN
+           IF ((iflag_bergeron == 1) .AND. (zt(i) < 273.15)) THEN
 !<LTP
                 IF (iflag_evap_prec == 4) THEN
@@ -1473,5 +1473,5 @@
                  ENDIF!iflag_evap_prec==4
 
-           if (fl_cor_ebil .GT. 0) then
+           if (fl_cor_ebil > 0) then
               zt(i)=zt(i)+zsolid*(RG*dtime)/(paprs(i,k)-paprs(i,k+1)) &
                       *(RLSTT-RLVTT)/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
@@ -1510,5 +1510,5 @@
     IF (iflag_evap_prec==4) THEN
         DO i=1, klon
-            IF (zrflclr(i) + ziflclr(i) .GT. 0 ) THEN
+            IF (zrflclr(i) + ziflclr(i) > 0 ) THEN
                znebprecipclr(i) = min(znebprecipclr(i), max(zrflclr(i) &
                     /(znebprecipclr(i)*rain_int_min), &
@@ -1518,5 +1518,5 @@
             ENDIF
 
-            IF (zrflcld(i) + ziflcld(i) .GT. 0 ) THEN
+            IF (zrflcld(i) + ziflcld(i) > 0 ) THEN
                znebprecipcld(i) = min(znebprecipcld(i), &
                     max(zrflcld(i)/(znebprecipcld(i)*rain_int_min), &
@@ -1536,5 +1536,5 @@
      IF (.NOT. ice_thermo) THEN
        DO i = 1, klon
-         IF (zt(i).LT.RTT) THEN
+         IF (zt(i)<RTT) THEN
            psfl(i,k)=zrfl(i)
          ELSE
@@ -1571,5 +1571,5 @@
      DO i = 1,klon
         !
-        if(zcond(i).gt.zoliq(i)+1.e-10) then
+        if(zcond(i)>zoliq(i)+1.e-10) then
          beta(i,k) = (zcond(i)-zoliq(i))/zcond(i)/dtime
         else
@@ -1578,8 +1578,8 @@
         zprec_cond(i) = MAX(zcond(i)-zoliq(i),0.0) &
              * (paprs(i,k)-paprs(i,k+1))/RG
-        IF (rneb(i,k).GT.0.0.and.zprec_cond(i).gt.0.) THEN
+        IF (rneb(i,k)>0.0.and.zprec_cond(i)>0.) THEN
            !AA lessivage nucleation LMD5 dans la couche elle-meme
-          IF (iflag_t_glace.EQ.0) THEN
-           if (t(i,k) .GE. t_glace_min_old) THEN
+          IF (iflag_t_glace==0) THEN
+           if (t(i,k) >= t_glace_min_old) THEN
               zalpha_tr = a_tr_sca(3)
            else
@@ -1587,5 +1587,5 @@
            endif
           ELSE ! of IF (iflag_t_glace.EQ.0)
-           if (t(i,k) .GE. t_glace_min) THEN
+           if (t(i,k) >= t_glace_min) THEN
               zalpha_tr = a_tr_sca(3)
            else
@@ -1607,7 +1607,7 @@
      DO kk = k-1, 1, -1
         DO i = 1, klon
-           IF (rneb(i,k).GT.0.0.and.zprec_cond(i).gt.0.) THEN
-             IF (iflag_t_glace.EQ.0) THEN
-              if (t(i,kk) .GE. t_glace_min_old) THEN
+           IF (rneb(i,k)>0.0.and.zprec_cond(i)>0.) THEN
+             IF (iflag_t_glace==0) THEN
+              if (t(i,kk) >= t_glace_min_old) THEN
                  zalpha_tr = a_tr_sca(1)
               else
@@ -1615,5 +1615,5 @@
               endif
              ELSE ! of IF (iflag_t_glace.EQ.0)
-              if (t(i,kk) .GE. t_glace_min) THEN
+              if (t(i,kk) >= t_glace_min) THEN
                  zalpha_tr = a_tr_sca(1)
               else
@@ -1639,5 +1639,5 @@
   IF (.NOT.ice_thermo) THEN
   DO i = 1, klon
-     IF ((t(i,1)+d_t(i,1)) .LT. RTT) THEN
+     IF ((t(i,1)+d_t(i,1)) < RTT) THEN
 !AJ<
 !        snow(i) = zrfl(i)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_poprecip.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_poprecip.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_poprecip.F90	(revision 5082)
@@ -151,5 +151,5 @@
   ! such as eps or thresh_precip_frac, to remove the senseless barrier in the formulas
   ! of evap / sublim
-  IF ( ( ( rain(i) + snow(i) ) .GT. 0. ) .AND. ( precipfracclr(i) .GT. 0. ) ) THEN
+  IF ( ( ( rain(i) + snow(i) ) > 0. ) .AND. ( precipfracclr(i) > 0. ) ) THEN
 
     IF ( ok_corr_vap_evasub ) THEN
@@ -210,5 +210,5 @@
     !--If activates if the total is LOWER than the max because
     !--everything is negative
-    IF ( dprecip_evasub_tot .LT. dprecip_evasub_max ) THEN
+    IF ( dprecip_evasub_tot < dprecip_evasub_max ) THEN
       draineva = dprecip_evasub_max * draineva / dprecip_evasub_tot
       dsnowsub = dprecip_evasub_max * dsnowsub / dprecip_evasub_tot
@@ -240,5 +240,5 @@
     !--If there is no more precip fluxes, the precipitation fraction in clear
     !--sky is set to 0
-    IF ( ( rainclr(i) + snowclr(i) ) .LE. 0. ) precipfracclr(i) = 0.
+    IF ( ( rainclr(i) + snowclr(i) ) <= 0. ) precipfracclr(i) = 0.
 
     !--Calculation of the total fluxes
@@ -246,5 +246,5 @@
     snow(i) = snowclr(i) + snowcld(i)
 
-  ELSEIF ( ( rain(i) + snow(i) ) .LE. 0. ) THEN
+  ELSEIF ( ( rain(i) + snow(i) ) <= 0. ) THEN
 
     !--If no precip, we reinitialize the cloud fraction used for the precip to 0 
@@ -444,5 +444,5 @@
 
 
-  IF ( precipfraccld(i) .GT. ( 1. - eps ) ) THEN
+  IF ( precipfraccld(i) > ( 1. - eps ) ) THEN
     precipfractot = 1.
   ELSE
@@ -469,10 +469,10 @@
 
   !--If the cloud extends
-  IF ( dprecipfraccld .GT. 0. ) THEN
+  IF ( dprecipfraccld > 0. ) THEN
     !--If there is no CS precip, nothing happens.
     !--If there is, we reattribute some of the CS precip flux
     !--to the cloud precip flux, proportionnally to the
     !--decrease of the CS precip fraction
-    IF ( precipfracclr(i) .LE. 0. ) THEN
+    IF ( precipfracclr(i) <= 0. ) THEN
       drainclr = 0.
       dsnowclr = 0.
@@ -482,5 +482,5 @@
     ENDIF
   !--If the cloud narrows
-  ELSEIF ( dprecipfraccld .LT. 0. ) THEN
+  ELSEIF ( dprecipfraccld < 0. ) THEN
     !--We reattribute some of the cloudy precip flux
     !--to the CS precip flux, proportionnally to the
@@ -510,5 +510,5 @@
   !--surface fraction (which is larger and artificially
   !--reduces the in-cloud water).
-  IF ( ( iflag_cloudth_vert .GE. 3 ) .AND. ( iflag_rain_incloud_vol .EQ. 1 ) ) THEN
+  IF ( ( iflag_cloudth_vert >= 3 ) .AND. ( iflag_rain_incloud_vol == 1 ) ) THEN
     eff_cldfra = ctot_vol(i)
   ELSE
@@ -521,5 +521,5 @@
   !--If the cloud is big enough, the precipitation processes activate
   ! TODO met on seuil_neb ici ?
-  IF ( cldfra(i) .GE. seuil_neb ) THEN
+  IF ( cldfra(i) >= seuil_neb ) THEN
 
     !---------------------------------------------------------
@@ -546,5 +546,5 @@
     Eff_rain_liq = 1.
     coef_col = gamma_col * 3. / 4. / rho_rain / r_rain * Eff_rain_liq
-    IF ( raincld(i) .GT. 0. ) THEN
+    IF ( raincld(i) > 0. ) THEN
       !--Exact explicit version, which does not need a barrier because of
       !--the exponential decrease
@@ -569,5 +569,5 @@
     rho_snow = 1.e3 * 0.178 * ( r_snow * 2. * 1000. )**(-0.922)
     coef_agg = gamma_agg * 3. / 4. / rho_snow / r_snow * Eff_snow_ice
-    IF ( snowcld(i) .GT. 0. ) THEN
+    IF ( snowcld(i) > 0. ) THEN
       !--Exact explicit version, which does not need a barrier because of
       !--the exponential decrease
@@ -663,5 +663,5 @@
     rho_snow = 1.e3 * 0.178 * ( r_snow * 2. * 1000. )**(-0.922)
     coef_rim = gamma_rim * 3. / 4. / rho_snow / r_snow * Eff_snow_liq
-    IF ( snowcld(i) .GT. 0. ) THEN
+    IF ( snowcld(i) > 0. ) THEN
       !--Exact version, which does not need a barrier because of
       !--the exponential decrease
@@ -710,5 +710,5 @@
   !--nb_snowflake        : number of snowflakes (in clear/cloudy air) [-]
 
-  IF ( ( snowclr(i) + snowcld(i) ) .GT. 0. ) THEN
+  IF ( ( snowclr(i) + snowcld(i) ) > 0. ) THEN
     !--Computed according to
     !--Cpdry * Delta T * (1 + (Cpvap/Cpdry - 1) * qtot) = Lfusion * Delta q
@@ -728,5 +728,5 @@
 
     !--In clear air
-    IF ( ( snowclr(i) .GT. 0. ) .AND.  ( precipfracclr(i) .GT. 0. ) ) THEN
+    IF ( ( snowclr(i) > 0. ) .AND.  ( precipfracclr(i) > 0. ) ) THEN
       !--Formula for the wet-bulb temperature from ECMWF (IFS)
       !--The vapor used is the vapor in the clear sky
@@ -749,5 +749,5 @@
 
     !--In cloudy air
-    IF ( ( snowcld(i) .GT. 0. ) .AND. ( precipfraccld(i) .GT. 0. ) ) THEN
+    IF ( ( snowcld(i) > 0. ) .AND. ( precipfraccld(i) > 0. ) ) THEN
       !--As the air is saturated, the wet-bulb temperature is equal to the
       !--temperature
@@ -771,5 +771,5 @@
     !--because everything is negative
     dqstotmelt = dqsclrmelt + dqscldmelt
-    IF ( dqstotmelt .LT. dqsmelt_max ) THEN
+    IF ( dqstotmelt < dqsmelt_max ) THEN
       !--We redistribute the max melted snow keeping
       !--the clear/cloud partition of the melted snow
@@ -820,5 +820,5 @@
   !--temp_nowater : temperature below which no liquid water exists [K] (about -40 degC)
 
-  IF ( ( rainclr(i) + raincld(i) ) .GT. 0. ) THEN
+  IF ( ( rainclr(i) + raincld(i) ) > 0. ) THEN
 
  
@@ -834,6 +834,6 @@
     dqrtotfreez_step1 = 0.
 
-    IF ( ( qice(i) .GT. 0. ) .AND. ( cldfra(i) .GT. 0. ) .AND. &
-         ( raincld(i) .GT. 0. ) .AND. ( precipfraccld(i) .GT. 0. ) ) THEN
+    IF ( ( qice(i) > 0. ) .AND. ( cldfra(i) > 0. ) .AND. &
+         ( raincld(i) > 0. ) .AND. ( precipfraccld(i) > 0. ) ) THEN
       dqrclrfreez = 0.
       dqrcldfreez = 0.
@@ -897,5 +897,5 @@
 
     !--In clear air
-    IF ( rainclr(i) .GT. 0. ) THEN
+    IF ( rainclr(i) > 0. ) THEN
       !--Exact solution of dqrain/dt = -qrain/tau_freez
       dqrclrfreez = rainclr(i) / dhum_to_dflux(i) * ( EXP( - dtime / tau_freez ) - 1. )
@@ -903,5 +903,5 @@
 
     !--In cloudy air
-    IF ( raincld(i) .GT. 0. ) THEN
+    IF ( raincld(i) > 0. ) THEN
       !--Exact solution of dqrain/dt = -qrain/tau_freez
       dqrcldfreez = raincld(i) / dhum_to_dflux(i) * ( EXP( - dtime / tau_freez ) - 1. )
@@ -913,5 +913,5 @@
     dqrtotfreez_step2 = dqrclrfreez + dqrcldfreez
   
-    IF ( dqrtotfreez_step2 .LT. dqrfreez_max ) THEN
+    IF ( dqrtotfreez_step2 < dqrfreez_max ) THEN
       !--We redistribute the max freezed rain keeping
       !--the clear/cloud partition of the freezing rain
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_tools.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_tools.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_tools.F90	(revision 5082)
@@ -49,7 +49,7 @@
         phpa=pres(i)/100.    ! pressure in hPa
 
-    IF (iflag_vice .EQ. 1) THEN
+    IF (iflag_vice == 1) THEN
         ! so-called 'empirical parameterization' in Stubenrauch et al. 2019
-        if (tempc .GE. -60.0) then
+        if (tempc >= -60.0) then
 
             logvm= -0.0000414122*tempc*tempc*log(iwcg)-0.00538922*tempc*log(iwcg) &
@@ -62,5 +62,5 @@
         velo(i)=fallv_tun*velo(i)/100.0 ! from cm/s to m/s
 
-    ELSE IF (iflag_vice .EQ. 2) THEN
+    ELSE IF (iflag_vice == 2) THEN
         ! so called  PSDM empirical coherent bulk ice scheme in Stubenrauch et al. 2019
         aice=0.587
@@ -136,10 +136,10 @@
     CHARACTER (len = 80) :: abort_message
 
-    IF ((iflag_t_glace.LT.2)) THEN !.OR. (iflag_t_glace.GT.6)) THEN
+    IF ((iflag_t_glace<2)) THEN !.OR. (iflag_t_glace.GT.6)) THEN
        abort_message = 'lscp cannot be used if iflag_t_glace<2 or >6'
        CALL abort_physic(modname,abort_message,1)
     ENDIF
 
-    IF (.NOT.((iflag_ice_thermo .EQ. 1).OR.(iflag_ice_thermo .GE. 3))) THEN
+    IF (.NOT.((iflag_ice_thermo == 1).OR.(iflag_ice_thermo >= 3))) THEN
        abort_message = 'lscp cannot be used without ice thermodynamics'
        CALL abort_physic(modname,abort_message,1)
@@ -150,14 +150,14 @@
  
         ! old function with sole dependence upon temperature
-        IF (iflag_t_glace .EQ. 2) THEN
+        IF (iflag_t_glace == 2) THEN
             liqfrac_tmp = (temp(i)-t_glace_min) / (t_glace_max-t_glace_min)
             liqfrac_tmp = MIN(MAX(liqfrac_tmp,0.0),1.0)
             icefrac(i) = (1.0-liqfrac_tmp)**exposant_glace
-            IF (icefrac(i) .GT.0.) THEN
+            IF (icefrac(i) >0.) THEN
                  dicefracdT(i)= exposant_glace * (icefrac(i)**(exposant_glace-1.)) &
                            / (t_glace_min - t_glace_max)
             ENDIF
 
-            IF ((icefrac(i).EQ.0).OR.(icefrac(i).EQ.1)) THEN
+            IF ((icefrac(i)==0).OR.(icefrac(i)==1)) THEN
                  dicefracdT(i)=0.
             ENDIF
@@ -166,9 +166,9 @@
 
         ! function of temperature used in CMIP6 physics
-        IF (iflag_t_glace .EQ. 3) THEN
+        IF (iflag_t_glace == 3) THEN
             liqfrac_tmp = (temp(i)-t_glace_min) / (t_glace_max-t_glace_min)
             liqfrac_tmp = MIN(MAX(liqfrac_tmp,0.0),1.0)
             icefrac(i) = 1.0-liqfrac_tmp**exposant_glace
-            IF ((icefrac(i) .GT.0.) .AND. (liqfrac_tmp .GT. 0.)) THEN
+            IF ((icefrac(i) >0.) .AND. (liqfrac_tmp > 0.)) THEN
                 dicefracdT(i)= exposant_glace * ((liqfrac_tmp)**(exposant_glace-1.)) &
                           / (t_glace_min - t_glace_max)
@@ -182,5 +182,5 @@
 
         !with linear function of temperature at cloud top
-        IF (iflag_t_glace .EQ. 4) THEN  
+        IF (iflag_t_glace == 4) THEN
                 liqfrac_tmp = (temp(i)-t_glace_min) / (t_glace_max-t_glace_min)
                 liqfrac_tmp = MIN(MAX(liqfrac_tmp,0.0),1.0)
@@ -188,5 +188,5 @@
                 dicefrac_tmp = - temp(i)/(t_glace_max-t_glace_min)
                 dicefracdT(i) = dicefrac_tmp*exp(-distcltop(i)/dist_liq)
-                IF ((liqfrac_tmp .LE.0) .OR. (liqfrac_tmp .GE. 1)) THEN
+                IF ((liqfrac_tmp <=0) .OR. (liqfrac_tmp >= 1)) THEN
                         dicefracdT(i) = 0.
                 ENDIF
@@ -194,10 +194,10 @@
 
         ! with CMIP6 function of temperature at cloud top
-        IF ((iflag_t_glace .EQ. 5) .OR. (iflag_t_glace .EQ. 7)) THEN 
+        IF ((iflag_t_glace == 5) .OR. (iflag_t_glace == 7)) THEN
                 liqfrac_tmp = (temp(i)-t_glace_min) / (t_glace_max-t_glace_min)
                 liqfrac_tmp =  MIN(MAX(liqfrac_tmp,0.0),1.0)
                 liqfrac_tmp = liqfrac_tmp**exposant_glace
                 icefrac(i)  =  MAX(MIN(1.,1.0 - liqfrac_tmp*exp(-distcltop(i)/dist_liq)),0.)
-                IF ((liqfrac_tmp .LE.0) .OR. (liqfrac_tmp .GE. 1)) THEN
+                IF ((liqfrac_tmp <=0) .OR. (liqfrac_tmp >= 1)) THEN
                         dicefracdT(i) = 0.
                 ELSE
@@ -209,6 +209,6 @@
         ! with modified function of temperature at cloud top 
         ! to get largere values around 260 K, works well with t_glace_min = 241K
-        IF (iflag_t_glace .EQ. 6) THEN 
-                IF (temp(i) .GT. t_glace_max) THEN
+        IF (iflag_t_glace == 6) THEN
+                IF (temp(i) > t_glace_max) THEN
                         liqfrac_tmp = 1.
                 ELSE
@@ -217,5 +217,5 @@
                 liqfrac_tmp  = MIN(MAX(liqfrac_tmp,0.0),1.0)
                 icefrac(i)   = MAX(MIN(1.,1.0 - liqfrac_tmp*exp(-distcltop(i)/dist_liq)),0.)        
-                IF ((liqfrac_tmp .LE.0) .OR. (liqfrac_tmp .GE. 1)) THEN
+                IF ((liqfrac_tmp <=0) .OR. (liqfrac_tmp >= 1)) THEN
                         dicefracdT(i) = 0.
                 ELSE
@@ -226,6 +226,6 @@
 
         ! if temperature of cloud top <-40°C, 
-        IF (iflag_t_glace .GE. 4) THEN
-                IF ((temp_cltop(i) .LE. temp_nowater) .AND. (temp(i) .LE. t_glace_max)) THEN 
+        IF (iflag_t_glace >= 4) THEN
+                IF ((temp_cltop(i) <= temp_nowater) .AND. (temp(i) <= t_glace_max)) THEN
                         icefrac(i) = 1.
                         dicefracdT(i) = 0.
@@ -331,5 +331,5 @@
      ! because cldfra is intent in, but can be locally modified due to test 
      cldfra1D = cldfra(i)
-     IF (cldfra(i) .LE. 0.) THEN
+     IF (cldfra(i) <= 0.) THEN
         qvap_cld(i)   = 0.
         qliq(i)       = 0.
@@ -341,10 +341,10 @@
      ! If there is a cloud
      ELSE
-        IF (cldfra(i) .GE. 1.0) THEN
+        IF (cldfra(i) >= 1.0) THEN
            cldfra1D = 1.0
         END IF
         
         ! T>0°C, no ice allowed
-        IF ( temp(i) .GE. RTT ) THEN
+        IF ( temp(i) >= RTT ) THEN
            qvap_cld(i)   = qsatl(i) * cldfra1D
            qliq(i)       = MAX(0.0,qtot_incl(i)-qsatl(i))  * cldfra1D
@@ -355,5 +355,5 @@
         
         ! T<-38°C, no liquid allowed
-        ELSE IF ( temp(i) .LE. temp_nowater) THEN
+        ELSE IF ( temp(i) <= temp_nowater) THEN
            qvap_cld(i)   = qsati(i) * cldfra1D
            qliq(i)       = 0.
@@ -366,5 +366,5 @@
         ELSE
            ! Not enough TKE     
-           IF ( tke_dissip(i) .LE. eps )  THEN
+           IF ( tke_dissip(i) <= eps )  THEN
               qvap_cld(i)   = qsati(i) * cldfra1D
               qliq(i)       = 0.
@@ -401,5 +401,5 @@
               qsnowcld_incl = snowcld(i) * RG * dtime / ( paprsdn(i) - paprsup(i) ) / cldfra1D
               sursat_env    = max(0., (qtot_incl(i) - qiceini_incl)/qsati(i) - 1.)
-              IF ( qiceini_incl .GT. eps ) THEN
+              IF ( qiceini_incl > eps ) THEN
                 nb_crystals = 1.e3 * 5.94e-5 * ( RTT - temp(i) )**3.33 * naero5**(0.0264*(RTT-temp(i))+0.0033)
                 lambda_PSD  = ( (RPI*rho_ice*nb_crystals*24.) / (6.*(qiceini_incl + gamma_snwretro * qsnowcld_incl)) ) ** (1./3.)
@@ -437,5 +437,5 @@
 
               ai = RG / RD / temp(i) * ( RD * RLSTT / RCPD / RV / temp(i) - 1. )
-              IF ( lmix_mpc .GT. 0 ) THEN 
+              IF ( lmix_mpc > 0 ) THEN
                  tau_mixingenv = ( lmix_mpc**2. / tke_dissip(i) )**(1./3.)
               ELSE 
@@ -467,5 +467,5 @@
               !------------ ICE AMOUNT AND WATER CONSERVATION  ------------
 
-              IF ( (qliq_incl .LE. eps) .OR. (cldfraliq(i) .LE. eps) ) THEN
+              IF ( (qliq_incl <= eps) .OR. (cldfraliq(i) <= eps) ) THEN
                   qliq_incl    = 0.
                   cldfraliq(i) = 0.
@@ -477,10 +477,10 @@
               qvap_incl = MAX(qsati(i), ( 1. - cldfraliq(i) ) * (sursat_iceext + 1.) * qsati(i) + cldfraliq(i) * qsatl(i) )
                
-              IF ( qvap_incl  .GE. qtot_incl(i) ) THEN
+              IF ( qvap_incl  >= qtot_incl(i) ) THEN
                  qvap_incl = qsati(i)
                  qliq_incl = qtot_incl(i) - qvap_incl
                  qice_incl = 0.
 
-              ELSEIF ( (qvap_incl + qliq_incl) .GE. qtot_incl(i) ) THEN
+              ELSEIF ( (qvap_incl + qliq_incl) >= qtot_incl(i) ) THEN
                  qliq_incl = MAX(0.0,qtot_incl(i) - qvap_incl)
                  qice_incl = 0.
@@ -538,7 +538,7 @@
     DO i=1,klon
 
-    IF (phase .EQ. 1) THEN
+    IF (phase == 1) THEN
         delta=0.
-    ELSEIF (phase .EQ. 2) THEN
+    ELSEIF (phase == 2) THEN
         delta=1.
     ELSE
@@ -601,12 +601,12 @@
     DO i=1,klon
 
-        IF (temp(i) .GE. RTT) THEN
+        IF (temp(i) >= RTT) THEN
             ! warm clouds: condensation at saturation wrt liquid
             gammasat(i)=1.
             dgammasatdt(i)=0.
 
-        ELSEIF ((temp(i) .LT. RTT) .AND. (temp(i) .GT. t_glace_min)) THEN
+        ELSEIF ((temp(i) < RTT) .AND. (temp(i) > t_glace_min)) THEN
             
-            IF (iflag_gammasat .GE. 2) THEN          
+            IF (iflag_gammasat >= 2) THEN
                gammasat(i)=qsl(i)/qsi(i)
                dgammasatdt(i)=(dqsl(i)*qsi(i)-dqsi(i)*qsl(i))/qsi(i)/qsi(i)
@@ -618,10 +618,10 @@
         ELSE
 
-            IF (iflag_gammasat .GE.1) THEN
+            IF (iflag_gammasat >=1) THEN
             ! homogeneous freezing of aerosols, according to
             ! Koop, 2000 and Karcher 2008, QJRMS
             ! 'Cirrus regime'
                fcirrus=acirrus-temp(i)/bcirrus
-               IF (fcirrus .GT. qsl(i)/qsi(i)) THEN
+               IF (fcirrus > qsl(i)/qsi(i)) THEN
                   gammasat(i)=qsl(i)/qsi(i)
                   dgammasatdt(i)=(dqsl(i)*qsi(i)-dqsi(i)*qsl(i))/qsi(i)/qsi(i)
@@ -678,5 +678,5 @@
 
           DO kvert=2,klev
-                 IF (kvert.EQ.klev) THEN
+                 IF (kvert==klev) THEN
                        dzlay(i,kvert) = 2*(rd * temp(i,kvert) / rg * log(paprs(i,kvert)/pplay(i,kvert)))
                  ELSE
@@ -690,5 +690,5 @@
    DO i=1,klon
           k_top = k
-          IF (rneb(i,k) .LE. tresh_cl) THEN
+          IF (rneb(i,k) <= tresh_cl) THEN
                  bool_cl = .FALSE.
           ELSE
@@ -696,7 +696,7 @@
           ENDIF
 
-          DO WHILE ((bool_cl) .AND. (k_top .LE. klev))
+          DO WHILE ((bool_cl) .AND. (k_top <= klev))
           ! find cloud top
-                IF (rneb(i,k_top) .GT. tresh_cl) THEN
+                IF (rneb(i,k_top) > tresh_cl) THEN
                       k_top = k_top + 1
                 ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_main.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_main.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_main.F90	(revision 5082)
@@ -71,5 +71,5 @@
 !   ----------------
 !   on ecrase le tableau ratqsc calcule par clouds_gno
-      if (iflag_cld_th.eq.1) then
+      if (iflag_cld_th==1) then
          do k=1,klev
          do i=1,klon
@@ -86,11 +86,11 @@
 !  par nversion de la fonction log normale
 !-----------------------------------------------------------------------
-      else if (iflag_cld_th.eq.4) then
+      else if (iflag_cld_th==4) then
          ptconvth(:,:)=.false.
          ratqsc(:,:)=0.
-         if(prt_level.ge.9) print*,'avant clouds_gno thermique'
+         if(prt_level>=9) print*,'avant clouds_gno thermique'
          call clouds_gno &
          (klon,klev,q_seri,zqsat,clwcon0th,ptconvth,ratqsc,rnebcon0th)
-         if(prt_level.ge.9) print*,' CLOUDS_GNO OK'
+         if(prt_level>=9) print*,' CLOUDS_GNO OK'
        
        endif
@@ -99,5 +99,5 @@
 !   -------------
 
-      if (iflag_ratqs.eq.0) then
+      if (iflag_ratqs==0) then
 
 ! Le cas iflag_ratqs=0 correspond a la version IPCC 2005 du modele.
@@ -116,11 +116,11 @@
 ! avec thermiques.
 
-      else if (iflag_ratqs.eq.1) then
+      else if (iflag_ratqs==1) then
 
          do k=1,klev
             do i=1, klon
-               if (pplay(i,k).ge.60000.) then
+               if (pplay(i,k)>=60000.) then
                   ratqss(i,k)=ratqsbas
-               else if ((pplay(i,k).ge.30000.).and.(pplay(i,k).lt.60000.)) then
+               else if ((pplay(i,k)>=30000.).and.(pplay(i,k)<60000.)) then
                   ratqss(i,k)=ratqsbas+(ratqshaut-ratqsbas)*(60000.-pplay(i,k))/(60000.-30000.)
                else
@@ -130,11 +130,11 @@
          enddo
 
-      else if (iflag_ratqs.eq.2) then
+      else if (iflag_ratqs==2) then
 
          do k=1,klev
             do i=1, klon
-               if (pplay(i,k).ge.60000.) then
+               if (pplay(i,k)>=60000.) then
                   ratqss(i,k)=ratqsbas*(paprs(i,1)-pplay(i,k))/(paprs(i,1)-60000.)
-               else if ((pplay(i,k).ge.30000.).and.(pplay(i,k).lt.60000.)) then
+               else if ((pplay(i,k)>=30000.).and.(pplay(i,k)<60000.)) then
                     ratqss(i,k)=ratqsbas+(ratqshaut-ratqsbas)*(60000.-pplay(i,k))/(60000.-30000.)
                else
@@ -173,5 +173,5 @@
 
 
-       else if (iflag_ratqs .GT. 9) then
+       else if (iflag_ratqs > 9) then
  
        ! interactive ratqs calculations that depend on cold pools, orography, surface heterogeneity and small-scale turbulence
@@ -193,5 +193,5 @@
           enddo
       
-          if (iflag_ratqs .EQ. 10) then 
+          if (iflag_ratqs == 10) then
              ! interactive ratqs in presence of cold pools     
              call ratqs_inter(klon,klev,iflag_ratqs,pdtphys,paprs, &
@@ -205,5 +205,5 @@
              enddo
              ratqss=ratqss+ratqs_inter_
-          else if (iflag_ratqs .EQ. 11) then
+          else if (iflag_ratqs == 11) then
             print*,'avant ratqs_inter'
             ! interactive ratqs with several sources
@@ -213,13 +213,13 @@
                        ratqs_inter_)
              ratqss=ratqss+ratqs_inter_
-          else if (iflag_ratqs .EQ. 12) then
+          else if (iflag_ratqs == 12) then
              ! contribution of surface heterogeneities to ratqs
              call ratqs_hetero(klon,klev,pctsrf,s_pblh,t2m,q2m,t_seri,q_seri,pplay,paprs,ratqs_hetero_)
              ratqss=ratqss+ratqs_hetero_
-          else if (iflag_ratqs .EQ. 13) then
+          else if (iflag_ratqs == 13) then
              ! contribution of ubgrid orography to ratqs
              call ratqs_oro(klon,klev,pctsrf,zstd,zqsat,t_seri,pplay,paprs,ratqs_oro_)
              ratqss=ratqss+ratqs_oro_
-          else if (iflag_ratqs .EQ. 14) then
+          else if (iflag_ratqs == 14) then
              ! effect of subgrid-scale TKE on ratqs (in development)
              call ratqs_tke(klon,klev,pdtphys,t_seri,q_seri,zqsat,pplay,paprs,omega,tke,tke_dissip,lmix,wprime,ratqs_tke_)     
@@ -234,5 +234,5 @@
 !  -----------
 
-      if (iflag_cld_th.eq.1 .or.iflag_cld_th.eq.2.or.iflag_cld_th.eq.4) then
+      if (iflag_cld_th==1 .or.iflag_cld_th==2.or.iflag_cld_th==4) then
 
 ! On ajoute une constante au ratqsc*2 pour tenir compte de 
@@ -248,5 +248,5 @@
 
 !   les ratqs sont une combinaison de ratqss et ratqsc
-       if(prt_level.ge.9) write(lunout,*)'PHYLMD NOUVEAU TAU_RATQS ',tau_ratqs
+       if(prt_level>=9) write(lunout,*)'PHYLMD NOUVEAU TAU_RATQS ',tau_ratqs
 
          if (tau_ratqs>1.e-10) then
@@ -271,5 +271,5 @@
           do k=1,klev
              do i=1,klon
-                if (ratqsc(i,k).gt.1.e-10) then
+                if (ratqsc(i,k)>1.e-10) then
                    ratqs(i,k)=ratqs(i,k)*zfratqs2+(iflag_cld_th/100.)*ratqsc(i,k)*(1.-zfratqs2)
                 endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_multi.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_multi.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_multi.F90	(revision 5082)
@@ -128,5 +128,5 @@
             var_var(i,k) = detr0(i,k)*(varq_therm(i,k)-povariance(i,k))/zmasse(i,k)
             var_det_conv(i,k) =  a_ratqs_cv*(detrain_cv(i,k)/zmasse(i,k))
-            if (sigd(i).ne.0) then
+            if (sigd(i)/=0) then
                var_desc_prec(i,k) = sigd(i)*(1-sigd(i))*(fqd(i,k)*tau_cumul/sigd(i))**2/tau_cumul
             else
@@ -150,5 +150,5 @@
             do i=1,klon
               qd0(:,:) = 0.0
-              if (sigd(i).ne.0) then
+              if (sigd(i)/=0) then
                 qd0(i,k) = fqd(i,k)*tau_cumul/sigd(i) 
               endif
@@ -170,8 +170,8 @@
          do k=1,klev-1
             do i=1,klon
-               if (sigd(i).ne.0) then    ! termes de variance par accumulation
+               if (sigd(i)/=0) then    ! termes de variance par accumulation
                  qd0(i,k) = fqd(i,k)*tau_cumul/sigd(i) 
                endif
-               if (sigt_cv(i,k).ne.0) then
+               if (sigt_cv(i,k)/=0) then
                  q0(i,k) = fqcomp(i,k)*tau_cumul/sigt_cv(i,k)
                endif
@@ -196,5 +196,5 @@
       do k=1,klev
         do i=1,klon
-           if(q_seri(i,k).ge.1E-7) then
+           if(q_seri(i,k)>=1E-7) then
                ratqs_inter_(i,k) = abs(povariance(i,k))**0.5/q_seri(i,k)    
                sigma_therm(i,k) = abs(varq_therm(i,k))**0.5     ! sigma dans les thermiques
@@ -257,5 +257,5 @@
 DO i=1,klon
     temp0=temp(i,1)
-    IF (temp0 .LT. RTT) THEN
+    IF (temp0 < RTT) THEN
         Lvs=RLSTT
     ELSE
@@ -429,5 +429,5 @@
     DO i=1,klon
 
-       IF (temp(i,k) .LT. RTT) THEN
+       IF (temp(i,k) < RTT) THEN
            Lvs=RLSTT
        ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90	(revision 5082)
@@ -29,5 +29,5 @@
 !   Nicolas Rochetin et Jean-Yves Grandpeix
 !         pour la fermeture stochastique. 2012
-!   Frédéric Hourdin :
+!   Fr�d�ric Hourdin :
 !         netoyage informatique. 2022
 !   
@@ -81,14 +81,14 @@
       INTEGER ig,k,l
       integer nsrf
-      real rhobarz0(ngrid)                    ! Densité au LCL
+      real rhobarz0(ngrid)                    ! Densit� au LCL
       logical ok_lcl(ngrid)                   ! Existence du LCL des thermiques
       integer klcl(ngrid)                     ! Niveau du LCL
       real interp(ngrid)                      ! Coef d'interpolation pour le LCL
 !--Triggering
-      real, parameter :: su_cst=4e4              ! Surface unite: celle d'un updraft élémentaire
+      real, parameter :: su_cst=4e4              ! Surface unite: celle d'un updraft �l�mentaire
       real, parameter :: hcoef=1             ! Coefficient directeur pour le calcul de s2
-      real, parameter :: hmincoef=0.3        ! Coefficient directeur pour l'ordonnée à l'origine pour le calcul de s2 
-      real, parameter :: eps1=0.3            ! Fraction de surface occupée par la population 1 : eps1=n1*s1/(fraca0*Sd)
-      real, dimension(ngrid) :: hmin         ! Ordonnée à l'origine pour le calcul de s2
+      real, parameter :: hmincoef=0.3        ! Coefficient directeur pour l'ordonn�e � l'origine pour le calcul de s2 
+      real, parameter :: eps1=0.3            ! Fraction de surface occup�e par la population 1 : eps1=n1*s1/(fraca0*Sd)
+      real, dimension(ngrid) :: hmin         ! Ordonn�e � l'origine pour le calcul de s2
       real, dimension(ngrid) :: zmax_moy     ! Hauteur moyenne des thermiques : zmax_moy = zlcl + 0.33 (zmax-zlcl)
       real, parameter :: zmax_moy_coef=0.33
@@ -100,7 +100,7 @@
       real, dimension(ngrid,nlay) :: pbl_tke_max       ! Profil de TKE moyenne 
       real, dimension(ngrid) :: pbl_tke_max0           ! TKE moyenne au LCL
-      real, dimension(ngrid,nlay) :: w_ls              ! Vitesse verticale grande échelle (m/s)
-      real, parameter :: coef_m=1.            ! On considère un rendement pour alp_bl_fluct_m
-      real, parameter :: coef_tke=1.          ! On considère un rendement pour alp_bl_fluct_tke
+      real, dimension(ngrid,nlay) :: w_ls              ! Vitesse verticale grande �chelle (m/s)
+      real, parameter :: coef_m=1.            ! On consid�re un rendement pour alp_bl_fluct_m
+      real, parameter :: coef_tke=1.          ! On consid�re un rendement pour alp_bl_fluct_tke
       real :: zdp
       real, dimension(ngrid) :: alp_int,dp_int
@@ -137,5 +137,5 @@
     do ig=1,ngrid
       ok_lcl(ig)=.false.
-      if ( (pcon(ig) .gt. pplay(ig,nlay-1)) .and. (pcon(ig) .lt. pplay(ig,1)) ) ok_lcl(ig)=.true.
+      if ( (pcon(ig) > pplay(ig,nlay-1)) .and. (pcon(ig) < pplay(ig,1)) ) ok_lcl(ig)=.true.
     enddo
 
@@ -149,5 +149,5 @@
 !          interp(ig)=(pcon(ig)-pplay(ig,klcl(ig)))/(pplay(ig,klcl(ig)+1)-pplay(ig,klcl(ig)))
 !          endif
-          if ((pplev(ig,l) .ge. pcon(ig)) .and. (pplev(ig,l+1) .le. pcon(ig))) then
+          if ((pplev(ig,l) >= pcon(ig)) .and. (pplev(ig,l+1) <= pcon(ig))) then
           klcl(ig)=l
           interp(ig)=(pcon(ig)-pplev(ig,klcl(ig)))/(pplev(ig,klcl(ig)+1)-pplev(ig,klcl(ig)))
@@ -171,6 +171,6 @@
 !!jyg fin
 
-!------------Calcul des propriétés du thermique au LCL 
-  IF ( (iflag_trig_bl.ge.1) .or. (iflag_clos_bl.ge.1) ) THEN 
+!------------Calcul des propri�t�s du thermique au LCL 
+  IF ( (iflag_trig_bl>=1) .or. (iflag_clos_bl>=1) ) THEN
 
   !-----Initialisation de la TKE moyenne 
@@ -198,15 +198,15 @@
    enddo
 
-!-----Calcul de la TKE transportée par les thermiques : therm_tke_max
+!-----Calcul de la TKE transport�e par les thermiques : therm_tke_max
    call thermcell_tke_transport(ngrid,nlay,ptimestep,fm0,entr0,  &  ! in
   &           rg,pplev,therm_tke_max)                               ! out
 !   print *,' thermcell_tke_transport -> '   !!jyg
 
-!-----Calcul des profils verticaux de TKE hors thermiques : env_tke_max, et de la vitesse verticale grande échelle : W_ls
+!-----Calcul des profils verticaux de TKE hors thermiques : env_tke_max, et de la vitesse verticale grande �chelle : W_ls
    do l=1,nlay
     do ig=1,ngrid
-     pbl_tke_max(ig,l)=fraca(ig,l)*therm_tke_max(ig,l)+(1.-fraca(ig,l))*env_tke_max(ig,l)         !  Recalcul de TKE moyenne aprés transport de TKE_TH
-     env_tke_max(ig,l)=(pbl_tke_max(ig,l)-fraca(ig,l)*therm_tke_max(ig,l))/(1.-fraca(ig,l))       !  Recalcul de TKE dans  l'environnement aprés transport de TKE_TH
-     w_ls(ig,l)=-1.*omega(ig,l)/(RG*rhobarz(ig,l))                                                !  Vitesse verticale de grande échelle
+     pbl_tke_max(ig,l)=fraca(ig,l)*therm_tke_max(ig,l)+(1.-fraca(ig,l))*env_tke_max(ig,l)         !  Recalcul de TKE moyenne apr�s transport de TKE_TH
+     env_tke_max(ig,l)=(pbl_tke_max(ig,l)-fraca(ig,l)*therm_tke_max(ig,l))/(1.-fraca(ig,l))       !  Recalcul de TKE dans  l'environnement apr�s transport de TKE_TH
+     w_ls(ig,l)=-1.*omega(ig,l)/(RG*rhobarz(ig,l))                                                !  Vitesse verticale de grande �chelle
     enddo
    enddo
@@ -227,7 +227,7 @@
      pbl_tke_max0(ig)=pbl_tke_max(ig,klcl(ig))+(pbl_tke_max(ig,klcl(ig)+1) &
  &                   -pbl_tke_max(ig,klcl(ig)))*interp(ig)
-     if (therm_tke_max0(ig).ge.20.) therm_tke_max0(ig)=20.
-     if (env_tke_max0(ig).ge.20.) env_tke_max0(ig)=20.
-     if (pbl_tke_max0(ig).ge.20.) pbl_tke_max0(ig)=20.
+     if (therm_tke_max0(ig)>=20.) therm_tke_max0(ig)=20.
+     if (env_tke_max0(ig)>=20.) env_tke_max0(ig)=20.
+     if (pbl_tke_max0(ig)>=20.) pbl_tke_max0(ig)=20.
    else 
      fraca0(ig)=0.
@@ -243,5 +243,5 @@
 
 !------------Triggering------------------
-  IF (iflag_trig_bl.ge.1) THEN 
+  IF (iflag_trig_bl>=1) THEN
 
 !-----Initialisations
@@ -253,10 +253,10 @@
 
 
-!-----Epaisseur du nuage (depth) et détermination de la queue du spectre de panaches (n2,s2) et du panache le plus gros (s_max)
+!-----Epaisseur du nuage (depth) et d�termination de la queue du spectre de panaches (n2,s2) et du panache le plus gros (s_max)
    do ig=1,ngrid
      zmax_moy(ig)=zlcl(ig)+zmax_moy_coef*(zmax(ig)-zlcl(ig))
      depth(ig)=zmax_moy(ig)-zlcl(ig)
      hmin(ig)=hmincoef*zlcl(ig)
-     if (depth(ig).ge.10.) then 
+     if (depth(ig)>=10.) then
        s2(ig)=(hcoef*depth(ig)+hmin(ig))**2
        n2(ig)=(1.-eps1)*fraca0(ig)*airephy(ig)/s2(ig)
@@ -275,7 +275,7 @@
 
 !CR: calcul de strig
-   if (iflag_strig.eq.0) then
+   if (iflag_strig==0) then
       strig(:)=s_trig
-   else if (iflag_strig.eq.1) then
+   else if (iflag_strig==1) then
       do ig=1,ngrid
 !         zcong_moy(ig)=zlcl(ig)+zmax_moy_coef*(zcong(ig)-zlcl(ig))
@@ -283,7 +283,7 @@
          strig(ig)=(zcong(ig)-zlcl(ig))**2  
       enddo
-   else if (iflag_strig.eq.2) then
+   else if (iflag_strig==2) then
       do ig=1,ngrid 
-         if (h_trig.gt.zlcl(ig)) then
+         if (h_trig>zlcl(ig)) then
          strig(ig)=(h_trig-zlcl(ig))**2
          else
@@ -296,5 +296,5 @@
    reuler=exp(1.)
    do ig=1,ngrid
-     if ( (depth(ig).ge.10.) .and. (s_max(ig).gt.susqr2pi*reuler) ) then
+     if ( (depth(ig)>=10.) .and. (s_max(ig)>susqr2pi*reuler) ) then
       w_max(ig)=w0(ig)*(1.+sqrt(2.*log(s_max(ig)/susqr2pi)-log(2.*log(s_max(ig)/susqr2pi))))
       ale_bl_stat(ig)=0.5*w_max(ig)**2
@@ -310,5 +310,5 @@
 !------------Closure------------------
 
-  IF (iflag_clos_bl.ge.2) THEN 
+  IF (iflag_clos_bl>=2) THEN
 
 !-----Calcul de ALP_BL_STAT
@@ -319,5 +319,5 @@
   alp_bl_fluct_tke(ig)=3.*coef_m*rhobarz0(ig)*w0(ig)*fraca0(ig)*(therm_tke_max0(ig)-env_tke_max0(ig)) &
  &                    +3.*rhobarz0(ig)*w_conv(ig)*pbl_tke_max0(ig)
-    if (iflag_clos_bl.ge.2) then 
+    if (iflag_clos_bl>=2) then
     alp_bl_conv(ig)=1.5*coef_m*rhobarz0(ig)*fraca0(ig)*(fraca0(ig)/(1.-fraca0(ig)))*w_conv(ig)* &
  &                   (w0(ig)**2)
@@ -328,7 +328,7 @@
   enddo
 
-!-----Sécurité ALP infinie
+!-----S�curit� ALP infinie
   do ig=1,ngrid
-   if (fraca0(ig).gt.0.98) alp_bl_stat(ig)=2.
+   if (fraca0(ig)>0.98) alp_bl_stat(ig)=2.
   enddo
 
@@ -381,5 +381,5 @@
       do ig=1,ngrid
 !v1d  if ((alim_star(ig,1).lt.1.e-10).and.(therm)) then
-      if ((alim_star(ig,1).lt.1.e-10)) then
+      if ((alim_star(ig,1)<1.e-10)) then
       lalim_conv(ig)=1
       wght_th(ig,1)=1.
@@ -399,5 +399,5 @@
       do l=2,nlay
         do ig=1,ngrid
-           if(l.LE.lmax(ig)) THEN
+           if(l<=lmax(ig)) THEN
            zdp=pplay(ig,l-1)-pplay(ig,l)
            alp_int(ig)=alp_int(ig)+0.5*rhobarz(ig,l)*wth3(ig,l)*zdp
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_down.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_down.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_down.F90	(revision 5082)
@@ -74,5 +74,5 @@
       do ig=1,ngrid
          !if ( lmax(ig) > nlay - 2 ) stop "les thermiques montent trop haut"
-         if (ilay.le.lmax(ig) .and. lmax(ig)>1 ) then
+         if (ilay<=lmax(ig) .and. lmax(ig)>1 ) then
             fdn(ig,ilay)=fdn(ig,ilay+1)+edn(ig,ilay)-ddn(ig,ilay)
             if ( fdn(ig,ilay)+ddn(ig,ilay) > 0. ) then
@@ -90,5 +90,5 @@
    do ilay=1,nlay,1
       do ig=1,ngrid
-         if (ilay.lt.lmax(ig) .and. lmax(ig)>1) then
+         if (ilay<lmax(ig) .and. lmax(ig)>1) then
             fup(ig,ilay+1)=fup(ig,ilay)+eup(ig,ilay)-dup(ig,ilay)
             if (fup(ig,ilay+1)+dup(ig,ilay) > 0.) then
@@ -131,5 +131,5 @@
          !!!!ATTENTION HYPOTHESE de FLUX COMPENSATOIRE DESCENDANT ET DONC comme schema amont on va chercher trac au dessus!!!!!
          !!!! tentative de prise en compte d'un flux compensatoire montant  !!!!
-         if (fup(ig,ilay)-fdn(ig,ilay) .lt. 0.) then
+         if (fup(ig,ilay)-fdn(ig,ilay) < 0.) then
             call abort_physic("thermcell_updown_dq", 'flux compensatoire '&
                  // 'montant, cas non traite par thermcell_updown_dq', 1)
@@ -164,5 +164,5 @@
      do ilay=2,nlay,1
        do ig=1,ngrid
-         if (fup(ig,ilay)-fdn(ig,ilay) .lt. 0.) then
+         if (fup(ig,ilay)-fdn(ig,ilay) < 0.) then
             call abort_physic("thermcell_updown_dq", 'flux compensatoire ' &
                  // 'montant, cas non traite par thermcell_updown_dq', 1)
@@ -193,5 +193,5 @@
      do ilay=nlay-1,1,-1
        do ig=1,ngrid
-         if((fup(ig,ilay)-fdn(ig,ilay)) .lt. 0) then
+         if((fup(ig,ilay)-fdn(ig,ilay)) < 0) then
             write(*,*) 'flux compensatoire montant, cas non traite par thermcell_updown_dq dans le cas d une resolution implicite, ilay : ', ilay
             call abort_physic("thermcell_updown_dq", "", 1)
@@ -273,5 +273,5 @@
    do ilay=nlay,1,-1
       do ig=1,ngrid
-         if (ilay.le.lmax(ig).and.lmax(ig)>1) then
+         if (ilay<=lmax(ig).and.lmax(ig)>1) then
             edn(ig,ilay)=fact_thermals_down*dup(ig,ilay)
             ddn(ig,ilay)=fact_thermals_down*eup(ig,ilay)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dq.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dq.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dq.F90	(revision 5082)
@@ -57,5 +57,5 @@
             zzm=masse(ig,k)/ptimestep
             cfl=max(cfl,fm(ig,k)/zzm)
-            if (entr(ig,k).gt.zzm) then
+            if (entr(ig,k)>zzm) then
                print*,'entr*dt>m,1',k,entr(ig,k)*ptimestep,masse(ig,k)
                abort_message = 'entr dt > m, 1st'
@@ -68,5 +68,5 @@
 
 
-      if (prt_level.ge.1) print*,'Q2 THERMCEL_DQ 0'
+      if (prt_level>=1) print*,'Q2 THERMCEL_DQ 0'
 
 !   calcul du detrainement
@@ -76,5 +76,5 @@
 !           print*,'Q2 DQ ',detr(ig,k),fm(ig,k),entr(ig,k)
 !test
-            if (detr(ig,k).lt.0.) then
+            if (detr(ig,k)<0.) then
                entr(ig,k)=entr(ig,k)-detr(ig,k)
                detr(ig,k)=0.
@@ -82,8 +82,8 @@
 !     s         'f+1=',fm(ig,k+1),'e=',entr(ig,k),'d=',detr(ig,k)
             endif
-            if (fm(ig,k+1).lt.0.) then
+            if (fm(ig,k+1)<0.) then
 !               print*,'fm2<0!!!'
             endif
-            if (entr(ig,k).lt.0.) then
+            if (entr(ig,k)<0.) then
 !               print*,'entr2<0!!!'
             endif
@@ -98,5 +98,5 @@
       do k=2,nlay
          do ig=1,ngrid
-            if ((fm(ig,k+1)+detr(ig,k))*ptimestep.gt.  &
+            if ((fm(ig,k+1)+detr(ig,k))*ptimestep>  &
      &         1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
@@ -105,8 +105,8 @@
                qa(ig,k)=q(ig,k)
             endif
-            if (qa(ig,k).lt.0.) then
+            if (qa(ig,k)<0.) then
 !               print*,'qa<0!!!'
             endif
-            if (q(ig,k).lt.0.) then
+            if (q(ig,k)<0.) then
 !               print*,'q<0!!!'
             endif
@@ -200,5 +200,5 @@
             zzm=masse(ig,k)/ptimestep
             cfl=max(cfl,fm(ig,k)/zzm)
-            if (entr(ig,k).gt.zzm) then
+            if (entr(ig,k)>zzm) then
                print*,'entr*dt>m,2',k,entr(ig,k)*ptimestep,masse(ig,k)
                abort_message = 'entr dt > m, 2nd'
@@ -223,5 +223,5 @@
 
 do iter=1,niter
-      if (prt_level.ge.1) print*,'Q2 THERMCEL_DQ 0'
+      if (prt_level>=1) print*,'Q2 THERMCEL_DQ 0'
 
 !   calcul du detrainement
@@ -231,5 +231,5 @@
 !           print*,'Q2 DQ ',detr(ig,k),fm(ig,k),entr(ig,k)
 !test
-            if (detr(ig,k).lt.0.) then
+            if (detr(ig,k)<0.) then
                entr(ig,k)=entr(ig,k)-detr(ig,k)
                detr(ig,k)=0.
@@ -237,8 +237,8 @@
 !     s         'f+1=',fm(ig,k+1),'e=',entr(ig,k),'d=',detr(ig,k)
             endif
-            if (fm(ig,k+1).lt.0.) then
+            if (fm(ig,k+1)<0.) then
 !               print*,'fm2<0!!!'
             endif
-            if (entr(ig,k).lt.0.) then
+            if (entr(ig,k)<0.) then
 !               print*,'entr2<0!!!'
             endif
@@ -253,5 +253,5 @@
       do k=2,nlay
          do ig=1,ngrid
-            if ((fm(ig,k+1)+detr(ig,k))*ztimestep.gt.  &
+            if ((fm(ig,k+1)+detr(ig,k))*ztimestep>  &
      &         1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
@@ -260,8 +260,8 @@
                qa(ig,k)=q(ig,k)
             endif
-            if (qa(ig,k).lt.0.) then
+            if (qa(ig,k)<0.) then
 !               print*,'qa<0!!!'
             endif
-            if (q(ig,k).lt.0.) then
+            if (q(ig,k)<0.) then
 !               print*,'q<0!!!'
             endif
@@ -292,5 +292,5 @@
 #endif
 
-            if (wqd(ig,k).lt.0.) then
+            if (wqd(ig,k)<0.) then
 !               print*,'wqd<0!!!'
             endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dry.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dry.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dry.F90	(revision 5082)
@@ -15,5 +15,5 @@
 ! Le calcul pourrait etre sans doute simplifier.
 ! La temperature potentielle virtuelle dans la panache ascendant est
-! la temperature potentielle virtuelle pondÃ©rÃ©e par alim_star.
+! la temperature potentielle virtuelle pondérée par alim_star.
 !--------------------------------------------------------------------------
        USE lmdz_thermcell_ini, ONLY: prt_level, RG
@@ -73,5 +73,5 @@
        do l=1,nlay-2
          do ig=1,ngrid
-            if (l.eq.lmin(ig).and.lalim(ig).gt.1) then
+            if (l==lmin(ig).and.lalim(ig)>1) then
 
 !------------------------------------------------------------------------
@@ -90,8 +90,8 @@
 ! 1. le flux de masse en haut  f_star(ig,l+1)
 ! 2. la temperature potentielle virtuelle dans la couche ztva(ig,l)
-! 3. la vitesse au carré en haut zw2(ig,l+1)
+! 3. la vitesse au carr� en haut zw2(ig,l+1)
 !------------------------------------------------------------------------
 
-            else if (zw2(ig,l).ge.1e-10) then
+            else if (zw2(ig,l)>=1e-10) then
 
                ztva(ig,l)=(f_star(ig,l)*ztva(ig,l-1)+alim_star(ig,l)  &
@@ -104,5 +104,5 @@
 !------------------------------------------------------------------------
 
-            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1).lt.1.e-10) then
+            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1)<1.e-10) then
 !               stop'On tombe sur le cas particulier de thermcell_dry'
 !               print*,'On tombe sur le cas particulier de thermcell_dry'
@@ -112,5 +112,5 @@
             endif
 
-            if (zw2(ig,l+1).lt.0.) then
+            if (zw2(ig,l+1)<0.) then
                linter(ig)=(l*(zw2(ig,l+1)-zw2(ig,l))  &
      &           -zw2(ig,l))/(zw2(ig,l+1)-zw2(ig,l))
@@ -119,5 +119,5 @@
 !            endif
 !CR:zmax continu 06/05/12: calcul de linter quand le thermique est stoppe par le detrainement
-            elseif (f_star(ig,l+1).lt.0.) then
+            elseif (f_star(ig,l+1)<0.) then
                linter(ig)=(l*(f_star(ig,l+1)-f_star(ig,l))  &
      &           -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
@@ -128,5 +128,5 @@
                wa_moy(ig,l+1)=sqrt(zw2(ig,l+1))
 
-            if (wa_moy(ig,l+1).gt.wmaxa(ig)) then
+            if (wa_moy(ig,l+1)>wmaxa(ig)) then
 !   lmix est le niveau de la couche ou w (wa_moy) est maximum
                lmix(ig)=l+1
@@ -135,5 +135,5 @@
          enddo
       enddo
-       if (prt_level.ge.1) print*,'fin calcul zw2'
+       if (prt_level>=1) print*,'fin calcul zw2'
 !
 ! Determination de zw2 max
@@ -144,5 +144,5 @@
       do l=1,nlay
          do ig=1,ngrid
-            if (l.le.lmax(ig)) then
+            if (l<=lmax(ig)) then
                 zw2(ig,l)=sqrt(zw2(ig,l))
                 wmax(ig)=max(wmax(ig),zw2(ig,l))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dtke.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dtke.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dtke.F90	(revision 5082)
@@ -37,5 +37,5 @@
 !print*,'thermcell_dtke'
 
-      if (prt_level.ge.1) print*,'Q2 THERMCEL_DQ 0'
+      if (prt_level>=1) print*,'Q2 THERMCEL_DQ 0'
 
 !   calcul du detrainement
@@ -73,5 +73,5 @@
       do k=2,nlay
          do ig=1,ngrid
-            if ((fm(ig,k+1)+detr(ig,k))*ptimestep.gt.  &
+            if ((fm(ig,k+1)+detr(ig,k))*ptimestep>  &
      &         1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
@@ -80,8 +80,8 @@
                qa(ig,k)=q(ig,k)
             endif
-            if (qa(ig,k).lt.0.) then
+            if (qa(ig,k)<0.) then
 !               print*,'qa<0!!!'
             endif
-            if (q(ig,k).lt.0.) then
+            if (q(ig,k)<0.) then
 !               print*,'q<0!!!'
             endif
@@ -94,5 +94,5 @@
          do ig=1,ngrid
             wqd(ig,k)=fm(ig,k)*q(ig,k)
-            if (wqd(ig,k).lt.0.) then
+            if (wqd(ig,k)<0.) then
 !               print*,'wqd<0!!!'
             endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dv2.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dv2.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dv2.F90	(revision 5082)
@@ -113,5 +113,5 @@
                zf2=1.
 
-!  la première fois on multiplie le coefficient de freinage
+!  la premi�re fois on multiplie le coefficient de freinage
 !  par le module du vent dans la couche en dessous.
 !  Mais pourquoi donc ???
@@ -177,5 +177,5 @@
 !----------------------
 
-   if(prt_level.GE.10) then
+   if(prt_level>=10) then
       do k=1,nlay
          do ig=1,ngrid
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_env.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_env.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_env.F90	(revision 5082)
@@ -61,5 +61,5 @@
 
 !-----------------------------------------------------------------------
-   if (prt_level.ge.1) print*,'0 OK convect8'
+   if (prt_level>=1) print*,'0 OK convect8'
 
    do ll=1,nlay
@@ -86,5 +86,5 @@
    do ig=1,ngrid
       do ll=1,nlay-1
-         if ((zh(ig,ll).gt.273.15).and.(zh(ig,ll+1).le.273.15)) then
+         if ((zh(ig,ll)>273.15).and.(zh(ig,ll+1)<=273.15)) then
             lcong(ig)=ll+1
             lintercong(ig)=(ll*(zh(ig,ll+1)-zh(ig,ll))  &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_flux2.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_flux2.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_flux2.F90	(revision 5082)
@@ -71,5 +71,5 @@
       fm(:,:)=0.
       
-      if (prt_level.ge.10) then
+      if (prt_level>=10) then
          write(lunout1,*) 'Dans thermcell_flux 0'
          write(lunout1,*) 'flux base ',f(igout)
@@ -94,6 +94,6 @@
       do l=1,nlay
          do ig=1,ngrid
-            if (l.le.lmax(ig)) then
-               if (entr_star(ig,l).gt.1.) then
+            if (l<=lmax(ig)) then
+               if (entr_star(ig,l)>1.) then
                     print*,'WARNING thermcell_flux 1 ig,l,lmax(ig)',ig,l,lmax(ig)
                     print*,'entr_star(ig,l)',entr_star(ig,l)
@@ -102,5 +102,5 @@
                endif
             else
-               if (abs(entr_star(ig,l))+abs(alim_star(ig,l))+abs(detr_star(ig,l)).gt.0.) then
+               if (abs(entr_star(ig,l))+abs(alim_star(ig,l))+abs(detr_star(ig,l))>0.) then
                     print*,'cas 1 : ig,l,lmax(ig)',ig,l,lmax(ig)
                     print*,'entr_star(ig,l)',entr_star(ig,l)
@@ -125,5 +125,5 @@
       enddo
 
-      if (prt_level.ge.10) then
+      if (prt_level>=10) then
          write(lunout1,*) 'Dans thermcell_flux 1'
          write(lunout1,*) 'flux base ',f(igout)
@@ -139,7 +139,7 @@
       do l=1,nlay
          do ig=1,ngrid
-            if (l.lt.lmax(ig)) then
+            if (l<lmax(ig)) then
                fm(ig,l+1)=fm(ig,l)+entr(ig,l)-detr(ig,l)
-            elseif(l.eq.lmax(ig)) then
+            elseif(l==lmax(ig)) then
                fm(ig,l+1)=0.
                detr(ig,l)=fm(ig,l)+entr(ig,l)
@@ -158,5 +158,5 @@
       do l=1,nlay
          do ig=1,ngrid
-            if (detr(ig,l).gt.fm(ig,l)) then
+            if (detr(ig,l)>fm(ig,l)) then
                ncorecfm8=ncorecfm8+1
 !              igout=ig
@@ -183,7 +183,7 @@
 
          do ig=1,ngrid
-            if (l.lt.lmax(ig)) then
+            if (l<lmax(ig)) then
                fm(ig,l+1)=fm(ig,l)+entr(ig,l)-detr(ig,l)
-            elseif(l.eq.lmax(ig)) then
+            elseif(l==lmax(ig)) then
                fm(ig,l+1)=0.
                detr(ig,l)=fm(ig,l)+entr(ig,l)
@@ -200,5 +200,5 @@
 !     do l=1,nlay
          do ig=1,ngrid
-            if (fm(ig,l+1).lt.0.) then
+            if (fm(ig,l+1)<0.) then
 !              print*,'fm1<0',l+1,lmax(ig),fm(ig,l+1)
                 ncorecfm1=ncorecfm1+1
@@ -209,5 +209,5 @@
 !     enddo
 
-      if (prt_level.ge.10) &
+      if (prt_level>=10) &
      &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
      &     entr(igout,l),detr(igout,l),fm(igout,l+1)
@@ -219,10 +219,10 @@
 !     do l=1,nlay
          do ig=1,ngrid
-          if (l.ge.lalim(ig).and.l.le.lmax(ig) &
-     &    .and.(zw2(ig,l+1).gt.1.e-10).and.(zw2(ig,l).gt.1.e-10) ) then
+          if (l>=lalim(ig).and.l<=lmax(ig) &
+     &    .and.(zw2(ig,l+1)>1.e-10).and.(zw2(ig,l)>1.e-10) ) then
 !  zzz est le flux en l+1 a frac constant
              zzz=fm(ig,l)*rhobarz(ig,l+1)*zw2(ig,l+1)  &
      &                          /(rhobarz(ig,l)*zw2(ig,l))
-             if (fm(ig,l+1).gt.zzz) then
+             if (fm(ig,l+1)>zzz) then
                 detr(ig,l)=detr(ig,l)+fm(ig,l+1)-zzz
                 fm(ig,l+1)=zzz
@@ -234,5 +234,5 @@
       endif
 
-      if (prt_level.ge.10) &
+      if (prt_level>=10) &
      &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
      &     entr(igout,l),detr(igout,l),fm(igout,l+1)
@@ -245,5 +245,5 @@
 !     do l=1,nlay
          do ig=1,ngrid
-            if ((fm(ig,l+1).gt.fm(ig,l)).and.(l.gt.lalim(ig))) then
+            if ((fm(ig,l+1)>fm(ig,l)).and.(l>lalim(ig))) then
               f_old=fm(ig,l+1)
               fm(ig,l+1)=fm(ig,l)
@@ -255,5 +255,5 @@
       endif
 
-      if (prt_level.ge.10) &
+      if (prt_level>=10) &
      &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
      &     entr(igout,l),detr(igout,l),fm(igout,l+1)
@@ -264,5 +264,5 @@
 !-------------------------------------------------------------------------
 
-      if(1.eq.1) then
+      if(1==1) then
 
 !     do l=1,nlay
@@ -286,5 +286,5 @@
 
          do ig=1,ngrid
-            if (detr(ig,l).gt.fm(ig,l)) then
+            if (detr(ig,l)>fm(ig,l)) then
                ncorecfm6=ncorecfm6+1
                detr(ig,l)=fm(ig,l)
@@ -303,5 +303,5 @@
             endif
 
-            if(l.gt.lmax(ig)) then
+            if(l>lmax(ig)) then
                detr(ig,l)=0.
                fm(ig,l+1)=0.
@@ -312,5 +312,5 @@
          labort_physic=.false.
          do ig=1,ngrid
-            if (entr(ig,l).lt.0.) then
+            if (entr(ig,l)<0.) then
                labort_physic=.true.
                igout=ig
@@ -331,5 +331,5 @@
 
 
-      if (prt_level.ge.10) &
+      if (prt_level>=10) &
      &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
      &     entr(igout,l),detr(igout,l),fm(igout,l+1)
@@ -341,5 +341,5 @@
 !     do l=1,nlay
          do ig=1,ngrid
-            if (fm(ig,l+1).lt.0.) then
+            if (fm(ig,l+1)<0.) then
                detr(ig,l)=detr(ig,l)+fm(ig,l+1)
                fm(ig,l+1)=0.
@@ -350,5 +350,5 @@
          labort_physic=.false.
          do ig=1,ngrid
-            if (detr(ig,l).lt.0.) then
+            if (detr(ig,l)<0.) then
                labort_physic=.true.
                igout=ig
@@ -365,5 +365,5 @@
 !    enddo
 
-      if (prt_level.ge.10) &
+      if (prt_level>=10) &
      &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
      &     entr(igout,l),detr(igout,l),fm(igout,l+1)
@@ -390,7 +390,7 @@
 !    do l=1,nlay
         do ig=1,ngrid
-           if (zw2(ig,l+1).gt.1.e-10) then
+           if (zw2(ig,l+1)>1.e-10) then
            zfm=rhobarz(ig,l+1)*zw2(ig,l+1)*alphamax
-           if ( fm(ig,l+1) .gt. zfm) then
+           if ( fm(ig,l+1) > zfm) then
               f_old=fm(ig,l+1)
               fm(ig,l+1)=zfm
@@ -407,5 +407,5 @@
 
 
-      if (prt_level.ge.10) &
+      if (prt_level>=10) &
      &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
      &     entr(igout,l),detr(igout,l),fm(igout,l+1)
@@ -424,5 +424,5 @@
 !-----------------------------------------------------------------------
 
-      if (1.eq.1) then
+      if (1==1) then
       labort_physic=.false.
       do l=1,nlay-1
@@ -432,8 +432,8 @@
             eee=entr(ig,l)-masse(ig,l)*fomass_max/ptimestep
             ddd=detr(ig,l)-eee
-            if (eee.gt.0.) then
+            if (eee>0.) then
                 ncorecfm3=ncorecfm3+1
                 entr(ig,l)=entr(ig,l)-eee
-                if ( ddd.gt.0.) then
+                if ( ddd>0.) then
 !   l'entrainement est trop fort mais l'exces peut etre compense par une
 !   diminution du detrainement)
@@ -442,8 +442,8 @@
 !   l'entrainement est trop fort mais l'exces doit etre compense en partie
 !   par un entrainement plus fort dans la couche superieure
-                   if(l.eq.lmax(ig)) then
+                   if(l==lmax(ig)) then
                       detr(ig,l)=fm(ig,l)+entr(ig,l)
                    else
-                      if(l.ge.lmax(ig).and.0.eq.1) then
+                      if(l>=lmax(ig).and.0==1) then
                          igout=ig
                          lout=l
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_height.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_height.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_height.F90	(revision 5082)
@@ -33,5 +33,5 @@
       do ig=1,ngrid
          do l=nlay,lalim(ig)+1,-1
-            if (zw2(ig,l).le.1.e-10) then
+            if (zw2(ig,l)<=1.e-10) then
                lmax(ig)=l-1
             endif
@@ -39,5 +39,5 @@
       enddo
 
-! On traite le cas particulier qu'il faudrait éviter ou le thermique
+! On traite le cas particulier qu'il faudrait �viter ou le thermique
 ! atteind le haut du modele ...
       do ig=1,ngrid
@@ -50,5 +50,5 @@
 ! pas de thermique si couche 1 stable
       do ig=1,ngrid
-         if (lmin(ig).gt.1) then
+         if (lmin(ig)>1) then
              lmax(ig)=1
              lmin(ig)=1
@@ -64,6 +64,6 @@
       do l=1,nlay
          do ig=1,ngrid
-            if (l.le.lmax(ig)) then
-                if (zw2(ig,l).lt.0.)then
+            if (l<=lmax(ig)) then
+                if (zw2(ig,l)<0.)then
                   print*,'pb2 zw2<0'
                 endif
@@ -94,5 +94,5 @@
        enddo
        do ig=1,ngrid
-       if (denom(ig).gt.1.e-10) then
+       if (denom(ig)>1.e-10) then
           zmax(ig)=2.*num(ig)/denom(ig)
           zmax0(ig)=zmax(ig)
@@ -128,10 +128,10 @@
 ! def de  zmix continu (profil parabolique des vitesses)
       do ig=1,ngrid
-           if (lmix(ig).gt.1) then
+           if (lmix(ig)>1) then
 ! test 
               if (((zw2(ig,lmix(ig)-1)-zw2(ig,lmix(ig)))  &
      &        *((zlev(ig,lmix(ig)))-(zlev(ig,lmix(ig)+1)))  &
      &        -(zw2(ig,lmix(ig))-zw2(ig,lmix(ig)+1))  &
-     &        *((zlev(ig,lmix(ig)-1))-(zlev(ig,lmix(ig))))).gt.1e-10)  &
+     &        *((zlev(ig,lmix(ig)-1))-(zlev(ig,lmix(ig)))))>1e-10)  &
      &        then
 !             
@@ -152,5 +152,5 @@
           endif
 !test
-         if ((zmax(ig)-zmix(ig)).le.0.) then
+         if ((zmax(ig)-zmix(ig))<=0.) then
             zmix(ig)=0.9*zmax(ig)
 !            print*,'pb zmix>zmax'
@@ -161,6 +161,6 @@
       do ig=1,ngrid
          do l=1,nlay
-            if (zmix(ig).ge.zlev(ig,l).and.  &
-     &          zmix(ig).lt.zlev(ig,l+1)) then
+            if (zmix(ig)>=zlev(ig,l).and.  &
+     &          zmix(ig)<zlev(ig,l+1)) then
               lmix(ig)=l
              endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_main.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_main.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_main.F90	(revision 5082)
@@ -187,8 +187,8 @@
    fm=0. ; entr=0. ; detr=0.
 
-      if (prt_level.ge.1) print*,'thermcell_main V4'
+      if (prt_level>=1) print*,'thermcell_main V4'
 
        sorties=.true.
-      IF(ngrid.NE.ngrid) THEN
+      IF(ngrid/=ngrid) THEN
          PRINT*
          PRINT*,'STOP dans convadj'
@@ -205,5 +205,5 @@
      enddo
 
-      if (prt_level.ge.20) then
+      if (prt_level>=20) then
        do ig=1,ngrid
           print*,'th_main ig f0',ig,f0(ig)
@@ -276,5 +276,5 @@
       endif
        
-      if (prt_level.ge.1) print*,'thermcell_main apres thermcell_env'
+      if (prt_level>=1) print*,'thermcell_main apres thermcell_env'
 
 !------------------------------------------------------------------------
@@ -317,5 +317,5 @@
 
       rho(:,:)=pplay(:,:)/(zpspsk(:,:)*RD*ztv(:,:))
-      if (prt_level.ge.10) write(lunout,*) 'WARNING thermcell_main rhobarz(:,1)=rho(:,1)'
+      if (prt_level>=10) write(lunout,*) 'WARNING thermcell_main rhobarz(:,1)=rho(:,1)'
       rhobarz(:,1)=rho(:,1)
       do l=2,nlay
@@ -325,5 +325,5 @@
          masse(:,l)=(pplev(:,l)-pplev(:,l+1))/RG
       enddo
-      if (prt_level.ge.1) print*,'thermcell_main apres initialisation'
+      if (prt_level>=1) print*,'thermcell_main apres initialisation'
 
 !------------------------------------------------------------------
@@ -398,5 +398,5 @@
 !--------------------------------------------------------------------------------
 !
-      if (prt_level.ge.1) print*,'avant thermcell_plume ',lev_out
+      if (prt_level>=1) print*,'avant thermcell_plume ',lev_out
 
 !=====================================================================
@@ -437,11 +437,11 @@
       endif
 
-      if (prt_level.ge.1) print*,'apres thermcell_plume ',lev_out
+      if (prt_level>=1) print*,'apres thermcell_plume ',lev_out
 
       call test_ltherm(ngrid,nlay,pplay,lalim,ztv,p_o,ztva,zqla,f_star,zw2,'thermcell_plum lalim ')
       call test_ltherm(ngrid,nlay,pplay,lmix ,ztv,p_o,ztva,zqla,f_star,zw2,'thermcell_plum lmix  ')
 
-      if (prt_level.ge.1) print*,'thermcell_main apres thermcell_plume'
-      if (prt_level.ge.10) then
+      if (prt_level>=1) print*,'thermcell_main apres thermcell_plume'
+      if (prt_level>=10) then
          write(lunout1,*) 'Dans thermcell_main 2'
          write(lunout1,*) 'lmin ',lmin(igout)
@@ -473,5 +473,5 @@
       call test_ltherm(ngrid,nlay,pplay,lmax ,ztv,p_o,ztva,zqla,f_star,zw2,'thermcell_heig lmax  ')
 
-      if (prt_level.ge.1) print*,'thermcell_main apres thermcell_height'
+      if (prt_level>=1) print*,'thermcell_main apres thermcell_height'
 
 !-------------------------------------------------------------------------------
@@ -487,6 +487,6 @@
 call test_ltherm(ngrid,nlay,pplay,lalim,ztv,p_o,ztva,zqla,f_star,zw2,'thermcell_dry  lalim ')
 
-      if (prt_level.ge.1) print*,'thermcell_main apres thermcell_dry'
-      if (prt_level.ge.10) then
+      if (prt_level>=1) print*,'thermcell_main apres thermcell_dry'
+      if (prt_level>=10) then
          write(lunout1,*) 'Dans thermcell_main 1b'
          write(lunout1,*) 'lmin ',lmin(igout)
@@ -506,5 +506,5 @@
 !
 !CR Appel de la fermeture seche 
-      if (iflag_thermals_closure.eq.1) then
+      if (iflag_thermals_closure==1) then
 
      CALL thermcell_closure(ngrid,nlay,r_aspect_thermals,ptimestep,rho,  &
@@ -514,5 +514,5 @@
 ! Appel avec les zmax et wmax tenant compte de la condensation
 ! Semble moins bien marcher
-     else if (iflag_thermals_closure.eq.2) then
+     else if (iflag_thermals_closure==2) then
 
      CALL thermcell_closure(ngrid,nlay,r_aspect_thermals,ptimestep,rho,  &
@@ -524,5 +524,5 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      if(prt_level.ge.1)print*,'thermcell_closure apres thermcell_closure'
+      if(prt_level>=1)print*,'thermcell_closure apres thermcell_closure'
 
       if (tau_thermals>1.) then
@@ -534,5 +534,5 @@
 
 ! Test valable seulement en 1D mais pas genant
-      if (.not. (f0(1).ge.0.) ) then
+      if (.not. (f0(1)>=0.) ) then
               abort_message = '.not. (f0(1).ge.0.)'
               CALL abort_physic (modname,abort_message,1)
@@ -549,5 +549,5 @@
 !IM 060508    &       detr,zqla,zmax,lev_out,lunout,igout)
 
-      if (prt_level.ge.1) print*,'thermcell_main apres thermcell_flux'
+      if (prt_level>=1) print*,'thermcell_main apres thermcell_flux'
       call test_ltherm(ngrid,nlay,pplay,lalim,ztv,p_o,ztva,zqla,f_star,zw2,'thermcell_flux lalim ')
       call test_ltherm(ngrid,nlay,pplay,lmax ,ztv,p_o,ztva,zqla,f_star,zw2,'thermcell_flux lmax  ')
@@ -579,5 +579,5 @@
       do l=2,nlay
          do ig=1,ngrid
-            if (zw2(ig,l).gt.1.e-10) then
+            if (zw2(ig,l)>1.e-10) then
             fraca(ig,l)=fm(ig,l)/(rhobarz(ig,l)*zw2(ig,l))
             else
@@ -590,5 +590,5 @@
 !   calcul du transport vertical
 !------------------------------------------------------------------
-      IF (iflag_thermals_down .GT. 0) THEN
+      IF (iflag_thermals_down > 0) THEN
         if (debut) print*,'WARNING !!! routine thermcell_down en cours de developpement'
         entrdn=fact_thermals_down*detr0
@@ -692,5 +692,5 @@
       enddo
 
-      if (prt_level.ge.1) print*,'14 OK convect8'
+      if (prt_level>=1) print*,'14 OK convect8'
 !------------------------------------------------------------------
 !   Calculs de diagnostiques pour les sorties
@@ -699,5 +699,5 @@
       
       if (sorties) then
-      if (prt_level.ge.1) print*,'14a OK convect8'
+      if (prt_level>=1) print*,'14a OK convect8'
 ! calcul du niveau de condensation
 ! initialisation
@@ -715,6 +715,6 @@
       do k=1,nlay-1
          do ig=1,ngrid
-         if ((pcon(ig).le.pplay(ig,k))  &
-     &      .and.(pcon(ig).gt.pplay(ig,k+1))) then
+         if ((pcon(ig)<=pplay(ig,k))  &
+     &      .and.(pcon(ig)>pplay(ig,k+1))) then
             zcon2(ig)=zlay(ig,k)-(pcon(ig)-pplay(ig,k))/(RG*rho(ig,k))/100.
          endif
@@ -724,5 +724,5 @@
       ierr=0
       do ig=1,ngrid
-        if (pcon(ig).le.pplay(ig,nlay)) then 
+        if (pcon(ig)<=pplay(ig,nlay)) then
            zcon2(ig)=zlay(ig,nlay)-(pcon(ig)-pplay(ig,nlay))/(RG*rho(ig,nlay))/100.
            ierr=1
@@ -734,8 +734,8 @@
 !      endif
 
-      if (prt_level.ge.1) print*,'14b OK convect8'
+      if (prt_level>=1) print*,'14b OK convect8'
       do k=nlay,1,-1
          do ig=1,ngrid
-            if (zqla(ig,k).gt.1e-10) then
+            if (zqla(ig,k)>1e-10) then
                nivcon(ig)=k
                zcon(ig)=zlev(ig,k)
@@ -743,5 +743,5 @@
          enddo
       enddo
-      if (prt_level.ge.1) print*,'14c OK convect8'
+      if (prt_level>=1) print*,'14c OK convect8'
 !calcul des moments
 !initialisation
@@ -755,6 +755,6 @@
          enddo
       enddo      
-      if (prt_level.ge.1) print*,'14d OK convect8'
-      if (prt_level.ge.10)write(lunout,*)                                &
+      if (prt_level>=1) print*,'14d OK convect8'
+      if (prt_level>=10)write(lunout,*)                                &
     &     'WARNING thermcell_main wth2=0. si zw2 > 1.e-10'
       do l=1,nlay
@@ -764,5 +764,5 @@
 !
             thetath2(ig,l)=zf2*(ztla(ig,l)-zthl(ig,l))**2
-            if(zw2(ig,l).gt.1.e-10) then
+            if(zw2(ig,l)>1.e-10) then
              wth2(ig,l)=zf2*(zw2(ig,l))**2
             else
@@ -786,5 +786,5 @@
 
 !calcul du ratqscdiff
-      if (prt_level.ge.1) print*,'14e OK convect8'
+      if (prt_level>=1) print*,'14e OK convect8'
       var=0.
       vardiff=0.
@@ -799,5 +799,5 @@
       enddo
 
-      if (prt_level.ge.1) print*,'14f OK convect8'
+      if (prt_level>=1) print*,'14f OK convect8'
 
       do l=1,nlay
@@ -811,5 +811,5 @@
       enddo
 
-      if (prt_level.ge.1) print*,'14g OK convect8'
+      if (prt_level>=1) print*,'14g OK convect8'
          do l=1,nlay
             do ig=1,ngrid
@@ -819,5 +819,5 @@
       endif
 
-      if (prt_level.ge.1) print*,'thermcell_main FIN  OK'
+      if (prt_level>=1) print*,'thermcell_main FIN  OK'
 
 !print*,'thermcell_main fin'
@@ -843,5 +843,5 @@
       seuil=0.25
 
-      if (prt_level.ge.1) THEN
+      if (prt_level>=1) THEN
        print*,'WARNING !!! TEST ',comment
       endif
@@ -851,5 +851,5 @@
          do i=1,ngrid
 !IMtemp           if (pplay(i,long(i)).lt.seuil*pplev(i,1)) then
-           if (prt_level.ge.10) then
+           if (prt_level>=10) then
                print*,'WARNING ',comment,' au point ',i,' K= ',long(i)
                print*,'  K  P(MB)  THV(K)     Qenv(g/kg)THVA        QLA(g/kg)   F*        W2'
@@ -908,5 +908,5 @@
 
 
-      if (prt_level.ge.1) print*,'Q2 THERMCEL_DQ 0'
+      if (prt_level>=1) print*,'Q2 THERMCEL_DQ 0'
 
 !   calcul du detrainement
@@ -941,5 +941,5 @@
       do k=2,nlay
          do ig=1,ngrid
-            if ((fm(ig,k+1)+detr(ig,k))*ptimestep.gt.  &
+            if ((fm(ig,k+1)+detr(ig,k))*ptimestep>  &
      &         1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
@@ -948,8 +948,8 @@
                qa(ig,k)=q(ig,k)
             endif
-            if (qa(ig,k).lt.0.) then
+            if (qa(ig,k)<0.) then
 !               print*,'qa<0!!!'
             endif
-            if (q(ig,k).lt.0.) then
+            if (q(ig,k)<0.) then
 !               print*,'q<0!!!'
             endif
@@ -962,5 +962,5 @@
          do ig=1,ngrid
             wqd(ig,k)=fm(ig,k)*q(ig,k)
-            if (wqd(ig,k).lt.0.) then
+            if (wqd(ig,k)<0.) then
 !               print*,'wqd<0!!!'
             endif
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume.F90	(revision 5082)
@@ -255,5 +255,5 @@
         zdz2=zlev(ig,lt)-zlev(ig,l)
 
-        do while (lmel.gt.zdz2)
+        do while (lmel>zdz2)
            lt=lt+1
            zlt=zlev(ig,lt)
@@ -321,5 +321,5 @@
 ! En dessous de lalim, on prend le max de alim_star et entr_star pour
 ! alim_star et 0 sinon
-        if (l.lt.lalim(ig)) then
+        if (l<lalim(ig)) then
           alim_star(ig,l)=max(alim_star(ig,l),entr_star(ig,l))
           entr_star(ig,l)=0.
@@ -375,5 +375,5 @@
    enddo
 
-   if (prt_level.ge.20) print*,'coucou calcul detr 460: ig, l',ig, l
+   if (prt_level>=20) print*,'coucou calcul detr 460: ig, l',ig, l
 !
 !===========================================================================
@@ -383,5 +383,5 @@
    nbpb=0
    do ig=1,ngrid
-            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1).lt.1.e-10) then
+            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1)<1.e-10) then
 !               stop'On tombe sur le cas particulier de thermcell_dry'
 !               print*,'On tombe sur le cas particulier de thermcell_plume'
@@ -391,10 +391,10 @@
             endif
 
-        if (zw2(ig,l+1).lt.0.) then 
+        if (zw2(ig,l+1)<0.) then
            linter(ig)=(l*(zw2(ig,l+1)-zw2(ig,l))  &
      &               -zw2(ig,l))/(zw2(ig,l+1)-zw2(ig,l))
            zw2(ig,l+1)=0.
 !+CR:04/05/12:correction calcul linter pour calcul de zmax continu
-        elseif (f_star(ig,l+1).lt.0.) then
+        elseif (f_star(ig,l+1)<0.) then
            linter(ig)=(l*(f_star(ig,l+1)-f_star(ig,l))  &
      &               -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
@@ -405,8 +405,8 @@
            wa_moy(ig,l+1)=sqrt(zw2(ig,l+1)) 
 
-        if (wa_moy(ig,l+1).gt.wmaxa(ig)) then
+        if (wa_moy(ig,l+1)>wmaxa(ig)) then
 !   lmix est le niveau de la couche ou w (wa_moy) est maximum
 !on rajoute le calcul de lmix_bis
-            if (zqla(ig,l).lt.1.e-10) then
+            if (zqla(ig,l)<1.e-10) then
                lmix_bis(ig)=l+1
             endif
@@ -436,5 +436,5 @@
        
 
-        if (prt_level.ge.20) print*,'coucou calcul detr 470: ig, l', ig, l
+        if (prt_level>=20) print*,'coucou calcul detr 470: ig, l', ig, l
 
 #undef wrgrads_thermcell
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume_6A.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume_6A.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume_6A.F90	(revision 5082)
@@ -249,10 +249,10 @@
 
 !--------------------------------------------------
-        if (iflag_thermals_ed.lt.8) then
+        if (iflag_thermals_ed<8) then
 !--------------------------------------------------
 !AJ052014: J'ai remplac?? la boucle do par un do while
 ! afin de faire moins de calcul dans la boucle
 !--------------------------------------------------
-            do while (zlmelup.gt.zltup)
+            do while (zlmelup>zltup)
                lt=lt+1
                zlt=zlev(ig,lt)
@@ -286,5 +286,5 @@
              ztv2=atv2*zlt+btv2
 
-             if (ztv(ig,lt).gt.ztv1.and.ztv(ig,lt).lt.ztv2) then  
+             if (ztv(ig,lt)>ztv1.and.ztv(ig,lt)<ztv2) then
 
 !--------------------------------------------------
@@ -296,9 +296,9 @@
 
           
-                if (zlmeldwn.ge.zinv) then
+                if (zlmeldwn>=zinv) then
                    ztv_est(ig,l)=atv2*zlmel+btv2
                    zbuoyjam(ig,l)=fact_shell*RG*(ztva_est(ig,l)-ztv_est(ig,l))/ztv_est(ig,l) &
     &                    +(1.-fact_shell)*zbuoy(ig,l)
-                elseif (zlmelup.ge.zinv) then
+                elseif (zlmelup>=zinv) then
                  ztv_est2=atv2*0.5*(zlmelup+zinv)+btv2
                    ztv_est1=atv1*0.5*(zinv+zlmeldwn)+btv1
@@ -317,5 +317,5 @@
              else ! if (ztv(ig,lt).gt.ztv1.and.ztv(ig,lt).lt.ztv2) then
 
-                if (zlmeldwn.gt.zltdwn) then
+                if (zlmeldwn>zltdwn) then
                    zbuoyjam(ig,l)=fact_shell*RG*((ztva_est(ig,l)- & 
     &                ztv(ig,lt))/ztv(ig,lt))+(1.-fact_shell)*zbuoy(ig,l)
@@ -340,5 +340,5 @@
            zdz2=zlev(ig,lt)-zlev(ig,l)
 
-           do while (lmel.gt.zdz2)
+           do while (lmel>zdz2)
              lt=lt+1
              zlt=zlev(ig,lt)
@@ -481,5 +481,5 @@
 !          entrbis=entr_star(ig,l)
 
-          if (iflag_thermals_ed.lt.6) then
+          if (iflag_thermals_ed<6) then
           fact_epsilon=0.0002/(zalpha+0.1)
           endif
@@ -520,5 +520,5 @@
 ! En dessous de lalim, on prend le max de alim_star et entr_star pour
 ! alim_star et 0 sinon
-        if (l.lt.lalim(ig)) then
+        if (l<lalim(ig)) then
           alim_star(ig,l)=max(alim_star(ig,l),entr_star(ig,l))
           entr_star(ig,l)=0.
@@ -599,5 +599,5 @@
 
 
-           if (iflag_thermals_ed.lt.6) then
+           if (iflag_thermals_ed<6) then
            zalpha=f0(ig)*f_star(ig,l)/sqrt(zw2(ig,l+1))/rhobarz(ig,l)
 !           fact_epsilon=0.0005/(zalpha+0.025)**0.5
@@ -621,5 +621,5 @@
    enddo
 
-        if (prt_level.ge.20) print*,'coucou calcul detr 460: ig, l',ig, l
+        if (prt_level>=20) print*,'coucou calcul detr 460: ig, l',ig, l
 !
 !===========================================================================
@@ -629,5 +629,5 @@
    nbpb=0
    do ig=1,ngrid
-            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1).lt.1.e-10) then
+            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1)<1.e-10) then
 !               stop'On tombe sur le cas particulier de thermcell_dry'
 !               print*,'On tombe sur le cas particulier de thermcell_plume'
@@ -637,10 +637,10 @@
             endif
 
-        if (zw2(ig,l+1).lt.0.) then 
+        if (zw2(ig,l+1)<0.) then
            linter(ig)=(l*(zw2(ig,l+1)-zw2(ig,l))  &
      &               -zw2(ig,l))/(zw2(ig,l+1)-zw2(ig,l))
            zw2(ig,l+1)=0.
 !+CR:04/05/12:correction calcul linter pour calcul de zmax continu
-        elseif (f_star(ig,l+1).lt.0.) then
+        elseif (f_star(ig,l+1)<0.) then
            linter(ig)=(l*(f_star(ig,l+1)-f_star(ig,l))  &
      &               -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
@@ -651,8 +651,8 @@
            wa_moy(ig,l+1)=sqrt(zw2(ig,l+1)) 
 
-        if (wa_moy(ig,l+1).gt.wmaxa(ig)) then
+        if (wa_moy(ig,l+1)>wmaxa(ig)) then
 !   lmix est le niveau de la couche ou w (wa_moy) est maximum
 !on rajoute le calcul de lmix_bis
-            if (zqla(ig,l).lt.1.e-10) then
+            if (zqla(ig,l)<1.e-10) then
                lmix_bis(ig)=l+1
             endif
@@ -682,5 +682,5 @@
        
 
-        if (prt_level.ge.20) print*,'coucou calcul detr 470: ig, l', ig, l
+        if (prt_level>=20) print*,'coucou calcul detr 470: ig, l', ig, l
 
 #undef wrgrads_thermcell
@@ -952,5 +952,5 @@
  
 
-             if (w_est(ig,l+1).lt.0.) then
+             if (w_est(ig,l+1)<0.) then
                 w_est(ig,l+1)=zw2(ig,l)
              endif
@@ -986,5 +986,5 @@
 ! En dessous de lalim, on prend le max de alim_star et entr_star pour
 ! alim_star et 0 sinon
-        if (l.lt.lalim(ig)) then
+        if (l<lalim(ig)) then
           alim_star(ig,l)=max(alim_star(ig,l),entr_star(ig,l))
           entr_star(ig,l)=0.
@@ -1040,5 +1040,5 @@
    enddo
 
-        if (prt_level.ge.20) print*,'coucou calcul detr 460: ig, l',ig, l
+        if (prt_level>=20) print*,'coucou calcul detr 460: ig, l',ig, l
 !
 !---------------------------------------------------------------------------
@@ -1048,5 +1048,5 @@
    nbpb=0
    do ig=1,ngrid
-            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1).lt.1.e-10) then
+            if (zw2(ig,l+1)>0. .and. zw2(ig,l+1)<1.e-10) then
 !               stop'On tombe sur le cas particulier de thermcell_dry'
 !               print*,'On tombe sur le cas particulier de thermcell_plume'
@@ -1056,9 +1056,9 @@
             endif
 
-        if (zw2(ig,l+1).lt.0.) then 
+        if (zw2(ig,l+1)<0.) then
            linter(ig)=(l*(zw2(ig,l+1)-zw2(ig,l))  &
      &               -zw2(ig,l))/(zw2(ig,l+1)-zw2(ig,l))
            zw2(ig,l+1)=0.
-        elseif (f_star(ig,l+1).lt.0.) then
+        elseif (f_star(ig,l+1)<0.) then
            linter(ig)=(l*(f_star(ig,l+1)-f_star(ig,l))  &
      &               -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
@@ -1069,8 +1069,8 @@
            wa_moy(ig,l+1)=sqrt(zw2(ig,l+1)) 
 
-        if (wa_moy(ig,l+1).gt.wmaxa(ig)) then
+        if (wa_moy(ig,l+1)>wmaxa(ig)) then
 !   lmix est le niveau de la couche ou w (wa_moy) est maximum
 !on rajoute le calcul de lmix_bis
-            if (zqla(ig,l).lt.1.e-10) then
+            if (zqla(ig,l)<1.e-10) then
                lmix_bis(ig)=l+1
             endif
@@ -1100,5 +1100,5 @@
        
 
-        if (prt_level.ge.20) print*,'coucou calcul detr 470: ig, l', ig, l
+        if (prt_level>=20) print*,'coucou calcul detr 470: ig, l', ig, l
 
 #undef wrgrads_thermcell
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_qsat.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_qsat.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_qsat.F90	(revision 5082)
@@ -73,5 +73,5 @@
 
 do iter=1,10
-    afaire(:)=abs(DT(:)).gt.DDT0
+    afaire(:)=abs(DT(:))>DDT0
     do ig=1,klon
                if (afaire(ig)) then
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/lsc_scav.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/lsc_scav.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/lsc_scav.F90	(revision 5082)
@@ -181,5 +181,5 @@
     DO i=1, klon 
 !  incloud scavenging
-      IF (iflag_lscav .EQ. 4) THEN
+      IF (iflag_lscav == 4) THEN
         beta=beta_fisrt(i,k)*rneb(i,k)
       ELSE
@@ -213,5 +213,5 @@
       deltaP(i,k)=max(deltaP(i,k),0.)
 
-      IF (flxr(i,k+1)+flxs(i,k+1).GT.1.e-16) THEn
+      IF (flxr(i,k+1)+flxs(i,k+1)>1.e-16) THEn
         beta_ev(i,k)=deltaP(i,k)/(flxr(i,k+1)+flxs(i,k+1))
       ELSE
@@ -222,5 +222,5 @@
 
 !jyg
-      IF (ABS(1.-(1.-frac_ev)*beta_ev(i,k)).GT.1.e-16) THEN
+      IF (ABS(1.-(1.-frac_ev)*beta_ev(i,k))>1.e-16) THEN
 ! remove tracers from precipitation owing to release by evaporation in his_dh
         dxev=frac_ev*beta_ev(i,k)*his_dh(i)*pdtime/zmass(i,k)/(1.-(1.-frac_ev)*beta_ev(i,k))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/macv2sp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/macv2sp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/macv2sp.F90	(revision 5082)
@@ -80,5 +80,5 @@
   !
   year_fr = FLOAT(year_cur) + (FLOAT(day_cur)-0.5) / FLOAT(year_len)
-  IF (year_fr.LT.1850.0.OR.year_fr.GE.2017.0) THEN
+  IF (year_fr<1850.0.OR.year_fr>=2017.0) THEN
      CALL abort_physic ('macv2sp','year not supported by plume model',1)
   ENDIF
@@ -132,21 +132,21 @@
   DO Nwv=0,Nwvmax-1
 
-    IF (Nwv.EQ.0) THEN          !--RRTM spectral band 1
+    IF (Nwv==0) THEN          !--RRTM spectral band 1
       zlambda=lambda(Nwv)
       zweight=1.0
       band=1
-    ELSEIF (Nwv.LE.5) THEN      !--RRTM spectral band 2
+    ELSEIF (Nwv<=5) THEN      !--RRTM spectral band 2
       zlambda=0.5*(lambda(Nwv)+lambda(Nwv+1))
       zweight=weight(Nwv)/SUM(weight(1:5))
       band=2
-    ELSEIF (Nwv.LE.10) THEN     !--RRTM spectral band 3
+    ELSEIF (Nwv<=10) THEN     !--RRTM spectral band 3
       zlambda=0.5*(lambda(Nwv)+lambda(Nwv+1))
       zweight=weight(Nwv)/SUM(weight(6:10))
       band=3
-    ELSEIF (Nwv.LE.16) THEN     !--RRTM spectral band 4
+    ELSEIF (Nwv<=16) THEN     !--RRTM spectral band 4
       zlambda=0.5*(lambda(Nwv)+lambda(Nwv+1))
       zweight=weight(Nwv)/SUM(weight(11:16))
       band=4
-    ELSEIF (Nwv.LE.21) THEN     !--RRTM spectral band 5
+    ELSEIF (Nwv<=21) THEN     !--RRTM spectral band 5
       zlambda=0.5*(lambda(Nwv)+lambda(Nwv+1))
       zweight=weight(Nwv)/SUM(weight(17:21))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/minmaxqfi.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/minmaxqfi.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/minmaxqfi.F90	(revision 5082)
@@ -19,10 +19,10 @@
      jbad = 0
      DO i = 1, klon
-        IF (zq(i,k).GT.qmax .OR. zq(i,k).LT.qmin) THEN
+        IF (zq(i,k)>qmax .OR. zq(i,k)<qmin) THEN
            jbad = jbad + 1
            jadrs(jbad) = i
         ENDIF
      ENDDO
-     IF (jbad.GT.0) THEN
+     IF (jbad>0) THEN
         WRITE(*,*)comment, "  k = ", k, "jbad > 0"
         if (prt_level >= 1) then
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/nflxtr.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/nflxtr.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/nflxtr.F90	(revision 5082)
@@ -100,5 +100,5 @@
   DO k=1,klev
      DO i=1, klon
-        IF ((zmfu(i,k+1)+zde_u(i,k)).lt.zmfmin) THEN
+        IF ((zmfu(i,k+1)+zde_u(i,k))<zmfmin) THEN
            xu(i,k)=x(i,k)
         ELSE
@@ -118,5 +118,5 @@
   DO k=klev,1,-1
      DO i=1, klon
-        IF ((zde_d(i,k)-zmfd(i,k)).lt.zmfmin) THEN
+        IF ((zde_d(i,k)-zmfd(i,k))<zmfmin) THEN
            xd(i,k)=x(i,k)
         ELSE
@@ -133,5 +133,5 @@
      DO i=1, klon
         zmfe=-zmfu(i,k)-zmfd(i,k)
-        IF (zmfe.le.0.) then
+        IF (zmfe<=0.) then
            zmfex(i,k)= zmfe*x(i,k)
         ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/nuage.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/nuage.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/nuage.F90	(revision 5082)
@@ -103,5 +103,5 @@
 
   DO k = 1, klev
-     IF (iflag_t_glace.EQ.0) THEN
+     IF (iflag_t_glace==0) THEN
        DO i = 1, klon
         zfice(i) = 1.0 - (t(i,k)-t_glace_min_old)/(273.13-t_glace_min_old)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_albedo.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_albedo.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_albedo.F90	(revision 5082)
@@ -211,5 +211,5 @@
   SELECT CASE(nsw)
   CASE(2)
-    IF (JWL.LE.49) THEN       ! from 200  to 680 nm 
+    IF (JWL<=49) THEN       ! from 200  to 680 nm
      inu=1
     ELSE                      ! from 690  to 4000 nm
@@ -217,9 +217,9 @@
     ENDIF
   CASE(4)
-    IF (JWL.LE.49) THEN       ! from 200  to 680 nm 
+    IF (JWL<=49) THEN       ! from 200  to 680 nm
      inu=1
-    ELSE IF (JWL.LE.99) THEN  ! from 690  to 1180 nm
+    ELSE IF (JWL<=99) THEN  ! from 690  to 1180 nm
      inu=2
-    ELSE IF (JWL.LE.218) THEN ! from 1190 to 2370 nm
+    ELSE IF (JWL<=218) THEN ! from 1190 to 2370 nm
      inu=3
     ELSE                      ! from 2380 to 4000 nm
@@ -227,13 +227,13 @@
     ENDIF
   CASE(6)
-    IF (JWL.LE.5) THEN        ! from 200  to 240 nm 
+    IF (JWL<=5) THEN        ! from 200  to 240 nm
      inu=1
-    ELSE IF (JWL.LE.24) THEN  ! from 250  to 430 nm
+    ELSE IF (JWL<=24) THEN  ! from 250  to 430 nm
      inu=2
-    ELSE IF (JWL.LE.49) THEN  ! from 440  to 680 nm
+    ELSE IF (JWL<=49) THEN  ! from 440  to 680 nm
      inu=3
-    ELSE IF (JWL.LE.99) THEN  ! from 690  to 1180 nm
+    ELSE IF (JWL<=99) THEN  ! from 690  to 1180 nm
      inu=4
-    ELSE IF (JWL.LE.218) THEN ! from 1190 to 2370 nm
+    ELSE IF (JWL<=218) THEN ! from 1190 to 2370 nm
      inu=5
     ELSE                      ! from 2380 to 4000 nm
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_forced_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_forced_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_forced_mod.F90	(revision 5082)
@@ -143,5 +143,5 @@
 !--sb:
 !!jyg    if (knon.eq.1) then ! single-column model
-    if (klon_glo.eq.1) then ! single-column model
+    if (klon_glo==1) then ! single-column model
       ! EV: now surface Tin flux_arp.h
       !CALL read_tsurf1d(knon,tsurf_lim) ! new
@@ -492,5 +492,5 @@
     CALL albsno(klon, knon, dtime, agesno(:), alb_neig(:), precip_snow(:))  
 
-    WHERE (snow(1:knon) .LT. 0.0001) agesno(1:knon) = 0.
+    WHERE (snow(1:knon) < 0.0001) agesno(1:knon) = 0.
 
     alb1_new(:) = 0.0
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_slab_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_slab_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_slab_mod.F90	(revision 5082)
@@ -162,5 +162,5 @@
     slabh(1)=50.
     CALL getin_p('slab_depth',slabh(1))
-    IF (nslay.GT.1) THEN 
+    IF (nslay>1) THEN
         slabh(2)=150.
     END IF
@@ -186,9 +186,9 @@
     slab_gm=.FALSE.
     CALL getin_p('slab_gm',slab_gm)
-    IF (slab_ekman.LT.2) THEN
+    IF (slab_ekman<2) THEN
        slab_gm=.FALSE.
     ENDIF 
 ! Convective adjustment
-    IF (nslay.EQ.1) THEN
+    IF (nslay==1) THEN
         slab_cadj=0
     ELSE
@@ -275,5 +275,5 @@
     ENDIF
 
-    IF (slab_ekman.GT.0) THEN ! ekman transport
+    IF (slab_ekman>0) THEN ! ekman transport
         ALLOCATE(dt_ekman(klon,nslay), stat = error)
         IF (error /= 0) THEN
@@ -297,5 +297,5 @@
 
 ! Initialize transport
-    IF (slab_hdiff.OR.(slab_ekman.GT.0)) THEN
+    IF (slab_hdiff.OR.(slab_ekman>0)) THEN
       CALL gather(zmasq,zmasq_glo)
 ! Master thread/process only
@@ -461,5 +461,5 @@
 
 ! save cumulated wind stress
-    IF (slab_ekman.GT.0) THEN 
+    IF (slab_ekman>0) THEN
       DO i=1,knon
           ki=knindex(i)
@@ -477,5 +477,5 @@
     ! qflux = total QFlux correction (in W/m2)
     dt_qflux(:,1)=lmt_bils(:,1)+diff_sst(:)/cyang/86400.-diff_siv(:)*ice_den*ice_lat/86400.
-    IF (nslay.GT.1) THEN
+    IF (nslay>1) THEN
        dt_qflux(:,2:nslay)=lmt_bils(:,2:nslay)
     END IF
@@ -487,9 +487,9 @@
 !***********************************************o*****************************************
     tsurf_new=tsurf_in
-    IF (MOD(itime,cpl_pas).EQ.0) THEN ! time to update tslab & fraction
+    IF (MOD(itime,cpl_pas)==0) THEN ! time to update tslab & fraction
 ! ***********************************
 !  Horizontal transport 
 ! ***********************************
-      IF (slab_ekman.GT.0) THEN 
+      IF (slab_ekman>0) THEN
           ! copy wind stress to global var
           CALL gather(taux_cum,taux_glo)
@@ -497,5 +497,5 @@
       END IF
 
-      IF (slab_hdiff.OR.(slab_ekman.GT.0)) THEN 
+      IF (slab_hdiff.OR.(slab_ekman>0)) THEN
         CALL gather(tslab,tslab_glo)
       ! Compute horiz transport on one process only
@@ -504,5 +504,5 @@
               dt_hdiff_glo(:,:)=0.
           END IF
-          IF (slab_ekman.GT.0) THEN 
+          IF (slab_ekman>0) THEN
               dt_ekman_glo(:,:)=0.
           END IF
@@ -511,5 +511,5 @@
           END IF
           DO i=1,cpl_pas ! time splitting for numerical stability
-            IF (slab_ekman.GT.0) THEN
+            IF (slab_ekman>0) THEN
               SELECT CASE (slab_ekman)
                 CASE (1)
@@ -564,5 +564,5 @@
             dt_gm_glo(:,:)=dt_gm_glo(:,:)*sea_cap/cpl_pas
           END IF
-          IF (slab_ekman.GT.0) THEN 
+          IF (slab_ekman>0) THEN
             ! dt_ekman_glo saved in W/m2
             dt_ekman_glo(:,:)=dt_ekman_glo(:,:)*sea_cap/cpl_pas
@@ -578,5 +578,5 @@
           CALL Scatter(dt_gm_glo,dt_gm)
         END IF
-        IF (slab_ekman.GT.0) THEN 
+        IF (slab_ekman>0) THEN
           CALL Scatter(dt_ekman_glo,dt_ekman)
           ! clear wind stress
@@ -597,7 +597,7 @@
       tslab(:,1)=tslab(:,1)+bils_cum(:)*cyang*dtime
       ! Convective adjustment if 2 layers 
-      IF ((nslay.GT.1).AND.(slab_cadj.GT.0)) THEN
+      IF ((nslay>1).AND.(slab_cadj>0)) THEN
         DO i=1,klon
-          IF (tslab(i,2).GT.tslab(i,1)) THEN
+          IF (tslab(i,2)>tslab(i,1)) THEN
             ! mean (mass-weighted) temperature
             t_cadj=SUM(tslab(i,:)*slabh(:))/SUM(slabh(:))
@@ -620,5 +620,5 @@
           DO i=1,knon
               ki=knindex(i)
-              IF ((tslab(ki,1).LT.t_freeze).OR.(fsic(ki).GT.epsfra)) THEN
+              IF ((tslab(ki,1)<t_freeze).OR.(fsic(ki)>epsfra)) THEN
                   tslab(ki,1)=t_freeze
               END IF
@@ -628,6 +628,6 @@
           DO i=1,knon
               ki=knindex(i)
-              IF (fsic(ki).LT.epsfra) THEN ! Free of ice
-                  IF (tslab(ki,1).LT.t_freeze) THEN ! create new ice
+              IF (fsic(ki)<epsfra) THEN ! Free of ice
+                  IF (tslab(ki,1)<t_freeze) THEN ! create new ice
                       ! quantity of new ice formed
                       e_freeze=(t_freeze-tslab(ki,1))/cyang/ice_lat
@@ -635,5 +635,5 @@
                       tice(ki)=t_freeze
                       fsic(ki)=MIN(ice_frac_max,e_freeze/h_ice_thin)
-                      IF (fsic(ki).GT.ice_frac_min) THEN
+                      IF (fsic(ki)>ice_frac_min) THEN
                           seaice(ki)=MIN(e_freeze/fsic(ki),h_ice_max)
                           tslab(ki,1)=t_freeze
@@ -647,5 +647,5 @@
               ELSE ! ice present
                   tsurf_new(i)=t_freeze
-                  IF (tslab(ki,1).LT.t_freeze) THEN ! create new ice
+                  IF (tslab(ki,1)<t_freeze) THEN ! create new ice
                       ! quantity of new ice formed over open ocean
                       e_freeze=(t_freeze-tslab(ki,1))/cyang*(1.-fsic(ki)) &
@@ -754,5 +754,5 @@
     DO i=1,knon
     ki=knindex(i)
-        IF (snow(i).GT.snow_min) THEN
+        IF (snow(i)>snow_min) THEN
             ! snow-layer heat capacity
             cal(i)=2.*RCPD/(snow(i)*ice_cap)
@@ -788,5 +788,5 @@
         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
     DO i=1,knon 
-        IF (snow(i).LT.snow_min) tice(knindex(i))=tsurf_new(i)
+        IF (snow(i)<snow_min) tice(knindex(i))=tsurf_new(i)
     END DO
 
@@ -815,10 +815,10 @@
         ENDIF
 ! Melt / Freeze snow from above if Tsurf>0
-        IF (tsurf_new(i).GT.t_melt) THEN
+        IF (tsurf_new(i)>t_melt) THEN
             ! energy available for melting snow (in kg of melted snow /m2)
             e_melt = MIN(MAX(snow(i)*(tsurf_new(i)-t_melt)*ice_cap/2. &
                /(ice_lat+ice_cap/2.*(t_melt-tice(ki))),0.0),snow(i))
             ! remove snow
-            IF (snow(i).GT.e_melt) THEN
+            IF (snow(i)>e_melt) THEN
                 snow(i)=snow(i)-e_melt
                 tsurf_new(i)=t_melt
@@ -831,5 +831,5 @@
         END IF
 ! melt ice from above if Tice>0
-        IF (tice(ki).GT.t_melt) THEN
+        IF (tice(ki)>t_melt) THEN
             ! quantity of ice melted (kg/m2)
             e_melt=MAX(seaice(ki)*(tice(ki)-t_melt)*ice_cap/2. & 
@@ -838,5 +838,5 @@
             dhsic=MIN(seaice(ki)-h_ice_min,e_melt)
             e_melt=e_melt-dhsic
-            IF (e_melt.GT.0) THEN
+            IF (e_melt>0) THEN
             ! lateral melt if ice too thin
             dfsic=MAX(fsic(ki)-ice_frac_min,e_melt/h_ice_min*fsic(ki))
@@ -854,5 +854,5 @@
         ! convert snow to ice if below floating line
         h_test=(seaice(ki)+snow(i))*ice_den-seaice(ki)*sea_den
-        IF (h_test.GT.0.) THEN !snow under water
+        IF (h_test>0.) THEN !snow under water
             ! extra snow converted to ice (with added frozen sea water)
             dhsic=h_test/(sea_den-ice_den+sno_den)
@@ -871,5 +871,5 @@
         ki=knindex(i)
        ! snow albedo: update snow age
-        IF (snow(i).GT.0.0001) THEN
+        IF (snow(i)>0.0001) THEN
              agesno(i)=(agesno(i) + (1.-agesno(i)/50.)*dtime/86400.)&
                          * EXP(-1.*MAX(0.0,precip_snow(i))*dtime/5.)
@@ -881,5 +881,5 @@
         ! ice albedo (varies with ice tkickness and temp)
         alb_ice=MAX(0.0,0.13*LOG(100.*seaice(ki)/ice_den)+0.1)
-        IF (tice(ki).GT.t_freeze-0.01) THEN
+        IF (tice(ki)>t_freeze-0.01) THEN
             alb_ice=MIN(alb_ice,alb_ice_wet)
         ELSE
@@ -905,5 +905,5 @@
     !cumul fluxes
     bilg_cum(:)=bilg_cum(:)+slab_bilg(:)
-    IF (MOD(itime,cpl_pas).EQ.0) THEN ! time to update tslab & fraction
+    IF (MOD(itime,cpl_pas)==0) THEN ! time to update tslab & fraction
         ! Add cumulated surface fluxes
         tslab(:,1)=tslab(:,1)+bilg_cum(:)*cyang*dtime
@@ -912,5 +912,5 @@
             ! split lateral/top melt-freeze
             frac_mf=MIN(1.,MAX(0.,(seaice(ki)-h_ice_thin)/(h_ice_thick-h_ice_thin)))
-            IF (tslab(ki,1).LE.t_freeze) THEN 
+            IF (tslab(ki,1)<=t_freeze) THEN
                ! ****** Form new ice from below *******
                ! quantity of new ice
@@ -921,5 +921,5 @@
                seaice(ki)=dhsic+seaice(ki)
                e_melt=e_melt-fsic(ki)*dhsic
-               IF (e_melt.GT.0.) THEN
+               IF (e_melt>0.) THEN
                ! frac_mf fraction used for lateral increase
                dfsic=MIN(ice_frac_max-fsic(ki),e_melt*frac_mf/seaice(ki))
@@ -939,5 +939,5 @@
                seaice(ki)=seaice(ki)-dhsic
                e_melt=e_melt-fsic(ki)*dhsic
-               IF (e_melt.GT.0) THEN
+               IF (e_melt>0) THEN
                ! frac_mf fraction used for height decrease
                dhsic=MAX(0.,MIN(seaice(ki)-h_ice_min,e_melt*frac_mf/fsic(ki)))
@@ -957,5 +957,5 @@
     
     !tests ice fraction 
-    WHERE (fsic.LT.ice_frac_min)
+    WHERE (fsic<ice_frac_min)
         tslab(:,1)=tslab(:,1)-fsic*seaice*ice_lat*cyang
         tice=t_melt
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/orografi_strato.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/orografi_strato.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/orografi_strato.F90	(revision 5082)
@@ -396,5 +396,5 @@
         ! -----------------
 
-        IF (partdrag .GE. 2) THEN
+        IF (partdrag >= 2) THEN
         facpart=0.
         ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/paramlmdz_phy_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/paramlmdz_phy_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/paramlmdz_phy_mod.F90	(revision 5082)
@@ -60,5 +60,5 @@
 !
        CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,rlon_glo,zx_lon)
-       IF (nbp_lon.GT.1) THEN
+       IF (nbp_lon>1) THEN
        DO i = 1, nbp_lon
          zx_lon(i,1) = rlon_glo(i+1)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90	(revision 5082)
@@ -1561,5 +1561,5 @@
    ENDDO
 ! >> PC
-   IF (carbon_cycle_cpl .AND. carbon_cycle_tr .AND. nbcf_out.GT.0 ) THEN
+   IF (carbon_cycle_cpl .AND. carbon_cycle_tr .AND. nbcf_out>0 ) THEN
        r_co2_ppm(:) = co2_send(:)
        DO n=1,nbcf_out
@@ -1567,5 +1567,5 @@
        ENDDO
    ENDIF
-   IF ( .NOT. carbon_cycle_tr .AND. nbcf_out.GT.0 ) THEN
+   IF ( .NOT. carbon_cycle_tr .AND. nbcf_out>0 ) THEN
        r_co2_ppm(:) = co2_ppm     ! Constant field
        DO n=1,nbcf_out
@@ -1633,8 +1633,8 @@
 !jyg<    (20190926)
 !   Provisional : set ybeta to standard values
-       IF (nsrf .NE. is_ter) THEN
+       IF (nsrf /= is_ter) THEN
            ybeta(1:knon) = 1.
        ELSE
-           IF (iflag_split .EQ. 0) THEN
+           IF (iflag_split == 0) THEN
               ybeta(1:knon) = 1.
            ELSE
@@ -1768,5 +1768,5 @@
         ENDDO
 !
-       IF (iflag_split.GE.1) THEN
+       IF (iflag_split>=1) THEN
 !!! nrlmd le 02/05/2011
         DO k = 1, klev
@@ -1791,5 +1791,5 @@
         ENDDO
 
-        IF (prt_level .ge. 10) THEN
+        IF (prt_level >= 10) THEN
           print *,'pbl_surface, wake_s(1), wake_dlt(1,:) ', wake_s(1), wake_dlt(1,:)
           print *,'pbl_surface, wake_s(1), wake_dlq(1,:) ', wake_s(1), wake_dlq(1,:)
@@ -1839,5 +1839,5 @@
        
        ! qsol(water height in soil) only for bucket continental model
-       IF ( nsrf .EQ. is_ter .AND. .NOT. ok_veget ) THEN 
+       IF ( nsrf == is_ter .AND. .NOT. ok_veget ) THEN
           DO j = 1, knon
              i = ni(j)
@@ -1871,5 +1871,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!!
 !!! nrlmd & jyg les 02/05/2011, 13/06/2011, 05/02/2012
@@ -1980,5 +1980,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!! nrlmd & jyg les 02/05/2011, 13/06/2011, 05/02/2012
       IF (prt_level >=10) THEN
@@ -2133,5 +2133,5 @@
 ! - Calculate the coefficients Ccoef_H, Ccoef_Q, Dcoef_H and Dcoef_Q 
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!!
 !!! nrlmd & jyg les 02/05/2011, 13/06/2011, 05/02/2012
@@ -2191,5 +2191,5 @@
 ! - Calculate the coefficients Ccoef_U, Ccoef_V, Dcoef_U and Dcoef_V
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!! nrlmd & jyg les 02/05/2011, 13/06/2011, 05/02/2012
         CALL climb_wind_down(knon, dtime, ycoefm, ypplay, ypaprs, yt, ydelp, yu, yv, &
@@ -2256,5 +2256,5 @@
 !!! jyg le 07/02/2012
 !!! jyg le 01/02/2017
-       IF (iflag_split .eq. 0) THEN
+       IF (iflag_split == 0) THEN
          yt1(:) = yt(:,1)
          yq1(:) = yq(:,1)
@@ -2263,5 +2263,5 @@
 #endif
 
-       ELSE IF (iflag_split .ge. 1) THEN
+       ELSE IF (iflag_split >= 1) THEN
 #ifdef ISO
         call abort_gcm('pbl_surface_mod 2149','isos pas encore dans iflag_split=1',1)
@@ -2279,5 +2279,5 @@
     !******************************************************************************
 !
-    IF ( f_z0qh_oce .ne. 1. .and. nsrf .eq.is_oce) THEN
+    IF ( f_z0qh_oce /= 1. .and. nsrf ==is_oce) THEN
        ! Si on suit les formulations par exemple de Tessel, on 
        ! a z0h=0.4*nu/u*, z0q=0.62*nu/u*, d'ou f_z0qh_oce=0.62/0.4=1.55
@@ -2332,5 +2332,5 @@
                          yt1, yq1, yu1, yv1 &
                          )
-         IF (iflag_split .eq. 2 .AND. nsrf .ne. is_oce) THEN
+         IF (iflag_split == 2 .AND. nsrf /= is_oce) THEN
            CALL wx_pbl_dts_merge(knon, dtime, ypplay, ypaprs, &
                            ywake_s, ybeta, ywake_cstar, ywake_dens, &
@@ -2439,5 +2439,5 @@
 !FC quid qd yveget ylai yheight ne sont pas definit
 !FC  yveget,ylai,yheight, &
-            IF (ifl_pbltree .ge. 1) THEN
+            IF (ifl_pbltree >= 1) THEN
               CALL   freinage(knon, yu, yv, yt, &
 !                yveget,ylai, yheight,ypaprs,ypplay,y_d_u_frein,y_d_v_frein)
@@ -2491,5 +2491,5 @@
           ! Martin
 
-          IF (landice_opt .LT. 2) THEN
+          IF (landice_opt < 2) THEN
              ! Land ice is treated by LMDZ and not by ORCHIDEE
              CALL surf_landice(itap, dtime, knon, ni, &
@@ -2742,5 +2742,5 @@
 ! ------------------------------------------------------------------------------
 
-       IF (iflag_split .GE. 1) THEN
+       IF (iflag_split >= 1) THEN
 #ifdef ISO
         call abort_gcm('pbl_surface_mod 2607','isos pas encore dans iflag_split=1',1)
@@ -2748,5 +2748,5 @@
 !
 !
-         IF (nsrf .ne. is_oce) THEN
+         IF (nsrf /= is_oce) THEN
 !
 !         Compute potential evaporation and aridity factor  (jyg, 20200328)
@@ -2790,5 +2790,5 @@
                           yt1, yq1, yu1, yv1 &
                           )
-          IF (iflag_split .eq. 2) THEN
+          IF (iflag_split == 2) THEN
             CALL wx_pbl_dts_merge(knon, dtime, ypplay, ypaprs, &
                             ywake_s, ybeta, ywake_cstar, ywake_dens, &
@@ -2859,5 +2859,5 @@
                        y_flux_q1_x, y_flux_q1_w)
 !
-         IF (nsrf .ne. is_oce) THEN
+         IF (nsrf /= is_oce) THEN
            CALL wx_pbl_dts_check(knon, dtime, ypplay, ypaprs, ywake_s, ybeta, iflag_split, &
                          yTs, y_delta_tsurf,  & 
@@ -2931,5 +2931,5 @@
 !!jyg!!!!! fin nrlmd le 13/06/2011
 !!jyg!!
-       IF (iflag_split .ge. 1) THEN
+       IF (iflag_split >= 1) THEN
        IF (prt_level >=10) THEN
         DO j = 1, knon
@@ -2954,5 +2954,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!!
 !!! nrlmd & jyg les 02/05/2011, 13/06/2011, 05/02/2012
@@ -3006,5 +3006,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!!
 !!! nrlmd & jyg les 02/05/2011, 13/06/2011, 05/02/2012
@@ -3092,5 +3092,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split.EQ.0) THEN
+       IF (iflag_split==0) THEN
 !!!
         DO k = 1, klev
@@ -3103,5 +3103,5 @@
              y_d_v(j,k)  = y_d_v(j,k) * ypct(j)
 !FC
-             IF  (nsrf .EQ. is_ter .and. ifl_pbltree .GE. 1) THEN
+             IF  (nsrf == is_ter .and. ifl_pbltree >= 1) THEN
 !            if (y_d_u_frein(j,k).ne.0. ) then
 !        print*, nsrf,'IS_TER ++', y_d_u_frein(j,k)*ypct(j),y_d_u(j,k),j,k
@@ -3286,5 +3286,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split .ge.1) THEN
+       IF (iflag_split >=1) THEN
 !!!
 !!! nrlmd le 02/05/2011
@@ -3333,5 +3333,5 @@
 !!        ENDDO
 !!!
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
         wake_dltke(:,:,nsrf) = 0.
         DO k = 1, klev+1
@@ -3381,5 +3381,5 @@
 !      print*,'Dans pbl OK3'
 
-       IF ( nsrf .EQ. is_ter ) THEN 
+       IF ( nsrf == is_ter ) THEN
           DO j = 1, knon
              i = ni(j)
@@ -3423,5 +3423,5 @@
 #endif
 !!! jyg le 07/02/2012
-       IF (iflag_split .ge.1) THEN
+       IF (iflag_split >=1) THEN
 !!!
 !!! nrlmd+jyg le 02/05/2011 et le 20/02/2012
@@ -3555,5 +3555,5 @@
 !      print*, tair1,yt(:,1),y_d_t(:,1)
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
         DO j=1, knon
           uzon(j) = yu(j,1) + y_d_u(j,1)
@@ -3614,5 +3614,5 @@
 ! Calculate the temperature and relative humidity at 2m and the wind at 10m 
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
         IF (iflag_new_t2mq2m==1) THEN
            CALL stdlevvarn(klon, knon, nsrf, zxli, &
@@ -3653,5 +3653,5 @@
 !!!
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
         DO j=1, knon
           i = ni(j)
@@ -3710,5 +3710,5 @@
        IF (thermcep) THEN
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
           DO j = 1, knon
              i=ni(j)
@@ -3758,5 +3758,5 @@
 !
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
         CALL hbtm(knon, ypaprs, ypplay, &
             yt2m,yt10m,yq2m,yq10m,yustar,ywstar, &
@@ -3806,5 +3806,5 @@
        
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
 !!!
         DO j=1, knon
@@ -3928,5 +3928,5 @@
 
 !!! jyg le 07/02/2012
-       IF (iflag_split .ge.1) THEN
+       IF (iflag_split >=1) THEN
 !!!
 !!! nrlmd & jyg les 02/05/2011, 05/02/2012
@@ -4059,5 +4059,5 @@
           
 !!! jyg le 07/02/2012
-       IF (iflag_split .eq.0) THEN
+       IF (iflag_split ==0) THEN
         DO nsrf = 1, nbsrf
          DO i = 1, klon          
@@ -4381,5 +4381,5 @@
                 mfois(nsrf) = mfois(nsrf) + 1
                 ! F. Codron sensible default values for ocean and sea ice
-                IF (nsrf.EQ.is_oce) THEN
+                IF (nsrf==is_oce) THEN
                    tsurf(i,nsrf) = 271.35
                    ! (temperature of sea water under sea ice, so that
@@ -4402,5 +4402,5 @@
                       dt_ns(i) = 0.
                    end if
-                ELSE IF (nsrf.EQ.is_sic) THEN
+                ELSE IF (nsrf==is_sic) THEN
                    tsurf(i,nsrf) = 271.35
                    ! (Temperature at base of sea ice. Surface
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/phyredem.F90	(revision 5082)
@@ -99,5 +99,5 @@
   tab_cntrl(6) = nbapp_rad
 
-  IF( iflag_cycle_diurne.GE.1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
+  IF( iflag_cycle_diurne>=1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
   IF(   soil_model ) tab_cntrl( 8 ) = 1.
   IF(     new_oliq ) tab_cntrl( 9 ) = 1.
@@ -134,5 +134,5 @@
     ! Get last fractions from slab ocean
     IF (type_ocean == 'slab' .AND. version_ocean == "sicINT") THEN
-        WHERE (1.-zmasq(:).GT.EPSFRA)
+        WHERE (1.-zmasq(:)>EPSFRA)
             pctsrf(:,is_oce)=(1.-fsic(:))*(1.-zmasq(:))
             pctsrf(:,is_sic)=fsic(:)*(1.-zmasq(:))
@@ -362,5 +362,5 @@
     ! Restart variables for Slab ocean
     IF (type_ocean == 'slab') THEN
-        IF (nslay.EQ.1) THEN
+        IF (nslay==1) THEN
           CALL put_field(pass,"tslab", "Slab ocean temperature", tslab)
         ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_mod.F90	(revision 5082)
@@ -352,9 +352,9 @@
 
        ! Calculate ecrit_files for all files
-      IF ( chtimestep(iff).eq.'Default' ) THEN
+      IF ( chtimestep(iff)=='Default' ) THEN
           ! Par defaut ecrit_files = (ecrit_mensuel ecrit_jour ecrit_hf
           ! ...)*86400.
           ecrit_files(iff)=ecrit_files(iff)*86400.
-      ELSE IF (chtimestep(iff).eq.'-1') THEN
+      ELSE IF (chtimestep(iff)=='-1') THEN
           PRINT*,'ecrit_files(',iff,') < 0 so IOIPSL work on different'
           PRINT*,'months length'
@@ -382,5 +382,5 @@
       ENDIF
 
-      IF (iff.LE.6.OR.iff.EQ.10) THEN
+      IF (iff<=6.OR.iff==10) THEN
         CALL wxios_add_vaxis("presnivs", &
               levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))
@@ -441,12 +441,12 @@
              DO i=1,nbp_lon
                 WRITE(lunout,*)'io_lon(i)=',io_lon(i)
-                IF (io_lon(i).le.phys_out_lonmin(iff)) imin_ins=i
-                IF (io_lon(i).le.phys_out_lonmax(iff)) imax_ins=i+1
+                IF (io_lon(i)<=phys_out_lonmin(iff)) imin_ins=i
+                IF (io_lon(i)<=phys_out_lonmax(iff)) imax_ins=i+1
              ENDDO
 
              DO j=1,jjmp1
                 WRITE(lunout,*)'io_lat(j)=',io_lat(j)
-                IF (io_lat(j).ge.phys_out_latmin(iff)) jmax_ins=j+1
-                IF (io_lat(j).ge.phys_out_latmax(iff)) jmin_ins=j
+                IF (io_lat(j)>=phys_out_latmin(iff)) jmax_ins=j+1
+                IF (io_lat(j)>=phys_out_latmax(iff)) jmin_ins=j
              ENDDO
 
@@ -484,5 +484,5 @@
 
 #ifndef CPP_IOIPSL_NO_OUTPUT 
-          IF (iff.LE.6.OR.iff.EQ.10) THEN
+          IF (iff<=6.OR.iff==10) THEN
              CALL histvert(nid_files(iff), "presnivs", "Vertical levels", "Pa", &  
                levmax(iff) - levmin(iff) + 1, &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90	(revision 5082)
@@ -1332,5 +1332,5 @@
     ! en imposant la valeur de igout.
     !======================================================================
-    IF (prt_level.ge.1) THEN
+    IF (prt_level>=1) THEN
        igout=klon/2+1/klon
        write(lunout,*) 'DEBUT DE PHYSIQ !!!!!!!!!!!!!!!!!!!!'
@@ -1397,5 +1397,5 @@
        !
        !CR: check sur le nb de traceurs de l eau
-       IF ((iflag_ice_thermo.gt.0).and.(nqo==2)) THEN
+       IF ((iflag_ice_thermo>0).and.(nqo==2)) THEN
           WRITE (lunout, *) ' iflag_ice_thermo==1 requires 3 H2O tracers ', &
                '(H2O_g, H2O_l, H2O_s) but nqo=', nqo, '. Might as well stop here.'
@@ -1404,5 +1404,5 @@
        ENDIF
 
-       IF (ok_ice_sursat.AND.(iflag_ice_thermo.EQ.0)) THEN
+       IF (ok_ice_sursat.AND.(iflag_ice_thermo==0)) THEN
           WRITE (lunout, *) ' ok_ice_sursat=y requires iflag_ice_thermo=1 as well'
           abort_message='see above'
@@ -1410,5 +1410,5 @@
        ENDIF
 
-       IF (ok_ice_sursat.AND.(nqo.LT.4)) THEN
+       IF (ok_ice_sursat.AND.(nqo<4)) THEN
           WRITE (lunout, *) ' ok_ice_sursat=y requires 4 H2O tracers ', &
                '(H2O_g, H2O_l, H2O_s, H2O_r) but nqo=', nqo, '. Might as well stop here.'
@@ -1430,5 +1430,5 @@
 
         IF (ok_bs) THEN
-         IF ((ok_ice_sursat.AND.nqo .LT.5).OR.(.NOT.ok_ice_sursat.AND.nqo.LT.4)) THEN
+         IF ((ok_ice_sursat.AND.nqo <5).OR.(.NOT.ok_ice_sursat.AND.nqo<4)) THEN
              WRITE (lunout, *) 'activation of blowing snow needs a specific H2O tracer', &
                                'but nqo=', nqo
@@ -1551,5 +1551,5 @@
     ENDIF
 
-    IF (prt_level.ge.1) print *,'CONVERGENCE PHYSIQUE THERM 1 '
+    IF (prt_level>=1) print *,'CONVERGENCE PHYSIQUE THERM 1 '
 
     !======================================================================
@@ -1620,5 +1620,5 @@
        print*,'iflag_cycle_diurne', iflag_cycle_diurne
        !
-       IF (iflag_con.EQ.2.AND.iflag_cld_th.GT.-1) THEN
+       IF (iflag_con==2.AND.iflag_cld_th>-1) THEN
           abort_message = 'Tiedtke needs iflag_cld_th=-2 or -1'
           CALL abort_physic (modname,abort_message,1)
@@ -1654,5 +1654,5 @@
        ENDIF
 !>jyg
-       IF (MOD(NINT(86400./phys_tstep),nbapp_rad).EQ.0) THEN
+       IF (MOD(NINT(86400./phys_tstep),nbapp_rad)==0) THEN
           radpas = NINT( 86400./phys_tstep)/nbapp_rad
        ELSE 
@@ -1665,8 +1665,8 @@
           CALL abort_physic(modname,abort_message,1)
        ENDIF
-       IF (nbapp_cv .EQ. 0) nbapp_cv=86400./phys_tstep
-       IF (nbapp_wk .EQ. 0) nbapp_wk=86400./phys_tstep
+       IF (nbapp_cv == 0) nbapp_cv=86400./phys_tstep
+       IF (nbapp_wk == 0) nbapp_wk=86400./phys_tstep
        print *,'physiq, nbapp_cv, nbapp_wk ',nbapp_cv,nbapp_wk
-       IF (MOD(NINT(86400./phys_tstep),nbapp_cv).EQ.0) THEN
+       IF (MOD(NINT(86400./phys_tstep),nbapp_cv)==0) THEN
           cvpas_0 = NINT( 86400./phys_tstep)/nbapp_cv
           cvpas = cvpas_0
@@ -1681,5 +1681,5 @@
           CALL abort_physic(modname,abort_message,1)
        ENDIF
-       IF (MOD(NINT(86400./phys_tstep),nbapp_wk).EQ.0) THEN
+       IF (MOD(NINT(86400./phys_tstep),nbapp_wk)==0) THEN
           wkpas = NINT( 86400./phys_tstep)/nbapp_wk
 !       print *,'physiq, wkpas ',wkpas
@@ -1706,5 +1706,5 @@
              CLOSE(98)
              CONTINUE
-             IF(nCFMIP.GT.npCFMIP) THEN
+             IF(nCFMIP>npCFMIP) THEN
                 print*,'nCFMIP > npCFMIP : augmenter npCFMIP et recompiler'
                 CALL abort_physic("physiq", "", 1)
@@ -1867,5 +1867,5 @@
        ! Test de coherence sur oc_cdnc utilisé uniquement par cloud_optics_prop
        IF (ok_newmicro) then
-          IF (iflag_rrtm.EQ.1) THEN
+          IF (iflag_rrtm==1) THEN
 #ifdef CPP_RRTM
              IF (ok_cdnc.AND.NRADLP.NE.3) THEN
@@ -1966,5 +1966,5 @@
        ! on remet le calendrier a zero
        !
-       IF (raz_date .eq. 1) THEN
+       IF (raz_date == 1) THEN
           itau_phy = 0
        ENDIF
@@ -1977,5 +1977,5 @@
 !          phys_tstep=pdtphys
 !       ENDIF
-       IF (nlon .NE. klon) THEN
+       IF (nlon /= klon) THEN
           WRITE(lunout,*)'nlon et klon ne sont pas coherents', nlon,  &
                klon
@@ -1983,5 +1983,5 @@
           CALL abort_physic(modname,abort_message,1)
        ENDIF
-       IF (nlev .NE. klev) THEN
+       IF (nlev /= klev) THEN
           WRITE(lunout,*)'nlev et klev ne sont pas coherents', nlev, &
                klev
@@ -1990,5 +1990,5 @@
        ENDIF
        !
-       IF (phys_tstep*REAL(radpas).GT.21600..AND.iflag_cycle_diurne.GE.1) THEN 
+       IF (phys_tstep*REAL(radpas)>21600..AND.iflag_cycle_diurne>=1) THEN
           WRITE(lunout,*)'Nbre d appels au rayonnement insuffisant'
           WRITE(lunout,*)"Au minimum 4 appels par jour si cycle diurne"
@@ -2007,5 +2007,5 @@
        !KE43
        ! Initialisation pour la convection de K.E. (sb):
-       IF (iflag_con.GE.3) THEN
+       IF (iflag_con>=3) THEN
 
           WRITE(lunout,*)"*** Convection de Kerry Emanuel 4.3  "
@@ -2090,5 +2090,5 @@
              zuthe(i)=0.
              zvthe(i)=0.
-             IF (zstd(i).gt.10.) THEN
+             IF (zstd(i)>10.) THEN
                 zuthe(i)=(1.-zgam(i))*cos(zthe(i))
                 zvthe(i)=(1.-zgam(i))*sin(zthe(i))
@@ -2447,11 +2447,11 @@
           qbs_seri(i,k) = 0.
           !CR: ATTENTION, on rajoute la variable glace
-          IF (nqo.EQ.2) THEN             !--vapour and liquid only
+          IF (nqo==2) THEN             !--vapour and liquid only
              qs_seri(i,k) = 0.
              rneb_seri(i,k) = 0.
-          ELSE IF (nqo.EQ.3) THEN        !--vapour, liquid and ice
+          ELSE IF (nqo==3) THEN        !--vapour, liquid and ice
              qs_seri(i,k) = qx(i,k,isol)
              rneb_seri(i,k) = 0.
-          ELSE IF (nqo.GE.4) THEN        !--vapour, liquid, ice and rneb and blowing snow
+          ELSE IF (nqo>=4) THEN        !--vapour, liquid, ice and rneb and blowing snow
              qs_seri(i,k) = qx(i,k,isol)
              IF (ok_ice_sursat) THEN
@@ -2520,5 +2520,5 @@
     ENDDO
     ! Initialize variables used for diagnostic purpose
-    IF (flag_inhib_tend .ne. 0) CALL init_cmp_seri
+    IF (flag_inhib_tend /= 0) CALL init_cmp_seri
 
     ! Diagnostiquer la tendance dynamique
@@ -2705,5 +2705,5 @@
     ENDIF
 
-    IF (prt_level.ge.1) write(lunout,*)'Longitude solaire ',zlongi,solarlong0,dist
+    IF (prt_level>=1) write(lunout,*)'Longitude solaire ',zlongi,solarlong0,dist
 
 
@@ -2716,5 +2716,5 @@
     ! non nul aux poles.
     IF (abs(solarlong0-1000.)<1.e-4) THEN
-       CALL zenang_an(iflag_cycle_diurne.GE.1,jH_cur, &
+       CALL zenang_an(iflag_cycle_diurne>=1,jH_cur, &
             latitude_deg,longitude_deg,rmu0,fract)
        swradcorr(:) = 1.0
@@ -2741,5 +2741,5 @@
           ! Calcul du flag jour-nuit
           JrNt = 0.0
-          WHERE (fract.GT.0.0) JrNt = 1.0
+          WHERE (fract>0.0) JrNt = 1.0
        CASE(2)  
           !  Avec cycle diurne sans application des poids
@@ -2763,9 +2763,9 @@
                latitude_deg,longitude_deg,zrmu0,zfract)
           swradcorr = 0.0
-          WHERE (rmu0.GE.1.e-10 .OR. fract.GE.1.e-10) &
+          WHERE (rmu0>=1.e-10 .OR. fract>=1.e-10) &
                swradcorr=zfract/fract*zrmu0/rmu0
           ! Calcul du flag jour-nuit
           JrNt = 0.0
-          WHERE (zfract.GT.0.0) JrNt = 1.0 
+          WHERE (zfract>0.0) JrNt = 1.0
        END SELECT
     ENDIF
@@ -2826,5 +2826,5 @@
        !jyg+nrlmd<
 !!jyg       IF (prt_level .ge. 2 .and. mod(iflag_pbl_split,2) .eq. 1) THEN
-       IF (prt_level .ge. 2 .and. mod(iflag_pbl_split,10) .ge. 1) THEN
+       IF (prt_level >= 2 .and. mod(iflag_pbl_split,10) >= 1) THEN
           print *,'debut du splitting de la PBL, wake_s = ', wake_s(:)
           print *,'debut du splitting de la PBL, wake_deltat = ', wake_deltat(:,1)
@@ -2923,5 +2923,5 @@
        !  Add turbulent diffusion tendency to the wake difference variables
 !!jyg       IF (mod(iflag_pbl_split,2) .NE. 0) THEN
-       IF (mod(iflag_pbl_split,10) .NE. 0) THEN
+       IF (mod(iflag_pbl_split,10) /= 0) THEN
 !jyg<
           d_deltat_vdf(:,:) = d_t_vdf_w(:,:)-d_t_vdf_x(:,:)
@@ -3032,5 +3032,5 @@
           ELSE
              !!           IF (zx_t.LT.t_coup) THEN             !jyg
-             IF (zx_t.LT.rtt) THEN                  !jyg
+             IF (zx_t<rtt) THEN                  !jyg
                 zx_qs = qsats(zx_t)/pplay(i,k)
              ELSE
@@ -3042,5 +3042,5 @@
     ENDDO
 
-    IF (prt_level.ge.1) THEN
+    IF (prt_level>=1) THEN
        write(lunout,*) 'L   qsat (g/kg) avant clouds_gno'
        write(lunout,'(i4,f15.4)') (k,1000.*zqsat(igout,k),k=1,klev)
@@ -3065,5 +3065,5 @@
     ENDDO
 
-    IF (prt_level.ge.1) write(lunout,*) 'omega(igout, :) = ', &
+    IF (prt_level>=1) write(lunout,*) 'omega(igout, :) = ', &
          omega(igout, :)
     !
@@ -3073,5 +3073,5 @@
 !!    print *,' physiq : itapcv, cvpas, itap-1, cvpas_0 ', &
 !!                       itapcv, cvpas, itap-1, cvpas_0
-    IF (MOD(itapcv,cvpas).EQ.0 .OR. MOD(itap-1,cvpas_0).EQ.0) THEN
+    IF (MOD(itapcv,cvpas)==0 .OR. MOD(itap-1,cvpas_0)==0) THEN
 
     !
@@ -3101,5 +3101,5 @@
     sij(:,:,:)=0.
     !
-    IF (iflag_con.EQ.1) THEN
+    IF (iflag_con==1) THEN
        abort_message ='reactiver le call conlmd dans physiq.F'
        CALL abort_physic (modname,abort_message,1)
@@ -3107,5 +3107,5 @@
        !    .             d_t_con, d_q_con,
        !    .             rain_con, snow_con, ibas_con, itop_con)
-    ELSE IF (iflag_con.EQ.2) THEN
+    ELSE IF (iflag_con==2) THEN
        CALL conflx(phys_tstep, paprs, pplay, t_seri, q_seri, &
             conv_t, conv_q, -evap, omega, &
@@ -3122,5 +3122,5 @@
           itop_con(i) = klev+1 - kctop(i)
        ENDDO
-    ELSE IF (iflag_con.GE.3) THEN
+    ELSE IF (iflag_con>=3) THEN
        ! nb of tracers for the KE convection:
        ! MAF la partie traceurs est faite dans phytrac
@@ -3160,5 +3160,5 @@
              DO k=1,klev
                 DO i=1,klon
-                   IF (wake_s(i) .GT. 1.e-3) THEN
+                   IF (wake_s(i) > 1.e-3) THEN
                       t_w(i,k) = t_w(i,k) + d_t_adjwk(i,k)
                       q_w(i,k) = q_w(i,k) + d_q_adjwk(i,k)
@@ -3212,5 +3212,5 @@
              IF (-7*log(presnivs(k)/presnivs(1)) > 25.) k_upper_cv = k
           ENDDO
-          IF (prt_level .ge. 5) THEN
+          IF (prt_level >= 5) THEN
              Print *, 'upmost level of deep convection loops: k_upper_cv = ', &
                   k_upper_cv
@@ -3288,5 +3288,5 @@
           !
           DO i = 1, klon
-             IF (iflagctrl(i).le.1) itau_con(i)=itau_con(i)+cvpas
+             IF (iflagctrl(i)<=1) itau_con(i)=itau_con(i)+cvpas
           ENDDO
           !
@@ -3373,5 +3373,5 @@
           ema_pct(i)  = paprs(i,itop_con(i)+1)
 
-          IF (itop_con(i).gt.klev-3) THEN
+          IF (itop_con(i)>klev-3) THEN
              IF (prt_level >= 9) THEN
                 write(lunout,*)'La convection monte trop haut '
@@ -3380,5 +3380,5 @@
           ENDIF
        ENDDO
-    ELSE IF (iflag_con.eq.0) THEN
+    ELSE IF (iflag_con==0) THEN
        write(lunout,*) 'On n appelle pas la convection'
        clwcon0=0.
@@ -3465,5 +3465,5 @@
        ! Call wakes every "wkpas" step
        !
-       IF (MOD(itapwk,wkpas).EQ.0) THEN
+       IF (MOD(itapwk,wkpas)==0) THEN
           !
           DO k=1,klev
@@ -3536,5 +3536,5 @@
 
        ! Increment Wake state variables
-       IF (iflag_wake_tend .GT. 0.) THEN
+       IF (iflag_wake_tend > 0.) THEN
 
          CALL add_wake_tend &
@@ -3544,5 +3544,5 @@
        ENDIF   ! (iflag_wake_tend .GT. 0.)
        !
-       IF (prt_level .GE. 10) THEN
+       IF (prt_level >= 10) THEN
          print *,' physiq, after calwake, wake_s: ',wake_s(:)
          print *,' physiq, after calwake, wake_deltat: ',wake_deltat(:,1)
@@ -3550,5 +3550,5 @@
        ENDIF
 
-       IF (iflag_alp_wk_cond .GT. 0.) THEN
+       IF (iflag_alp_wk_cond > 0.) THEN
 
          CALL alpale_wk(phys_tstep, cell_area, wake_k, wake_s, wake_dens, wake_fip_0, &
@@ -3648,5 +3648,5 @@
           !jyg<
 !!       IF (mod(iflag_pbl_split/2,2) .EQ. 1) THEN
-          IF (mod(iflag_pbl_split/10,10) .GE. 1) THEN
+          IF (mod(iflag_pbl_split/10,10) >= 1) THEN
              !  Appel des thermiques avec les profils exterieurs aux poches
              DO k=1,klev
@@ -3696,5 +3696,5 @@
           !jyg<
 !!jyg          IF (mod(iflag_pbl_split/2,2) .EQ. 1) THEN
-          IF (mod(iflag_pbl_split/10,10) .GE. 1) THEN
+          IF (mod(iflag_pbl_split/10,10) >= 1) THEN
              !  Si les thermiques ne sont presents que hors des
              !  poches, la tendance moyenne associ\'ee doit etre
@@ -3762,5 +3762,5 @@
        IF (iflag_thermals>=13.or.iflag_thermals<=0) THEN
 
-          IF (iflag_thermals.eq.0) THEN
+          IF (iflag_thermals==0) THEN
              IF (prt_level>9) WRITE(lunout,*)'ajsec'
              limbas(:)=1
@@ -3829,5 +3829,5 @@
     ! et le processus de precipitation
     !-------------------------------------------------------------------------
-    IF (prt_level .GE.10) THEN
+    IF (prt_level >=10) THEN
        print *,'itap, ->fisrtilp ',itap
     ENDIF
@@ -3958,9 +3958,9 @@
     !IM cf FH
     !     IF (iflag_cld_th.eq.-1) THEN ! seulement pour Tiedtke
-    IF (iflag_cld_th.le.-1) THEN ! seulement pour Tiedtke
+    IF (iflag_cld_th<=-1) THEN ! seulement pour Tiedtke
        snow_tiedtke=0.
        !     print*,'avant calcul de la pseudo precip '
        !     print*,'iflag_cld_th',iflag_cld_th
-       IF (iflag_cld_th.eq.-1) THEN
+       IF (iflag_cld_th==-1) THEN
           rain_tiedtke=rain_con
        ELSE
@@ -3970,5 +3970,5 @@
           DO k=1,klev
              DO i=1,klon
-                IF (d_q_con(i,k).lt.0.) THEN
+                IF (d_q_con(i,k)<0.) THEN
                    rain_tiedtke(i)=rain_tiedtke(i)-d_q_con(i,k)/pdtphys &
                         *(paprs(i,k)-paprs(i,k+1))/rg
@@ -3988,5 +3988,5 @@
        DO k = 1, klev
           DO i = 1, klon
-             IF (diafra(i,k).GT.cldfra(i,k)) THEN
+             IF (diafra(i,k)>cldfra(i,k)) THEN
                 radocond(i,k) = dialiq(i,k)
                 cldfra(i,k) = diafra(i,k)
@@ -3995,5 +3995,5 @@
        ENDDO
 
-    ELSE IF (iflag_cld_th.ge.3) THEN
+    ELSE IF (iflag_cld_th>=3) THEN
        !  On prend pour les nuages convectifs le max du calcul de la
        !  convection et du calcul du pas de temps precedent diminue d'un facteur
@@ -4003,5 +4003,5 @@
           DO i=1,klon
              rnebcon(i,k)=rnebcon(i,k)*facteur
-             IF (rnebcon0(i,k)*clwcon0(i,k).GT.rnebcon(i,k)*clwcon(i,k)) THEN
+             IF (rnebcon0(i,k)*clwcon0(i,k)>rnebcon(i,k)*clwcon(i,k)) THEN
                 rnebcon(i,k)=rnebcon0(i,k)
                 clwcon(i,k)=clwcon0(i,k)
@@ -4087,5 +4087,5 @@
        DO k = 1, klev
           DO i = 1, klon
-             IF (diafra(i,k).GT.cldfra(i,k)) THEN
+             IF (diafra(i,k)>cldfra(i,k)) THEN
                 radocond(i,k) = dialiq(i,k)
                 cldfra(i,k) = diafra(i,k)
@@ -4119,5 +4119,5 @@
           ELSE
              !!           IF (zx_t.LT.t_coup) THEN             !jyg
-             IF (zx_t.LT.rtt) THEN                  !jyg
+             IF (zx_t<rtt) THEN                  !jyg
                 zx_qs = qsats(zx_t)/pplay(i,k)
              ELSE
@@ -4126,5 +4126,5 @@
           ENDIF
           zx_rh(i,k) = q_seri(i,k)/zx_qs
-            IF (iflag_ice_thermo .GT. 0) THEN
+            IF (iflag_ice_thermo > 0) THEN
           zx_rhl(i,k) = q_seri(i,k)/(qsatl(zx_t)/pplay(i,k))
           zx_rhi(i,k) = q_seri(i,k)/(qsats(zx_t)/pplay(i,k))
@@ -4140,5 +4140,5 @@
        tpot(i)=zt2m(i)*(100000./paprs(i,1))**RKAPPA
        IF (thermcep) THEN
-          IF(zt2m(i).LT.RTT) then
+          IF(zt2m(i)<RTT) then
              Lheat=RLSTT
           ELSE
@@ -4146,5 +4146,5 @@
           ENDIF
        ELSE
-          IF (zt2m(i).LT.RTT) THEN
+          IF (zt2m(i)<RTT) THEN
              Lheat=RLSTT
           ELSE
@@ -4222,11 +4222,11 @@
     ! Appeler le rayonnement mais calculer tout d'abord l'albedo du sol.
     !
-    IF (MOD(itaprad,radpas).EQ.0) THEN
+    IF (MOD(itaprad,radpas)==0) THEN
 
        !
        !jq - introduce the aerosol direct and first indirect radiative forcings
        !jq - Johannes Quaas, 27/11/2003 (quaas@lmd.jussieu.fr)
-       IF (flag_aerosol .GT. 0) THEN
-          IF (iflag_rrtm .EQ. 0) THEN !--old radiation
+       IF (flag_aerosol > 0) THEN
+          IF (iflag_rrtm == 0) THEN !--old radiation
              IF (.NOT. aerosol_couple) THEN
                 !
@@ -4238,5 +4238,5 @@
                      tausum_aero, tau3d_aero)
              ENDIF
-          ELSE IF (iflag_rrtm .EQ.1) THEN  ! RRTM radiation
+          ELSE IF (iflag_rrtm ==1) THEN  ! RRTM radiation
              IF (aerosol_couple .AND. config_inca == 'aero' ) THEN
                 abort_message='config_inca=aero et rrtm=1 impossible'
@@ -4304,5 +4304,5 @@
                 !
              ENDIF
-          ELSE IF (iflag_rrtm .EQ.2) THEN    ! ecrad RADIATION
+          ELSE IF (iflag_rrtm ==2) THEN    ! ecrad RADIATION
 #ifdef CPP_ECRAD
              !--climatologies or INCA aerosols
@@ -4322,5 +4322,5 @@
           mass_solu_aero(:,:) = 0.
           mass_solu_aero_pi(:,:) = 0.
-          IF (iflag_rrtm .EQ. 0) THEN !--old radiation
+          IF (iflag_rrtm == 0) THEN !--old radiation
              tau_aero(:,:,:,:) = 1.e-15
              piz_aero(:,:,:,:) = 1.
@@ -4339,10 +4339,10 @@
        !--STRAT AEROSOL
        !--updates tausum_aero,tau_aero,piz_aero,cg_aero
-       IF (flag_aerosol_strat.GT.0) THEN
-          IF (prt_level .GE.10) THEN
+       IF (flag_aerosol_strat>0) THEN
+          IF (prt_level >=10) THEN
              PRINT *,'appel a readaerosolstrat', mth_cur
           ENDIF
-          IF (iflag_rrtm.EQ.0) THEN
-           IF (flag_aerosol_strat.EQ.1) THEN
+          IF (iflag_rrtm==0) THEN
+           IF (flag_aerosol_strat==1) THEN
              CALL readaerosolstrato(debut)
            ELSE
@@ -4413,6 +4413,6 @@
 
        !
-       IF (lon1_beta.EQ.-180..AND.lon2_beta.EQ.180..AND. &
-           lat1_beta.EQ.90..AND.lat2_beta.EQ.-90.) THEN
+       IF (lon1_beta==-180..AND.lon2_beta==180..AND. &
+           lat1_beta==90..AND.lat2_beta==-90.) THEN
           !
           ! global
@@ -4423,5 +4423,5 @@
           DO k=1, klev
              DO i=1, klon
-                IF (pplay(i,k).GE.pfree) THEN
+                IF (pplay(i,k)>=pfree) THEN
                    beta(i,k) = beta_pbl
                 ELSE
@@ -4445,9 +4445,9 @@
              DO i=1,klon
                 !
-                IF (longitude_deg(i).ge.lon1_beta.AND. &
-                    longitude_deg(i).le.lon2_beta.AND. &
-                    latitude_deg(i).le.lat1_beta.AND.  &
-                    latitude_deg(i).ge.lat2_beta) THEN
-                   IF (pplay(i,k).GE.pfree) THEN
+                IF (longitude_deg(i)>=lon1_beta.AND. &
+                    longitude_deg(i)<=lon2_beta.AND. &
+                    latitude_deg(i)<=lat1_beta.AND.  &
+                    latitude_deg(i)>=lat2_beta) THEN
+                   IF (pplay(i,k)>=pfree) THEN
                       beta(i,k) = beta_pbl
                    ELSE
@@ -4478,5 +4478,5 @@
 !--this is needed for CMIP6 runs
 !--and only possible for new radiation scheme
-       IF (iflag_rrtm.EQ.1.AND.ok_suntime_rrtm) THEN 
+       IF (iflag_rrtm==1.AND.ok_suntime_rrtm) THEN
 #ifdef CPP_RRTM
          CALL read_rsun_rrtm(debut)
@@ -4495,5 +4495,5 @@
        !input to radiation (DICE)
        !
-       IF (iflag_radia .ge. 2) THEN
+       IF (iflag_radia >= 2) THEN
           zsav_tsol (:) = zxtsol(:)
           CALL perturb_radlwsw(zxtsol,iflag_radia)
@@ -4535,5 +4535,5 @@
           IF (carbon_cycle_rad) RCO2=RCO2_glo
           !
-          IF (prt_level .GE.10) THEN
+          IF (prt_level >=10) THEN
              print *,' ->radlwsw, number 1 '
           ENDIF
@@ -4550,5 +4550,5 @@
                t_seri,q_seri,wo, &
                cldfrarad, cldemirad, cldtaurad, &
-               ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
+               ok_ade.OR.flag_aerosol_strat>0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
                flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
                tau_aero, piz_aero, cg_aero, &
@@ -4599,9 +4599,9 @@
             !IM Par defaut on a les taux perturbes egaux aux taux actuels
             !
-            IF (RCO2_per.NE.RCO2_act.OR. &
-                RCH4_per.NE.RCH4_act.OR. &
-                RN2O_per.NE.RN2O_act.OR. &
-                RCFC11_per.NE.RCFC11_act.OR. &
-                RCFC12_per.NE.RCFC12_act) ok_4xCO2atm =.TRUE. 
+            IF (RCO2_per/=RCO2_act.OR. &
+                RCH4_per/=RCH4_act.OR. &
+                RN2O_per/=RN2O_act.OR. &
+                RCFC11_per/=RCFC11_act.OR. &
+                RCFC12_per/=RCFC12_act) ok_4xCO2atm =.TRUE.
           ENDIF
    ! 
@@ -4614,5 +4614,5 @@
                 RCFC12 = RCFC12_per
                 !
-                IF (prt_level .GE.10) THEN
+                IF (prt_level >=10) THEN
                    print *,' ->radlwsw, number 2 '
                 ENDIF
@@ -4628,5 +4628,5 @@
                      t_seri,q_seri,wo, &
                      cldfrarad, cldemirad, cldtaurad, &
-                     ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
+                     ok_ade.OR.flag_aerosol_strat>0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
                      flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
                      tau_aero, piz_aero, cg_aero, &
@@ -4714,5 +4714,5 @@
        !  If Iflag_radia >=2, reset pertubed variables
        !
-       IF (iflag_radia .ge. 2) THEN
+       IF (iflag_radia >= 2) THEN
           zxtsol(:) = zsav_tsol (:)
        ENDIF
@@ -4720,6 +4720,6 @@
     itaprad = itaprad + 1
 
-    IF (iflag_radia.eq.0) THEN
-       IF (prt_level.ge.9) THEN
+    IF (iflag_radia==0) THEN
+       IF (prt_level>=9) THEN
           PRINT *,'--------------------------------------------------'
           PRINT *,'>>>> ATTENTION rayonnement desactive pour ce cas'
@@ -4795,5 +4795,5 @@
     ! a l'echelle sous-maille:
     !
-    IF (prt_level .GE.10) THEN
+    IF (prt_level >=10) THEN
        print *,' call orography ? ', ok_orodr
     ENDIF
@@ -4811,5 +4811,5 @@
           ! zpmm_orodr_t and zstd_orodr_t are activation thresholds set by F. Lott to
           ! earn computation time but they are not physical.
-          IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF (((zpic(i)-zmea(i))>zpmm_orodr_t).AND.(zstd(i)>zstd_orodr_t).AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -4864,5 +4864,5 @@
           !    such as ice sheets (work by V. Wiener)
           zrel_oro(i)=zstd(i)/(max(zsig(i),1.E-8)*sqrt(cell_area(i)))
-          IF (((zpic(i)-zmea(i)).GT.zpmm_orolf_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF (((zpic(i)-zmea(i))>zpmm_orolf_t).AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -5062,5 +5062,5 @@
        CALL getin_p('addtkeoro',addtkeoro) 
       
-       IF (prt_level.ge.5) &
+       IF (prt_level>=5) &
             print*,'addtkeoro', addtkeoro
             
@@ -5083,5 +5083,5 @@
 !
 
-       IF (addtkeoro .GT. 0 .AND. ok_orodr ) THEN
+       IF (addtkeoro > 0 .AND. ok_orodr ) THEN
 !      -------------------------------------------
 
@@ -5090,10 +5090,10 @@
 
 
-  IF (addtkeoro .EQ. 1 ) THEN
+  IF (addtkeoro == 1 ) THEN
 
             duadd(:,:)=alphatkeoro*d_u_oro(:,:)
             dvadd(:,:)=alphatkeoro*d_v_oro(:,:)
 
-  ELSE IF (addtkeoro .EQ. 2) THEN
+  ELSE IF (addtkeoro == 2) THEN
 
      IF (smallscales_tkeoro) THEN
@@ -5104,5 +5104,5 @@
 ! car on peut s'attendre a ce que les petites echelles produisent aussi de la TKE
 ! Mais attention, cela ne va pas dans le sens de la conservation de l'energie! 
-          IF ((zstd(i).GT.1.0) .AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF ((zstd(i)>1.0) .AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -5116,5 +5116,5 @@
        DO i=1,klon
           itest(i)=0
-        IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+        IF (((zpic(i)-zmea(i))>zpmm_orodr_t).AND.(zstd(i)>zstd_orodr_t).AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -5257,5 +5257,5 @@
   IF (ok_airs) then
 
-  IF (itap.eq.1.or.MOD(itap,NINT(freq_airs/phys_tstep)).EQ.0) THEN
+  IF (itap==1.or.MOD(itap,NINT(freq_airs/phys_tstep))==0) THEN
      write(*,*) 'je vais appeler simu_airs, ok_airs, freq_airs=', ok_airs, freq_airs
      CALL simu_airs(itap,rneb, t_seri, cldemi, fiwc, ref_ice, pphi, pplay, paprs,&
@@ -5364,5 +5364,5 @@
     IF (offline) THEN
 
-       IF (prt_level.ge.9) &
+       IF (prt_level>=9) &
             print*,'Attention on met a 0 les thermiques pour phystoke'
        CALL phystokenc ( &
@@ -5385,5 +5385,5 @@
     !
     !IM global posePB BEG
-    IF(1.EQ.0) THEN
+    IF(1==0) THEN
        !
        CALL transp_lay (paprs,zxtsol, t_seri, q_seri, u_seri, v_seri, zphi, &
@@ -5538,5 +5538,5 @@
     ! Convertir les incrementations en tendances
     !
-    IF (prt_level .GE.10) THEN
+    IF (prt_level >=10) THEN
        print *,'Convertir les incrementations en tendances '
     ENDIF
@@ -5561,9 +5561,9 @@
           ENDIF
           !--ice_sursat: nqo=4, on ajoute rneb
-          IF (nqo.ge.4 .and. ok_ice_sursat) THEN
+          IF (nqo>=4 .and. ok_ice_sursat) THEN
              d_qx(i,k,irneb) = ( rneb_seri(i,k) - qx(i,k,irneb) ) / phys_tstep
           ENDIF
 
-           IF (nqo.ge.4 .and. ok_bs) THEN
+           IF (nqo>=4 .and. ok_bs) THEN
              d_qx(i,k,ibs) = ( qbs_seri(i,k) - qx(i,k,ibs) ) / phys_tstep
           ENDIF
@@ -5612,5 +5612,5 @@
     !==========================================================================
 
-    IF (prt_level.ge.1) THEN
+    IF (prt_level>=1) THEN
        write(lunout,*) 'FIN DE PHYSIQ !!!!!!!!!!!!!!!!!!!!'
        write(lunout,*) &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/phytrac_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/phytrac_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/phytrac_mod.F90	(revision 5082)
@@ -526,5 +526,5 @@
        !
        ALLOCATE(flag_cvltr(nbtr))
-       IF (iflag_con.EQ.3) THEN
+       IF (iflag_con==3) THEN
           !
           ALLOCATE(ccntrAA(nbtr))
@@ -620,5 +620,5 @@
     ENDDO
     !
-    IF (id_be .GT. 0) THEN
+    IF (id_be > 0) THEN
        DO k=1,klev
           DO i=1,klon
@@ -681,9 +681,9 @@
        DO it=1, nbtr
           IF ( conv_flg(it) == 0 ) CYCLE
-          IF (iflag_con.LT.2) THEN
+          IF (iflag_con<2) THEN
              !--pas de transport convectif
              d_tr_cv(:,:,it)=0.
 
-          ELSE IF (iflag_con.EQ.2) THEN
+          ELSE IF (iflag_con==2) THEN
              !--ancien transport convectif de Tiedtke
 
@@ -793,5 +793,5 @@
     ENDDO
 
-    IF (iflag_thermals.GT.0.AND.iflag_the_trac>0) THEN   
+    IF (iflag_thermals>0.AND.iflag_the_trac>0) THEN
 
        DO it=1, nbtr
@@ -913,5 +913,5 @@
        ! choix du lessivage
        !
-       IF (iflag_lscav .EQ. 3 .OR. iflag_lscav .EQ. 4) THEN
+       IF (iflag_lscav == 3 .OR. iflag_lscav == 4) THEN
           ! ********  Olivier Boucher version (3) possibly with modified ql_incl (4)
           !
@@ -966,5 +966,5 @@
 #endif
 
-       ELSE IF (iflag_lscav .EQ. 2) THEN ! frac_impa, frac_nucl
+       ELSE IF (iflag_lscav == 2) THEN ! frac_impa, frac_nucl
           ! *********   modified  old version
 
@@ -992,5 +992,5 @@
                       evaplsc = prfl(i,k) - prfl(i,k+1) + psfl(i,k) - psfl(i,k+1)
                       ! Evaporation Partielle -> Liberation Partielle 0.5*evap
-                      IF ( evaplsc .LT.0..and.abs(prfl(i,k+1)+psfl(i,k+1)).gt.1.e-10) THEN
+                      IF ( evaplsc <0..and.abs(prfl(i,k+1)+psfl(i,k+1))>1.e-10) THEN
                          evaplsc = (-evaplsc)/(prfl(i,k+1)+psfl(i,k+1))
                          ! evaplsc est donc positif, his_dh(i) est positif
@@ -1000,5 +1000,5 @@
                          !-------------   d_tr_evapls(i,k,it)=-0.5*evaplsc*(d_tr_lsc(i,k+1,it))
                          beta=0.5*evaplsc
-                         if ((prfl(i,k)+psfl(i,k)).lt.1.e-10) THEN
+                         if ((prfl(i,k)+psfl(i,k))<1.e-10) THEN
                             beta=1.0*evaplsc
                          endif
@@ -1034,5 +1034,5 @@
           ! *********   end modified old version
 
-       ELSE IF (iflag_lscav .EQ. 1) THEN ! frac_impa, frac_nucl
+       ELSE IF (iflag_lscav == 1) THEN ! frac_impa, frac_nucl
           ! *********    old version
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/printflag.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/printflag.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/printflag.F90	(revision 5082)
@@ -30,5 +30,5 @@
     &  ************'
   PRINT 100
-  PRINT 10, iflag_cycle_diurne.GE.1, soil_model
+  PRINT 10, iflag_cycle_diurne>=1, soil_model
   PRINT 100
 
@@ -97,6 +97,6 @@
   END IF
 
-  IF (cycle_diurn0 .AND. .NOT. (iflag_cycle_diurne.GE.1) .OR. .NOT. cycle_diurn0 .AND. &
-      (iflag_cycle_diurne.GE.1) ) THEN
+  IF (cycle_diurn0 .AND. .NOT. (iflag_cycle_diurne>=1) .OR. .NOT. cycle_diurn0 .AND. &
+      (iflag_cycle_diurne>=1) ) THEN
     PRINT 13, cycle_diurn0, iflag_cycle_diurne
     PRINT 100
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/radio_decay.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/radio_decay.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/radio_decay.F90	(revision 5082)
@@ -36,5 +36,5 @@
      d_tr(:,:,it) = 0.
      IF ( radio(it) ) THEN
-        IF (tautr(it) .GT. 0.) THEN
+        IF (tautr(it) > 0.) THEN
            DO k = 1,klev
               DO i = 1,klon
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/radlwsw_m.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/radlwsw_m.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/radlwsw_m.F90	(revision 5082)
@@ -536,9 +536,9 @@
     !-------------------------------------------
     nb_gr = KLON / kdlon
-    IF (nb_gr*kdlon .NE. KLON) THEN
+    IF (nb_gr*kdlon /= KLON) THEN
        PRINT*, "kdlon mauvais:", KLON, kdlon, nb_gr
        call abort_physic("radlwsw", "", 1)
     ENDIF
-    IF (kflev .NE. KLEV) THEN
+    IF (kflev /= KLEV) THEN
        PRINT*, "kflev differe de KLEV, kflev, KLEV"
        call abort_physic("radlwsw", "", 1)
@@ -1676,5 +1676,5 @@
 
     IF (lldebug) THEN
-       if (0.eq.1) then
+       if (0==1) then
           ! Verifs dans le cas 1D
           print*,'================== Sortie de radlw ================='
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosol_optic.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosol_optic.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosol_optic.F90	(revision 5082)
@@ -78,6 +78,6 @@
 !****************************************************************************************
 ! Read and interpolate sulfate
-  IF ( flag_aerosol .EQ. 1 .OR. &
-       flag_aerosol .EQ. 6 ) THEN 
+  IF ( flag_aerosol == 1 .OR. &
+       flag_aerosol == 6 ) THEN
 
      CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfate, sulfate_pi,loadso4)
@@ -88,6 +88,6 @@
 
 ! Read and interpolate bcsol and bcins
-  IF ( flag_aerosol .EQ. 2 .OR. &
-       flag_aerosol .EQ. 6 ) THEN 
+  IF ( flag_aerosol == 2 .OR. &
+       flag_aerosol == 6 ) THEN
 
      ! Get bc aerosol distribution 
@@ -103,6 +103,6 @@
 
 ! Read and interpolate pomsol and pomins
-  IF ( flag_aerosol .EQ. 3 .OR. &
-       flag_aerosol .EQ. 6 ) THEN
+  IF ( flag_aerosol == 3 .OR. &
+       flag_aerosol == 6 ) THEN
 
      CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
@@ -117,6 +117,6 @@
 
 ! Read and interpolate csssm, ssssm, assssm
-  IF (flag_aerosol .EQ. 4 .OR. &
-      flag_aerosol .EQ. 6 ) THEN 
+  IF (flag_aerosol == 4 .OR. &
+      flag_aerosol == 6 ) THEN
 
       CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sssupco, sssupco_pi,  load_tmp5) 
@@ -132,6 +132,6 @@
 
 ! Read and interpolate cidustm
-  IF (flag_aerosol .EQ. 5 .OR.  &
-      flag_aerosol .EQ. 6 ) THEN 
+  IF (flag_aerosol == 5 .OR.  &
+      flag_aerosol == 6 ) THEN
 
       CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust) 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90	(revision 5082)
@@ -27,5 +27,5 @@
     DO k = 1, klev  ! re-evaporation de l'eau liquide nuageuse
        DO i = 1, klon
-        if (fl_cor_ebil .GT. 0) then
+        if (fl_cor_ebil > 0) then
           zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
           zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
@@ -37,10 +37,10 @@
           zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*q_seri(i,k))
         end if
-          IF (iflag_ice_thermo .EQ. 0) THEN
+          IF (iflag_ice_thermo == 0) THEN
              zlsdcp=zlvdcp
           ENDIF
           !>jyg
 
-          IF (iflag_ice_thermo.eq.0) THEN   
+          IF (iflag_ice_thermo==0) THEN
              !pas necessaire a priori
 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_5wv_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_5wv_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_5wv_rrtm.F90	(revision 5082)
@@ -356,20 +356,20 @@
   ENDDO
 
-  IF (flag_aerosol .EQ. 1) THEN 
+  IF (flag_aerosol == 1) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASSO4M_phy
      aerosol_name(2) = id_CSSO4M_phy
-  ELSEIF (flag_aerosol .EQ. 2) THEN
+  ELSEIF (flag_aerosol == 2) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASBCM_phy
      aerosol_name(2) = id_AIBCM_phy
-  ELSEIF (flag_aerosol .EQ. 3) THEN 
+  ELSEIF (flag_aerosol == 3) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASPOMM_phy
      aerosol_name(2) = id_AIPOMM_phy
-  ELSEIF (flag_aerosol .EQ. 4) THEN 
+  ELSEIF (flag_aerosol == 4) THEN
      nb_aer = 3
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -377,9 +377,9 @@
      aerosol_name(2) = id_SSSSM_phy
      aerosol_name(3) = id_ASSSM_phy
-  ELSEIF (flag_aerosol .EQ. 5) THEN 
+  ELSEIF (flag_aerosol == 5) THEN
      nb_aer = 1
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_CIDUSTM_phy
-  ELSEIF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+  ELSEIF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
      nb_aer = 13
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -417,6 +417,6 @@
       rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
       RH_num(i,k) = INT( rh(i,k)/10. + 1.)
-      IF (rh(i,k).GT.85.) RH_num(i,k)=10
-      IF (rh(i,k).GT.90.) RH_num(i,k)=11
+      IF (rh(i,k)>85.) RH_num(i,k)=10
+      IF (rh(i,k)>90.) RH_num(i,k)=11
       delta(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -425,46 +425,46 @@
   DO m=1,nb_aer   ! tau is only computed for each mass    
     fac=1.0
-    IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
+    IF (aerosol_name(m)==id_ASBCM_phy) THEN
         soluble=.TRUE.
         spsol=1
-    ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_ASPOMM_phy) THEN
         soluble=.TRUE.
         spsol=2 
-    ELSEIF (aerosol_name(m).EQ.id_CSSO4M_phy) THEN
+    ELSEIF (aerosol_name(m)==id_CSSO4M_phy) THEN
         soluble=.TRUE.
         spsol=3
         !fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
         fac=0.0      !--6 March 2017 - OB as Didier H said CSSO4 should not be used
-    ELSEIF (aerosol_name(m).EQ.id_ASSO4M_phy) THEN
+    ELSEIF (aerosol_name(m)==id_ASSO4M_phy) THEN
         soluble=.TRUE.
         spsol=4
         fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
-    ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_SSSSM_phy) THEN
         soluble=.TRUE.
         spsol=5
-    ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_CSSSM_phy) THEN
         soluble=.TRUE.
         spsol=6
-    ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
+    ELSEIF (aerosol_name(m)==id_ASSSM_phy) THEN
         soluble=.TRUE.
         spsol=7
-    ELSEIF (aerosol_name(m).EQ.id_CSNO3M_phy) THEN
+    ELSEIF (aerosol_name(m)==id_CSNO3M_phy) THEN
         soluble=.TRUE.
         spsol=8
         fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
-    ELSEIF (aerosol_name(m).EQ.id_ASNO3M_phy) THEN
+    ELSEIF (aerosol_name(m)==id_ASNO3M_phy) THEN
         soluble=.TRUE.
         spsol=9
         fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
-    ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_CIDUSTM_phy) THEN
         soluble=.FALSE.
         spinsol=1
-    ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN 
+    ELSEIF  (aerosol_name(m)==id_AIBCM_phy) THEN
         soluble=.FALSE.
         spinsol=2
-    ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_AIPOMM_phy) THEN
         soluble=.FALSE.
         spinsol=3
-    ELSEIF (aerosol_name(m).EQ.id_CINO3M_phy) THEN 
+    ELSEIF (aerosol_name(m)==id_CINO3M_phy) THEN
         soluble=.FALSE.
         spinsol=4
@@ -481,10 +481,10 @@
     !--to save time 670 and AI are not computed for CMIP6
     !IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la670.AND.la.NE.la865) CYCLE
-    IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la865) CYCLE
+    IF (la/=la443.AND.la/=la550.AND.la/=la865) CYCLE
 
       IF (soluble) THEN            ! For soluble aerosol
 
         !--treat special case of soluble BC internal mixture
-        IF (spsol.EQ.1 .AND. flag_bc_internal_mixture) THEN
+        IF (spsol==1 .AND. flag_bc_internal_mixture) THEN
 
           DO k=1, klev
@@ -493,13 +493,13 @@
              BC_massfra = m_allaer(i,k,id_ASBCM_phy)/(m_allaer(i,k,id_ASBCM_phy)+m_allaer(i,k,id_ASSO4M_phy))
 
-             IF (BC_massfra.GE.0.20) THEN
+             IF (BC_massfra>=0.20) THEN
                classbc = 6
-             ELSEIF (BC_massfra.GE.0.10) THEN
+             ELSEIF (BC_massfra>=0.10) THEN
                classbc = 5
-             ELSEIF  (BC_massfra.GE.0.05) THEN
+             ELSEIF  (BC_massfra>=0.05) THEN
                classbc = 4
-             ELSEIF  (BC_massfra.GE.0.02) THEN
+             ELSEIF  (BC_massfra>=0.02) THEN
                classbc = 3
-             ELSEIF  (BC_massfra.GE.0.01) THEN
+             ELSEIF  (BC_massfra>=0.01) THEN
                classbc = 2
              ELSE
@@ -513,10 +513,10 @@
              tausum(i,la,aerindex)=tausum(i,la,aerindex)+tau(i,k,la,aerindex)
 
-             IF (la.EQ.la550.AND.dryaod_diag) THEN 
+             IF (la==la550.AND.dryaod_diag) THEN
                 tau_ae5wv_int = alpha_MG_5wv(1,la,classbc)
                 drytausum(i,aerindex)=drytausum(i,aerindex)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*tau_ae5wv_int*fac
              ENDIF
 
-             IF (la.EQ.la550) THEN 
+             IF (la==la550) THEN
                 abs_ae5wv_int = abs_MG_5wv(RH_num(i,k),la,classbc)+DELTA(i,k)* &
                                (abs_MG_5wv(RH_num(i,k)+1,la,classbc) - & 
@@ -539,10 +539,10 @@
               tausum(i,la,aerindex)=tausum(i,la,aerindex)+tau(i,k,la,aerindex)
 
-              IF (la.EQ.la550.AND.dryaod_diag) THEN 
+              IF (la==la550.AND.dryaod_diag) THEN
                  tau_ae5wv_int = alpha_aers_5wv(1,la,spsol)
                  drytausum(i,aerindex)=drytausum(i,aerindex)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*tau_ae5wv_int*fac
               ENDIF
 
-              IF (la.EQ.la550) THEN 
+              IF (la==la550) THEN
                  abs_ae5wv_int = abs_aers_5wv(RH_num(i,k),la,spsol)+DELTA(i,k)* &
                                 (abs_aers_5wv(RH_num(i,k)+1,la,spsol) - & 
@@ -566,9 +566,9 @@
             tausum(i,la,aerindex)= tausum(i,la,aerindex)+tau(i,k,la,aerindex)
 
-            IF (la.EQ.la550.AND.dryaod_diag) THEN 
+            IF (la==la550.AND.dryaod_diag) THEN
               drytausum(i,aerindex)= drytausum(i,aerindex)+tau(i,k,la,aerindex)
             ENDIF
 
-            IF (la.EQ.la550) THEN 
+            IF (la==la550) THEN
                abs_ae5wv_int = abs_aeri_5wv(la,spinsol)
                abs550aer(i)=abs550aer(i)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*abs_ae5wv_int*fac
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90	(revision 5082)
@@ -16,6 +16,6 @@
   !    Anne Cozic Avril 2009
   !    a partir d'une sous-routine de Johannes Quaas pour les sulfates
-  !    Olivier Boucher février 2014 pour passage à RRTM
-  !    a partir des propriétés optiques fournies par Yves Balkanski
+  !    Olivier Boucher f�vrier 2014 pour passage � RRTM
+  !    a partir des propri�t�s optiques fournies par Yves Balkanski
   !
   IMPLICIT NONE
@@ -477,5 +477,5 @@
   spinsol = 0 
 
-  IF (NSW.NE.nbands_sw_rrtm) THEN
+  IF (NSW/=nbands_sw_rrtm) THEN
     CALL abort_physic(modname,'Erreur NSW doit etre egal a 6 pour cette routine',1)
   ENDIF
@@ -483,20 +483,20 @@
   zdh(:,:)=pdel(:,:)/(RG*zrho(:,:))      ! m
 
-  IF (flag_aerosol .EQ. 1) THEN 
+  IF (flag_aerosol == 1) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASSO4M_phy
      aerosol_name(2) = id_CSSO4M_phy
-  ELSEIF (flag_aerosol .EQ. 2) THEN
+  ELSEIF (flag_aerosol == 2) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASBCM_phy
      aerosol_name(2) = id_AIBCM_phy
-  ELSEIF (flag_aerosol .EQ. 3) THEN 
+  ELSEIF (flag_aerosol == 3) THEN
      nb_aer = 2
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_ASPOMM_phy
      aerosol_name(2) = id_AIPOMM_phy
-  ELSEIF (flag_aerosol .EQ. 4) THEN 
+  ELSEIF (flag_aerosol == 4) THEN
      nb_aer = 3
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -504,9 +504,9 @@
      aerosol_name(2) = id_SSSSM_phy
      aerosol_name(3) = id_ASSSM_phy
-  ELSEIF (flag_aerosol .EQ. 5) THEN 
+  ELSEIF (flag_aerosol == 5) THEN
      nb_aer = 1
      ALLOCATE (aerosol_name(nb_aer)) 
      aerosol_name(1) = id_CIDUSTM_phy
-  ELSEIF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+  ELSEIF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
      nb_aer = 13
      ALLOCATE (aerosol_name(nb_aer)) 
@@ -541,6 +541,6 @@
       rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
       RH_num(i,k) = INT(rh(i,k)/10. + 1.)
-      IF (rh(i,k).GT.85.) RH_num(i,k)=10
-      IF (rh(i,k).GT.90.) RH_num(i,k)=11
+      IF (rh(i,k)>85.) RH_num(i,k)=10
+      IF (rh(i,k)>90.) RH_num(i,k)=11
       delta(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
     ENDDO
@@ -557,46 +557,46 @@
   DO m=1,nb_aer   ! tau is only computed for each mass
      fac=1.0
-     IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
+     IF (aerosol_name(m)==id_ASBCM_phy) THEN
         soluble=.TRUE.
         spsol=1
-     ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_ASPOMM_phy) THEN
         soluble=.TRUE.
         spsol=2 
-     ELSEIF (aerosol_name(m).EQ.id_CSSO4M_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_CSSO4M_phy) THEN
         soluble=.TRUE.
         spsol=3
         !fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
         fac=0.0      !--6 March 2017 - OB as Didier H said CSSO4 should not be used
-     ELSEIF  (aerosol_name(m).EQ.id_ASSO4M_phy) THEN
+     ELSEIF  (aerosol_name(m)==id_ASSO4M_phy) THEN
         soluble=.TRUE.
         spsol=4
         fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
-     ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_SSSSM_phy) THEN
          soluble=.TRUE.
          spsol=5
-     ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_CSSSM_phy) THEN
          soluble=.TRUE.
          spsol=6
-     ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
+     ELSEIF (aerosol_name(m)==id_ASSSM_phy) THEN
          soluble=.TRUE.
          spsol=7
-     ELSEIF (aerosol_name(m).EQ.id_CSNO3M_phy) THEN
+     ELSEIF (aerosol_name(m)==id_CSNO3M_phy) THEN
          soluble=.TRUE.
          spsol=8
          fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
-     ELSEIF (aerosol_name(m).EQ.id_ASNO3M_phy) THEN
+     ELSEIF (aerosol_name(m)==id_ASNO3M_phy) THEN
          soluble=.TRUE.
          spsol=9
          fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
-     ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_CIDUSTM_phy) THEN
          soluble=.FALSE.
          spinsol=1
-     ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN 
+     ELSEIF  (aerosol_name(m)==id_AIBCM_phy) THEN
          soluble=.FALSE.
          spinsol=2
-     ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN 
+     ELSEIF (aerosol_name(m)==id_AIPOMM_phy) THEN
          soluble=.FALSE.
          spinsol=3
-     ELSEIF (aerosol_name(m).EQ.id_CINO3M_phy) THEN
+     ELSEIF (aerosol_name(m)==id_CINO3M_phy) THEN
          soluble=.FALSE.
          spinsol=4
@@ -612,5 +612,5 @@
 
        !--here we treat the special case of soluble BC internal mixture with Maxwell-Garnett rule
-       IF (spsol.EQ.1 .AND. flag_bc_internal_mixture) THEN
+       IF (spsol==1 .AND. flag_bc_internal_mixture) THEN
 
          DO k=1, klev
@@ -623,13 +623,13 @@
              BC_massfra = m_allaer(i,k,id_ASBCM_phy)/(m_allaer(i,k,id_ASBCM_phy)+m_allaer(i,k,id_ASSO4M_phy))
 
-             IF (BC_massfra.GE.0.20) THEN
+             IF (BC_massfra>=0.20) THEN
                classbc = 6
-             ELSEIF (BC_massfra.GE.0.10) THEN
+             ELSEIF (BC_massfra>=0.10) THEN
                classbc = 5
-             ELSEIF  (BC_massfra.GE.0.05) THEN
+             ELSEIF  (BC_massfra>=0.05) THEN
                classbc = 4
-             ELSEIF  (BC_massfra.GE.0.02) THEN
+             ELSEIF  (BC_massfra>=0.02) THEN
                classbc = 3
-             ELSEIF  (BC_massfra.GE.0.01) THEN
+             ELSEIF  (BC_massfra>=0.01) THEN
                classbc = 2
              ELSE
@@ -640,13 +640,13 @@
              BC_massfra_pi = m_allaer_pi(i,k,id_ASBCM_phy)/(m_allaer_pi(i,k,id_ASBCM_phy)+m_allaer_pi(i,k,id_ASSO4M_phy))
 
-             IF (BC_massfra_pi.GE.0.20) THEN
+             IF (BC_massfra_pi>=0.20) THEN
                classbc_pi = 6
-             ELSEIF (BC_massfra_pi.GE.0.10) THEN
+             ELSEIF (BC_massfra_pi>=0.10) THEN
                classbc_pi = 5
-             ELSEIF  (BC_massfra_pi.GE.0.05) THEN
+             ELSEIF  (BC_massfra_pi>=0.05) THEN
                classbc_pi = 4
-             ELSEIF  (BC_massfra_pi.GE.0.02) THEN
+             ELSEIF  (BC_massfra_pi>=0.02) THEN
                classbc_pi = 3
-             ELSEIF  (BC_massfra_pi.GE.0.01) THEN
+             ELSEIF  (BC_massfra_pi>=0.01) THEN
                classbc_pi = 2
              ELSE
@@ -726,5 +726,5 @@
 
          !--external mixture case for soluble BC
-         IF (spsol.EQ.1) THEN
+         IF (spsol==1) THEN
            piz_ae_pi(:,:,aerindex,:) = piz_ae(:,:,aerindex,:)
            cg_ae_pi(:,:,aerindex,:)  = cg_ae(:,:,aerindex,:)
@@ -780,5 +780,5 @@
                                 /tau_allaer(i,k,2,inu)
          piz_allaer(i,k,2,inu)=MIN(MAX(piz_allaer(i,k,2,inu),0.01),1.0)
-         IF (tau_allaer(i,k,2,inu).LE.tau_min) piz_allaer(i,k,2,inu)=1.0
+         IF (tau_allaer(i,k,2,inu)<=tau_min) piz_allaer(i,k,2,inu)=1.0
 
          cg_allaer(i,k,2,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+ &
@@ -820,5 +820,5 @@
                                   /tau_allaer(i,k,1,inu)
            piz_allaer(i,k,1,inu)=MIN(MAX(piz_allaer(i,k,1,inu),0.01),1.0)
-           IF (tau_allaer(i,k,1,inu).LE.tau_min) piz_allaer(i,k,1,inu)=1.0
+           IF (tau_allaer(i,k,1,inu)<=tau_min) piz_allaer(i,k,1,inu)=1.0
          
            cg_allaer(i,k,1,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+    &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_lw_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_lw_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_lw_rrtm.F90	(revision 5082)
@@ -40,5 +40,5 @@
   modname='aeropt_lw_rrtm'
   !
-  IF (NLW.NE.nbands_lw_rrtm) THEN
+  IF (NLW/=nbands_lw_rrtm) THEN
     CALL abort_physic(modname,'Erreur NLW doit etre egal a 16 pour cette routine',1)
   ENDIF
@@ -46,5 +46,5 @@
   IF (ok_alw) THEN                                   !--aerosol LW effects
    !
-   IF (flag_aerosol.EQ.5.OR.flag_aerosol.EQ.6.OR.flag_aerosol.EQ.7) THEN  !-Dust
+   IF (flag_aerosol==5.OR.flag_aerosol==6.OR.flag_aerosol==7) THEN  !-Dust
     !
     zdh(:,:)=pdel(:,:)/(RG*zrho(:,:))      ! m
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/dump2ds.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/dump2ds.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/dump2ds.F	(revision 5082)
@@ -8,5 +8,5 @@
 c NAN et INF ajoute aux plots                           Pat fin 2006
 c ==================================================================
-c Comme dump2d sauf que le signe est préservé, la valeur zero
+c Comme dump2d sauf que le signe est pr�serv�, la valeur zero
 c identifiee par un blanc.
 c detection des Infty (= ou -) et NaN (?)
@@ -20,5 +20,5 @@
       logical zinf,znan,zsign
       CHARACTER (len=*) :: nom_z
-      INTEGER*4 icheck(2)
+      INTEGER(kind=4) icheck(2)
       EQUIVALENCE(az,icheck)
       EQUIVALENCE(iform,jform)
@@ -39,13 +39,13 @@
       DO 10003 j=1,jm
       DO 10005 i=1,im
-      IF(.NOT.( z(i,j).GT.zmax))GOTO 10007
+      IF(.NOT.( z(i,j)>zmax))GOTO 10007
       zmax=z(i,j)
       imax=i
       jmax=j
-10007 IF(.NOT.( z(i,j).LT.zmin))GOTO 10009
+10007 IF(.NOT.( z(i,j)<zmin))GOTO 10009
       zmin=z(i,j)
       imin=i
       jmin=j
-10009 IF(.NOT.( z(i,j).eq.0.))GOTO 10011
+10009 IF(.NOT.( z(i,j)==0.))GOTO 10011
       kzero=kzero+1
 10011 CONTINUE
@@ -53,8 +53,8 @@
 10006 CONTINUE
 10003 CONTINUE
-10004 zsign=(sign(1.,zmin)*sign(1.,zmax).gt.0.)
+10004 zsign=(sign(1.,zmin)*sign(1.,zmax)>0.)
       WRITE(*,*)'>>> dump2ds: ',trim(nom_z)
       PRINT*,'>>>  ',kzero,' zero values  <<<'
-      IF(.NOT.( ZMin.lt.0.))GOTO 10013
+      IF(.NOT.( ZMin<0.))GOTO 10013
       PRINT2000,' [MIN:',zmin,'(',imin,',',jmin,') (-@zyxwvutsrqpon NOPQ
      *RSTUVWXYZ*+) ',zmax,'(',imax,',',jmax,'):MAX]'
@@ -64,8 +64,8 @@
 10014 CONTINUE
 2000  Format(a,1pg11.4,a1,i3,a1,i3,a,1pg11.4,a1,i3,a1,i3,a)
-      IF(.NOT.( zmax.GT.zmin))GOTO 10015
+      IF(.NOT.( zmax>zmin))GOTO 10015
       zllm=max(abs(zmax),abs(zmin))
       zllu=min(abs(zmax),abs(zmin))
-      if(im.ge.100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
+      if(im>=100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
       WRITE(*,'(14x,1000i1)')(mod(i/10,10),i=10,im)
       WRITE(*,'(5x,1009i1)')(mod(i,10),i=1,im)
@@ -76,13 +76,13 @@
       DO 10019 i=1,im
       az=abs(z(i,j))
-      IF(.NOT.( az.eq.0.))GOTO 10021
+      IF(.NOT.( az==0.))GOTO 10021
       kchar(i)=16
       GOTO 10022
-10021 IF(.NOT.((az.ne.0.and.icheck(1).eq.0.and.icheck(2).eq.2146435072))
+10021 IF(.NOT.((az/=0.and.icheck(1)==0.and.icheck(2)==2146435072))
      *)GOTO 10023
       kchar(i)=31
       zinf=.true.
       GOTO 10022
-10023 IF(.NOT.((az.ne.0.and.icheck(1).eq.0.and.icheck(2).eq.2146959360))
+10023 IF(.NOT.((az/=0.and.icheck(1)==0.and.icheck(2)==2146959360))
      *)GOTO 10024
       kchar(i)=32
@@ -94,5 +94,5 @@
 10025 kchar(i)=NINT(13.*az/zllm+17)
 10026 CONTINUE
-10022 IF(.NOT.( z(i,j).lt.0.))GOTO 10027
+10022 IF(.NOT.( z(i,j)<0.))GOTO 10027
       kchar(i)=32-kchar(i)
 10027 CONTINUE
@@ -104,5 +104,5 @@
       WRITE(*,'(5x,1000i1)')(mod(i,10),i=1,im)
       WRITE(*,'(14x,1000i1)')(mod(i/10,10),i=10,im)
-      if(im.ge.100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
+      if(im>=100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
       GOTO 10016
 10015 print*,'>>> ZERO MAP  <<<'
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/eq_regions_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/eq_regions_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/eq_regions_mod.F90	(revision 5082)
@@ -349,5 +349,5 @@
 &    w + p9) * w + p8) * w + p7) * w + p6) * w + p5) *&
 &    w + p4) * w + p3) * w + p2) * w + p1) * w + p0
-if (n .gt. 0) then
+if (n > 0) then
   w = x - 1
   do k = 2, n
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/gstats.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/gstats.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/gstats.F90	(revision 5082)
@@ -104,6 +104,6 @@
       WRITE(CC,'(I4)')INUM
 !     write(6,*) inum,cctype(inum)
-      IF(CCTYPE(INUM).EQ."TRS".OR.CCTYPE(INUM).EQ.'MP-'.OR.CCTYPE(INUM).EQ.'MPL'&
-                            & .OR.CCTYPE(INUM).EQ.'BAR'.OR.CCTYPE(INUM).EQ.'OMP') THEN
+      IF(CCTYPE(INUM)=="TRS".OR.CCTYPE(INUM)=='MP-'.OR.CCTYPE(INUM)=='MPL'&
+                            & .OR.CCTYPE(INUM)=='BAR'.OR.CCTYPE(INUM)=='OMP') THEN
         CCDESC_DRHOOK(INUM)='>'//CCTYPE(INUM)//'-'//CCDESC(INUM)(1:21)//'('//CC//')'
       ENDIF
@@ -131,16 +131,16 @@
 !   write(0,*) "CCTYPE=",CCTYPE(KNUM)
 !   write(0,*) "CCDESC_DRHOOK=",CCDESC_DRHOOK(KNUM)
-    IF(CCTYPE(KNUM).EQ."TRS")THEN
+    IF(CCTYPE(KNUM)=="TRS")THEN
       CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_TRANS)
-    ELSEIF(CCTYPE(KNUM).EQ.'MP-')THEN
+    ELSEIF(CCTYPE(KNUM)=='MP-')THEN
       CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_COMMS)
-    ELSEIF(CCTYPE(KNUM).EQ.'MPL'.AND.KNUM.NE.682)THEN
+    ELSEIF(CCTYPE(KNUM)=='MPL'.AND.KNUM/=682)THEN
       CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_COMMS1)
-    ELSEIF(CCTYPE(KNUM).EQ.'OMP')THEN
+    ELSEIF(CCTYPE(KNUM)=='OMP')THEN
 !     CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE)
 ! MPL 1.12.08 : erreur a la compilation car zhook_handle est un tableau et non un
 ! scalaire (PKEY)
       CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZTIME)
-    ELSEIF(CCTYPE(KNUM).EQ.'BAR')THEN
+    ELSEIF(CCTYPE(KNUM)=='BAR')THEN
       CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_BARR)
     ENDIF
@@ -207,5 +207,5 @@
     THISTCPU(KNUM) = 0.0_JPRB
     THISVCPU(KNUM) = 0.0_JPRB
-    IF(MYPROC_STATS.LE.NSTATS_MEM.AND.MYPROC_STATS.NE.0) THEN
+    IF(MYPROC_STATS<=NSTATS_MEM.AND.MYPROC_STATS/=0) THEN
 !     CALL getrss(IMEM)
 !     IMEM = getrss()/1024
@@ -215,5 +215,5 @@
       IMEMC = 0
       IF(LSTATS_ALLOC) IMEMC = GETCURHEAP()/1024
-      IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC.NE.IIMEMC))) THEN
+      IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC/=IIMEMC))) THEN
         IF(LLMFIRST) THEN
           WRITE(0,*) ".---------------------------------------------------------"
@@ -258,5 +258,5 @@
     TTCPUSUM(KNUM) = TTCPUSUM(KNUM)+THISTCPU(KNUM)+ZTCPU-TTCPULCALL(KNUM)
     TVCPUSUM(KNUM) = TVCPUSUM(KNUM)+THISVCPU(KNUM)+ZVCPU-TVCPULCALL(KNUM)
-    IF(MYPROC_STATS.LE.NSTATS_MEM.AND.MYPROC_STATS.NE.0) THEN
+    IF(MYPROC_STATS<=NSTATS_MEM.AND.MYPROC_STATS/=0) THEN
 !     CALL getrss(IMEM)
       IMEM = GETRSS()/1024
@@ -266,5 +266,5 @@
       IMEMC = 0
       IF(LSTATS_ALLOC) IMEMC = GETCURHEAP()/1024
-      IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC.NE.IIMEMC))) THEN
+      IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC/=IIMEMC))) THEN
         WRITE(0,'(A10,I5,1X,A20,1X,I6,2(1X,I7),1X,I6,1X,I4,1X,I4,1X,I7)') &
              & "MEMORY aft ",KNUM,CCDESC(KNUM),IMEM-IIMEM,IMEM,IMEMH,IMEMS, &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/read_rsun_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/read_rsun_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/read_rsun_rrtm.F90	(revision 5082)
@@ -52,5 +52,5 @@
        CALL nf95_gw_var(ncid, varid, time)
 
-       IF (NSW.NE.size(wlen)) THEN 
+       IF (NSW/=size(wlen)) THEN
          PRINT *,'read_rsun_rrtm NSW <> wlen = ',NSW, size(wlen)
          CALL abort_physic('read_rsun_rrtm','size of SSI is different from NSW',1)
@@ -58,10 +58,10 @@
 
 !--test if time is different from year_len but allow a mismatch of 1 day
-       IF (size(time).NE.year_len.AND.size(time).NE.year_len+1) THEN
+       IF (size(time)/=year_len.AND.size(time)/=year_len+1) THEN
          PRINT *,'read_rsun_rrtm time <> year_len = ', size(time), year_len
          CALL abort_physic('read_rsun_rrtm','time dim should be the number of days in year',1)
        ENDIF
 !--warning only if forcing file has 366 days but year_len has only 365
-       IF (size(time).EQ.year_len+1) THEN 
+       IF (size(time)==year_len+1) THEN
          PRINT *,'Warning read_rsun_rrtm uses a leap year rsun for a noleap year'
        ENDIF
@@ -76,5 +76,5 @@
 
        DO nbday=1, year_len
-         IF (ABS(SUM(SSI_FRAC(:,nbday))-1.).GT.1.e-6) THEN 
+         IF (ABS(SUM(SSI_FRAC(:,nbday))-1.)>1.e-6) THEN
            PRINT *,'somme SSI_FRAC=', SUM(SSI_FRAC(:,nbday))
            CALL abort_physic('read_rsun_rrtm','somme SSI_FRAC <> 1',1)
@@ -92,5 +92,5 @@
 !--only read at beginning of day
 !--day in year is provided as days_elapsed since the beginning of the year +1
-    IF (debut.OR.days_elapsed+1.NE.day_pre) THEN
+    IF (debut.OR.days_elapsed+1/=day_pre) THEN
 
 !--keep memory of previous day
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90	(revision 5082)
@@ -161,5 +161,5 @@
      !
      ! Read and interpolate sulfate
-     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF ( flag_aerosol == 1 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfacc, sulfacc_pi,loadso4)
@@ -170,5 +170,5 @@
 
      ! Read and interpolate bcsol and bcins
-     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF ( flag_aerosol == 2 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         ! Get bc aerosol distribution 
@@ -183,5 +183,5 @@
 
      ! Read and interpolate pomsol and pomins
-     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
+     IF ( flag_aerosol == 3 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
@@ -195,5 +195,5 @@
 
      ! Read and interpolate csssm, ssssm, assssm
-     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol == 4 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
@@ -212,5 +212,5 @@
 
      ! Read and interpolate cidustm
-     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol == 5 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust) 
@@ -222,5 +222,5 @@
      !
      ! Read and interpolate asno3m, csno3m, cino3m
-     IF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
+     IF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
 
         CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, & 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90	(revision 5082)
@@ -79,10 +79,10 @@
 
 !--we only read monthly strat aerosol data
-    IF (debut.OR.mth_cur.NE.mth_pre) THEN
+    IF (debut.OR.mth_cur/=mth_pre) THEN
 
 !--only root reads the data
     IF (is_mpi_root.AND.is_omp_root) THEN
 
-    IF (nbands_sw_rrtm.NE.6) THEN 
+    IF (nbands_sw_rrtm/=6) THEN
         print *,'nbands_sw_rrtm doit etre egal a 6 dans readaerosolstrat_rrtm'
         STOP
@@ -94,5 +94,5 @@
     CALL nf95_gw_var(ncid_in, varid, lev)
     n_lev = size(lev)
-    IF (n_lev.NE.klev) THEN 
+    IF (n_lev/=klev) THEN
        print *,'Le nombre de niveaux n est pas egal a klev'
        STOP
@@ -105,5 +105,5 @@
 
     IF (grid_type/=unstructured) THEN
-      IF (n_lat.NE.nbp_lat) THEN 
+      IF (n_lat/=nbp_lat) THEN
          print *,'Le nombre de lat n est pas egal a nbp_lat'
          STOP
@@ -117,5 +117,5 @@
 
     IF (grid_type/=unstructured) THEN
-      IF (n_lon.NE.nbp_lon) THEN 
+      IF (n_lon/=nbp_lon) THEN
          print *,'Le nombre de lon n est pas egal a nbp_lon'
          STOP
@@ -128,5 +128,5 @@
     n_month = size(time)
     print *, 'TIME aerosol strato=', n_month, time
-    IF (n_month.NE.12) THEN 
+    IF (n_month/=12) THEN
        print *,'Le nombre de month n est pas egal a 12'
        STOP
@@ -145,5 +145,5 @@
 
 !---select the correct month
-    IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
+    IF (mth_cur<1.OR.mth_cur>12) THEN
       print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
     ENDIF
@@ -224,5 +224,5 @@
 
 !--stratospheric AOD in LW
-    IF (nbands_lw_rrtm .NE. NLW) then
+    IF (nbands_lw_rrtm /= NLW) then
       print*, 'different values for NLW (=',NLW,') and nbands_lw_rrtm (=', nbands_lw_rrtm, ')'
       STOP
@@ -246,5 +246,5 @@
 !--default SSA value if there is no aerosol
 !--to avoid 0 values that seems to cause some problem to RRTM
-    WHERE (tau_aero_sw_rrtm.LT.1.e-14)
+    WHERE (tau_aero_sw_rrtm<1.e-14)
       piz_aero_sw_rrtm = 1.0
     ENDWHERE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90	(revision 5082)
@@ -85,5 +85,5 @@
 
 !--we only read monthly strat aerosol data
-    IF (debut.OR.mth_cur.NE.mth_pre) THEN
+    IF (debut.OR.mth_cur/=mth_pre) THEN
 
 !--only root reads the data
@@ -91,5 +91,5 @@
 
 !--check mth_cur
-        IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
+        IF (mth_cur<1.OR.mth_cur>12) THEN
           print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
         ENDIF
@@ -105,5 +105,5 @@
         CALL nf95_gw_var(ncid_in, varid, lev)
         n_lev = size(lev)
-        IF (n_lev.NE.klev) THEN 
+        IF (n_lev/=klev) THEN
            abort_message='Le nombre de niveaux n est pas egal a klev'
            CALL abort_physic(modname,abort_message,1)
@@ -115,5 +115,5 @@
 
         IF (grid_type/=unstructured) THEN
-           IF (n_lat.NE.nbp_lat) THEN 
+           IF (n_lat/=nbp_lat) THEN
              print *, 'latitude=', n_lat, nbp_lat
              abort_message='Le nombre de lat n est pas egal a nbp_lat'
@@ -125,5 +125,5 @@
         CALL nf95_gw_var(ncid_in, varid, time)
         n_month = size(time)
-        IF (n_month.NE.12) THEN 
+        IF (n_month/=12) THEN
            abort_message='Le nombre de month n est pas egal a 12'
            CALL abort_physic(modname,abort_message,1)
@@ -134,5 +134,5 @@
         n_wav = size(wav)
         print *, 'WAV aerosol strato=', n_wav, wav
-        IF (n_wav.NE.NSW) THEN 
+        IF (n_wav/=NSW) THEN
            abort_message='Le nombre de wav n est pas egal a NSW'
            CALL abort_physic(modname,abort_message,1)
@@ -197,5 +197,5 @@
         CALL nf95_gw_var(ncid_in, varid, lev)
         n_lev = size(lev)
-        IF (n_lev.NE.klev) THEN 
+        IF (n_lev/=klev) THEN
            abort_message='Le nombre de niveaux n est pas egal a klev'
            CALL abort_physic(modname,abort_message,1)
@@ -207,5 +207,5 @@
 
         IF (grid_type/=unstructured) THEN
-          IF (n_lat.NE.nbp_lat) THEN 
+          IF (n_lat/=nbp_lat) THEN
              abort_message='Le nombre de lat n est pas egal a nbp_lat'
              CALL abort_physic(modname,abort_message,1)
@@ -216,5 +216,5 @@
         CALL nf95_gw_var(ncid_in, varid, time)
         n_month = size(time)
-        IF (n_month.NE.12) THEN 
+        IF (n_month/=12) THEN
            abort_message='Le nombre de month n est pas egal a 12'
            CALL abort_physic(modname,abort_message,1)
@@ -225,5 +225,5 @@
         n_wav = size(wav)
         print *, 'WAV aerosol strato=', n_wav, wav
-        IF (n_wav.NE.NLW) THEN 
+        IF (n_wav/=NLW) THEN
            abort_message='Le nombre de wav n est pas egal a NLW'
            CALL abort_physic(modname,abort_message,1)
@@ -332,5 +332,5 @@
     DO i=1, klon
     DO k=1, klev
-      IF (stratomask(i,k).GT.0.999999) THEN
+      IF (stratomask(i,k)>0.999999) THEN
         DO wave=1, nwave_sw
           tausum_aero(i,wave,id_STRAT_phy)=tausum_aero(i,wave,id_STRAT_phy)+tau_aer_strat(i,k,band)
@@ -346,5 +346,5 @@
 !--weighted average for cg, piz and tau, adding strat aerosols on top of tropospheric ones
     DO band=1, NSW
-      WHERE (stratomask.GT.0.999999)
+      WHERE (stratomask>0.999999)
 !--strat aerosols are added to index 2 : natural and anthropogenic aerosols for bands 1 to NSW 
         cg_aero_sw_rrtm(:,:,2,band)  = ( cg_aero_sw_rrtm(:,:,2,band)*piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) + &
@@ -374,5 +374,5 @@
 !--weighted average for cg, piz and tau, adding strat aerosols on top of tropospheric ones
     DO band=1, NSW
-      WHERE (stratomask.GT.0.999999)
+      WHERE (stratomask>0.999999)
 !--strat aerosols are added to index 2 : natural and anthropogenic aerosols for bands 1 to NSW 
         cg_aero_sw_rrtm(:,:,2,band)  = ( cg_aero_sw_rrtm(:,:,2,band)*piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) + &
@@ -393,5 +393,5 @@
     DO i=1, klon
     DO k=1, klev
-      IF (stratomask(i,k).GT.0.999999) THEN
+      IF (stratomask(i,k)>0.999999) THEN
         DO wave=1, nwave_lw
           tausum_aero(i,nwave_sw+wave,id_STRAT_phy)=tausum_aero(i,nwave_sw+wave,id_STRAT_phy)+taulw_aer_strat(i,k,band)
@@ -405,5 +405,5 @@
 !--stratospheric aerosols are added to both index 2 and 1
     DO band=1, NLW
-      WHERE (stratomask.GT.0.999999)
+      WHERE (stratomask>0.999999)
         tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + taulw_aer_strat(:,:,band)
         tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,1,band) + taulw_aer_strat(:,:,band)
@@ -419,5 +419,5 @@
       tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,2,band)
 !
-      WHERE (stratomask.GT.0.999999)
+      WHERE (stratomask>0.999999)
 !--stratospheric aerosols are only added to index 2
         tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + taulw_aer_strat(:,:,band)
@@ -428,5 +428,5 @@
 !--default SSA value if there is no aerosol
 !--to avoid 0 values that seems to cause some problem to RRTM
-    WHERE (tau_aero_sw_rrtm.LT.1.e-14)
+    WHERE (tau_aero_sw_rrtm<1.e-14)
       piz_aero_sw_rrtm = 1.0
     ENDWHERE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/recmwf_aero.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/recmwf_aero.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/recmwf_aero.F90	(revision 5082)
@@ -468,5 +468,5 @@
   !----aerosol flags are on
 
-  IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
+  IF (flag_aerosol > 0 .OR. flag_aerosol_strat) THEN
 
      !--Case 1
@@ -633,5 +633,5 @@
 
   ! case with no aerosols at all is also computed IF ACTIVEFEEDBACK_ACTIVE is false 
-  IF (.not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol .EQ. 0 .OR. swaerofree_diag) THEN    
+  IF (.not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol == 0 .OR. swaerofree_diag) THEN
 
      ! ZERO aerosol effect
@@ -732,5 +732,5 @@
   !---Now we copy back the correct fields to proceed to the next timestep
 
-  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) ) THEN
+  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol > 0 .OR. flag_aerosol_strat) ) THEN
 
      IF ( ok_ade .and. ok_aie  ) THEN
@@ -804,7 +804,7 @@
   IF (ok_ade.AND.ok_aie.AND.ok_volcan) THEN
      !--in this case the fluxes used for the heating rates come from case 4 but SW surface radiation is kept from case 2
-     IF (flag_volc_surfstrat.EQ.2) THEN ! STRAT HEATING
+     IF (flag_volc_surfstrat==2) THEN ! STRAT HEATING
         volmip_solsw(:)= ZFSDN_AERO(:,1,2)-ZFSUP_AERO(:,1,2)
-     ELSEIF (flag_volc_surfstrat.EQ.1) THEN ! SURF COOLING
+     ELSEIF (flag_volc_surfstrat==1) THEN ! SURF COOLING
         !--in this case the fluxes used for the heating rates come from case 2 but SW surface radiation is kept from case 4
         PFSUP(:,:) =    ZFSUP_AERO(:,:,2)
@@ -836,5 +836,5 @@
   ! Will need to be extended to LW radiation -> done by CK (2014-05-23)
 
-  IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
+  IF (flag_aerosol > 0 .OR. flag_aerosol_strat) THEN
 
      IF (ok_ade.AND.ok_aie) THEN
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_gasabs1a_140gp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_gasabs1a_140gp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_gasabs1a_140gp.F90	(revision 5082)
@@ -144,5 +144,5 @@
     Z_TF = Z_ODEPTH/(BPADE+Z_ODEPTH)
     ITR=INT(5.E+03_JPRB*Z_TF+0.5_JPRB)
-    IF (ITR.LT.0) ITR=0     ! MPL 12.12.08
+    IF (ITR<0) ITR=0     ! MPL 12.12.08
     P_ATR1(IPR,I_LAY) = 1.0_JPRB - TRANS(ITR)
     P_TF1(IPR,I_LAY) = Z_TF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90	(revision 5082)
@@ -383,5 +383,5 @@
 !       & (1.0_JPRB - Z_CLDFRAC(I_LEV-1))   
 !    ENDIF
-     if(istcld(i_lev).ne.1.and.i_lev.ne.1) then
+     if(istcld(i_lev)/=1.and.i_lev/=1) then
         z_faccmb1(i_lev+1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
                z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))
@@ -496,5 +496,5 @@
 !    Z_FACCMB2D(I_LEV-1) = Z_FACCLD1D(I_LEV-1) * Z_FACCLR2D(I_LEV) *&
 !     & (1.0_JPRB - Z_CLDFRAC(I_LEV+1))  
-    if (istcldd(i_lev).ne.1.and.i_lev.ne.1) then
+    if (istcldd(i_lev)/=1.and.i_lev/=1) then
        z_faccmb1d(i_lev-1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
                             z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/set99.F
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/set99.F	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/set99.F	(revision 5082)
@@ -28,19 +28,19 @@
       IL=1
    20 CONTINUE
-      IF (MOD(NU,IFAC).NE.0) GO TO 30
+      IF (MOD(NU,IFAC)/=0) GO TO 30
       K=K+1
       JFAX(K)=IFAC
-      IF (IFAC.NE.8) GO TO 25
-      IF (K.EQ.1) GO TO 25
+      IF (IFAC/=8) GO TO 25
+      IF (K==1) GO TO 25
       JFAX(1)=8
       JFAX(K)=6
    25 CONTINUE
       NU=NU/IFAC
-      IF (NU.EQ.1) GO TO 50
-      IF (IFAC.NE.8) GO TO 20
+      IF (NU==1) GO TO 50
+      IF (IFAC/=8) GO TO 20
    30 CONTINUE
       IL=IL+1
       IFAC=NLFAX(IL)
-      IF (IFAC.GT.1) GO TO 20
+      IF (IFAC>1) GO TO 20
 C
       WRITE(6,40) N
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/suecrad.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/suecrad.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/suecrad.F90	(revision 5082)
@@ -301,5 +301,5 @@
 LRRTM  = .FALSE.
 LECMWF = .FALSE.
-IF (iflag_rrtm.EQ.1) THEN
+IF (iflag_rrtm==1) THEN
         LRRTM  = .TRUE.
         LECMWF = .TRUE.
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomhook.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomhook.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomhook.F90	(revision 5082)
@@ -18,7 +18,7 @@
 INTEGER(KIND=JPIM),        INTENT(IN) :: KSWITCH
 REAL(KIND=JPRB),        INTENT(INOUT) :: PKEY
-IF (KSWITCH.EQ.0) THEN
+IF (KSWITCH==0) THEN
 !  PRINT *,'--> ON ENTRE DANS: ',CDNAME
-ELSE IF (KSWITCH.EQ.1) THEN
+ELSE IF (KSWITCH==1) THEN
 !  PRINT *,'    ON SORT  DE  : ',CDNAME
 ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomoml.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomoml.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomoml.F90	(revision 5082)
@@ -148,5 +148,5 @@
 LOGICAL :: OML_TEST_EVENT
 INTEGER(KIND=JPIM),intent(in) :: K,MYEVENT
-IF(K.EQ.MYEVENT) THEN
+IF(K==MYEVENT) THEN
  OML_TEST_EVENT =.TRUE.
 ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90	(revision 5082)
@@ -68,10 +68,10 @@
       DO i = 1, knon
 !
-        IF (lmon(i).GE.0.) THEN
+        IF (lmon(i)>=0.) THEN
 !
 ! STABLE CASE
 !
-          IF (speed(i).GT.1.5.AND.lmon(i).LE.1.0                        &
-     &                      .AND. rugos(i).LE.1.0) THEN
+          IF (speed(i)>1.5.AND.lmon(i)<=1.0                        &
+     &                      .AND. rugos(i)<=1.0) THEN
             delu(i) = (ustar(i)/RKAR)* &
                       (log(zref/(rugos(i))+1.) + &
@@ -92,5 +92,5 @@
 ! UNSTABLE CASE
 !
-          IF (speed(i).GT.5.0.AND.abs(lmon(i)).LE.50.0) THEN
+          IF (speed(i)>5.0.AND.abs(lmon(i))<=50.0) THEN
             xtmp = (1. - 16. * (zref/lmon(i)))**(1./4.)
             xtmp0 = (1. - 16. * (rugos(i)/lmon(i)))**(1./4.)
@@ -170,5 +170,5 @@
       DO i = 1, knon
 !
-       IF (zri1(i).GE.0.) THEN
+       IF (zri1(i)>=0.) THEN
           delu(i)  = 0.1 * speed(i)
           delte(i) = 0.1 * (tair(i) - ts(i) )
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/simu_airs.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/simu_airs.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/simu_airs.F90	(revision 5082)
@@ -33,5 +33,5 @@
         slope(N)=slope(N-1)
 
-        if (P(1).gt.P(N)) then
+        if (P(1)>P(N)) then
         i_dir= 1
         i=1
@@ -43,11 +43,11 @@
         first_point=0
         exit_flag=0
-        do while(exit_flag.eq.0)
-        if (P(i).ge.P_min.and.P(i).le.P_max) then
-        if (first_point.gt.0) then
+        do while(exit_flag==0)
+        if (P(i)>=P_min.and.P(i)<=P_max) then
+        if (first_point>0) then
         delta_alt=alt(i)-alt(first_point)
-        if (delta_alt.ge.delta_alt_limit) then
+        if (delta_alt>=delta_alt_limit) then
         slope_2km=(T(first_point)-T(i))/delta_alt
-        if (slope_2km.lt.slope_limit) then
+        if (slope_2km<slope_limit) then
         exit_flag=1
         else
@@ -56,13 +56,13 @@
         end if
         end if
-        if (first_point.eq.0.and.slope(i).lt.slope_limit) first_point=i
+        if (first_point==0.and.slope(i)<slope_limit) first_point=i
         end if
         i=i+i_dir
-        if (i.le.1.or.i.ge.N) exit_flag=1
+        if (i<=1.or.i>=N) exit_flag=1
         end do
 
-        if (first_point.le.0) P_tropo=65.4321
-        if (first_point.eq.1) P_tropo=64.5432
-        if (first_point.gt.1) then
+        if (first_point<=0) P_tropo=65.4321
+        if (first_point==1) P_tropo=64.5432
+        if (first_point>1) then
         tmp=(slope_limit-slope(first_point))/(slope(first_point+1)- &
      & slope(first_point))*(P(first_point+1)-P(first_point))
@@ -72,5 +72,5 @@
 
 ! Ajout Marine
-        if (P_tropo .lt. 60. .or. P_tropo .gt. 470.) then
+        if (P_tropo < 60. .or. P_tropo > 470.) then
         P_tropo = 999.
         endif
@@ -135,5 +135,5 @@
 
         do i = 2, size(rneb_cs)
-        if (rneb_ord(i) .gt. rneb_min) then
+        if (rneb_ord(i) > rneb_min) then
         nss = nss+1
         rneb_min = rneb_ord(i)
@@ -167,5 +167,5 @@
 
         do i = 2, size(rneb_cs)
-        if (rneb_ord(i) .gt. rneb_min) then
+        if (rneb_ord(i) > rneb_min) then
         n = n+1
         s(n) = rneb_ord(i)-rneb_min
@@ -303,11 +303,11 @@
 ! Tests
 
-        if (cc_tot_cs .gt. maxval(rneb_cs) .and. &
-     & abs(cc_tot_cs-maxval(rneb_cs)) .gt. 1.e-4 )  then
+        if (cc_tot_cs > maxval(rneb_cs) .and. &
+     & abs(cc_tot_cs-maxval(rneb_cs)) > 1.e-4 )  then
           WRITE(abort_message,*) 'cc_tot_cs > max rneb_cs', cc_tot_cs, maxval(rneb_cs)
           CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (iwp_hc_cs .lt. 0.) then
+        if (iwp_hc_cs < 0.) then
           abort_message= 'cloud_structure: iwp_hc_cs < 0'
           CALL abort_physic(modname,abort_message,1)
@@ -322,5 +322,5 @@
         REAL, intent(inout) :: num
 
-        if (den .ne. 0) then
+        if (den /= 0) then
         num = num/den
         else
@@ -337,5 +337,5 @@
         REAL, intent(out) :: res
 
-        if (den .ne. 0.) then
+        if (den /= 0.) then
         res = num/den
         else
@@ -375,5 +375,5 @@
 
         do i = 1, len_cs
-        if (rneb_cs(i) .ge. rnebmax) then
+        if (rneb_cs(i) >= rnebmax) then
         w(i) = 1.
         else
@@ -386,5 +386,5 @@
         som = 0.
         do i = 1, len_cs
-        if (emis_cs(i) .eq. 1.) then
+        if (emis_cs(i) == 1.) then
         tau_cs(i) = 10.
         else
@@ -401,5 +401,5 @@
 
 ! Boucle sur les nuages
-        do while (ideb .ne. 0 .and. ideb .le. len_cs)   
+        do while (ideb /= 0 .and. ideb <= len_cs)
 
 
@@ -409,5 +409,5 @@
         ideb = iend+1
 
-        if (ibeg .gt. 0) then
+        if (ibeg > 0) then
 
         nuage = nuage + 1
@@ -434,5 +434,5 @@
         call topbot(1, w, ibeg, iend)
 
-        if (ibeg .gt. 0) then
+        if (ibeg > 0) then
 
         call caract(ibeg, iend, temp_cs, tau_cs, iwco_cs, &
@@ -446,5 +446,5 @@
         rad = som_rad
 
-        if (pcld .gt. p_thresh) then
+        if (pcld > p_thresh) then
 
         shc = 0.
@@ -456,18 +456,18 @@
         else
 
-        if (emis .lt. em_min .or. emis .gt. em_max  &
-     & .or. tcld .gt. 230.) then
+        if (emis < em_min .or. emis > em_max  &
+     & .or. tcld > 230.) then
         shist = 0.
         endif
 
-        if (emis .lt. 0.98) then
+        if (emis < 0.98) then
         sCb = 0.
         endif
 
-        if (emis .gt. 0.5 .or. emis .lt. 0.1) then
+        if (emis > 0.5 .or. emis < 0.1) then
         sThCi = 0.
         endif
 
-        if (emis .le. 0.5 .or. emis .ge. 0.98) then
+        if (emis <= 0.5 .or. emis >= 0.98) then
         sAnv = 0.
         endif
@@ -496,15 +496,15 @@
 ! Tests
 
-        if (iwp .lt. 0.) then
+        if (iwp < 0.) then
           WRITE(abort_message,*) 'ideb iwp =', ideb, iwp
           CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (deltaz .lt. 0.) then
+        if (deltaz < 0.) then
           WRITE(abort_message,*)'ideb deltaz =', ideb, deltaz
           CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (emis .lt. 0.048 .and. emis .ne. 0.) then
+        if (emis < 0.048 .and. emis /= 0.) then
           WRITE(abort_message,*) 'ideb emis =', ideb, emis
           CALL abort_physic(modname,abort_message,1)
@@ -531,7 +531,7 @@
 ! Cas ou il n'y a pas de nuage visible au-dessus
 
-        if (visible .eq. 0) then
-
-        if (som_tau .lt. tau_thresh) then
+        if (visible == 0) then
+
+        if (som_tau < tau_thresh) then
         do i = ibeg, iend
         w(i) = 0.
@@ -587,5 +587,5 @@
         som_rad = som_rad + rad_cs(i)*dz_cs(i)
 
-        if (som_tau .gt. 3. .and. ibase .eq. -100) then
+        if (som_tau > 3. .and. ibase == -100) then
         ibase = i-1
         endif
@@ -593,5 +593,5 @@
         enddo
 
-        if (som_dz .ne. 0.) then
+        if (som_dz /= 0.) then
           som_rad = som_rad/som_dz
         else
@@ -607,5 +607,5 @@
 ! Determination de Pcld et Tcld
 
-       if (ibase .lt. ibeg) then
+       if (ibase < ibeg) then
        ibase = ibeg
        endif
@@ -633,5 +633,5 @@
         do i = ideb, size(w)
 
-        if (w(i) .eq. 1. .and. itest .eq. 0) then
+        if (w(i) == 1. .and. itest == 0) then
         ibeg = i
         itest = 1
@@ -642,5 +642,5 @@
 
         i = ibeg
-        do while (w(i) .eq. 1. .and. i .le. size(w))
+        do while (w(i) == 1. .and. i <= size(w))
         i = i+1
         enddo
@@ -671,5 +671,5 @@
 
         do i = 1, size(rneb_cs)
-        if (rneb(i) .lt. rneb_max) then
+        if (rneb(i) < rneb_max) then
         rneb_max = rneb(i)
         ind_min = i
@@ -794,5 +794,5 @@
         tsom_hist = 0.
 
-        do while (ltop .ge. 1)   ! Boucle sur toute la colonne
+        do while (ltop >= 1)   ! Boucle sur toute la colonne
 
         itop = 0
@@ -800,5 +800,5 @@
         do l = ltop,1,-1
 
-        if (itop .eq. 0 .and. rneb_1D(l) .gt. 0.001 ) then
+        if (itop == 0 .and. rneb_1D(l) > 0.001 ) then
         itop = l
         endif
@@ -808,5 +808,5 @@
         ibot = itop
 
-        do while (rneb_1D(ibot) .gt. 0.001 .and. ibot .ge. 1)
+        do while (rneb_1D(ibot) > 0.001 .and. ibot >= 1)
         ibot = ibot -1
         enddo
@@ -815,5 +815,5 @@
         ibot = ibot+1
 
-        if (itop .gt. 0) then    ! itop > 0
+        if (itop > 0) then    ! itop > 0
 
         num_cs = num_cs +1
@@ -944,5 +944,5 @@
 ! Determination des variables de sortie
 
-        if (N_CS .gt. 0) then   ! if N_CS>0
+        if (N_CS > 0) then   ! if N_CS>0
 
         cc_tot_mesh = 1. - prod
@@ -1002,44 +1002,44 @@
         ! Tests
 
-       if (cc_tot_mesh .gt. tsom_tot .and. &
-     & abs(cc_tot_mesh-tsom_tot) .gt. 1.e-4) then
+       if (cc_tot_mesh > tsom_tot .and. &
+     & abs(cc_tot_mesh-tsom_tot) > 1.e-4) then
            WRITE(abort_message,*)'cc_tot_mesh > tsom_tot', cc_tot_mesh, tsom_tot
            CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (cc_tot_mesh .lt. maxval(test_tot(1:N_CS)) .and. &
-     & abs(cc_tot_mesh-maxval(test_tot(1:N_CS))) .gt. 1.e-4) then
+        if (cc_tot_mesh < maxval(test_tot(1:N_CS)) .and. &
+     & abs(cc_tot_mesh-maxval(test_tot(1:N_CS))) > 1.e-4) then
            WRITE(abort_message,*) 'cc_tot_mesh < max', cc_tot_mesh, maxval(test_tot(1:N_CS))
            CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (cc_hc_mesh .gt. tsom_hc .and. &
-     & abs(cc_hc_mesh-tsom_hc) .gt. 1.e-4) then
+        if (cc_hc_mesh > tsom_hc .and. &
+     & abs(cc_hc_mesh-tsom_hc) > 1.e-4) then
            WRITE(abort_message,*) 'cc_hc_mesh > tsom_hc', cc_hc_mesh, tsom_hc
            CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (cc_hc_mesh .lt. maxval(test_hc(1:N_CS)) .and. &
-     & abs(cc_hc_mesh-maxval(test_hc(1:N_CS))) .gt. 1.e-4) then
+        if (cc_hc_mesh < maxval(test_hc(1:N_CS)) .and. &
+     & abs(cc_hc_mesh-maxval(test_hc(1:N_CS))) > 1.e-4) then
            WRITE(abort_message,*) 'cc_hc_mesh < max', cc_hc_mesh, maxval(test_hc(1:N_CS))
            CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (cc_hist_mesh .gt. tsom_hist .and. &
-     & abs(cc_hist_mesh-tsom_hist) .gt. 1.e-4) then
+        if (cc_hist_mesh > tsom_hist .and. &
+     & abs(cc_hist_mesh-tsom_hist) > 1.e-4) then
            WRITE(abort_message,*) 'cc_hist_mesh > tsom_hist', cc_hist_mesh, tsom_hist
            CALL abort_physic(modname,abort_message,1)
         endif
 
-        if (cc_hist_mesh .lt. 0.) then
+        if (cc_hist_mesh < 0.) then
            WRITE(abort_message,*) 'cc_hist_mesh < 0', cc_hist_mesh
            CALL abort_physic(modname,abort_message,1)
         endif
 
-        if ((pcld_hc_mesh .gt. maxval(test_pcld(1:N_CS)) .or. &
-     & pcld_hc_mesh .lt. minval(test_pcld(1:N_CS))) .and. &
-     & abs(pcld_hc_mesh-maxval(test_pcld(1:N_CS))) .gt. 1. .and. &
-     & maxval(test_pcld(1:N_CS)) .ne. 999. &
-     & .and. minval(test_pcld(1:N_CS)) .ne. 999.) then
+        if ((pcld_hc_mesh > maxval(test_pcld(1:N_CS)) .or. &
+     & pcld_hc_mesh < minval(test_pcld(1:N_CS))) .and. &
+     & abs(pcld_hc_mesh-maxval(test_pcld(1:N_CS))) > 1. .and. &
+     & maxval(test_pcld(1:N_CS)) /= 999. &
+     & .and. minval(test_pcld(1:N_CS)) /= 999.) then
            WRITE(abort_message,*) 'pcld_hc_mesh est faux', pcld_hc_mesh, maxval(test_pcld(1:N_CS)), &
      & minval(test_pcld(1:N_CS))
@@ -1047,9 +1047,9 @@
         endif
 
-       if ((tcld_hc_mesh .gt. maxval(test_tcld(1:N_CS)) .or. &
-     & tcld_hc_mesh .lt. minval(test_tcld(1:N_CS))) .and. &
-     & abs(tcld_hc_mesh-maxval(test_tcld(1:N_CS))) .gt. 0.1 .and. &
-     & maxval(test_tcld(1:N_CS)) .ne. 999. &
-     & .and. minval(test_tcld(1:N_CS)) .ne. 999.) then
+       if ((tcld_hc_mesh > maxval(test_tcld(1:N_CS)) .or. &
+     & tcld_hc_mesh < minval(test_tcld(1:N_CS))) .and. &
+     & abs(tcld_hc_mesh-maxval(test_tcld(1:N_CS))) > 0.1 .and. &
+     & maxval(test_tcld(1:N_CS)) /= 999. &
+     & .and. minval(test_tcld(1:N_CS)) /= 999.) then
            WRITE(abort_message,*) 'tcld_hc_mesh est faux', tcld_hc_mesh, maxval(test_tcld(1:N_CS)), &
                 & minval(test_tcld(1:N_CS))
@@ -1057,9 +1057,9 @@
         endif
 
-        if ((em_hc_mesh .gt. maxval(test_em(1:N_CS)) .or. &
-     & em_hc_mesh .lt. minval(test_em(1:N_CS))) .and. &
-     & abs(em_hc_mesh-maxval(test_em(1:N_CS))) .gt. 1.e-4 .and. &
-     & minval(test_em(1:N_CS)) .ne. 999. .and. &
-     & maxval(test_em(1:N_CS)) .ne. 999. ) then
+        if ((em_hc_mesh > maxval(test_em(1:N_CS)) .or. &
+     & em_hc_mesh < minval(test_em(1:N_CS))) .and. &
+     & abs(em_hc_mesh-maxval(test_em(1:N_CS))) > 1.e-4 .and. &
+     & minval(test_em(1:N_CS)) /= 999. .and. &
+     & maxval(test_em(1:N_CS)) /= 999. ) then
            WRITE(abort_message,*) 'em_hc_mesh est faux', em_hc_mesh, maxval(test_em(1:N_CS)), &
      & minval(test_em(1:N_CS))
@@ -1111,5 +1111,5 @@
         CHARACTER (len = 160)     :: abort_message
 
-        if (x .gt. bsup .or. x .lt. binf) then
+        if (x > bsup .or. x < binf) then
           WRITE(abort_message,*) sx, 'est faux', sx, x
           CALL abort_physic(modname,abort_message,1)
@@ -1202,5 +1202,5 @@
      & pplay_airs(i,j)/(temp_airs(i,j)*RD)
 
-        if (rneb_airs(i,j) .gt. 0.001) then
+        if (rneb_airs(i,j) > 0.001) then
         iwcon_airs(i,j) = iwcon0_airs(i,j)/rneb_airs(i,j)
         else
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/slab_heat_transp_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/slab_heat_transp_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/slab_heat_transp_mod.F90	(revision 5082)
@@ -110,6 +110,6 @@
     
     ! Sanity check on dimensions
-    if ((ip1jm.ne.((nbp_lon+1)*(nbp_lat-1))).or. &
-        (ip1jmp1.ne.((nbp_lon+1)*nbp_lat))) then
+    if ((ip1jm/=((nbp_lon+1)*(nbp_lat-1))).or. &
+        (ip1jmp1/=((nbp_lon+1)*nbp_lat))) then
       abort_message="ini_slab_transp_geom Error: wrong array sizes"
       CALL abort_physic(modname,abort_message,1)
@@ -214,5 +214,5 @@
     ! put flux mask to 0 at boundaries of continent cells
     DO i=1,ip1jmp1-1
-      IF (zmasq_2d(i).GT.1e-5 .OR. zmasq_2d(i+1).GT.1e-5) THEN
+      IF (zmasq_2d(i)>1e-5 .OR. zmasq_2d(i+1)>1e-5) THEN
               zmasqu(i)=0.
       ENDIF
@@ -222,5 +222,5 @@
     END DO
     DO i=1,ip1jm
-      IF (zmasq_2d(i).GT.1e-5 .OR. zmasq_2d(i+iip1).GT.1e-5) THEN
+      IF (zmasq_2d(i)>1e-5 .OR. zmasq_2d(i+iip1)>1e-5) THEN
               zmasqv(i)=0.
       END IF
@@ -231,5 +231,5 @@
     slab_ekman=2
     CALL getin("slab_ekman",slab_ekman)
-    IF (slab_ekman.GT.0) THEN
+    IF (slab_ekman>0) THEN
       allocate(unsfv(ip1jm))
       allocate(unsev(ip1jm))
@@ -409,5 +409,5 @@
       ELSE
           alpha(:)=alpham
-          ! Tsurf-Tdeep ~ 10° in the Tropics
+          ! Tsurf-Tdeep ~ 10� in the Tropics
       ENDIF
 
@@ -424,5 +424,5 @@
         ! upstream scheme to avoid hot spots
         DO ij=1,ip1jm
-        IF (fluxm(ij).GE.0.) THEN
+        IF (fluxm(ij)>=0.) THEN
            fluxm(ij)=fluxm(ij)*(ts(ij+iip1)-td(ij))
         ELSE
@@ -595,5 +595,5 @@
       IF (ekman_zonadv) THEN
         DO ij=iip2,ip1jm
-          IF (fluxz(ij).GE.0.) THEN
+          IF (fluxz(ij)>=0.) THEN
                  fluxtz(ij,1)=fluxz(ij)*ts(ij,1)
                  fluxtz(ij,2)=-fluxz(ij)*ts(ij+1,2)
@@ -658,5 +658,5 @@
 ! Schema upstream      
       DO ij=iip2,ip1jm
-      IF (fluxz(ij).GE.0.) THEN
+      IF (fluxz(ij)>=0.) THEN
              fluxtz(ij,1)=fluxz(ij)*ts(ij,1)
              fluxtz(ij,2)=-fluxz(ij)*ts(ij+1,2)
@@ -691,5 +691,5 @@
       DO ij=iip2,ip1jm
          fluxv=fluxv_ek(ij)+fluxv_gm(ij) ! net flux, needed for upstream scheme
-         IF (fluxv.GT.0.) THEN
+         IF (fluxv>0.) THEN
            dt_ek(ij,1)=dt_ek(ij,1)+fluxv_ek(ij)*ts(ij,2)
            dt_ek(ij,2)=dt_ek(ij,2)-fluxv_ek(ij)*ts(ij,2)
@@ -708,5 +708,5 @@
       ! North Pole
       fluxv=fluxv_ek(1)+fluxv_gm(1)
-        IF (fluxv.GT.0.) THEN
+        IF (fluxv>0.) THEN
           dt_ek(1,1)=dt_ek(1,1)+fluxv_ek(1)*ts(1,2)
           dt_ek(1,2)=dt_ek(1,2)-fluxv_ek(1)*ts(1,2)
@@ -723,5 +723,5 @@
       ! South pole
       fluxv=fluxv_ek(ip1jmp1)+fluxv_gm(ip1jmp1)
-        IF (fluxv.GT.0.) THEN
+        IF (fluxv>0.) THEN
           dt_ek(ip1jmp1,1)=dt_ek(ip1jmp1,1)+fluxv_ek(ip1jmp1)*ts(ip1jmp1,2)
           dt_ek(ip1jmp1,2)=dt_ek(ip1jmp1,2)-fluxv_ek(ip1jmp1)*ts(ip1jmp1,2)
@@ -829,5 +829,5 @@
 ! Schema upstream      
       DO ij=iip2,ip1jm
-      IF (fluxz(ij).GE.0.) THEN
+      IF (fluxz(ij)>=0.) THEN
              fluxtz(ij,1)=fluxz(ij)*ts(ij,1)
              fluxtz(ij,2)=-fluxz(ij)*ts(ij+1,2)
@@ -847,5 +847,5 @@
                  +fluxtm(ij,:)-fluxtm(ij-iip1,:)
 ! + vertical heat flux (mass flux * T, upstream scheme)
-         IF (fluxv(ij).GT.0.) THEN
+         IF (fluxv(ij)>0.) THEN
            dt(ij,1)=dt(ij,1)+fluxv(ij)*ts(ij,2)
            dt(ij,2)=dt(ij,2)-fluxv(ij)*ts(ij,2)
@@ -862,5 +862,5 @@
 ! Poles
       dt(1,:)=SUM(fluxtm(1:iim,:),dim=1)
-        IF (fluxv(1).GT.0.) THEN
+        IF (fluxv(1)>0.) THEN
           dt(1,1)=dt(1,1)+fluxv(1)*ts(1,2)
           dt(1,2)=dt(1,2)-fluxv(1)*ts(1,2)
@@ -871,5 +871,5 @@
       dt(1,:)=dt(1,:)/apoln
       dt(ip1jmp1,:)=-SUM(fluxtm(ip1jm-iim:ip1jm-1,:),dim=1)
-       IF (fluxv(ip1jmp1).GT.0.) THEN
+       IF (fluxv(ip1jmp1)>0.) THEN
          dt(ip1jmp1,1)=dt(ip1jmp1,1)+fluxv(ip1jmp1)*ts(ip1jmp1,2)
          dt(ip1jmp1,2)=dt(ip1jmp1,2)-fluxv(ip1jmp1)*ts(ip1jmp1,2)
@@ -932,5 +932,5 @@
 
   ! Sanity check:
-  IF(klon_glo.NE.2+(jm-2)*(im-1)) THEN
+  IF(klon_glo/=2+(jm-2)*(im-1)) THEN
     abort_message="gr_dyn_fi error, wrong sizes"
     CALL abort_physic(modname,abort_message,1)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/stdlevvar_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/stdlevvar_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/stdlevvar_mod.F90	(revision 5082)
@@ -201,5 +201,5 @@
 !IM ---
 !
-        IF(n.EQ.ncon) THEN
+        IF(n==ncon) THEN
           te_zref_con(i) = te_zref(i)
           q_zref_con(i) = q_zref(i)
@@ -494,13 +494,13 @@
 ! compteurs ici
 !
-         ok_t2m_toosmall(i)=te_zref(i).LT.tpot(i).AND. &
-         & te_zref(i).LT.ts1(i)
-         ok_t2m_toobig(i)=te_zref(i).GT.tpot(i).AND. &
-         & te_zref(i).GT.ts1(i)
-         ok_q2m_toosmall(i)=q_zref(i).LT.q1(i).AND. &
-         & q_zref(i).LT.qsurf(i)
-         ok_q2m_toobig(i)=q_zref(i).GT.q1(i).AND. &
-         & q_zref(i).GT.qsurf(i)
-         ok_u2m_toobig(i)=u_zref(i).GT.speed(i)
+         ok_t2m_toosmall(i)=te_zref(i)<tpot(i).AND. &
+         & te_zref(i)<ts1(i)
+         ok_t2m_toobig(i)=te_zref(i)>tpot(i).AND. &
+         & te_zref(i)>ts1(i)
+         ok_q2m_toosmall(i)=q_zref(i)<q1(i).AND. &
+         & q_zref(i)<qsurf(i)
+         ok_q2m_toobig(i)=q_zref(i)>q1(i).AND. &
+         & q_zref(i)>qsurf(i)
+         ok_u2m_toobig(i)=u_zref(i)>speed(i)
 !
          IF(ok_t2m_toosmall(i).OR.ok_t2m_toobig(i)) THEN
@@ -558,13 +558,13 @@
 ! compteurs ici
 !
-          ok_t2m_toosmall(i)=te_zref(i).LT.tpot(i).AND. &
-          & te_zref(i).LT.ts1(i)
-          ok_t2m_toobig(i)=te_zref(i).GT.tpot(i).AND. &
-          & te_zref(i).GT.ts1(i)
-          ok_q2m_toosmall(i)=q_zref(i).LT.q1(i).AND. &
-          & q_zref(i).LT.qsurf(i)
-          ok_q2m_toobig(i)=q_zref(i).GT.q1(i).AND. &
-          & q_zref(i).GT.qsurf(i)
-          ok_u2m_toobig(i)=u_zref(i).GT.speed(i)
+          ok_t2m_toosmall(i)=te_zref(i)<tpot(i).AND. &
+          & te_zref(i)<ts1(i)
+          ok_t2m_toobig(i)=te_zref(i)>tpot(i).AND. &
+          & te_zref(i)>ts1(i)
+          ok_q2m_toosmall(i)=q_zref(i)<q1(i).AND. &
+          & q_zref(i)<qsurf(i)
+          ok_q2m_toobig(i)=q_zref(i)>q1(i).AND. &
+          & q_zref(i)>qsurf(i)
+          ok_u2m_toobig(i)=u_zref(i)>speed(i)
 !
           IF(ok_t2m_toosmall(i).OR.ok_t2m_toobig(i)) THEN
@@ -591,5 +591,5 @@
 !
 !
-          IF(n.EQ.ncon) THEN
+          IF(n==ncon) THEN
             te_zref_con(i) = te_zref(i)
             q_zref_con(i) = q_zref(i)
@@ -637,13 +637,13 @@
 ! compteurs ici
 !
-         ok_t10m_toosmall(i)=te_zref(i).LT.tpot(i).AND. &
-         & te_zref(i).LT.ts1(i)
-         ok_t10m_toobig(i)=te_zref(i).GT.tpot(i).AND. &
-         & te_zref(i).GT.ts1(i)
-         ok_q10m_toosmall(i)=q_zref(i).LT.q1(i).AND. &
-         & q_zref(i).LT.qsurf(i)
-         ok_q10m_toobig(i)=q_zref(i).GT.q1(i).AND. &
-         & q_zref(i).GT.qsurf(i)
-         ok_u10m_toobig(i)=u_zref(i).GT.speed(i)
+         ok_t10m_toosmall(i)=te_zref(i)<tpot(i).AND. &
+         & te_zref(i)<ts1(i)
+         ok_t10m_toobig(i)=te_zref(i)>tpot(i).AND. &
+         & te_zref(i)>ts1(i)
+         ok_q10m_toosmall(i)=q_zref(i)<q1(i).AND. &
+         & q_zref(i)<qsurf(i)
+         ok_q10m_toobig(i)=q_zref(i)>q1(i).AND. &
+         & q_zref(i)>qsurf(i)
+         ok_u10m_toobig(i)=u_zref(i)>speed(i)
 !
          IF(ok_t10m_toosmall(i).OR.ok_t10m_toobig(i)) THEN
@@ -696,13 +696,13 @@
 ! compteurs ici
 !
-          ok_t10m_toosmall(i)=te_zref(i).LT.tpot(i).AND. &
-          & te_zref(i).LT.ts1(i)
-          ok_t10m_toobig(i)=te_zref(i).GT.tpot(i).AND. &
-          & te_zref(i).GT.ts1(i)
-          ok_q10m_toosmall(i)=q_zref(i).LT.q1(i).AND. &
-          & q_zref(i).LT.qsurf(i)
-          ok_q10m_toobig(i)=q_zref(i).GT.q1(i).AND. &
-          & q_zref(i).GT.qsurf(i)
-          ok_u10m_toobig(i)=u_zref(i).GT.speed(i)
+          ok_t10m_toosmall(i)=te_zref(i)<tpot(i).AND. &
+          & te_zref(i)<ts1(i)
+          ok_t10m_toobig(i)=te_zref(i)>tpot(i).AND. &
+          & te_zref(i)>ts1(i)
+          ok_q10m_toosmall(i)=q_zref(i)<q1(i).AND. &
+          & q_zref(i)<qsurf(i)
+          ok_q10m_toobig(i)=q_zref(i)>q1(i).AND. &
+          & q_zref(i)>qsurf(i)
+          ok_u10m_toobig(i)=u_zref(i)>speed(i)
 !
           IF(ok_t10m_toosmall(i).OR.ok_t10m_toobig(i)) THEN
@@ -729,5 +729,5 @@
 !
 !
-          IF(n.EQ.ncon) THEN
+          IF(n==ncon) THEN
             te_zref_con(i) = te_zref(i)
             q_zref_con(i) = q_zref(i)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/stratocu_if.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/stratocu_if.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/stratocu_if.F90	(revision 5082)
@@ -57,6 +57,6 @@
                - RD * 0.5*(t(i,k)+t(i,k+1))/RCPD/paprs(i,k+1)
           zdthdp = zdthdp * 100.0
-          IF (pplay(i,k).GT.0.8*paprs(i,1) .AND. &
-               zdthdp.LT.dthmin(i) ) THEN
+          IF (pplay(i,k)>0.8*paprs(i,1) .AND. &
+               zdthdp<dthmin(i) ) THEN
              dthmin(i) = zdthdp
              invb(i) = k
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/stratosphere_mask.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/stratosphere_mask.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/stratosphere_mask.F90	(revision 5082)
@@ -77,5 +77,5 @@
   ifil=0
   DO i=1,klon
-  IF (ABS(tp(i)/missing_val-1.0).LT.0.01) THEN
+  IF (ABS(tp(i)/missing_val-1.0)<0.01) THEN
     !set missing values to very simple profile (neighbour averaging too expensive in LMDZ)
     tp(i)=50000.-20000.*cos(xlat(i)/360.*2.*pi)
@@ -88,5 +88,5 @@
 DO i=1, klon
 DO k=1, klev
-  IF (pplay(i,k).LT.tp(i)) THEN
+  IF (pplay(i,k)<tp(i)) THEN
     stratomask(i,k)=1.0
   ELSE
@@ -96,5 +96,5 @@
 ENDDO
 
-IF (ifil.GT.0 .AND. prt_level >5) THEN
+IF (ifil>0 .AND. prt_level >5) THEN
   write(lunout,*)'Tropopause: number of undetermined values =', ifil
 ENDIF
@@ -149,8 +149,8 @@
 
    ! dt/dz valid?
-   if (j.eq.level)     go to 999                 ! no, start level, initialize first
-   if (dtdz.le.gamma)  go to 999                 ! no, dt/dz < -2 K/km
-   if (dtdz0.gt.gamma) go to 999                 ! no, dt/dz below > -2 K/km
-   if (pm.gt.plimu)    go to 999                 ! no, pm too low
+   if (j==level)     go to 999                 ! no, start level, initialize first
+   if (dtdz<=gamma)  go to 999                 ! no, dt/dz < -2 K/km
+   if (dtdz0>gamma) go to 999                 ! no, dt/dz below > -2 K/km
+   if (pm>plimu)    go to 999                 ! no, pm too low
 
    ! dtdz is valid, calculate tropopause pressure ptph
@@ -165,6 +165,6 @@
    ttph = ttph + (bg * log(ptph) + ag * (ptph**rkappa)/rkappa) / faktor*t(j)
 
-   if (ptph.lt.pliml) go to 999 
-   if (ptph.gt.plimu) go to 999     
+   if (ptph<pliml) go to 999
+   if (ptph>plimu) go to 999
 
    ! 2nd test: dtdz above 2 km must not exceed gamma
@@ -178,6 +178,6 @@
        pmk2 = .5 * (p(jj-1)**rkappa+p(jj)**rkappa)    ! p mean ^kappa
        pm2 = pmk2**(1/rkappa)                      ! p mean
-       if(pm2.gt.ptph) go to 110                ! doesn't happen
-       if(pm2.lt.p2km) go to 888                ! ptropo is valid
+       if(pm2>ptph) go to 110                ! doesn't happen
+       if(pm2<p2km) go to 888                ! ptropo is valid
 
        a2 = (t(jj-1)-t(jj))                     ! a
@@ -192,5 +192,5 @@
    
        ! discard ptropo ?
-        if (aquer.le.gamma) go to 999           ! dt/dz above < gamma
+        if (aquer<=gamma) go to 999           ! dt/dz above < gamma
 
 110 continue 
@@ -206,5 +206,5 @@
 
 jj = LEVEL                                       ! bottom
-do while ((P(jj).gt.PS) .or. (T(jj).lt.100))     ! T must be valid too
+do while ((P(jj)>PS) .or. (T(jj)<100))     ! T must be valid too
   jj=jj-1
 enddo
@@ -214,5 +214,5 @@
 TDLNP = TM*DLNP
 
-do while ( (JJ.ge.2) .and. (PTRP.lt.P(jj-1)) ) 
+do while ( (JJ>=2) .and. (PTRP<P(jj-1)) )
   DLNP = log(P(jj)/P(jj-1))
   TM = 0.5 * (T(jj) + T(jj-1))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_bucket_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_bucket_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_bucket_mod.F90	(revision 5082)
@@ -179,5 +179,5 @@
     ELSE 
        cal(:) = RCPD * capsol(:)
-       IF (klon_glo .EQ. 1) THEN
+       IF (klon_glo == 1) THEN
          cal(:) = 0.
        ENDIF
@@ -304,5 +304,5 @@
     CALL albsno(klon,knon,dtime,agesno(:),alb_neig(:), precip_snow(:))  
     
-    WHERE (snow(1 : knon) .LT. 0.0001) agesno(1 : knon) = 0.
+    WHERE (snow(1 : knon) < 0.0001) agesno(1 : knon) = 0.
     
     DO i=1, knon
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_orchidee_mod.F90	(revision 5082)
@@ -254,5 +254,5 @@
        IF ( .NOT. ALLOCATED(albedo_keep)) THEN
 !ym          ALLOCATE(albedo_keep(klon))
-!ym bizarre que non alloué en knon precedement
+!ym bizarre que non allou� en knon precedement
           ALLOCATE(albedo_keep(knon))
           ALLOCATE(zlev(knon))
@@ -621,5 +621,5 @@
        CALL cpl_send_land_fields(itime, knon, knindex, &
             riverflow, coastalflow)
-       IF (landice_opt .GE. 2) THEN
+       IF (landice_opt >= 2) THEN
           CALL cpl_send_landice_fields(itime, knon, knindex, run_off_lic, run_off_lic_frac)
        END IF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_landice_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_landice_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_landice_mod.F90	(revision 5082)
@@ -255,5 +255,5 @@
 
 
-    IF (landice_opt .EQ. 1) THEN
+    IF (landice_opt == 1) THEN
 
 !****************************************************************************************    
@@ -441,5 +441,5 @@
 !****************************************************************************************
 
-if (z0m_landice .GT. 0.) then
+if (z0m_landice > 0.) then
     z0m(1:knon) = z0m_landice
     z0h(1:knon) = z0h_landice
@@ -457,9 +457,9 @@
     coefd = log(z03)-coefc*ta3
     do j=1,knon 
-      if (temp_air(j) .lt. ta1) then
+      if (temp_air(j) < ta1) then
         z0m(j) = z01
-      else if (temp_air(j).ge.ta1 .and. temp_air(j).lt.ta2) then
+      else if (temp_air(j)>=ta1 .and. temp_air(j)<ta2) then
         z0m(j) = exp(coefa*temp_air(j) + coefb)
-      else if (temp_air(j).ge.ta2 .and. temp_air(j).lt.ta3) then
+      else if (temp_air(j)>=ta2 .and. temp_air(j)<ta3) then
         ! if st > 0, melting induce smooth surface
         z0m(j) = exp(coefc*temp_air(j) + coefd)
@@ -493,5 +493,5 @@
        ! 1st step: erosion of fresh snow accumulated during the time step
        do j=1, knon
-       if (precip_snow(j) .GT. 0.) then
+       if (precip_snow(j) > 0.) then
            rhos(j)=rhofresh_bs
            ! blowing snow flux formula used in MAR
@@ -516,5 +516,5 @@
            fluxbs_1(j)=max(-maxerosion,fluxbs_1(j))
 
-           if (precip_snow(j) .gt. abs(fluxbs_1(j))) then
+           if (precip_snow(j) > abs(fluxbs_1(j))) then
                ok_remaining_freshsnow(j)=.true.
                bsweight_fresh(j)=1.
@@ -643,5 +643,5 @@
 #endif
    
-    WHERE (snow(1 : knon) .LT. 0.0001) agesno(1 : knon) = 0.                                         
+    WHERE (snow(1 : knon) < 0.0001) agesno(1 : knon) = 0.
     zfra(1:knon) = MAX(0.0,MIN(1.0,snow(1:knon)/(snow(1:knon)+10.0)))  
 
@@ -655,5 +655,5 @@
 ! If landice_opt>=2, corresponding call is done from surf_land_orchidee
 !****************************************************************************************
-    IF (type_ocean=='couple' .AND. landice_opt .LT. 2) THEN
+    IF (type_ocean=='couple' .AND. landice_opt < 2) THEN
        ! Compress fraction where run_off_lic is active (here all pctsrf(is_lic))
        run_off_lic_frac(:)=0.0
@@ -696,5 +696,5 @@
        alb_dir(1:knon,6)=alb2(1:knon)
 
-       IF ((landice_opt .EQ. 1) .AND. (iflag_albcalc .EQ. 2)) THEN
+       IF ((landice_opt == 1) .AND. (iflag_albcalc == 2)) THEN
        alb_dir(1:knon,1)=alb6(1:knon,1)
        alb_dir(1:knon,2)=alb6(1:knon,2)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_ocean_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_ocean_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/surf_ocean_mod.F90	(revision 5082)
@@ -142,9 +142,9 @@
 
     REAL, intent(out):: tkt(:) ! (knon)
-    ! épaisseur (m) de la couche de diffusion thermique (microlayer)
+    ! �paisseur (m) de la couche de diffusion thermique (microlayer)
     ! cool skin thickness
 
     REAL, intent(out):: tks(:) ! (knon)
-    ! épaisseur (m) de la couche de diffusion de masse (microlayer)
+    ! �paisseur (m) de la couche de diffusion de masse (microlayer)
 
     REAL, intent(out):: taur(:) ! (knon)
@@ -220,5 +220,5 @@
     !******************************************************************************
 
-    IF ( f_z0qh_oce .ne. 1.) THEN
+    IF ( f_z0qh_oce /= 1.) THEN
        ! Si on suit les formulations par exemple de Tessel, on 
        ! a z0h=0.4*nu/u*, z0q=0.62*nu/u*, d'ou f_z0qh_oce=0.62/0.4=1.55
@@ -280,5 +280,5 @@
     ! fcodron: compute lmt_bils  forced case (same as wfbils_oce / 1.-contfracatm)
     !******************************************************************************
-    IF (type_ocean.NE.'slab') THEN
+    IF (type_ocean/='slab') THEN
        lmt_bils(1:klon)=0.
        DO i=1,knon
@@ -295,5 +295,5 @@
        !--old parametrizations of ocean surface albedo
        !
-       IF (iflag_cycle_diurne.GE.1) THEN
+       IF (iflag_cycle_diurne>=1) THEN
           !
           CALL alboc_cd(rmu0,alb_eau)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/sw_aeroAR4.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/sw_aeroAR4.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/sw_aeroAR4.F90	(revision 5082)
@@ -241,5 +241,5 @@
   ENDIF
   !     ------------------------------------------------------------------
-  IF (MOD(itapsw,swpas).EQ.0) THEN
+  IF (MOD(itapsw,swpas)==0) THEN
 
      DO JK = 1 , KFLEV
@@ -252,5 +252,5 @@
 
 ! clear sky with no aerosols at all is computed IF ACTIVEFEEDBACK_ACTIVE is false or for extended diag
-     IF ( swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol .EQ. 0 ) THEN    
+     IF ( swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol == 0 ) THEN
 
      ! clear-sky: zero aerosol effect
@@ -281,5 +281,5 @@
 
 ! cloudy sky with no aerosols at all is either computed IF no indirect effect is asked for, or for extended diag
-     IF ( swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol .EQ. 0 ) THEN    
+     IF ( swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol == 0 ) THEN
      ! cloudy-sky: zero aerosol effect
      flag_aer=0.0
@@ -309,5 +309,5 @@
      ENDIF ! swaero_diag .or. .not. AEROSOLFEEDBACK_ACTIVE
 
-     IF (flag_aerosol.GT.0 .OR. flag_aerosol_strat.GT.0) THEN
+     IF (flag_aerosol>0 .OR. flag_aerosol_strat>0) THEN
 
      IF (ok_ade.and.swaero_diag .or. .not. ok_ade) THEN
@@ -506,5 +506,5 @@
   itapsw = itapsw + 1
 
-  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol.GT.0 .OR. flag_aerosol_strat.GT.0) ) THEN
+  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol>0 .OR. flag_aerosol_strat>0) ) THEN
   IF ( ok_ade .and. ok_aie  ) THEN
     ZFSUP(:,:) =    ZFSUP_AERO(:,:,4)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/traclmdz_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/traclmdz_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/traclmdz_mod.F90	(revision 5082)
@@ -404,5 +404,5 @@
      DO k = 1, klev
       DO i = 1, klon
-         IF ( pplay(i,k).GE.85000.) THEN
+         IF ( pplay(i,k)>=85000.) THEN
             tr_seri(i,k,id_pcsat) = qsat(i,k)
          ELSE
@@ -416,5 +416,5 @@
      DO k = 1, klev
       DO i = 1, klon
-         IF ( pplay(i,k).GE.85000.) THEN
+         IF ( pplay(i,k)>=85000.) THEN
             IF ( pctsrf (i, is_oce) > 0. ) THEN
                tr_seri(i,k,id_pcocsat) = qsat(i,k)
@@ -432,5 +432,5 @@
      DO k = 1, klev
       DO i = 1, klon
-         IF ( pplay(i,k).GE.85000.) THEN
+         IF ( pplay(i,k)>=85000.) THEN
             tr_seri(i,k,id_pcq) = sh(i,k)
          ELSE
@@ -445,5 +445,5 @@
      DO k = 1, klev
       DO i = 1, klon
-         IF ( pplay(i,k).GE.85000.) THEN
+         IF ( pplay(i,k)>=85000.) THEN
             tr_seri(i,k,id_pcs0) = qsat(i,k)
          ELSE
@@ -458,5 +458,5 @@
      DO k = 1, klev
       DO i = 1, klon
-         IF ( pplay(i,k).GE.85000.) THEN
+         IF ( pplay(i,k)>=85000.) THEN
             IF ( pctsrf (i, is_oce) > 0. ) THEN
                tr_seri(i,k,id_pcos0) = qsat(i,k)
@@ -475,5 +475,5 @@
      DO k = 1, klev
       DO i = 1, klon
-         IF ( pplay(i,k).GE.85000.) THEN
+         IF ( pplay(i,k)>=85000.) THEN
             tr_seri(i,k,id_pcq0) = sh(i,k)
          ELSE 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/wx_pbl_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/wx_pbl_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/wx_pbl_mod.F90	(revision 5082)
@@ -507,5 +507,5 @@
   dqsatsrf_ins(1:knon) = (beta(1:knon)/QQ_b(1:knon))*dTs_ins(1:knon)
 !
-   IF (prt_level .Ge. 10) THEN
+   IF (prt_level >= 10) THEN
       print *,'wx_pbl_merge, tau         ', tau
       print *,'wx_pbl_merge, AcoefT0     ', AcoefT0
@@ -539,5 +539,5 @@
    ENDDO ! j = 1,knon
    
-   IF (prt_level .Ge. 10) THEN
+   IF (prt_level >= 10) THEN
    print *,'wx_pbl_dts AAAA BcoefQ, BcoefQ0, sigw ', &
                             BcoefQ, BcoefQ0, sigw
@@ -625,5 +625,5 @@
 !      print *,' AAAA wx_pbl_split, C_p(j), qsat0(j), Ts0(j) : ', C_p(:), qsat0(:), Ts0(:)
 !
-   IF (iflag_split .EQ. 2 .AND. nsrf .NE. is_oce) THEN
+   IF (iflag_split == 2 .AND. nsrf /= is_oce) THEN
 !
 !   Delta_tsurf and  Delta_qsurf computation
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/yamada4.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/yamada4.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/yamada4.F90	(revision 5082)
@@ -1038,5 +1038,5 @@
    hlim(1:ngrid)=0.
 
-   IF (nsrf .EQ. 1) THEN
+   IF (nsrf == 1) THEN
 
 ! coefficients 
@@ -1076,5 +1076,5 @@
         DO ig=1,ngrid
            winds(ig,k)=sqrt(u(ig,k)**2+v(ig,k)**2)
-           IF (zlev(ig,k) .LE. h_oro(ig)) THEN  ! sous l'orographie
+           IF (zlev(ig,k) <= h_oro(ig)) THEN  ! sous l'orographie
               l2strat= kapb*pbl_lmixmin_alpha*winds(ig,k)/sqrt(max(n2(ig,k),1.E-10))  ! si stratifi??, amplitude d'oscillation * kappab (voir Van de Wiel et al 2008)
               l2neutre=kap*zlev(ig,k)*h_oro(ig)/(kap*zlev(ig,k)+h_oro(ig))            ! Dans le cas neutre, formule de blackadar. tend asymptotiquement vers h
@@ -1083,5 +1083,5 @@
               l2(ig,k)=l2limit(ig)
                                       
-           ELSE IF (zlev(ig,k) .LE. hlim(ig)) THEN ! Si on est au dessus des montagnes, mais affect?? encore par elles
+           ELSE IF (zlev(ig,k) <= hlim(ig)) THEN ! Si on est au dessus des montagnes, mais affect?? encore par elles
 
       ! Au dessus des montagnes, on prend la l2limit au sommet des montagnes 
Index: /LMDZ6/branches/Amaury_dev/libf/phylmd/yamada_c.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmd/yamada_c.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmd/yamada_c.F90	(revision 5082)
@@ -277,5 +277,5 @@
 !        n2(ig,k)=0.
          ri=n2(ig,k)/max(m2(ig,k),1.e-10)
-         if (ri.lt.ric) then
+         if (ri<ric) then
             rif(ig,k)=frif(ri)
          else
@@ -427,5 +427,5 @@
             rif(ig,k)=min(kn2(ig,k)/km2(ig,k),rifc)
          ENDIF
-         IF (rif(ig,k).lt.0.16) THEN
+         IF (rif(ig,k)<0.16) THEN
             alpha(ig,k)=falpha(rif(ig,k))
             sm(ig,k)=fsm(rif(ig,k))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_wake_tend.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_wake_tend.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_wake_tend.F90	(revision 5082)
@@ -5,5 +5,5 @@
         )
 !===================================================================
-! Ajoute les tendances liées aux diverses parametrisations physiques aux
+! Ajoute les tendances li�es aux diverses parametrisations physiques aux
 ! variables d'etat des poches froides.
 !===================================================================
@@ -57,5 +57,5 @@
          DO l = 1, klev
            DO i = 1, klon
-             IF (zoccur(i) .GE. 1) THEN
+             IF (zoccur(i) >= 1) THEN
                wake_deltat(i, l) = wake_deltat(i, l) + zddeltat(i,l)
                wake_deltaq(i, l) = wake_deltaq(i, l) + zddeltaq(i,l)
@@ -77,5 +77,5 @@
          END DO
          DO i = 1, klon
-           IF (zoccur(i) .GE. 1) THEN
+           IF (zoccur(i) >= 1) THEN
              wake_s(i)     = wake_s(i)    + zds(i)
              awake_s(i)    = awake_s(i)    + zdas(i)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/calwake.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/calwake.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/calwake.F90	(revision 5082)
@@ -396,5 +396,5 @@
 
 !jyg<  
-  IF (iflag_wake_tend .EQ. 0) THEN
+  IF (iflag_wake_tend == 0) THEN
 !  Update State variables
     DO l = 1, klev
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/change_srf_frac_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/change_srf_frac_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/change_srf_frac_mod.F90	(revision 5082)
@@ -171,5 +171,5 @@
        END WHERE
 ! Send fractions back to slab ocean if needed
-       IF (type_ocean == 'slab'.AND. version_ocean.NE.'sicINT') THEN
+       IF (type_ocean == 'slab'.AND. version_ocean/='sicINT') THEN
            WHERE (1.-zmasq(:)>EPSFRA)
                fsic(:)=pctsrf(:,is_sic)/(1.-zmasq(:))
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/climb_hq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/climb_hq_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/climb_hq_mod.F90	(revision 5082)
@@ -376,5 +376,5 @@
 !!! jyg le 07/02/2012
 !!jyg       IF (mod(iflag_pbl_split,2) .eq.1) THEN
-       IF (mod(iflag_pbl_split,10) .ge.1) THEN
+       IF (mod(iflag_pbl_split,10) >=1) THEN
 !!! nrlmd le 02/05/2011
     DO k= 1, klev
@@ -391,5 +391,5 @@
         enddo   
 #endif
-          IF (k.eq.1) THEN
+          IF (k==1) THEN
             gama_h_out(i,k)  = 0.
             gama_q_out(i,k)  = 0.
@@ -600,5 +600,5 @@
 !!! jyg le 07/02/2012
 !!jyg       IF (mod(iflag_pbl_split,2) .eq.1) THEN
-       IF (mod(iflag_pbl_split,10) .ge.1) THEN
+       IF (mod(iflag_pbl_split,10) >=1) THEN
 !!! nrlmd le 02/05/2011
     DO i = 1, knon
@@ -627,5 +627,5 @@
       enddo    
 #endif
-          IF (k.gt.1) THEN
+          IF (k>1) THEN
             gamah(i,k)=gama_h_in(i,k)
             gamaq(i,k)=gama_q_in(i,k)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90	(revision 5082)
@@ -613,5 +613,5 @@
     END DO
   ENDIF
-  IF (prt_level .GE. 10) THEN
+  IF (prt_level >= 10) THEN
     print *,'cv3_feed : iflag(1), pfeed(1), plcl(1), wghti(1,k) ', &
                         iflag(1), pfeed(1), plcl(1), (wghti(1,k),k=1,10)
@@ -1711,5 +1711,5 @@
           IF (k>=(icbs(i)+1)) THEN                                ! convect3
             tg = tp(i, k)
-            IF (tg .gt. Tx) THEN
+            IF (tg > Tx) THEN
               es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
               qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1738,9 +1738,9 @@
             coefx = aa
             coefm = aa + dd
-            IF (tg .gt. Tx) THEN
+            IF (tg > Tx) THEN
               Zx = ahg            + coefx*(Tx - tg)
               Zm = ahg - ddelta   + coefm*(Tm - tg)
             ELSE
-              IF (tg .gt. Tm) THEN
+              IF (tg > Tm) THEN
                 Zx = ahg          + (coefx +fp*ddelta)*(Tx - Tg)
                 Zm = ahg          + (coefm +fp*ddelta)*(Tm - Tg)
@@ -1755,5 +1755,5 @@
             U = (1. - Um)*(1. - Ux)
 ! Compute the updated parcell temperature Tp : 3 cases depending on tg value
-            IF (tg .gt. Tx) THEN
+            IF (tg > Tx) THEN
               discr = bb*bb - 4*dd*fp*(ah0(i) - ahg + ddelta*fp*(Tx-tg))
               Tp(i,k) = tg + &
@@ -1761,5 +1761,5 @@
                   U *2*(ah0(i) - ahg + ddelta*fp*(Tx-tg))/(bb + sqrt(discr)) + &
                   Ux*  (ah0(i) - ahg)                    /aa
-            ELSEIF (tg .gt. Tm) THEN
+            ELSEIF (tg > Tm) THEN
               discr = bb*bb - 4*dd*fp*(ah0(i) - ahg)
               Tp(i,k) = tg + &
@@ -1783,5 +1783,5 @@
         IF (k>=(icbs(i)+1)) THEN                                ! convect3
           tg = tp(i, k)
-          IF (tg .gt. Tx) THEN
+          IF (tg > Tx) THEN
             es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
             qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1822,5 +1822,5 @@
           IF (k>=(icbs(i)+1)) THEN                                ! convect3
             tg = tp(i, k)
-            IF (tg .gt. Tx .OR. .NOT.cvflag_ice) THEN
+            IF (tg > Tx .OR. .NOT.cvflag_ice) THEN
               es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
               qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -1847,5 +1847,5 @@
         IF (k>=(icbs(i)+1)) THEN                                ! convect3
           tg = tp(i, k)
-          IF (tg .gt. Tx .OR. .NOT.cvflag_ice) THEN
+          IF (tg > Tx .OR. .NOT.cvflag_ice) THEN
             es = 6.112*exp(17.67*(tg - 273.15)/(tg + 243.5 - 273.15))
             qg = eps*es/(p(i,k)-es*(1.-eps))
@@ -2317,5 +2317,5 @@
 !CR fix computation of inb
 !keep flag or modify in all cases?
-  IF (iflag_mix_adiab.eq.1) THEN
+  IF (iflag_mix_adiab==1) THEN
   DO i = 1, ncum
      cape(i)=0.
@@ -2328,5 +2328,5 @@
        deltap = min(plcl(i), ph(i,k-1)) - min(plcl(i), ph(i,k))
        cape(i) = cape(i) + rrd*buoy(i, k-1)*deltap/p(i, k-1)
-       IF (cape(i).gt.0.) THEN
+       IF (cape(i)>0.) THEN
         inb(i) = max(inb(i), k)
        END IF
@@ -3698,5 +3698,5 @@
 
 ! ------------------------------------------------------
-IF (prt_level .GE. 10) print *,' ->cv3_unsat, iflag(1) ', iflag(1)
+IF (prt_level >= 10) print *,' ->cv3_unsat, iflag(1) ', iflag(1)
 
 smallestreal=tiny(smallestreal)
@@ -4280,5 +4280,5 @@
 
       END IF !(i.le.inb(il) .and. lwork(il) .and. i.ne.1)
-      IF (prt_level .GE. 20) THEN
+      IF (prt_level >= 20) THEN
         PRINT *,'cv3_unsat, mp hydrostatic ', i, mp(il,i)
       ENDIF
@@ -4329,5 +4329,5 @@
           END IF
           mp(il, i) = max(0.0, mp(il,i))
-          IF (prt_level .GE. 20) THEN
+          IF (prt_level >= 20) THEN
             PRINT *,'cv3_unsat, mp cubic ', i, mp(il,i)
           ENDIF
@@ -6815,5 +6815,5 @@
   END DO
 !
-    IF (prt_level .GE. 5) THEN
+    IF (prt_level >= 5) THEN
       print *,' CV3_YIELD : alpha_qpos ',alpha_qpos(1)
     ENDIF
@@ -7646,5 +7646,5 @@
       real cape(nloc)
         
-        if (coef_epmax_cape.gt.1e-12) then
+        if (coef_epmax_cape>1e-12) then
 
         ! il faut calculer la cape: on fait un calcule simple car tant qu'on ne
@@ -7700,5 +7700,5 @@
       do k=minorig+1,nl
        do i=1,ncum
-        if((k.ge.icb(i)).and.(k.le.inb(i)))then
+        if((k>=icb(i)).and.(k<=inb(i)))then
           hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k)+frac(i,k)*lf(i,k))* &
                               ep(i, k)*clw(i, k)
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3p_mixing.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3p_mixing.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3p_mixing.F90	(revision 5082)
@@ -478,5 +478,5 @@
     IF (prt_level >= 10) THEN
       print *,'cv3p_mixing i, nent(i), icb, inb ',i, nent(igout,i), icb(igout), inb(igout)
-      IF (nent(igout,i) .gt. 0) THEN
+      IF (nent(igout,i) > 0) THEN
         print *,'i,(j,Sij(i,j),j=icb-1,inb) ',i,(j,Sij(igout,i,j),j=icb(igout)-1,inb(igout))
       ENDIF
@@ -499,5 +499,5 @@
         uent(il, i, i) = unk(il)
         vent(il, i, i) = vnk(il)
-        IF (fl_cor_ebil .GE. 2) THEN
+        IF (fl_cor_ebil >= 2) THEN
           hent(il, i, i) = hp(il,i)
         ENDIF
@@ -821,5 +821,5 @@
     cpm = cpd+Qent(il,i,j)*(cpv-cpd)
 !
-    IF (cvflag_ice .and. frac(il,j) .gt. 0.) THEN
+    IF (cvflag_ice .and. frac(il,j) > 0.) THEN
             elij(il, i, j) = Qent(il, i, j) - rs(il, j)
             elij(il, i, j) = elij(il, i, j) + &
@@ -856,5 +856,5 @@
 !            hent(il, i, j) = hent(il, i, j) + (lv(il,j)+(cpd-cpv)*t(il,j))*awat
 ! Mixed draught temperature at level j
-    IF (cvflag_ice .and. frac(il,j) .gt. 0.) THEN
+    IF (cvflag_ice .and. frac(il,j) > 0.) THEN
           Tm = t(il,j) + (Qent(il,i,j)-elij(il,i,j)-rs(il,j))*rrv*t(il,j)*t(il,j)/(lv(il,j)*rs(il,j))
           hent(il, i, j) = hent(il, i, j) + (lv(il,j)+frac(il,j)*lf(il,j)+(cpd-cpv)*Tm)*awat
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cva_driver.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cva_driver.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/cva_driver.F90	(revision 5082)
@@ -1067,5 +1067,5 @@
 !   is assumed useless.
 !
-  compress = ncum .lt. len*comp_threshold
+  compress = ncum < len*comp_threshold
 !
   IF (.not. compress) THEN
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90	(revision 5082)
@@ -326,5 +326,5 @@
   znebprecip(:)=0.
 
-  ice_thermo = (iflag_ice_thermo .EQ. 1).OR.(iflag_ice_thermo .GE. 3)
+  ice_thermo = (iflag_ice_thermo == 1).OR.(iflag_ice_thermo >= 3)
   zdelq=0.0
   ctot_vol(1:klon,1:klev)=0.0
@@ -342,5 +342,5 @@
      WRITE(lunout,*) 'fisrtilp, cpartiel:', cpartiel
      
-     IF (ABS(dtime/REAL(ninter)-360.0).GT.0.001) THEN
+     IF (ABS(dtime/REAL(ninter)-360.0)>0.001) THEN
         WRITE(lunout,*) 'fisrtilp: Ce n est pas prevu, voir Z.X.Li', dtime
         WRITE(lunout,*) 'Je prefere un sous-intervalle de 6 minutes'
@@ -407,5 +407,5 @@
   !
 !CR: on est oblige de definir des valeurs fisrt car les valeurs de newmicro ne sont pas les memes par defaut
-  IF (iflag_t_glace.EQ.0) THEN
+  IF (iflag_t_glace==0) THEN
 !   ztglace = RTT - 15.0
     t_glace_min_old = RTT - 15.0
@@ -605,5 +605,5 @@
      !   - zmqc: masse de precip qui doit etre thermalisee
      !
-     IF(k.LE.klevm1) THEN         
+     IF(k<=klevm1) THEN
         DO i = 1, klon
            !IM
@@ -612,5 +612,5 @@
            zcpair=RCPD*(1.0+RVTMP2*zq(i))
            zcpeau=RCPD*RVTMP2
-         if (fl_cor_ebil .GT. 0) then
+         if (fl_cor_ebil > 0) then
            ! zmqc: masse de precip qui doit etre thermalisee avec l'air de la couche atm 
            ! pour s'assurer que la precip arrivant au sol aura bien la temperature de la 
@@ -679,5 +679,5 @@
         DO i = 1, klon
 !          S'il y a des precipitations
-           IF (zrfl(i)+zifl(i).GT.0.) THEN
+           IF (zrfl(i)+zifl(i)>0.) THEN
               ! Calcul du qsat
               IF (thermcep) THEN
@@ -688,5 +688,5 @@
                  zqs(i)=zqs(i)*zcor
               ELSE
-                 IF (zt(i) .LT. t_coup) THEN
+                 IF (zt(i) < t_coup) THEN
                     zqs(i) = qsats(zt(i)) / pplay(i,k)
                  ELSE
@@ -701,5 +701,5 @@
         DO i = 1, klon
 !          S'il y a des precipitations
-           IF (zrfl(i)+zifl(i).GT.0.) THEN                
+           IF (zrfl(i)+zifl(i)>0.) THEN
                 ! Evap max pour ne pas saturer la fraction sous le nuage
                 ! Evap max jusqu'à atteindre la saturation dans la partie
@@ -710,5 +710,5 @@
              ! Ajout de la prise en compte des precip a thermiser
              ! avec petite reecriture 
-             if  (fl_cor_ebil .GT. 0) then ! nouveau
+             if  (fl_cor_ebil > 0) then ! nouveau
                 ! Calcul de l'evaporation du flux de precip herite
                 !   d'au-dessus
@@ -721,5 +721,5 @@
                 zrfln(i) = zrfl(i) - zqev*zmair(i)/dtime
                 ! Aucun flux liquide pour T < t_coup, on reevapore tout.
-                IF (zt(i) .LT. t_coup.and.reevap_ice) THEN
+                IF (zt(i) < t_coup.and.reevap_ice) THEN
                   zrfln(i)=0.
                   zqev = (zrfl(i)-zrfln(i))/zmair(i)*dtime
@@ -745,5 +745,5 @@
                      /RG/dtime
                 ! Aucun flux liquide pour T < t_coup
-                IF (zt(i) .LT. t_coup.and.reevap_ice) zrfln(i)=0.
+                IF (zt(i) < t_coup.and.reevap_ice) zrfln(i)=0.
                 ! Nouvelle vapeur 
                 zq(i) = zq(i) - (zrfln(i)-zrfl(i)) &
@@ -788,5 +788,5 @@
 !AJ<
 !        S'il y a des precipitations
-         IF (zrfl(i)+zifl(i).GT.0.) THEN
+         IF (zrfl(i)+zifl(i)>0.) THEN
 
          IF (iflag_evap_prec==1) THEN
@@ -850,5 +850,5 @@
         ! en conservant la proportion liquide / glace
      
-         IF (zqevt+zqevti.GT.zqev0) THEN
+         IF (zqevt+zqevti>zqev0) THEN
             zqev=zqev0*zqevt/(zqevt+zqevti)
             zqevi=zqev0*zqevti/(zqevt+zqevti)
@@ -859,5 +859,5 @@
 !            zqev=zqevt
 !            zqevi=zqevti
-             IF (zqevt+zqevti.GT.0.) THEN
+             IF (zqevt+zqevti>0.) THEN
                 zqev=MIN(zqev0*zqevt/(zqevt+zqevti),zqevt)
                 zqevi=MIN(zqev0*zqevti/(zqevt+zqevti),zqevti)
@@ -876,5 +876,5 @@
          zq(i) = zq(i) - (zrfln(i)+zifln(i)-zrfl(i)-zifl(i)) &
                   * (RG/(paprs(i,k)-paprs(i,k+1)))*dtime
-       if (fl_cor_ebil .GT. 0) then ! avec correction thermalisation des precips
+       if (fl_cor_ebil > 0) then ! avec correction thermalisation des precips
          zmqc(i) = zmqc(i) + (zrfln(i)+zifln(i)-zrfl(i)-zifl(i)) &
                   * (RG/(paprs(i,k)-paprs(i,k+1)))*dtime
@@ -907,5 +907,5 @@
            ! Fusion de la glace
            zrfl(i)=zrfl(i)+zmelt*zifl(i)
-           if (fl_cor_ebil .LE. 0) then
+           if (fl_cor_ebil <= 0) then
              ! the following line should not be here. Indeed, if zifl is modified
              ! now, zifl(i)*zmelt is no more the amount of ice that has melt
@@ -914,5 +914,5 @@
            end if
            ! Chaleur latente de fusion
-        if (fl_cor_ebil .GT. 0) then ! avec correction thermalisation des precips
+        if (fl_cor_ebil > 0) then ! avec correction thermalisation des precips
            zt(i)=zt(i)-zifl(i)*zmelt*(RG*dtime)/(paprs(i,k)-paprs(i,k+1)) &
                       *RLMLT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))
@@ -921,5 +921,5 @@
                       *RLMLT/RCPD/(1.0+RVTMP2*zq(i))
         end if
-           if (fl_cor_ebil .GT. 0) then ! correction bug, deplacement ligne precedente
+           if (fl_cor_ebil > 0) then ! correction bug, deplacement ligne precedente
              zifl(i)=zifl(i)*(1.-zmelt)
            end if
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90	(revision 5082)
@@ -173,5 +173,5 @@
   tab_cntrl(6)=nbapp_rad
 
-  IF (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
+  IF (iflag_cycle_diurne>=1) tab_cntrl( 7) = iflag_cycle_diurne
   IF (soil_model) tab_cntrl( 8) =1.
   IF (new_oliq) tab_cntrl( 9) =1.
@@ -272,5 +272,5 @@
        + pctsrf(1 : klon, is_lic)
   DO i = 1 , klon
-     IF ( abs(fractint(i) - zmasq(i) ) .GT. EPSFRA ) THEN
+     IF ( abs(fractint(i) - zmasq(i) ) > EPSFRA ) THEN
         WRITE(*, *) 'phyetat0: attention fraction terre pas ',  &
              'coherente ', i, zmasq(i), pctsrf(i, is_ter) &
@@ -283,5 +283,5 @@
        + pctsrf(1 : klon, is_sic)
   DO i = 1 , klon
-     IF ( abs( fractint(i) - (1. - zmasq(i))) .GT. EPSFRA ) THEN
+     IF ( abs( fractint(i) - (1. - zmasq(i))) > EPSFRA ) THEN
         WRITE(*, *) 'phyetat0 attention fraction ocean pas ',  &
              'coherente ', i, zmasq(i) , pctsrf(i, is_oce) &
@@ -311,5 +311,5 @@
   DO nsrf = 1, nbsrf
      DO isw=1, nsw
-        IF (isw.GT.99) THEN
+        IF (isw>99) THEN
            PRINT*, "Trop de bandes SW"
            call abort_physic("phyetat0", "", 1)
@@ -334,5 +334,5 @@
 
    DO isoil=1, nsoilmx
-        IF (isoil.GT.99) THEN
+        IF (isoil>99) THEN
            PRINT*, "Trop de couches "
            call abort_physic("phyetat0", "", 1)
@@ -439,18 +439,18 @@
   !          dummy values (as is the case when generated by ce0l,
   !          or by iniaqua)
-  IF ( (maxval(q_ancien).EQ.minval(q_ancien))       .OR. &
-       (maxval(ql_ancien).EQ.minval(ql_ancien))     .OR. &
-       (maxval(qs_ancien).EQ.minval(qs_ancien))     .OR. &
-       (maxval(rneb_ancien).EQ.minval(rneb_ancien)) .OR. &
-       (maxval(prw_ancien).EQ.minval(prw_ancien))   .OR. &
-       (maxval(prlw_ancien).EQ.minval(prlw_ancien)) .OR. &
-       (maxval(prsw_ancien).EQ.minval(prsw_ancien)) .OR. &
-       (maxval(t_ancien).EQ.minval(t_ancien)) ) THEN
+  IF ( (maxval(q_ancien)==minval(q_ancien))       .OR. &
+       (maxval(ql_ancien)==minval(ql_ancien))     .OR. &
+       (maxval(qs_ancien)==minval(qs_ancien))     .OR. &
+       (maxval(rneb_ancien)==minval(rneb_ancien)) .OR. &
+       (maxval(prw_ancien)==minval(prw_ancien))   .OR. &
+       (maxval(prlw_ancien)==minval(prlw_ancien)) .OR. &
+       (maxval(prsw_ancien)==minval(prsw_ancien)) .OR. &
+       (maxval(t_ancien)==minval(t_ancien)) ) THEN
     ancien_ok=.false.
   ENDIF
 
   IF (ok_bs) THEN
-    IF ( (maxval(qbs_ancien).EQ.minval(qbs_ancien))       .OR. &
-         (maxval(prbsw_ancien).EQ.minval(prbsw_ancien)) ) THEN
+    IF ( (maxval(qbs_ancien)==minval(qbs_ancien))       .OR. &
+         (maxval(prbsw_ancien)==minval(prbsw_ancien)) ) THEN
        ancien_ok=.false.
     ENDIF
@@ -592,5 +592,5 @@
   IF ( type_ocean == 'slab' ) THEN
       CALL ocean_slab_init(phys_tstep, pctsrf)
-      IF (nslay.EQ.1) THEN
+      IF (nslay==1) THEN
         found=phyetat0_get(tslab,["tslab01","tslab  "],"tslab",0.)
       ELSE
@@ -621,5 +621,5 @@
               PRINT*, "Initialisation a 0/1m suivant fraction glace"
               seaice(:)=0.
-              WHERE (pctsrf(:,is_sic).GT.EPSFRA)
+              WHERE (pctsrf(:,is_sic)>EPSFRA)
                   seaice=917.
               ENDWHERE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyredem.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyredem.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyredem.F90	(revision 5082)
@@ -119,5 +119,5 @@
   tab_cntrl(6) = nbapp_rad
 
-  IF( iflag_cycle_diurne.GE.1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
+  IF( iflag_cycle_diurne>=1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
   IF(   soil_model ) tab_cntrl( 8 ) = 1.
   IF(     new_oliq ) tab_cntrl( 9 ) = 1.
@@ -154,5 +154,5 @@
     ! Get last fractions from slab ocean
     IF (type_ocean == 'slab' .AND. version_ocean == "sicINT") THEN
-        WHERE (1.-zmasq(:).GT.EPSFRA)
+        WHERE (1.-zmasq(:)>EPSFRA)
             pctsrf(:,is_oce)=(1.-fsic(:))*(1.-zmasq(:))
             pctsrf(:,is_sic)=fsic(:)*(1.-zmasq(:))
@@ -373,5 +373,5 @@
     ! Restart variables for Slab ocean
     IF (type_ocean == 'slab') THEN
-        IF (nslay.EQ.1) THEN
+        IF (nslay==1) THEN
           CALL put_field(pass,"tslab", "Slab ocean temperature", tslab)
         ELSE
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phys_output_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phys_output_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/phys_output_mod.F90	(revision 5082)
@@ -347,9 +347,9 @@
 
        ! Calculate ecrit_files for all files
-      IF ( chtimestep(iff).eq.'Default' ) THEN
+      IF ( chtimestep(iff)=='Default' ) THEN
           ! Par defaut ecrit_files = (ecrit_mensuel ecrit_jour ecrit_hf
           ! ...)*86400.
           ecrit_files(iff)=ecrit_files(iff)*86400.
-      ELSE IF (chtimestep(iff).eq.'-1') THEN
+      ELSE IF (chtimestep(iff)=='-1') THEN
           PRINT*,'ecrit_files(',iff,') < 0 so IOIPSL work on different'
           PRINT*,'months length'
@@ -377,5 +377,5 @@
       ENDIF
 
-      IF (iff.LE.6.OR.iff.EQ.10) THEN
+      IF (iff<=6.OR.iff==10) THEN
         CALL wxios_add_vaxis("presnivs", &
             levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))
@@ -436,12 +436,12 @@
              DO i=1,nbp_lon
                 WRITE(lunout,*)'io_lon(i)=',io_lon(i)
-                IF (io_lon(i).le.phys_out_lonmin(iff)) imin_ins=i
-                IF (io_lon(i).le.phys_out_lonmax(iff)) imax_ins=i+1
+                IF (io_lon(i)<=phys_out_lonmin(iff)) imin_ins=i
+                IF (io_lon(i)<=phys_out_lonmax(iff)) imax_ins=i+1
              ENDDO
 
              DO j=1,jjmp1
                 WRITE(lunout,*)'io_lat(j)=',io_lat(j)
-                IF (io_lat(j).ge.phys_out_latmin(iff)) jmax_ins=j+1
-                IF (io_lat(j).ge.phys_out_latmax(iff)) jmin_ins=j
+                IF (io_lat(j)>=phys_out_latmin(iff)) jmax_ins=j+1
+                IF (io_lat(j)>=phys_out_latmax(iff)) jmin_ins=j
              ENDDO
 
@@ -479,5 +479,5 @@
 
 #ifndef CPP_IOIPSL_NO_OUTPUT 
-          IF (iff.LE.6.OR.iff.EQ.10) THEN
+          IF (iff<=6.OR.iff==10) THEN
              CALL histvert(nid_files(iff), "presnivs", "Vertical levels", "Pa", &  
                levmax(iff) - levmin(iff) + 1, &
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90	(revision 5082)
@@ -1448,5 +1448,5 @@
     ! en imposant la valeur de igout.
     !======================================================================
-    IF (prt_level.ge.1) THEN
+    IF (prt_level>=1) THEN
        igout=klon/2+1/klon
        write(lunout,*) 'DEBUT DE PHYSIQ !!!!!!!!!!!!!!!!!!!!'
@@ -1524,5 +1524,5 @@
        !
        !CR: check sur le nb de traceurs de l eau
-       IF ((iflag_ice_thermo.gt.0).and.(nqo==2)) THEN
+       IF ((iflag_ice_thermo>0).and.(nqo==2)) THEN
           WRITE (lunout, *) ' iflag_ice_thermo==1 requires 3 H2O tracers ', &
                '(H2O_g, H2O_l, H2O_s) but nqo=', nqo, '. Might as well stop here.'
@@ -1531,5 +1531,5 @@
        ENDIF
 
-       IF (ok_ice_sursat.AND.(iflag_ice_thermo.EQ.0)) THEN
+       IF (ok_ice_sursat.AND.(iflag_ice_thermo==0)) THEN
           WRITE (lunout, *) ' ok_ice_sursat=y requires iflag_ice_thermo=1 as well'
           abort_message='see above'
@@ -1537,5 +1537,5 @@
        ENDIF
 
-       IF (ok_ice_sursat.AND.(nqo.LT.4)) THEN
+       IF (ok_ice_sursat.AND.(nqo<4)) THEN
           WRITE (lunout, *) ' ok_ice_sursat=y requires 4 H2O tracers ', &
                '(H2O_g, H2O_l, H2O_s, H2O_r) but nqo=', nqo, '. Might as well stop here.'
@@ -1561,5 +1561,5 @@
           CALL abort_physic(modname,abort_message, 1)
 #endif
-         IF ((ok_ice_sursat.AND.nqo .LT.5).OR.(.NOT.ok_ice_sursat.AND.nqo.LT.4)) THEN
+         IF ((ok_ice_sursat.AND.nqo <5).OR.(.NOT.ok_ice_sursat.AND.nqo<4)) THEN
              WRITE (lunout, *) 'activation of blowing snow needs a specific H2O tracer', &
                                'but nqo=', nqo
@@ -1680,5 +1680,5 @@
     ENDIF
 
-    IF (prt_level.ge.1) print *,'CONVERGENCE PHYSIQUE THERM 1 '
+    IF (prt_level>=1) print *,'CONVERGENCE PHYSIQUE THERM 1 '
 
     !======================================================================
@@ -1749,5 +1749,5 @@
        print*,'iflag_cycle_diurne', iflag_cycle_diurne
        !
-       IF (iflag_con.EQ.2.AND.iflag_cld_th.GT.-1) THEN
+       IF (iflag_con==2.AND.iflag_cld_th>-1) THEN
           abort_message = 'Tiedtke needs iflag_cld_th=-2 or -1'
           CALL abort_physic (modname,abort_message,1)
@@ -1818,5 +1818,5 @@
        ENDIF
 !>jyg
-       IF (MOD(NINT(86400./phys_tstep),nbapp_rad).EQ.0) THEN
+       IF (MOD(NINT(86400./phys_tstep),nbapp_rad)==0) THEN
           radpas = NINT( 86400./phys_tstep)/nbapp_rad
        ELSE 
@@ -1829,8 +1829,8 @@
           CALL abort_physic(modname,abort_message,1)
        ENDIF
-       IF (nbapp_cv .EQ. 0) nbapp_cv=86400./phys_tstep
-       IF (nbapp_wk .EQ. 0) nbapp_wk=86400./phys_tstep
+       IF (nbapp_cv == 0) nbapp_cv=86400./phys_tstep
+       IF (nbapp_wk == 0) nbapp_wk=86400./phys_tstep
        print *,'physiq, nbapp_cv, nbapp_wk ',nbapp_cv,nbapp_wk
-       IF (MOD(NINT(86400./phys_tstep),nbapp_cv).EQ.0) THEN
+       IF (MOD(NINT(86400./phys_tstep),nbapp_cv)==0) THEN
           cvpas_0 = NINT( 86400./phys_tstep)/nbapp_cv
           cvpas = cvpas_0
@@ -1845,5 +1845,5 @@
           CALL abort_physic(modname,abort_message,1)
        ENDIF
-       IF (MOD(NINT(86400./phys_tstep),nbapp_wk).EQ.0) THEN
+       IF (MOD(NINT(86400./phys_tstep),nbapp_wk)==0) THEN
           wkpas = NINT( 86400./phys_tstep)/nbapp_wk
 !       print *,'physiq, wkpas ',wkpas
@@ -1870,5 +1870,5 @@
              CLOSE(98)
              CONTINUE
-             IF(nCFMIP.GT.npCFMIP) THEN
+             IF(nCFMIP>npCFMIP) THEN
                 print*,'nCFMIP > npCFMIP : augmenter npCFMIP et recompiler'
                 CALL abort_physic("physiq", "", 1)
@@ -2031,5 +2031,5 @@
        ! Test de coherence sur oc_cdnc utilisé uniquement par cloud_optics_prop
        IF (ok_newmicro) then
-          IF (iflag_rrtm.EQ.1) THEN
+          IF (iflag_rrtm==1) THEN
 #ifdef CPP_RRTM
              IF (ok_cdnc.AND.NRADLP.NE.3) THEN
@@ -2122,5 +2122,5 @@
        ! on remet le calendrier a zero
        !
-       IF (raz_date .eq. 1) THEN
+       IF (raz_date == 1) THEN
           itau_phy = 0
        ENDIF
@@ -2133,5 +2133,5 @@
 !          phys_tstep=pdtphys
 !       ENDIF
-       IF (nlon .NE. klon) THEN
+       IF (nlon /= klon) THEN
           WRITE(lunout,*)'nlon et klon ne sont pas coherents', nlon,  &
                klon
@@ -2139,5 +2139,5 @@
           CALL abort_physic(modname,abort_message,1)
        ENDIF
-       IF (nlev .NE. klev) THEN
+       IF (nlev /= klev) THEN
           WRITE(lunout,*)'nlev et klev ne sont pas coherents', nlev, &
                klev
@@ -2146,5 +2146,5 @@
        ENDIF
        !
-       IF (phys_tstep*REAL(radpas).GT.21600..AND.iflag_cycle_diurne.GE.1) THEN 
+       IF (phys_tstep*REAL(radpas)>21600..AND.iflag_cycle_diurne>=1) THEN
           WRITE(lunout,*)'Nbre d appels au rayonnement insuffisant'
           WRITE(lunout,*)"Au minimum 4 appels par jour si cycle diurne"
@@ -2163,5 +2163,5 @@
        !KE43
        ! Initialisation pour la convection de K.E. (sb):
-       IF (iflag_con.GE.3) THEN
+       IF (iflag_con>=3) THEN
 
           WRITE(lunout,*)"*** Convection de Kerry Emanuel 4.3  "
@@ -2250,5 +2250,5 @@
              zuthe(i)=0.
              zvthe(i)=0.
-             IF (zstd(i).gt.10.) THEN
+             IF (zstd(i)>10.) THEN
                 zuthe(i)=(1.-zgam(i))*cos(zthe(i))
                 zvthe(i)=(1.-zgam(i))*sin(zthe(i))
@@ -2617,11 +2617,11 @@
           qbs_seri(i,k) = 0.
           !CR: ATTENTION, on rajoute la variable glace
-          IF (nqo.EQ.2) THEN             !--vapour and liquid only
+          IF (nqo==2) THEN             !--vapour and liquid only
              qs_seri(i,k) = 0.
              rneb_seri(i,k) = 0.
-          ELSE IF (nqo.EQ.3) THEN        !--vapour, liquid and ice
+          ELSE IF (nqo==3) THEN        !--vapour, liquid and ice
              qs_seri(i,k) = qx(i,k,isol)
              rneb_seri(i,k) = 0.
-          ELSE IF (nqo.GE.4) THEN        !--vapour, liquid, ice and rneb and blowing snow
+          ELSE IF (nqo>=4) THEN        !--vapour, liquid, ice and rneb and blowing snow
              qs_seri(i,k) = qx(i,k,isol)
              IF (ok_ice_sursat) THEN
@@ -2738,5 +2738,5 @@
     ENDDO
     ! Initialize variables used for diagnostic purpose
-    IF (flag_inhib_tend .ne. 0) CALL init_cmp_seri
+    IF (flag_inhib_tend /= 0) CALL init_cmp_seri
 
     ! Diagnostiquer la tendance dynamique
@@ -3128,5 +3128,5 @@
     ENDIF
 
-    IF (prt_level.ge.1) write(lunout,*)'Longitude solaire ',zlongi,solarlong0,dist
+    IF (prt_level>=1) write(lunout,*)'Longitude solaire ',zlongi,solarlong0,dist
 
 
@@ -3139,5 +3139,5 @@
     ! non nul aux poles.
     IF (abs(solarlong0-1000.)<1.e-4) THEN
-       CALL zenang_an(iflag_cycle_diurne.GE.1,jH_cur, &
+       CALL zenang_an(iflag_cycle_diurne>=1,jH_cur, &
             latitude_deg,longitude_deg,rmu0,fract)
        swradcorr(:) = 1.0
@@ -3164,5 +3164,5 @@
           ! Calcul du flag jour-nuit
           JrNt = 0.0
-          WHERE (fract.GT.0.0) JrNt = 1.0
+          WHERE (fract>0.0) JrNt = 1.0
        CASE(2)  
           !  Avec cycle diurne sans application des poids
@@ -3186,9 +3186,9 @@
                latitude_deg,longitude_deg,zrmu0,zfract)
           swradcorr = 0.0
-          WHERE (rmu0.GE.1.e-10 .OR. fract.GE.1.e-10) &
+          WHERE (rmu0>=1.e-10 .OR. fract>=1.e-10) &
                swradcorr=zfract/fract*zrmu0/rmu0
           ! Calcul du flag jour-nuit
           JrNt = 0.0
-          WHERE (zfract.GT.0.0) JrNt = 1.0 
+          WHERE (zfract>0.0) JrNt = 1.0
        END SELECT
     ENDIF
@@ -3254,5 +3254,5 @@
        !jyg+nrlmd<
 !!jyg       IF (prt_level .ge. 2 .and. mod(iflag_pbl_split,2) .eq. 1) THEN
-       IF (prt_level .ge. 2 .and. mod(iflag_pbl_split,10) .ge. 1) THEN
+       IF (prt_level >= 2 .and. mod(iflag_pbl_split,10) >= 1) THEN
           print *,'debut du splitting de la PBL, wake_s = ', wake_s(:)
           print *,'debut du splitting de la PBL, wake_deltat = ', wake_deltat(:,1)
@@ -3431,5 +3431,5 @@
        !  Add turbulent diffusion tendency to the wake difference variables
 !!jyg       IF (mod(iflag_pbl_split,2) .NE. 0) THEN
-       IF (mod(iflag_pbl_split,10) .NE. 0) THEN
+       IF (mod(iflag_pbl_split,10) /= 0) THEN
 !jyg<
           d_deltat_vdf(:,:) = d_t_vdf_w(:,:)-d_t_vdf_x(:,:)
@@ -3559,5 +3559,5 @@
           ELSE
              !!           IF (zx_t.LT.t_coup) THEN             !jyg
-             IF (zx_t.LT.rtt) THEN                  !jyg
+             IF (zx_t<rtt) THEN                  !jyg
                 zx_qs = qsats(zx_t)/pplay(i,k)
              ELSE
@@ -3569,5 +3569,5 @@
     ENDDO
 
-    IF (prt_level.ge.1) THEN
+    IF (prt_level>=1) THEN
        write(lunout,*) 'L   qsat (g/kg) avant clouds_gno'
        write(lunout,'(i4,f15.4)') (k,1000.*zqsat(igout,k),k=1,klev)
@@ -3589,5 +3589,5 @@
     ENDIF
     zx_ajustq = .FALSE.
-    IF (iflag_con.EQ.2) zx_ajustq=.TRUE.
+    IF (iflag_con==2) zx_ajustq=.TRUE.
     IF (zx_ajustq) THEN
        DO i = 1, klon
@@ -3609,5 +3609,5 @@
     ENDDO
 
-    IF (prt_level.ge.1) write(lunout,*) 'omega(igout, :) = ', &
+    IF (prt_level>=1) write(lunout,*) 'omega(igout, :) = ', &
          omega(igout, :)
     !
@@ -3617,5 +3617,5 @@
 !!    print *,' physiq : itapcv, cvpas, itap-1, cvpas_0 ', &
 !!                       itapcv, cvpas, itap-1, cvpas_0
-    IF (MOD(itapcv,cvpas).EQ.0 .OR. MOD(itap-1,cvpas_0).EQ.0) THEN
+    IF (MOD(itapcv,cvpas)==0 .OR. MOD(itap-1,cvpas_0)==0) THEN
 
     !
@@ -3650,5 +3650,5 @@
 #endif
     !
-    IF (iflag_con.EQ.1) THEN
+    IF (iflag_con==1) THEN
        abort_message ='reactiver le call conlmd dans physiq.F'
        CALL abort_physic (modname,abort_message,1)
@@ -3656,5 +3656,5 @@
        !    .             d_t_con, d_q_con,
        !    .             rain_con, snow_con, ibas_con, itop_con)
-    ELSE IF (iflag_con.EQ.2) THEN
+    ELSE IF (iflag_con==2) THEN
 #ifdef ISO
       CALL abort_gcm('physiq 2770','isos pas prevus ici',1)
@@ -3674,5 +3674,5 @@
           itop_con(i) = klev+1 - kctop(i)
        ENDDO
-    ELSE IF (iflag_con.GE.3) THEN
+    ELSE IF (iflag_con>=3) THEN
        ! nb of tracers for the KE convection:
        ! MAF la partie traceurs est faite dans phytrac
@@ -3813,5 +3813,5 @@
              DO k=1,klev
                 DO i=1,klon
-                   IF (wake_s(i) .GT. 1.e-3) THEN
+                   IF (wake_s(i) > 1.e-3) THEN
                       t_w(i,k) = t_w(i,k) + d_t_adjwk(i,k)
                       q_w(i,k) = q_w(i,k) + d_q_adjwk(i,k)
@@ -3964,5 +3964,5 @@
              IF (-7*log(presnivs(k)/presnivs(1)) > 25.) k_upper_cv = k
           ENDDO
-          IF (prt_level .ge. 5) THEN
+          IF (prt_level >= 5) THEN
              Print *, 'upmost level of deep convection loops: k_upper_cv = ', &
                   k_upper_cv
@@ -4080,5 +4080,5 @@
           !
           DO i = 1, klon
-             IF (iflagctrl(i).le.1) itau_con(i)=itau_con(i)+cvpas
+             IF (iflagctrl(i)<=1) itau_con(i)=itau_con(i)+cvpas
           ENDDO
           !
@@ -4175,5 +4175,5 @@
           ema_pct(i)  = paprs(i,itop_con(i)+1)
 
-          IF (itop_con(i).gt.klev-3) THEN
+          IF (itop_con(i)>klev-3) THEN
              IF (prt_level >= 9) THEN
                 write(lunout,*)'La convection monte trop haut '
@@ -4182,5 +4182,5 @@
           ENDIF
        ENDDO
-    ELSE IF (iflag_con.eq.0) THEN
+    ELSE IF (iflag_con==0) THEN
        write(lunout,*) 'On n appelle pas la convection'
        clwcon0=0.
@@ -4314,6 +4314,6 @@
        DO k = 1, klev
           DO i = 1, klon
-             IF (z_factor(i).GT.(1.0+1.0E-08) .OR. &
-                  z_factor(i).LT.(1.0-1.0E-08)) THEN
+             IF (z_factor(i)>(1.0+1.0E-08) .OR. &
+                  z_factor(i)<(1.0-1.0E-08)) THEN
                 q_seri(i,k) = q_seri(i,k) * z_factor(i)
 #ifdef ISO
@@ -4363,5 +4363,5 @@
        ! Call wakes every "wkpas" step
        !
-       IF (MOD(itapwk,wkpas).EQ.0) THEN
+       IF (MOD(itapwk,wkpas)==0) THEN
           !
           DO k=1,klev
@@ -4486,5 +4486,5 @@
 
        ! Increment Wake state variables
-       IF (iflag_wake_tend .GT. 0.) THEN
+       IF (iflag_wake_tend > 0.) THEN
 
          CALL add_wake_tend &
@@ -4498,5 +4498,5 @@
        ENDIF   ! (iflag_wake_tend .GT. 0.)
        !
-       IF (prt_level .GE. 10) THEN
+       IF (prt_level >= 10) THEN
          print *,' physiq, after calwake, wake_s: ',wake_s(:)
          print *,' physiq, after calwake, wake_deltat: ',wake_deltat(:,1)
@@ -4504,5 +4504,5 @@
        ENDIF
 
-       IF (iflag_alp_wk_cond .GT. 0.) THEN
+       IF (iflag_alp_wk_cond > 0.) THEN
 
          CALL alpale_wk(phys_tstep, cell_area, wake_k, wake_s, wake_dens, wake_fip_0, &
@@ -4689,5 +4689,5 @@
           !jyg<
 !!       IF (mod(iflag_pbl_split/2,2) .EQ. 1) THEN
-       IF (mod(iflag_pbl_split/10,10) .GE. 1) THEN
+       IF (mod(iflag_pbl_split/10,10) >= 1) THEN
              !  Appel des thermiques avec les profils exterieurs aux poches
              DO k=1,klev
@@ -4773,5 +4773,5 @@
           !jyg<
 !!jyg          IF (mod(iflag_pbl_split/2,2) .EQ. 1) THEN
-          IF (mod(iflag_pbl_split/10,10) .GE. 1) THEN
+          IF (mod(iflag_pbl_split/10,10) >= 1) THEN
              !  Si les thermiques ne sont presents que hors des
              !  poches, la tendance moyenne associ\'ee doit etre
@@ -4857,5 +4857,5 @@
        IF (iflag_thermals>=13.or.iflag_thermals<=0) THEN
 
-          IF (iflag_thermals.eq.0) THEN
+          IF (iflag_thermals==0) THEN
              IF (prt_level>9) WRITE(lunout,*)'ajsec'
              limbas(:)=1
@@ -4981,5 +4981,5 @@
     ! et le processus de precipitation
     !-------------------------------------------------------------------------
-    IF (prt_level .GE.10) THEN
+    IF (prt_level >=10) THEN
        print *,'itap, ->fisrtilp ',itap
     ENDIF
@@ -5347,9 +5347,9 @@
     !IM cf FH
     !     IF (iflag_cld_th.eq.-1) THEN ! seulement pour Tiedtke
-    IF (iflag_cld_th.le.-1) THEN ! seulement pour Tiedtke
+    IF (iflag_cld_th<=-1) THEN ! seulement pour Tiedtke
        snow_tiedtke=0.
        !     print*,'avant calcul de la pseudo precip '
        !     print*,'iflag_cld_th',iflag_cld_th
-       IF (iflag_cld_th.eq.-1) THEN
+       IF (iflag_cld_th==-1) THEN
           rain_tiedtke=rain_con
        ELSE
@@ -5359,5 +5359,5 @@
           DO k=1,klev
              DO i=1,klon
-                IF (d_q_con(i,k).lt.0.) THEN
+                IF (d_q_con(i,k)<0.) THEN
                    rain_tiedtke(i)=rain_tiedtke(i)-d_q_con(i,k)/pdtphys &
                         *(paprs(i,k)-paprs(i,k+1))/rg
@@ -5377,5 +5377,5 @@
        DO k = 1, klev
           DO i = 1, klon
-             IF (diafra(i,k).GT.cldfra(i,k)) THEN
+             IF (diafra(i,k)>cldfra(i,k)) THEN
                 radocond(i,k) = dialiq(i,k)
                 cldfra(i,k) = diafra(i,k)
@@ -5384,5 +5384,5 @@
        ENDDO
 
-    ELSE IF (iflag_cld_th.ge.3) THEN
+    ELSE IF (iflag_cld_th>=3) THEN
        !  On prend pour les nuages convectifs le max du calcul de la
        !  convection et du calcul du pas de temps precedent diminue d'un facteur
@@ -5392,5 +5392,5 @@
           DO i=1,klon
              rnebcon(i,k)=rnebcon(i,k)*facteur
-             IF (rnebcon0(i,k)*clwcon0(i,k).GT.rnebcon(i,k)*clwcon(i,k)) THEN
+             IF (rnebcon0(i,k)*clwcon0(i,k)>rnebcon(i,k)*clwcon(i,k)) THEN
                 rnebcon(i,k)=rnebcon0(i,k)
                 clwcon(i,k)=clwcon0(i,k)
@@ -5476,5 +5476,5 @@
        DO k = 1, klev
           DO i = 1, klon
-             IF (diafra(i,k).GT.cldfra(i,k)) THEN
+             IF (diafra(i,k)>cldfra(i,k)) THEN
                 radocond(i,k) = dialiq(i,k)
                 cldfra(i,k) = diafra(i,k)
@@ -5574,5 +5574,5 @@
           ELSE
              !!           IF (zx_t.LT.t_coup) THEN             !jyg
-             IF (zx_t.LT.rtt) THEN                  !jyg
+             IF (zx_t<rtt) THEN                  !jyg
                 zx_qs = qsats(zx_t)/pplay(i,k)
              ELSE
@@ -5581,5 +5581,5 @@
           ENDIF
           zx_rh(i,k) = q_seri(i,k)/zx_qs
-            IF (iflag_ice_thermo .GT. 0) THEN
+            IF (iflag_ice_thermo > 0) THEN
           zx_rhl(i,k) = q_seri(i,k)/(qsatl(zx_t)/pplay(i,k))
           zx_rhi(i,k) = q_seri(i,k)/(qsats(zx_t)/pplay(i,k))
@@ -5595,5 +5595,5 @@
        tpot(i)=zt2m(i)*(100000./paprs(i,1))**RKAPPA
        IF (thermcep) THEN
-          IF(zt2m(i).LT.RTT) then
+          IF(zt2m(i)<RTT) then
              Lheat=RLSTT
           ELSE
@@ -5601,5 +5601,5 @@
           ENDIF
        ELSE
-          IF (zt2m(i).LT.RTT) THEN
+          IF (zt2m(i)<RTT) THEN
              Lheat=RLSTT
           ELSE
@@ -5677,11 +5677,11 @@
     ! Appeler le rayonnement mais calculer tout d'abord l'albedo du sol.
     !
-    IF (MOD(itaprad,radpas).EQ.0) THEN
+    IF (MOD(itaprad,radpas)==0) THEN
 
        !
        !jq - introduce the aerosol direct and first indirect radiative forcings
        !jq - Johannes Quaas, 27/11/2003 (quaas@lmd.jussieu.fr)
-       IF (flag_aerosol .GT. 0) THEN
-          IF (iflag_rrtm .EQ. 0) THEN !--old radiation
+       IF (flag_aerosol > 0) THEN
+          IF (iflag_rrtm == 0) THEN !--old radiation
              IF (.NOT. aerosol_couple) THEN
                 !
@@ -5693,5 +5693,5 @@
                      tausum_aero, tau3d_aero)
              ENDIF
-          ELSE IF (iflag_rrtm .EQ.1) THEN  ! RRTM radiation
+          ELSE IF (iflag_rrtm ==1) THEN  ! RRTM radiation
              IF (aerosol_couple .AND. config_inca == 'aero' ) THEN
                 abort_message='config_inca=aero et rrtm=1 impossible'
@@ -5759,5 +5759,5 @@
                 !
              ENDIF
-          ELSE IF (iflag_rrtm .EQ.2) THEN    ! ecrad RADIATION
+          ELSE IF (iflag_rrtm ==2) THEN    ! ecrad RADIATION
 #ifdef CPP_ECRAD
              !--climatologies or INCA aerosols
@@ -5776,5 +5776,5 @@
           mass_solu_aero(:,:) = 0.
           mass_solu_aero_pi(:,:) = 0.
-          IF (iflag_rrtm .EQ. 0) THEN !--old radiation
+          IF (iflag_rrtm == 0) THEN !--old radiation
              tau_aero(:,:,:,:) = 1.e-15
              piz_aero(:,:,:,:) = 1.
@@ -5793,10 +5793,10 @@
        !--STRAT AEROSOL
        !--updates tausum_aero,tau_aero,piz_aero,cg_aero
-       IF (flag_aerosol_strat.GT.0) THEN
-          IF (prt_level .GE.10) THEN
+       IF (flag_aerosol_strat>0) THEN
+          IF (prt_level >=10) THEN
              PRINT *,'appel a readaerosolstrat', mth_cur
           ENDIF
-          IF (iflag_rrtm.EQ.0) THEN
-           IF (flag_aerosol_strat.EQ.1) THEN
+          IF (iflag_rrtm==0) THEN
+           IF (flag_aerosol_strat==1) THEN
              CALL readaerosolstrato(debut)
            ELSE
@@ -5867,6 +5867,6 @@
 
        !
-       IF (lon1_beta.EQ.-180..AND.lon2_beta.EQ.180..AND. &
-           lat1_beta.EQ.90..AND.lat2_beta.EQ.-90.) THEN
+       IF (lon1_beta==-180..AND.lon2_beta==180..AND. &
+           lat1_beta==90..AND.lat2_beta==-90.) THEN
           !
           ! global
@@ -5877,5 +5877,5 @@
           DO k=1, klev
              DO i=1, klon
-                IF (pplay(i,k).GE.pfree) THEN
+                IF (pplay(i,k)>=pfree) THEN
                    beta(i,k) = beta_pbl
                 ELSE
@@ -5899,9 +5899,9 @@
              DO i=1,klon
                 !
-                IF (longitude_deg(i).ge.lon1_beta.AND. &
-                    longitude_deg(i).le.lon2_beta.AND. &
-                    latitude_deg(i).le.lat1_beta.AND.  &
-                    latitude_deg(i).ge.lat2_beta) THEN
-                   IF (pplay(i,k).GE.pfree) THEN
+                IF (longitude_deg(i)>=lon1_beta.AND. &
+                    longitude_deg(i)<=lon2_beta.AND. &
+                    latitude_deg(i)<=lat1_beta.AND.  &
+                    latitude_deg(i)>=lat2_beta) THEN
+                   IF (pplay(i,k)>=pfree) THEN
                       beta(i,k) = beta_pbl
                    ELSE
@@ -5932,5 +5932,5 @@
 !--this is needed for CMIP6 runs
 !--and only possible for new radiation scheme
-       IF (iflag_rrtm.EQ.1.AND.ok_suntime_rrtm) THEN 
+       IF (iflag_rrtm==1.AND.ok_suntime_rrtm) THEN
 #ifdef CPP_RRTM
          CALL read_rsun_rrtm(debut)
@@ -5949,5 +5949,5 @@
        !input to radiation (DICE)
        !
-       IF (iflag_radia .ge. 2) THEN
+       IF (iflag_radia >= 2) THEN
           zsav_tsol (:) = zxtsol(:)
           CALL perturb_radlwsw(zxtsol,iflag_radia)
@@ -5989,5 +5989,5 @@
           IF (carbon_cycle_rad) RCO2=RCO2_glo
           !
-          IF (prt_level .GE.10) THEN
+          IF (prt_level >=10) THEN
              print *,' ->radlwsw, number 1 '
           ENDIF
@@ -6004,5 +6004,5 @@
                t_seri,q_seri,wo, &
                cldfrarad, cldemirad, cldtaurad, &
-               ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
+               ok_ade.OR.flag_aerosol_strat>0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
                flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
                tau_aero, piz_aero, cg_aero, &
@@ -6053,9 +6053,9 @@
             !IM Par defaut on a les taux perturbes egaux aux taux actuels
             !
-            IF (RCO2_per.NE.RCO2_act.OR. &
-                RCH4_per.NE.RCH4_act.OR. &
-                RN2O_per.NE.RN2O_act.OR. &
-                RCFC11_per.NE.RCFC11_act.OR. &
-                RCFC12_per.NE.RCFC12_act) ok_4xCO2atm =.TRUE. 
+            IF (RCO2_per/=RCO2_act.OR. &
+                RCH4_per/=RCH4_act.OR. &
+                RN2O_per/=RN2O_act.OR. &
+                RCFC11_per/=RCFC11_act.OR. &
+                RCFC12_per/=RCFC12_act) ok_4xCO2atm =.TRUE.
           ENDIF
    ! 
@@ -6068,5 +6068,5 @@
                 RCFC12 = RCFC12_per
                 !
-                IF (prt_level .GE.10) THEN
+                IF (prt_level >=10) THEN
                    print *,' ->radlwsw, number 2 '
                 ENDIF
@@ -6083,5 +6083,5 @@
                      t_seri,q_seri,wo, &
                      cldfrarad, cldemirad, cldtaurad, &
-                     ok_ade.OR.flag_aerosol_strat.GT.0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
+                     ok_ade.OR.flag_aerosol_strat>0, ok_aie,  ok_volcan, flag_volc_surfstrat, &
                      flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
                      tau_aero, piz_aero, cg_aero, &
@@ -6169,5 +6169,5 @@
        !  If Iflag_radia >=2, reset pertubed variables
        !
-       IF (iflag_radia .ge. 2) THEN
+       IF (iflag_radia >= 2) THEN
           zxtsol(:) = zsav_tsol (:)
        ENDIF
Index: /LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90
===================================================================
--- /LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90	(revision 5081)
+++ /LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90	(revision 5082)
@@ -45,6 +45,6 @@
        DO i = 1, klon
 
-        if (ixt.eq.1) then
-         if (fl_cor_ebil .GT. 0) then
+        if (ixt==1) then
+         if (fl_cor_ebil > 0) then
           !zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
           !zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
@@ -58,5 +58,5 @@
            zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*qx(i,k,ivapcur))
          end if
-         IF (iflag_ice_thermo .EQ. 0) THEN
+         IF (iflag_ice_thermo == 0) THEN
              zlsdcp=zlvdcp
          ENDIF
