Changeset 5087 for LMDZ6/branches/Amaury_dev/libf/phylmd

Timestamp:

Jul 20, 2024, 12:00:23 PM (6 months ago)

Author:

abarral

Message:

remove fixed-form ^{\s+& remaining in .f90,.F90}

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd

Files:

• Dust/dustemission_mod.F90 (modified) (1 diff)
• Dust/read_surface.F90 (modified) (1 diff)
• StratAer/aer_sedimnt.F90 (modified) (1 diff)
• StratAer/coagulate.F90 (modified) (2 diffs)
• StratAer/cond_evap_tstep_mod.F90 (modified) (4 diffs)
• StratAer/micphy_tstep.F90 (modified) (6 diffs)
• StratAer/miecalc_aer.F90 (modified) (1 diff)
• StratAer/nucleation_tstep_mod.F90 (modified) (13 diffs)
• StratAer/so2_to_h2so4.F90 (modified) (1 diff)
• StratAer/stratdistrib.F90 (modified) (2 diffs)
• StratAer/stratemit.F90 (modified) (6 diffs)
• StratAer/sulfate_aer_mod.F90 (modified) (12 diffs)
• StratAer/traccoag_mod.F90 (modified) (4 diffs)
• add_phys_tend_mod.F90 (modified) (7 diffs)
• albsno.F90 (modified) (1 diff)
• calltherm.F90 (modified) (12 diffs)
• cdrag_mod.F90 (modified) (2 diffs)
• cosp/lidar_simulator.F90 (modified) (16 diffs)
• cosp2/cosp_optics.F90 (modified) (1 diff)
• cospv2/cosp_optics.F90 (modified) (1 diff)
• dyn1d/mod_1D_amma_read.F90 (modified) (5 diffs)
• dyn1d/mod_1D_cases_read.F90 (modified) (5 diffs)
• dyn1d/old_lmdz1d.F90 (modified) (18 diffs)
• dyn1d/replay1d.F90 (modified) (1 diff)
• dyn1d/scm.F90 (modified) (18 diffs)
• ener_conserv.F90 (modified) (4 diffs)
• evappot.F90 (modified) (1 diff)
• fonte_neige_mod.F90 (modified) (9 diffs)
• grid_noro_m.F90 (modified) (1 diff)
• inlandsis/VARdSV.F90 (modified) (1 diff)
• inlandsis/VARphy.F90 (modified) (4 diffs)
• inlandsis/surf_inlandsis_mod.F90 (modified) (5 diffs)
• iotd_ini.F90 (modified) (2 diffs)
• lmdz_call_cloud_optics_prop.F90 (modified) (1 diff)
• lmdz_cloud_optics_prop.F90 (modified) (3 diffs)
• lmdz_cloud_optics_prop_ini.F90 (modified) (1 diff)
• lmdz_cloudth.F90 (modified) (9 diffs)
• lmdz_lscp.F90 (modified) (1 diff)
• lmdz_lscp_old.F90 (modified) (4 diffs)
• lmdz_ratqs_multi.F90 (modified) (2 diffs)
• lmdz_thermcell_alim.F90 (modified) (1 diff)
• lmdz_thermcell_alp.F90 (modified) (5 diffs)
• lmdz_thermcell_closure.F90 (modified) (1 diff)
• lmdz_thermcell_down.F90 (modified) (1 diff)
• lmdz_thermcell_dq.F90 (modified) (8 diffs)
• lmdz_thermcell_dry.F90 (modified) (6 diffs)
• lmdz_thermcell_dtke.F90 (modified) (3 diffs)
• lmdz_thermcell_dv2.F90 (modified) (6 diffs)
• lmdz_thermcell_env.F90 (modified) (2 diffs)
• lmdz_thermcell_flux2.F90 (modified) (10 diffs)
• lmdz_thermcell_height.F90 (modified) (5 diffs)
• lmdz_thermcell_ini.F90 (modified) (1 diff)
• lmdz_thermcell_main.F90 (modified) (23 diffs)
• lmdz_thermcell_plume.F90 (modified) (8 diffs)
• lmdz_thermcell_plume_6A.F90 (modified) (20 diffs)
• methox.F90 (modified) (1 diff)
• ocean_forced_mod.F90 (modified) (9 diffs)
• open_climoz_m.F90 (modified) (1 diff)
• pbl_surface_mod.F90 (modified) (30 diffs)
• phys_output_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (5 diffs)
• physiqex_mod.F90 (modified) (1 diff)
• phytrac_mod.F90 (modified) (4 diffs)
• printflag.F90 (modified) (4 diffs)
• radlwsw_m.F90 (modified) (3 diffs)
• reevap.F90 (modified) (1 diff)
• regr_horiz_time_climoz_m.F90 (modified) (1 diff)
• regr_lat_time_coefoz_m.F90 (modified) (1 diff)
• screenp_mod.F90 (modified) (3 diffs)
• simu_airs.F90 (modified) (33 diffs)
• stdlevvar_mod.F90 (modified) (22 diffs)
• sumethox.F90 (modified) (1 diff)
• suphel.F90 (modified) (1 diff)
• surf_land_bucket_mod.F90 (modified) (8 diffs)
• surf_land_mod.F90 (modified) (6 diffs)
• surf_landice_mod.F90 (modified) (7 diffs)
• surf_ocean_mod.F90 (modified) (2 diffs)
• surf_seaice_mod.F90 (modified) (1 diff)
• yamada4.F90 (modified) (3 diffs)
• yamada_c.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/dustemission_mod.F90

@@ -822 +822 @@
               xk=solspe(ns,npi)/(sqrt(2.*pi)*log(solspe(ns,nsi)))
               xl=((log(sizeclass(i))-log(solspe(ns,nd)))**2) &
-     &              /(2.*(log(solspe(ns,nsi)))**2)
+                /(2.*(log(solspe(ns,nsi)))**2)
               xm=xk*exp(-xl)
               xn=rop*(2./3.)*(sizeclass(i)/2.)

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_surface.F90

@@ -124 +124 @@
            if (isinversed) then
                         call gr_dyn_fi(1, nbp_lon+1, nbp_lat, klon_glo, &
-     & tmp_dyn_invers_glo, tmp_fi_glo)
+   tmp_dyn_invers_glo, tmp_fi_glo)
 !              call gr_dyn_fi(1, iip1, jjp1, klon, tmp_dyn_invers, tmp_fi)
 !              call gr_dyn_fi_p(1, iip1, jjp1, klon, tmp_dyn_invers, tmp_fi)
            else      
                         call gr_dyn_fi(1, nbp_lon+1, nbp_lat, klon_glo, &
-     &   tmp_dyn_glo, tmp_fi_glo)
+     tmp_dyn_glo, tmp_fi_glo)
 !              call gr_dyn_fi(1, iip1, jjp1, klon, tmp_dyn, tmp_fi)
 !              call gr_dyn_fi_p(1, iip1, jjp1, klon, tmp_dyn, tmp_fi)

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/aer_sedimnt.F90

@@ -122 +122 @@
     !compute budg_sed_part as sum over bins in kg(S)/m2/s
     budg_sed_part(JL)=budg_sed_part(JL)+ZRHO*ZAERONWM1(JL,nb)*ZVAER(JL,1,nb)*(mSatom/mH2SO4mol) &
-                & *dens_aer_dry*4./3.*RPI*(mdw(nb)/2.)**3
+   *dens_aer_dry*4./3.*RPI*(mdw(nb)/2.)**3
   ENDDO
 ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/coagulate.F90

@@ -197 +197 @@
   DO i=1, nbtr_bin
       delta(i)=((2.*radiuswet(i)+mfppar(i))**3.-(4.*radiuswet(i)**2.+mfppar(i)**2.)**1.5)/ &
-           & (6.*radiuswet(i)*mfppar(i))-2.*radiuswet(i)
+   (6.*radiuswet(i)*mfppar(i))-2.*radiuswet(i)
   ENDDO
 
@@ -208 +208 @@
      num=4.*RPI*(radiuswet(i)+radiuswet(j))*(Di(i)+Di(j))
      denom=(radiuswet(i)+radiuswet(j))/(radiuswet(i)+radiuswet(j)+sqrt(delta(i)**2.+delta(j)**2.))+ &
-          & 4.*(Di(i)+Di(j))/(sqrt(thvelpar(i)**2.+thvelpar(j)**2.)*(radiuswet(i)+radiuswet(j)))
+   4.*(Di(i)+Di(j))/(sqrt(thvelpar(i)**2.+thvelpar(j)**2.)*(radiuswet(i)+radiuswet(j)))
      beta(i,j)=num/denom
 !

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/cond_evap_tstep_mod.F90

@@ -10 +10 @@
 
       SUBROUTINE condens_evapor_rate_kelvin(R2SO4G,t_seri,pplay,R2SO4, &
-          & DENSO4,f_r_wet,R2SO4ik,DENSO4ik,f_r_wetik,FL,ASO4,DNDR)
+   DENSO4,f_r_wet,R2SO4ik,DENSO4ik,f_r_wetik,FL,ASO4,DNDR)
 !
 !     INPUT: 
@@ -140 +140 @@
 !       SENFELD
         FL(IK)=FL1*RRSI_wet(IK)**2*( 1.0 +RKNUD ) & 
-     &     /( 1.0 +ALPHA/(2.0*RKNUD) +RKNUD )
+       /( 1.0 +ALPHA/(2.0*RKNUD) +RKNUD )
 !       TURCO
 !        RL= (4.0/3.0 +0.71/RKNUD)/(1.0+1.0/RKNUD)
@@ -166 +166 @@
 !********************************************************************
       SUBROUTINE condens_evapor_rate(R2SO4G,t_seri,pplay,ACTSO4,R2SO4, &
-                   & DENSO4,f_r_wet,FL,ASO4,DNDR)
+   DENSO4,f_r_wet,FL,ASO4,DNDR)
 !
 !     INPUT: 
@@ -263 +263 @@
 !       SENFELD
         FL(IK)=FL1*RRSI_wet(IK)**2*( 1.0 +RKNUD ) & 
-     &     /( 1.0 +ALPHA/(2.0*RKNUD) +RKNUD )
+       /( 1.0 +ALPHA/(2.0*RKNUD) +RKNUD )
 !       TURCO
 !        RL= (4.0/3.0 +0.71/RKNUD)/(1.0+1.0/RKNUD)

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/micphy_tstep.F90

@@ -51 +51 @@
   !coefficients for H2SO4 density parametrization used for nucleation if ntot<4
   a_xm = 0.7681724 + 1.*(2.1847140 + 1.*(7.1630022 + 1.*(-44.31447 + &
-       & 1.*(88.75606 + 1.*(-75.73729 + 1.*23.43228)))))
+   1.*(88.75606 + 1.*(-75.73729 + 1.*23.43228)))))
   b_xm = 1.808225e-3 + 1.*(-9.294656e-3 + 1.*(-0.03742148 + 1.*(0.2565321 + &
-       & 1.*(-0.5362872 + 1.*(0.4857736 - 1.*0.1629592)))))
+   1.*(-0.5362872 + 1.*(0.4857736 - 1.*0.1629592)))))
   c_xm = -3.478524e-6 + 1.*(1.335867e-5 + 1.*(5.195706e-5 + 1.*(-3.717636e-4 + &
-       & 1.*(7.990811e-4 + 1.*(-7.458060e-4 + 1.*2.58139e-4 )))))
+   1.*(7.990811e-4 + 1.*(-7.458060e-4 + 1.*2.58139e-4 )))))
 
   IF(.not.flag_new_strat_compo) THEN
@@ -85 +85 @@
       ! convert tr_seri(GASH2SO4) (in kg/kgA) to H2SO4 number density (in molecules/cm3) 
       rhoa=tr_seri(ilon,ilev,id_H2SO4_strat) &
-          & *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mH2SO4mol
+   *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mH2SO4mol
       ! compute nucleation rate in kg(H2SO4)/kgA/s
       CALL nucleation_rate(rhoa,t_seri(ilon,ilev),pplay(ilon,ilev),rh(ilon,ilev), &
-           & a_xm,b_xm,c_xm,nucl_rate,ntot,x)
+   a_xm,b_xm,c_xm,nucl_rate,ntot,x)
       !NL - add nucleation box (if flag on)
       IF (flag_nuc_rate_box) THEN
@@ -102 +102 @@
          f_r_wetik(:) = f_r_wetB(ilon,ilev,:)
          CALL condens_evapor_rate_kelvin(rhoa,t_seri(ilon,ilev),pplay(ilon,ilev), &
-              & R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
-              & R2SO4ik,DENSO4ik,f_r_wetik,FL,ASO4,DNDR)
+   R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
+   R2SO4ik,DENSO4ik,f_r_wetik,FL,ASO4,DNDR)
       ELSE
          CALL condens_evapor_rate(rhoa,t_seri(ilon,ilev),pplay(ilon,ilev), &
-              & ACTSO4(ilon,ilev),R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
-              & FL,ASO4,DNDR)
+   ACTSO4(ilon,ilev),R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
+   FL,ASO4,DNDR)
       ENDIF
       ! Compute H2SO4 saturate vapor for big particules
@@ -134 +134 @@
       ! compute fluxes as diagnostic in [kg(S)/m2/layer/s] (now - for evap and + for cond)
       budg_3D_cond_evap(ilon,ilev)=budg_3D_cond_evap(ilon,ilev)+mSatom/mH2SO4mol &
-               & *cond_evap_rate*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG*dt/pdtphys
+   *cond_evap_rate*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG*dt/pdtphys
       budg_3D_nucl(ilon,ilev)=budg_3D_nucl(ilon,ilev)+mSatom/mH2SO4mol &
-               & *nucl_rate*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG*dt/pdtphys
+   *nucl_rate*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG*dt/pdtphys
       ! update time step
       PDT=PDT-dt
@@ -142 +142 @@
     ! convert tr_seri(GASH2SO4) (in kg/kgA) to H2SO4 number density (in molecules/cm3) 
     rhoa=tr_seri(ilon,ilev,id_H2SO4_strat) &
-        & *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mH2SO4mol
+   *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mH2SO4mol
     ! compute cond/evap rate in kg(H2SO4)/kgA/s (now only evap for pdtphys)
     IF(flag_new_strat_compo) THEN
        CALL condens_evapor_rate_kelvin(rhoa,t_seri(ilon,ilev),pplay(ilon,ilev), &
-            & R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
-            & R2SO4ik,DENSO4ik,f_r_wetik,FL,ASO4,DNDR)
+   R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
+   R2SO4ik,DENSO4ik,f_r_wetik,FL,ASO4,DNDR)
     ELSE
        CALL condens_evapor_rate(rhoa,t_seri(ilon,ilev),pplay(ilon,ilev), &
-            & ACTSO4(ilon,ilev),R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
-            & FL,ASO4,DNDR)
+   ACTSO4(ilon,ilev),R2SO4(ilon,ilev),DENSO4(ilon,ilev),f_r_wet(ilon,ilev), &
+   FL,ASO4,DNDR)
     ENDIF
     ! limit evaporation (negative FL) over one physics time step to H2SO4 content of the droplet
@@ -170 +170 @@
     ! compute fluxes as diagnostic in [kg(S)/m2/layer/s] (now - for evap and + for cond)
     budg_3D_cond_evap(ilon,ilev)=budg_3D_cond_evap(ilon,ilev)+mSatom/mH2SO4mol &
-             & *evap_rate*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG
+   *evap_rate*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG
     ! compute vertically integrated flux due to the net effect of nucleation and condensation/evaporation
     budg_h2so4_to_part(ilon)=budg_h2so4_to_part(ilon)+(H2SO4_init-tr_seri(ilon,ilev,id_H2SO4_strat)) &
-             & *mSatom/mH2SO4mol*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG/pdtphys
+   *mSatom/mH2SO4mol*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG/pdtphys
   ENDIF
   ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/miecalc_aer.F90

@@ -258 +258 @@
       Nwv=1
       dlambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)= &
-      &  lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)- &
-      &  lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv+1)
+    lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)- &
+    lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv+1)
       DO Nwv=2, NwvmaxLW-1
       dlambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)= &
-      &  (lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv-1)- &
-      &  lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv+1))/2.
+    (lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv-1)- &
+    lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv+1))/2.
       ENDDO
       Nwv=NwvmaxLW
       dlambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)= &
-      &  lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv-1)- &
-      &  lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)
+    lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv-1)- &
+    lambda_int(NwvmaxSW+nwave_sw+nwave_lw+Nwv)
 
       IF (refr_ind_interpol) THEN

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/nucleation_tstep_mod.F90

@@ -49 +49 @@
       VH2SO4mol=mH2SO4mol/(1.E-3*(a_xm+t_seri*(b_xm+t_seri*c_xm))) !cm3
       jnuc_n = rhoa**2. *(3./4.*RPI)**(1./6.) *(12.*RKBOL*t_seri/mH2SO4mol)**0.5 &
-           & *100.*(2.*VH2SO4mol**(1./3.))**2. !1/(cm3s)
+   *100.*(2.*VH2SO4mol**(1./3.))**2. !1/(cm3s)
       ntot_n=2.0
       x_n=1.0
@@ -60 +60 @@
 !   airn=pplay/t_seri/RD/1.E3*RNAVO/RMD ! molec cm-3 (for future use, to be confirmed)
     CALL newbinapara(t_seri,rh,rhoa,csi,airn,ipr,jnuc_n,ntot_n,jnuc_i,ntot_i, &
-                   & x_n,x_i,na_n,na_i,rc_n,rc_i,n_i,kinetic_n,kinetic_i)
+   x_n,x_i,na_n,na_i,rc_n,rc_i,n_i,kinetic_n,kinetic_i)
   ENDIF
 
@@ -197 +197 @@
 
   x=  0.7409967177282139 - 0.002663785665140117*t + 0.002010478847383187*LOG(rh)  &
-       & - 0.0001832894131464668*t*LOG(rh) + 0.001574072538464286*LOG(rh)**2      &
-       & - 0.00001790589121766952*t*LOG(rh)**2 + 0.0001844027436573778*LOG(rh)**3 &
-       & -  1.503452308794887E-6*t*LOG(rh)**3 - 0.003499978417957668*LOG(rhoa)    &
-       & + 0.0000504021689382576*t*LOG(rhoa)
+   - 0.0001832894131464668*t*LOG(rh) + 0.001574072538464286*LOG(rh)**2      &
+   - 0.00001790589121766952*t*LOG(rh)**2 + 0.0001844027436573778*LOG(rh)**3 &
+   -  1.503452308794887E-6*t*LOG(rh)**3 - 0.003499978417957668*LOG(rhoa)    &
+   + 0.0000504021689382576*t*LOG(rhoa)
 
   jnuc= 0.1430901615568665 + 2.219563673425199*t - 0.02739106114964264*t**2 + &
-       &  0.00007228107239317088*t**3 + 5.91822263375044/x +                  &
-       &  0.1174886643003278*LOG(rh) + 0.4625315047693772*t*LOG(rh) -          &
-       &  0.01180591129059253*t**2*LOG(rh) +                                  &
-       &  0.0000404196487152575*t**3*LOG(rh) + (15.79628615047088*LOG(rh))/x - &
-       &  0.215553951893509*LOG(rh)**2 - 0.0810269192332194*t*LOG(rh)**2 +    &
-       &  0.001435808434184642*t**2*LOG(rh)**2 -                               &
-       &  4.775796947178588E-6*t**3*LOG(rh)**2 -                               &
-       &  (2.912974063702185*LOG(rh)**2)/x - 3.588557942822751*LOG(rh)**3 +   &
-       &  0.04950795302831703*t*LOG(rh)**3 -                                   &
-       &  0.0002138195118737068*t**2*LOG(rh)**3 +                             &
-       &  3.108005107949533E-7*t**3*LOG(rh)**3 -                               &
-       &  (0.02933332747098296*LOG(rh)**3)/x +                                &
-       &  1.145983818561277*LOG(rhoa) -                                        &
-       &  0.6007956227856778*t*LOG(rhoa) +                                    &
-       &  0.00864244733283759*t**2*LOG(rhoa) -                                 &
-       &  0.00002289467254710888*t**3*LOG(rhoa) -                              &
-       &  (8.44984513869014*LOG(rhoa))/x +                                    &
-       &  2.158548369286559*LOG(rh)*LOG(rhoa) +                               &
-       &  0.0808121412840917*t*LOG(rh)*LOG(rhoa) -                             &
-       &  0.0004073815255395214*t**2*LOG(rh)*LOG(rhoa) -                       &
-       &  4.019572560156515E-7*t**3*LOG(rh)*LOG(rhoa) +                       &
-       &  (0.7213255852557236*LOG(rh)*LOG(rhoa))/x +                          &
-       &  1.62409850488771*LOG(rh)**2*LOG(rhoa) -                              &
-       &  0.01601062035325362*t*LOG(rh)**2*LOG(rhoa) +                        &
-       &  0.00003771238979714162*t**2*LOG(rh)**2*LOG(rhoa) +                  &
-       &  3.217942606371182E-8*t**3*LOG(rh)**2*LOG(rhoa) -                     &
-       &  (0.01132550810022116*LOG(rh)**2*LOG(rhoa))/x +                      &
-       &  9.71681713056504*LOG(rhoa)**2 -                                      &
-       &  0.1150478558347306*t*LOG(rhoa)**2 +                                 &
-       &  0.0001570982486038294*t**2*LOG(rhoa)**2 +                           &
-       &  4.009144680125015E-7*t**3*LOG(rhoa)**2 +                            &
-       &  (0.7118597859976135*LOG(rhoa)**2)/x -                                &
-       &  1.056105824379897*LOG(rh)*LOG(rhoa)**2 +                            &
-       &  0.00903377584628419*t*LOG(rh)*LOG(rhoa)**2 -                         &
-       &  0.00001984167387090606*t**2*LOG(rh)*LOG(rhoa)**2 +                  &
-       &  2.460478196482179E-8*t**3*LOG(rh)*LOG(rhoa)**2 -                     &
-       &  (0.05790872906645181*LOG(rh)*LOG(rhoa)**2)/x -                       &
-       &  0.1487119673397459*LOG(rhoa)**3 +                                   &
-       &  0.002835082097822667*t*LOG(rhoa)**3 -                                &
-       &  9.24618825471694E-6*t**2*LOG(rhoa)**3 +                             &
-       &  5.004267665960894E-9*t**3*LOG(rhoa)**3 -                             &
-       &  (0.01270805101481648*LOG(rhoa)**3)/x
+    0.00007228107239317088*t**3 + 5.91822263375044/x +                  &
+    0.1174886643003278*LOG(rh) + 0.4625315047693772*t*LOG(rh) -          &
+    0.01180591129059253*t**2*LOG(rh) +                                  &
+    0.0000404196487152575*t**3*LOG(rh) + (15.79628615047088*LOG(rh))/x - &
+    0.215553951893509*LOG(rh)**2 - 0.0810269192332194*t*LOG(rh)**2 +    &
+    0.001435808434184642*t**2*LOG(rh)**2 -                               &
+    4.775796947178588E-6*t**3*LOG(rh)**2 -                               &
+    (2.912974063702185*LOG(rh)**2)/x - 3.588557942822751*LOG(rh)**3 +   &
+    0.04950795302831703*t*LOG(rh)**3 -                                   &
+    0.0002138195118737068*t**2*LOG(rh)**3 +                             &
+    3.108005107949533E-7*t**3*LOG(rh)**3 -                               &
+    (0.02933332747098296*LOG(rh)**3)/x +                                &
+    1.145983818561277*LOG(rhoa) -                                        &
+    0.6007956227856778*t*LOG(rhoa) +                                    &
+    0.00864244733283759*t**2*LOG(rhoa) -                                 &
+    0.00002289467254710888*t**3*LOG(rhoa) -                              &
+    (8.44984513869014*LOG(rhoa))/x +                                    &
+    2.158548369286559*LOG(rh)*LOG(rhoa) +                               &
+    0.0808121412840917*t*LOG(rh)*LOG(rhoa) -                             &
+    0.0004073815255395214*t**2*LOG(rh)*LOG(rhoa) -                       &
+    4.019572560156515E-7*t**3*LOG(rh)*LOG(rhoa) +                       &
+    (0.7213255852557236*LOG(rh)*LOG(rhoa))/x +                          &
+    1.62409850488771*LOG(rh)**2*LOG(rhoa) -                              &
+    0.01601062035325362*t*LOG(rh)**2*LOG(rhoa) +                        &
+    0.00003771238979714162*t**2*LOG(rh)**2*LOG(rhoa) +                  &
+    3.217942606371182E-8*t**3*LOG(rh)**2*LOG(rhoa) -                     &
+    (0.01132550810022116*LOG(rh)**2*LOG(rhoa))/x +                      &
+    9.71681713056504*LOG(rhoa)**2 -                                      &
+    0.1150478558347306*t*LOG(rhoa)**2 +                                 &
+    0.0001570982486038294*t**2*LOG(rhoa)**2 +                           &
+    4.009144680125015E-7*t**3*LOG(rhoa)**2 +                            &
+    (0.7118597859976135*LOG(rhoa)**2)/x -                                &
+    1.056105824379897*LOG(rh)*LOG(rhoa)**2 +                            &
+    0.00903377584628419*t*LOG(rh)*LOG(rhoa)**2 -                         &
+    0.00001984167387090606*t**2*LOG(rh)*LOG(rhoa)**2 +                  &
+    2.460478196482179E-8*t**3*LOG(rh)*LOG(rhoa)**2 -                     &
+    (0.05790872906645181*LOG(rh)*LOG(rhoa)**2)/x -                       &
+    0.1487119673397459*LOG(rhoa)**3 +                                   &
+    0.002835082097822667*t*LOG(rhoa)**3 -                                &
+    9.24618825471694E-6*t**2*LOG(rhoa)**3 +                             &
+    5.004267665960894E-9*t**3*LOG(rhoa)**3 -                             &
+    (0.01270805101481648*LOG(rhoa)**3)/x
   jnuc=EXP(jnuc) !1/(cm3s)
 
   ntot =-0.002954125078716302 - 0.0976834264241286*t + 0.001024847927067835*t**2 - 2.186459697726116E-6*t**3 -    &
-       &   0.1017165718716887/x - 0.002050640345231486*LOG(rh) - 0.007585041382707174*t*LOG(rh) +                &
-       &   0.0001926539658089536*t**2*LOG(rh) - 6.70429719683894E-7*t**3*LOG(rh) -                                &
-       &   (0.2557744774673163*LOG(rh))/x + 0.003223076552477191*LOG(rh)**2 + 0.000852636632240633*t*LOG(rh)**2 - &
-       &   0.00001547571354871789*t**2*LOG(rh)**2 + 5.666608424980593E-8*t**3*LOG(rh)**2 +                       &
-       &   (0.03384437400744206*LOG(rh)**2)/x + 0.04743226764572505*LOG(rh)**3 -                                  &
-       &   0.0006251042204583412*t*LOG(rh)**3 + 2.650663328519478E-6*t**2*LOG(rh)**3 -                            &
-       &   3.674710848763778E-9*t**3*LOG(rh)**3 - (0.0002672510825259393*LOG(rh)**3)/x -                          &
-       &   0.01252108546759328*LOG(rhoa) + 0.005806550506277202*t*LOG(rhoa) -                                     &
-       &   0.0001016735312443444*t**2*LOG(rhoa) + 2.881946187214505E-7*t**3*LOG(rhoa) +                          &
-       &   (0.0942243379396279*LOG(rhoa))/x - 0.0385459592773097*LOG(rh)*LOG(rhoa) -                              &
-       &   0.0006723156277391984*t*LOG(rh)*LOG(rhoa) + 2.602884877659698E-6*t**2*LOG(rh)*LOG(rhoa) +             &
-       &   1.194163699688297E-8*t**3*LOG(rh)*LOG(rhoa) - (0.00851515345806281*LOG(rh)*LOG(rhoa))/x -              &
-       &   0.01837488495738111*LOG(rh)**2*LOG(rhoa) + 0.0001720723574407498*t*LOG(rh)**2*LOG(rhoa) -              &
-       &   3.717657974086814E-7*t**2*LOG(rh)**2*LOG(rhoa) -                                                       &
-       &   5.148746022615196E-10*t**3*LOG(rh)**2*LOG(rhoa) +                                                     &
-       &   (0.0002686602132926594*LOG(rh)**2*LOG(rhoa))/x - 0.06199739728812199*LOG(rhoa)**2 +                   &
-       &   0.000906958053583576*t*LOG(rhoa)**2 - 9.11727926129757E-7*t**2*LOG(rhoa)**2 -                          &
-       &   5.367963396508457E-9*t**3*LOG(rhoa)**2 - (0.007742343393937707*LOG(rhoa)**2)/x +                      &
-       &   0.0121827103101659*LOG(rh)*LOG(rhoa)**2 - 0.0001066499571188091*t*LOG(rh)*LOG(rhoa)**2 +              &
-       &   2.534598655067518E-7*t**2*LOG(rh)*LOG(rhoa)**2 -                                                       &
-       &   3.635186504599571E-10*t**3*LOG(rh)*LOG(rhoa)**2 +                                                     &
-       &   (0.0006100650851863252*LOG(rh)*LOG(rhoa)**2)/x + 0.0003201836700403512*LOG(rhoa)**3 -                  &
-       &   0.0000174761713262546*t*LOG(rhoa)**3 + 6.065037668052182E-8*t**2*LOG(rhoa)**3 -                        &
-       &   1.421771723004557E-11*t**3*LOG(rhoa)**3 + (0.0001357509859501723*LOG(rhoa)**3)/x
+     0.1017165718716887/x - 0.002050640345231486*LOG(rh) - 0.007585041382707174*t*LOG(rh) +                &
+     0.0001926539658089536*t**2*LOG(rh) - 6.70429719683894E-7*t**3*LOG(rh) -                                &
+     (0.2557744774673163*LOG(rh))/x + 0.003223076552477191*LOG(rh)**2 + 0.000852636632240633*t*LOG(rh)**2 - &
+     0.00001547571354871789*t**2*LOG(rh)**2 + 5.666608424980593E-8*t**3*LOG(rh)**2 +                       &
+     (0.03384437400744206*LOG(rh)**2)/x + 0.04743226764572505*LOG(rh)**3 -                                  &
+     0.0006251042204583412*t*LOG(rh)**3 + 2.650663328519478E-6*t**2*LOG(rh)**3 -                            &
+     3.674710848763778E-9*t**3*LOG(rh)**3 - (0.0002672510825259393*LOG(rh)**3)/x -                          &
+     0.01252108546759328*LOG(rhoa) + 0.005806550506277202*t*LOG(rhoa) -                                     &
+     0.0001016735312443444*t**2*LOG(rhoa) + 2.881946187214505E-7*t**3*LOG(rhoa) +                          &
+     (0.0942243379396279*LOG(rhoa))/x - 0.0385459592773097*LOG(rh)*LOG(rhoa) -                              &
+     0.0006723156277391984*t*LOG(rh)*LOG(rhoa) + 2.602884877659698E-6*t**2*LOG(rh)*LOG(rhoa) +             &
+     1.194163699688297E-8*t**3*LOG(rh)*LOG(rhoa) - (0.00851515345806281*LOG(rh)*LOG(rhoa))/x -              &
+     0.01837488495738111*LOG(rh)**2*LOG(rhoa) + 0.0001720723574407498*t*LOG(rh)**2*LOG(rhoa) -              &
+     3.717657974086814E-7*t**2*LOG(rh)**2*LOG(rhoa) -                                                       &
+     5.148746022615196E-10*t**3*LOG(rh)**2*LOG(rhoa) +                                                     &
+     (0.0002686602132926594*LOG(rh)**2*LOG(rhoa))/x - 0.06199739728812199*LOG(rhoa)**2 +                   &
+     0.000906958053583576*t*LOG(rhoa)**2 - 9.11727926129757E-7*t**2*LOG(rhoa)**2 -                          &
+     5.367963396508457E-9*t**3*LOG(rhoa)**2 - (0.007742343393937707*LOG(rhoa)**2)/x +                      &
+     0.0121827103101659*LOG(rh)*LOG(rhoa)**2 - 0.0001066499571188091*t*LOG(rh)*LOG(rhoa)**2 +              &
+     2.534598655067518E-7*t**2*LOG(rh)*LOG(rhoa)**2 -                                                       &
+     3.635186504599571E-10*t**3*LOG(rh)*LOG(rhoa)**2 +                                                     &
+     (0.0006100650851863252*LOG(rh)*LOG(rhoa)**2)/x + 0.0003201836700403512*LOG(rhoa)**3 -                  &
+     0.0000174761713262546*t*LOG(rhoa)**3 + 6.065037668052182E-8*t**2*LOG(rhoa)**3 -                        &
+     1.421771723004557E-11*t**3*LOG(rhoa)**3 + (0.0001357509859501723*LOG(rhoa)**3)/x
   ntot=EXP(ntot)
 
@@ -285 +285 @@
 
   rhotres=EXP( -279.2430007512709 + 11.73439886096903*rh + 22700.92970508331/t &
-       & - (1088.644983466801*rh)/t + 1.144362942094912*t                      &
-       & - 0.03023314602163684*rh*t - 0.001302541390154324*t**2                &
-       & - 6.386965238433532*LOG(rh) + (854.980361026715*LOG(rh))/t            &
-       & + 0.00879662256826497*t*LOG(rh)) !1/cm3
+   - (1088.644983466801*rh)/t + 1.144362942094912*t                      &
+   - 0.03023314602163684*rh*t - 0.001302541390154324*t**2                &
+   - 6.386965238433532*LOG(rh) + (854.980361026715*LOG(rh))/t            &
+   + 0.00879662256826497*t*LOG(rh)) !1/cm3
 
   RETURN
@@ -297 +297 @@
 
 SUBROUTINE newbinapara(t,satrat,rhoa,csi,airn,ipr,jnuc_n_real,ntot_n_real,jnuc_i_real,ntot_i_real,        &
-                   &   x_n_real,x_i_real,na_n_real,na_i_real,rc_n_real,rc_i_real,n_i_real,                & 
-                   &   kinetic_n,kinetic_i)
+     x_n_real,x_i_real,na_n_real,na_i_real,rc_n_real,rc_i_real,n_i_real,                &
+     kinetic_n,kinetic_i)
 
   !    Fortran 90 subroutine newbinapara
@@ -457 +457 @@
   !Critical cluster composition (valid for both cases, bounds not used here) 
   x_n=  7.9036365428891719E-1 - 2.8414059650092153E-3*tln + 1.4976802556584141E-2*LOG(satratln)  &
-       & - 2.4511581740839115E-4*tln*LOG(satratln) + 3.4319869471066424E-3 *LOG(satratln)**2     &
-       & - 2.8799393617748428E-5*tln*LOG(satratln)**2 + 3.0174314126331765E-4*LOG(satratln)**3   &
-       & - 2.2673492408841294E-6*tln*LOG(satratln)**3 - 4.3948464567032377E-3*LOG(rhoaln)        &
-       & + 5.3305314722492146E-5*tln*LOG(rhoaln)
+   - 2.4511581740839115E-4*tln*LOG(satratln) + 3.4319869471066424E-3 *LOG(satratln)**2     &
+   - 2.8799393617748428E-5*tln*LOG(satratln)**2 + 3.0174314126331765E-4*LOG(satratln)**3   &
+   - 2.2673492408841294E-6*tln*LOG(satratln)**3 - 4.3948464567032377E-3*LOG(rhoaln)        &
+   + 5.3305314722492146E-5*tln*LOG(rhoaln)
   x_i=  7.9036365428891719E-1 - 2.8414059650092153E-3*tli + 1.4976802556584141E-2*LOG(satratli)  &
-       & - 2.4511581740839115E-4*tli*LOG(satratli) + 3.4319869471066424E-3 *LOG(satratli)**2     &
-       & - 2.8799393617748428E-5*tli*LOG(satratli)**2 + 3.0174314126331765E-4*LOG(satratli)**3   &
-       & - 2.2673492408841294E-6*tli*LOG(satratli)**3 - 4.3948464567032377E-3*LOG(rhoali)        &
-       & + 5.3305314722492146E-5*tli*LOG(rhoali)
+   - 2.4511581740839115E-4*tli*LOG(satratli) + 3.4319869471066424E-3 *LOG(satratli)**2     &
+   - 2.8799393617748428E-5*tli*LOG(satratli)**2 + 3.0174314126331765E-4*LOG(satratli)**3   &
+   - 2.2673492408841294E-6*tli*LOG(satratli)**3 - 4.3948464567032377E-3*LOG(rhoali)        &
+   + 5.3305314722492146E-5*tli*LOG(rhoali)
        
   x_n=MIN(MAX(x_n,1.E-30),1.) 
@@ -475 +475 @@
   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                      &
-          & -1.3463066443605762E-2*satratln*tln + 8.3736373989909194E-06*tln**2                      &
-          & -1.4673887785408892*LOG(satratln) + (-3.2141890006517094E+1*LOG(satratln))/tln           &
-          & + 2.7137429081917556E-3*tln*LOG(satratln)) !1/cm3     
+   + (-6.1831234251470971E+2*satratln)/tln - 2.4501159970109945E-2*tln                      &
+   -1.3463066443605762E-2*satratln*tln + 8.3736373989909194E-06*tln**2                      &
+   -1.4673887785408892*LOG(satratln) + (-3.2141890006517094E+1*LOG(satratln))/tln           &
+   + 2.7137429081917556E-3*tln*LOG(satratln)) !1/cm3
      IF (kinrhotresn<rhoaln) kinetic_n=.TRUE.
   ENDIF
@@ -484 +484 @@
   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                         &
-          & -4.3983007681295948E-2*satratln*tln + 2.5943854791342071E-5*tln**2                          &
-          & -2.3141363245211317*LOG(satratln) + (9.9186787997857735E+1*LOG(satratln))/tln               &
-          & + 5.6819382556144681E-3*tln*LOG(satratln)) !1/cm3
+   + (-5.9205040320056632E+3*satratln)/tln - 2.4800372593452726E-2*tln                         &
+   -4.3983007681295948E-2*satratln*tln + 2.5943854791342071E-5*tln**2                          &
+   -2.3141363245211317*LOG(satratln) + (9.9186787997857735E+1*LOG(satratln))/tln               &
+   + 5.6819382556144681E-3*tln*LOG(satratln)) !1/cm3
      IF (kinrhotresn<rhoaln) kinetic_n=.TRUE.
   ENDIF
@@ -493 +493 @@
   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                         &
-          & + 5.0886987425326087*satratln*tln + 7.1964722655507067E-5*tln**2                            &
-          & -2.4472627526306372*LOG(satratln) + (1.7561478001423779E+2*LOG(satratln))/tln               &
-          & + 6.2640132818141811E-3*tln*LOG(satratln)) !1/cm3
+   + (-1.2439843468881438E+6*satratln)/tln - 5.4536964974944230E-2*tln                         &
+   + 5.0886987425326087*satratln*tln + 7.1964722655507067E-5*tln**2                            &
+   -2.4472627526306372*LOG(satratln) + (1.7561478001423779E+2*LOG(satratln))/tln               &
+   + 6.2640132818141811E-3*tln*LOG(satratln)) !1/cm3
      IF (kinrhotresn<rhoaln) kinetic_n=.TRUE.
   ENDIF
@@ -509 +509 @@
   ELSE
      jnuc_n= 2.1361182605986115E-1 + 3.3827029855551838*tln -3.2423555796175563E-2*tln**2 +        &
-          &  7.0120069477221989E-5*tln**3 +8.0286874752695141/x_n +                                &
-          &  (-2.6939840579762231E-1)*LOG(satratln) +1.6079879299099518*tln*LOG(satratln) +        &
-          &  (-1.9667486968141933E-2)*tln**2*LOG(satratln) +                                       &
-          &  5.5244755979770844E-5*tln**3*LOG(satratln) + (7.8884704837892468*LOG(satratln))/x_n + &
-          &  4.6374659198909596*LOG(satratln)**2 - 8.2002809894792153E-2*tln*LOG(satratln)**2 +    &
-          &  8.5077424451172196E-4*tln**2*LOG(satratln)**2 +                                       &
-          &  (-2.6518510168987462E-6)*tln**3*LOG(satratln)**2 +                                    &
-          &  (-1.4625482500575278*LOG(satratln)**2)/x_n - 5.2413002989192037E-1*LOG(satratln)**3 + &
-          &  5.2755117653715865E-3*tln*LOG(satratln)**3 +                                          &
-          &  (-2.9491061332113830E-6)*tln**2*LOG(satratln)**3 +                                    &
-          &  (-2.4815454194486752E-8)*tln**3*LOG(satratln)**3 +                                    &
-          &  (-5.2663760117394626E-2*LOG(satratln)**3)/x_n +                                       &
-          &  1.6496664658266762*LOG(rhoaln) +                                                      &
-          &  (-8.0809397859218401E-1)*tln*LOG(rhoaln) +                                            &
-          &  8.9302927091946642E-3*tln**2*LOG(rhoaln) +                                            &
-          &  (-1.9583649496497497E-5)*tln**3*LOG(rhoaln) +                                         &
-          &  (-8.9505572676891685*LOG(rhoaln))/x_n +                                               &
-          &  (-3.0025283601622881E+1)*LOG(satratln)*LOG(rhoaln) +                                  &
-          &  3.0783365644763633E-1*tln*LOG(satratln)*LOG(rhoaln) +                                 &
-          &  (-7.4521756337984706E-4)*tln**2*LOG(satratln)*LOG(rhoaln) +                           &
-          &  (-5.7651433870681853E-7)*tln**3*LOG(satratln)*LOG(rhoaln) +                           &
-          &  (1.2872868529673207*LOG(satratln)*LOG(rhoaln))/x_n +                                  &
-          &  (-6.1739867501526535E-1)*LOG(satratln)**2*LOG(rhoaln) +                               &
-          &  7.2347385705333975E-3*tln*LOG(satratln)**2*LOG(rhoaln) +                              &
-          &  (-3.0640494530822439E-5)*tln**2*LOG(satratln)**2*LOG(rhoaln) +                        &
-          &  6.5944609194346214E-8*tln**3*LOG(satratln)**2*LOG(rhoaln) +                           &
-          &  (-2.8681650332461055E-2*LOG(satratln)**2*LOG(rhoaln))/x_n +                           &
-          &  6.5213802375160306*LOG(rhoaln)**2 +                                                   &
-          &  (-4.7907162004793016E-2)*tln*LOG(rhoaln)**2 +                                         &
-          &  (-1.0727890114215117E-4)*tln**2*LOG(rhoaln)**2 +                                      &
-          &  5.6401818280534507E-7*tln**3*LOG(rhoaln)**2 +                                         &
-          &  (5.4113070888923009E-1*LOG(rhoaln)**2)/x_n +                                          &
-          &  5.2062808476476330E-1*LOG(satratln)*LOG(rhoaln)**2 +                                  &
-          &  (-6.0696882500824584E-3)*tln*LOG(satratln)*LOG(rhoaln)**2 +                           &
-          &  2.3851383302608477E-5*tln**2*LOG(satratln)*LOG(rhoaln)**2 +                           &
-          &  (-1.5243837103067096E-8)*tln**3*LOG(satratln)*LOG(rhoaln)**2 +                        &
-          &  (-5.6543192378015687E-2*LOG(satratln)*LOG(rhoaln)**2)/x_n +                           &
-          &  (-1.1630806410696815E-1)*LOG(rhoaln)**3 +                                             &
-          &  1.3806404273119610E-3*tln*LOG(rhoaln)**3 +                                            &
-          &  (-2.0199865087650833E-6)*tln**2*LOG(rhoaln)**3 +                                      &
-          &  (-3.0200284885763192E-9)*tln**3*LOG(rhoaln)**3 +                                      &
-          &  (-6.9425267104126316E-3*LOG(rhoaln)**3)/x_n
+    7.0120069477221989E-5*tln**3 +8.0286874752695141/x_n +                                &
+    (-2.6939840579762231E-1)*LOG(satratln) +1.6079879299099518*tln*LOG(satratln) +        &
+    (-1.9667486968141933E-2)*tln**2*LOG(satratln) +                                       &
+    5.5244755979770844E-5*tln**3*LOG(satratln) + (7.8884704837892468*LOG(satratln))/x_n + &
+    4.6374659198909596*LOG(satratln)**2 - 8.2002809894792153E-2*tln*LOG(satratln)**2 +    &
+    8.5077424451172196E-4*tln**2*LOG(satratln)**2 +                                       &
+    (-2.6518510168987462E-6)*tln**3*LOG(satratln)**2 +                                    &
+    (-1.4625482500575278*LOG(satratln)**2)/x_n - 5.2413002989192037E-1*LOG(satratln)**3 + &
+    5.2755117653715865E-3*tln*LOG(satratln)**3 +                                          &
+    (-2.9491061332113830E-6)*tln**2*LOG(satratln)**3 +                                    &
+    (-2.4815454194486752E-8)*tln**3*LOG(satratln)**3 +                                    &
+    (-5.2663760117394626E-2*LOG(satratln)**3)/x_n +                                       &
+    1.6496664658266762*LOG(rhoaln) +                                                      &
+    (-8.0809397859218401E-1)*tln*LOG(rhoaln) +                                            &
+    8.9302927091946642E-3*tln**2*LOG(rhoaln) +                                            &
+    (-1.9583649496497497E-5)*tln**3*LOG(rhoaln) +                                         &
+    (-8.9505572676891685*LOG(rhoaln))/x_n +                                               &
+    (-3.0025283601622881E+1)*LOG(satratln)*LOG(rhoaln) +                                  &
+    3.0783365644763633E-1*tln*LOG(satratln)*LOG(rhoaln) +                                 &
+    (-7.4521756337984706E-4)*tln**2*LOG(satratln)*LOG(rhoaln) +                           &
+    (-5.7651433870681853E-7)*tln**3*LOG(satratln)*LOG(rhoaln) +                           &
+    (1.2872868529673207*LOG(satratln)*LOG(rhoaln))/x_n +                                  &
+    (-6.1739867501526535E-1)*LOG(satratln)**2*LOG(rhoaln) +                               &
+    7.2347385705333975E-3*tln*LOG(satratln)**2*LOG(rhoaln) +                              &
+    (-3.0640494530822439E-5)*tln**2*LOG(satratln)**2*LOG(rhoaln) +                        &
+    6.5944609194346214E-8*tln**3*LOG(satratln)**2*LOG(rhoaln) +                           &
+    (-2.8681650332461055E-2*LOG(satratln)**2*LOG(rhoaln))/x_n +                           &
+    6.5213802375160306*LOG(rhoaln)**2 +                                                   &
+    (-4.7907162004793016E-2)*tln*LOG(rhoaln)**2 +                                         &
+    (-1.0727890114215117E-4)*tln**2*LOG(rhoaln)**2 +                                      &
+    5.6401818280534507E-7*tln**3*LOG(rhoaln)**2 +                                         &
+    (5.4113070888923009E-1*LOG(rhoaln)**2)/x_n +                                          &
+    5.2062808476476330E-1*LOG(satratln)*LOG(rhoaln)**2 +                                  &
+    (-6.0696882500824584E-3)*tln*LOG(satratln)*LOG(rhoaln)**2 +                           &
+    2.3851383302608477E-5*tln**2*LOG(satratln)*LOG(rhoaln)**2 +                           &
+    (-1.5243837103067096E-8)*tln**3*LOG(satratln)*LOG(rhoaln)**2 +                        &
+    (-5.6543192378015687E-2*LOG(satratln)*LOG(rhoaln)**2)/x_n +                           &
+    (-1.1630806410696815E-1)*LOG(rhoaln)**3 +                                             &
+    1.3806404273119610E-3*tln*LOG(rhoaln)**3 +                                            &
+    (-2.0199865087650833E-6)*tln**2*LOG(rhoaln)**3 +                                      &
+    (-3.0200284885763192E-9)*tln**3*LOG(rhoaln)**3 +                                      &
+    (-6.9425267104126316E-3*LOG(rhoaln)**3)/x_n
      jnuc_n=EXP(jnuc_n) 
      
      ntot_n =-3.5863435141979573E-3 - 1.0098670235841110E-1*tln + 8.9741268319259721E-4*tln**2 - 1.4855098605195757E-6*tln**3  &
-          &   - 1.2080330016937095E-1/x_n + 1.1902674923928015E-3*LOG(satratln) - 1.9211358507172177E-2*tln*LOG(satratln) +    &
-          &   2.4648094311204255E-4*tln**2*LOG(satratln) - 7.5641448594711666E-7*tln**3*LOG(satratln) +                        &
-          &   (-2.0668639384228818E-02*LOG(satratln))/x_n - 3.7593072011595188E-2*LOG(satratln)**2 +                           &
-          &   9.0993182774415718E-4 *tln*LOG(satratln)**2 +                                                                    &
-          &   (-9.5698412164297149E-6)*tln**2*LOG(satratln)**2 + 3.7163166416110421E-8*tln**3*LOG(satratln)**2 +               &
-          &   (1.1026579525210847E-2*LOG(satratln)**2)/x_n + 1.1530844115561925E-2 *LOG(satratln)**3 +                         &
-          &   (-1.8083253906466668E-4)*tln*LOG(satratln)**3 + 8.0213604053330654E-7*tln**2*LOG(satratln)**3 +                  &
-          &   (-8.5797885383051337E-10)*tln**3*LOG(satratln)**3 + (1.0243693899717402E-3*LOG(satratln)**3)/x_n +               &
-          &   (-1.7248695296299649E-2)*LOG(rhoaln) + 1.1294004162437157E-2*tln*LOG(rhoaln) +                                   &
-          &   (-1.2283640163189278E-4)*tln**2*LOG(rhoaln) + 2.7391732258259009E-7*tln**3*LOG(rhoaln) +                         &
-          &   (6.8505583974029602E-2*LOG(rhoaln))/x_n +2.9750968179523635E-1*LOG(satratln)*LOG(rhoaln) +                       &
-          &   (-3.6681154503992296E-3)*tln*LOG(satratln)*LOG(rhoaln) + 1.0636473034653114E-5*tln**2*LOG(satratln)*LOG(rhoaln)+ &
-          &   5.8687098466515866E-9*tln**3*LOG(satratln)*LOG(rhoaln) + (-5.2028866094191509E-3*LOG(satratln)*LOG(rhoaln))/x_n+ &
-          &   7.6971988880587231E-4*LOG(satratln)**2*LOG(rhoaln) - 2.4605575820433763E-5*tln*LOG(satratln)**2*LOG(rhoaln) +    &
-          &   2.3818484400893008E-7*tln**2*LOG(satratln)**2*LOG(rhoaln) +                                                      &
-          &   (-8.8474102392445200E-10)*tln**3*LOG(satratln)**2*LOG(rhoaln) +                                                  &
-          &   (-1.6640566678168968E-4*LOG(satratln)**2*LOG(rhoaln))/x_n - 7.7390093776705471E-2*LOG(rhoaln)**2 +               &
-          &   5.8220163188828482E-4*tln*LOG(rhoaln)**2 + 1.2291679321523287E-6*tln**2*LOG(rhoaln)**2 +                         &
-          &   (-7.4690997508075749E-9)*tln**3*LOG(rhoaln)**2 + (-5.6357941220497648E-3*LOG(rhoaln)**2)/x_n +                   &
-          &   (-4.7170109625089768E-3)*LOG(satratln)*LOG(rhoaln)**2 + 6.9828868534370193E-5*tln*LOG(satratln)*LOG(rhoaln)**2 + &
-          &   (-3.1738912157036403E-7)*tln**2*LOG(satratln)*LOG(rhoaln)**2 +                                                   &
-          &   2.3975538706787416E-10*tln**3*LOG(satratln)*LOG(rhoaln)**2 +                                                     &
-          &   (4.2304213386288567E-4*LOG(satratln)*LOG(rhoaln)**2)/x_n + 1.3696520973423231E-3*LOG(rhoaln)**3 +                &
-          &   (-1.6863387574788199E-5)*tln*LOG(rhoaln)**3 + 2.7959499278844516E-8*tln**2*LOG(rhoaln)**3 +                      &
-          &   3.9423927013227455E-11*tln**3*LOG(rhoaln)**3 + (8.6136359966337272E-5*LOG(rhoaln)**3)/x_n
+     - 1.2080330016937095E-1/x_n + 1.1902674923928015E-3*LOG(satratln) - 1.9211358507172177E-2*tln*LOG(satratln) +    &
+     2.4648094311204255E-4*tln**2*LOG(satratln) - 7.5641448594711666E-7*tln**3*LOG(satratln) +                        &
+     (-2.0668639384228818E-02*LOG(satratln))/x_n - 3.7593072011595188E-2*LOG(satratln)**2 +                           &
+     9.0993182774415718E-4 *tln*LOG(satratln)**2 +                                                                    &
+     (-9.5698412164297149E-6)*tln**2*LOG(satratln)**2 + 3.7163166416110421E-8*tln**3*LOG(satratln)**2 +               &
+     (1.1026579525210847E-2*LOG(satratln)**2)/x_n + 1.1530844115561925E-2 *LOG(satratln)**3 +                         &
+     (-1.8083253906466668E-4)*tln*LOG(satratln)**3 + 8.0213604053330654E-7*tln**2*LOG(satratln)**3 +                  &
+     (-8.5797885383051337E-10)*tln**3*LOG(satratln)**3 + (1.0243693899717402E-3*LOG(satratln)**3)/x_n +               &
+     (-1.7248695296299649E-2)*LOG(rhoaln) + 1.1294004162437157E-2*tln*LOG(rhoaln) +                                   &
+     (-1.2283640163189278E-4)*tln**2*LOG(rhoaln) + 2.7391732258259009E-7*tln**3*LOG(rhoaln) +                         &
+     (6.8505583974029602E-2*LOG(rhoaln))/x_n +2.9750968179523635E-1*LOG(satratln)*LOG(rhoaln) +                       &
+     (-3.6681154503992296E-3)*tln*LOG(satratln)*LOG(rhoaln) + 1.0636473034653114E-5*tln**2*LOG(satratln)*LOG(rhoaln)+ &
+     5.8687098466515866E-9*tln**3*LOG(satratln)*LOG(rhoaln) + (-5.2028866094191509E-3*LOG(satratln)*LOG(rhoaln))/x_n+ &
+     7.6971988880587231E-4*LOG(satratln)**2*LOG(rhoaln) - 2.4605575820433763E-5*tln*LOG(satratln)**2*LOG(rhoaln) +    &
+     2.3818484400893008E-7*tln**2*LOG(satratln)**2*LOG(rhoaln) +                                                      &
+     (-8.8474102392445200E-10)*tln**3*LOG(satratln)**2*LOG(rhoaln) +                                                  &
+     (-1.6640566678168968E-4*LOG(satratln)**2*LOG(rhoaln))/x_n - 7.7390093776705471E-2*LOG(rhoaln)**2 +               &
+     5.8220163188828482E-4*tln*LOG(rhoaln)**2 + 1.2291679321523287E-6*tln**2*LOG(rhoaln)**2 +                         &
+     (-7.4690997508075749E-9)*tln**3*LOG(rhoaln)**2 + (-5.6357941220497648E-3*LOG(rhoaln)**2)/x_n +                   &
+     (-4.7170109625089768E-3)*LOG(satratln)*LOG(rhoaln)**2 + 6.9828868534370193E-5*tln*LOG(satratln)*LOG(rhoaln)**2 + &
+     (-3.1738912157036403E-7)*tln**2*LOG(satratln)*LOG(rhoaln)**2 +                                                   &
+     2.3975538706787416E-10*tln**3*LOG(satratln)*LOG(rhoaln)**2 +                                                     &
+     (4.2304213386288567E-4*LOG(satratln)*LOG(rhoaln)**2)/x_n + 1.3696520973423231E-3*LOG(rhoaln)**3 +                &
+     (-1.6863387574788199E-5)*tln*LOG(rhoaln)**3 + 2.7959499278844516E-8*tln**2*LOG(rhoaln)**3 +                      &
+     3.9423927013227455E-11*tln**3*LOG(rhoaln)**3 + (8.6136359966337272E-5*LOG(rhoaln)**3)/x_n
      ntot_n=EXP(ntot_n)
      
@@ -603 +603 @@
      
      kinrhotresi = 5.3742280876674478E1  - 6.6837931590012266E-3 *LOG(satratli)**(-2)                                     &
-          & - 1.0142598385422842E-01 * LOG(satratli)**(-1) - 6.4170597272606873E+00 * LOG(satratli)                       &
-          & - 6.4315798914824518E-01 * LOG(satratli)**2 - 2.4428391714772721E-02 * LOG(satratli)**3                       &
-          & - 3.5356658734539019E-04 * LOG(satratli)**4 + 2.5400015099140506E-05 * tli * LOG(satratli)**(-2)              &
-          & - 2.7928900816637790E-04 * tli * LOG(satratli)**(-1) + 4.4108573484923690E-02 * tli * LOG(satratli)           &
-          & + 6.3943789012475532E-03 * tli * LOG(satratli)**(2) + 2.3164296174966580E-04 * tli * LOG(satratli)**(3)       &
-          & + 3.0372070669934950E-06 * tli * LOG(satratli)**4 + 3.8255873977423475E-06 * tli**2 * LOG(satratli)**(-1)     &
-          & - 1.2344793083561629E-04 * tli**2 * LOG(satratli) - 1.7959048869810192E-05 * tli**2 * LOG(satratli)**(2)      &
-          & - 3.2165622558722767E-07 * tli**2 * LOG(satratli)**3 - 4.7136923780988659E-09 * tli**3 * LOG(satratli)**(-1)  &
-          & + 1.1873317184482216E-07 * tli**3 * LOG(satratli) + 1.5685860354866621E-08 * tli**3 * LOG(satratli)**2        &
-          & - 1.4329645891059557E+04 * tli**(-1) + 1.3842599842575321E-01 * tli                                           &
-          & - 4.1376265912842938E-04 * tli**(2) + 3.9147639775826004E-07 * tli**3
+   - 1.0142598385422842E-01 * LOG(satratli)**(-1) - 6.4170597272606873E+00 * LOG(satratli)                       &
+   - 6.4315798914824518E-01 * LOG(satratli)**2 - 2.4428391714772721E-02 * LOG(satratli)**3                       &
+   - 3.5356658734539019E-04 * LOG(satratli)**4 + 2.5400015099140506E-05 * tli * LOG(satratli)**(-2)              &
+   - 2.7928900816637790E-04 * tli * LOG(satratli)**(-1) + 4.4108573484923690E-02 * tli * LOG(satratli)           &
+   + 6.3943789012475532E-03 * tli * LOG(satratli)**(2) + 2.3164296174966580E-04 * tli * LOG(satratli)**(3)       &
+   + 3.0372070669934950E-06 * tli * LOG(satratli)**4 + 3.8255873977423475E-06 * tli**2 * LOG(satratli)**(-1)     &
+   - 1.2344793083561629E-04 * tli**2 * LOG(satratli) - 1.7959048869810192E-05 * tli**2 * LOG(satratli)**(2)      &
+   - 3.2165622558722767E-07 * tli**2 * LOG(satratli)**3 - 4.7136923780988659E-09 * tli**3 * LOG(satratli)**(-1)  &
+   + 1.1873317184482216E-07 * tli**3 * LOG(satratli) + 1.5685860354866621E-08 * tli**3 * LOG(satratli)**2        &
+   - 1.4329645891059557E+04 * tli**(-1) + 1.3842599842575321E-01 * tli                                           &
+   - 4.1376265912842938E-04 * tli**(2) + 3.9147639775826004E-07 * tli**3
      
      kinrhotresi=EXP(kinrhotresi) !1/cm3
@@ -621 +621 @@
      IF (kinetic_i) THEN    
         jnuc_i1=1.0E6*(0.3E-9 + 0.487E-9)**2.*SQRT(8.*RPI*RKBOL*(1./mH2SO4mol+1./mH2SO4mol))*  &
-             &  SQRT(tli)*rhoali !1/cm3s  
+    SQRT(tli)*rhoali !1/cm3s
         ntot_i=1. !set to 1 
         na_i=1.
@@ -628 +628 @@
      ELSE
         jnuc_i1 = 3.0108954259038608E+01+tli*6.1176722090512577E+01+(tli**2)*8.7240333618891663E-01+(tli**3)*                &
-             & (-4.6191788649375719E-03)+(tli**(-1))*8.3537059107024481E-01 +                                                &
-             & (1.5028549216690628E+01+tli*(-1.9310989753720623E-01)+(tli**2)*8.0155514634860480E-04+(tli**3)*               &
-             & (-1.0832730707799128E-06)+(tli**(-1))*1.7577660457989019)*(LOG(satratli)**(-2)) +                             &
-             & (-2.0487870170216488E-01 + tli * 1.3263949252910405E-03 + (tli**2) *(-8.4195688402450274E-06) +               &
-             & (tli**3)*1.6154895940993287E-08 + (tli**(-1))*3.8734212545203874E+01) * (LOG(satratli)**(-2)*LOG(rhoali)) +   &
-             & (1.4955918863858371 + tli * 9.2290004245522454E+01 + (tli**2) *(-8.9006965195392618E-01) +                    &
-             & (tli**3) * 2.2319123411013099E-03 + (tli**(-1)) * 4.0180079996840852E-03) *                                   &
-             & (LOG(satratli)**(-1) * LOG(rhoali)**(-1)) +                                                                   &
-             & (7.9018031228561085 + tli *(-1.1649433968658949E+01) + (tli**2) * 1.1400827854910951E-01 +                    &
-             & (tli**3) *(-3.1941526492127755E-04) + (tli**(-1)) *(-3.7662115740271446E-01)) * (LOG(satratli)**(-1)) +       &
-             & (1.5725237111225979E+02 + tli *(-1.0051649979836277) + (tli**2) * 1.1866484014507624E-03 +                    &
-             & (tli**3) * 7.3557614998540389E-06 + (tli**(-1)) * 2.6270197023115189) * (LOG(satratli)**(-1) * LOG(rhoali)) + &
-             & (-1.6973840122470968E+01 + tli * 1.1258423691432135E-01 + (tli**2) *(-2.9850139351463793E-04) + (tli**3) *    &
-             & 1.4301286324827064E-07 + (tli**(-1)) * 1.3163389235253725E+01) * (LOG(satratli)**(-1) * LOG(rhoali)**2) +     &
-             & (-1.0399591631839757 + tli * 2.7022055588257691E-03 + (tli**2) *(-2.1507467231330936E-06) + (tli**3) *        &
-             & 3.8059489037584171E-10 + (tli**(-1)) * 1.5000492788553410E+02) * (LOG(satratli)**(-1) * LOG(rhoali)**3) +     &
-             & (1.2250990965305315 + tli * 3.0495946490079444E+01 + (tli**2) * 2.1051563135187106E+01 + (tli**3) *           &
-             & (-8.2200682916580878E-02) + (tli**(-1)) * 2.9965871386685029E-02) * (LOG(rhoali)**(-2)) +                     &
-             & (4.8281605955680433 + tli * 1.7346551710836445E+02 + (tli**2) *(-1.0113602140796010E+01) + (tli**3) *         &
-             & 3.7482518458685089E-02 + (tli**(-1)) *(-1.4449998158558205E-01)) * (LOG(rhoali)**(-1)) +                      &
-             & (2.3399230964451237E+02 + tli *(-2.3099267235261948E+01) + (tli**2) * 8.0122962140916354E-02 +                &
-             & (tli**3) * 6.1542576994557088E-05 + (tli**(-1)) * 5.3718413254843007) * (LOG(rhoali)) +                       &
-             & (1.0299715519499360E+02 + tli *(-6.4663357203364136E-02) + (tli**2) *(-2.0487150565050316E-03) +              &
-             & (tli**3) * 8.7935289055530897E-07 + (tli**(-1)) * 3.6013204601215229E+01) * (LOG(rhoali)**2) +                &
-             & (-3.5452115439584042 + tli * 1.7083445731159330E-02 + (tli**2) *(-1.2552625290862626E-05) + (tli**3) *        &
-             & 1.2968447449182847E-09 + (tli**(-1)) * 1.5748687512056560E+02) * (LOG(rhoali)**3) +                           &
-             & (2.2338490119517975 + tli * 1.0229410216045540E+02 + (tli**2) *(-3.2103611955174052) + (tli**3) *             &
-             & 1.3397152304977591E-02 + (tli**(-1)) *(-2.4155187776460030E-02)) * (LOG(satratli)* LOG(rhoali)**(-2)) +       &
-             & (3.7592282990713963 + tli *(-1.5257988769009816E+02) + (tli**2) * 2.6113805420558802 + (tli**3) *             &
-             & (-9.0380721653694363E-03) + (tli**(-1)) *(-1.3974197138171082E-01)) * (LOG(satratli)* LOG(rhoali)**(-1)) +    &
-             & (1.8293600730573988E+01 + tli * 1.8344728606002992E+01 + (tli**2) *(-4.0063363221106751E-01) + (tli**3)       &
-             & * 1.4842749371258522E-03 + (tli**(-1)) * 1.1848846003282287) * (LOG(satratli)) +                              &
-             & (-1.7634531623032314E+02 + tli * 4.9011762441271278 + (tli**2) *(-1.3195821562746339E-02) + (tli**3) *        &
-             & (-2.8668619526430859E-05) + (tli**(-1)) *(-2.9823396976393551E-01)) * (LOG(satratli)* LOG(rhoali)) +          &
-             & (-3.2944043694275727E+01 + tli * 1.2517571921051887E-01 + (tli**2) * 8.3239769771186714E-05 + (tli**3) *      &
-             & 2.8191859341519507E-07 + (tli**(-1)) *(-2.7352880736682319E+01)) * (LOG(satratli)* LOG(rhoali)**2) +          &
-             & (-1.1451811137553243 + tli * 2.0625997485732494E-03 + (tli**2) *(-3.4225389469233624E-06) + (tli**3) *        &
-             & 4.4437613496984567E-10 + (tli**(-1)) * 1.8666644332606754E+02) * (LOG(satratli)* LOG(rhoali)**3) +            &
-             & (3.2270897099493567E+01 + tli * 7.7898447327513687E-01 + (tli**2) *(-6.5662738484679626E-03) + (tli**3) *     &
-             & 3.7899330796456790E-06 + (tli**(-1)) * 7.1106427501756542E-01) * (LOG(satratli)**2 * LOG(rhoali)**(-1)) +     &
-             & (-2.8901906781697811E+01 + tli *(-1.5356398793054860) + (tli**2) * 1.9267271774384788E-02 + (tli**3) *        &
-             & (-5.3886270475516162E-05) + (tli**(-1)) * 5.0490415975693426E-01) * (LOG(satratli)**2) +                      &
-             & (3.3365683645733924E+01 + tli *(-3.6114561564894537E-01) + (tli**2) * 9.2977354471929262E-04 + (tli**3) *     &
-             & 1.9549769069511355E-07 + (tli**(-1)) *(-8.8865930095112855)) * (LOG(satratli)**2 * LOG(rhoali)) +             &
-             & (2.4592563042806375 + tli *(-8.3227071743101084E-03) + (tli**2) * 8.2563338043447783E-06 + (tli**3) *         &
-             & (-8.4374976698593496E-09) + (tli**(-1)) *(-2.0938173949893473E+02)) * (LOG(satratli)**2 * LOG(rhoali)**2) +   &
-             & (4.4099823444352317E+01 + tli * 2.5915665826835252 + (tli**2) *(-1.6449091819482634E-02) + (tli**3) *         &
-             & 2.6797249816144721E-05 + (tli**(-1)) * 5.5045672663909995E-01)* satratli
+   (-4.6191788649375719E-03)+(tli**(-1))*8.3537059107024481E-01 +                                                &
+   (1.5028549216690628E+01+tli*(-1.9310989753720623E-01)+(tli**2)*8.0155514634860480E-04+(tli**3)*               &
+   (-1.0832730707799128E-06)+(tli**(-1))*1.7577660457989019)*(LOG(satratli)**(-2)) +                             &
+   (-2.0487870170216488E-01 + tli * 1.3263949252910405E-03 + (tli**2) *(-8.4195688402450274E-06) +               &
+   (tli**3)*1.6154895940993287E-08 + (tli**(-1))*3.8734212545203874E+01) * (LOG(satratli)**(-2)*LOG(rhoali)) +   &
+   (1.4955918863858371 + tli * 9.2290004245522454E+01 + (tli**2) *(-8.9006965195392618E-01) +                    &
+   (tli**3) * 2.2319123411013099E-03 + (tli**(-1)) * 4.0180079996840852E-03) *                                   &
+   (LOG(satratli)**(-1) * LOG(rhoali)**(-1)) +                                                                   &
+   (7.9018031228561085 + tli *(-1.1649433968658949E+01) + (tli**2) * 1.1400827854910951E-01 +                    &
+   (tli**3) *(-3.1941526492127755E-04) + (tli**(-1)) *(-3.7662115740271446E-01)) * (LOG(satratli)**(-1)) +       &
+   (1.5725237111225979E+02 + tli *(-1.0051649979836277) + (tli**2) * 1.1866484014507624E-03 +                    &
+   (tli**3) * 7.3557614998540389E-06 + (tli**(-1)) * 2.6270197023115189) * (LOG(satratli)**(-1) * LOG(rhoali)) + &
+   (-1.6973840122470968E+01 + tli * 1.1258423691432135E-01 + (tli**2) *(-2.9850139351463793E-04) + (tli**3) *    &
+   1.4301286324827064E-07 + (tli**(-1)) * 1.3163389235253725E+01) * (LOG(satratli)**(-1) * LOG(rhoali)**2) +     &
+   (-1.0399591631839757 + tli * 2.7022055588257691E-03 + (tli**2) *(-2.1507467231330936E-06) + (tli**3) *        &
+   3.8059489037584171E-10 + (tli**(-1)) * 1.5000492788553410E+02) * (LOG(satratli)**(-1) * LOG(rhoali)**3) +     &
+   (1.2250990965305315 + tli * 3.0495946490079444E+01 + (tli**2) * 2.1051563135187106E+01 + (tli**3) *           &
+   (-8.2200682916580878E-02) + (tli**(-1)) * 2.9965871386685029E-02) * (LOG(rhoali)**(-2)) +                     &
+   (4.8281605955680433 + tli * 1.7346551710836445E+02 + (tli**2) *(-1.0113602140796010E+01) + (tli**3) *         &
+   3.7482518458685089E-02 + (tli**(-1)) *(-1.4449998158558205E-01)) * (LOG(rhoali)**(-1)) +                      &
+   (2.3399230964451237E+02 + tli *(-2.3099267235261948E+01) + (tli**2) * 8.0122962140916354E-02 +                &
+   (tli**3) * 6.1542576994557088E-05 + (tli**(-1)) * 5.3718413254843007) * (LOG(rhoali)) +                       &
+   (1.0299715519499360E+02 + tli *(-6.4663357203364136E-02) + (tli**2) *(-2.0487150565050316E-03) +              &
+   (tli**3) * 8.7935289055530897E-07 + (tli**(-1)) * 3.6013204601215229E+01) * (LOG(rhoali)**2) +                &
+   (-3.5452115439584042 + tli * 1.7083445731159330E-02 + (tli**2) *(-1.2552625290862626E-05) + (tli**3) *        &
+   1.2968447449182847E-09 + (tli**(-1)) * 1.5748687512056560E+02) * (LOG(rhoali)**3) +                           &
+   (2.2338490119517975 + tli * 1.0229410216045540E+02 + (tli**2) *(-3.2103611955174052) + (tli**3) *             &
+   1.3397152304977591E-02 + (tli**(-1)) *(-2.4155187776460030E-02)) * (LOG(satratli)* LOG(rhoali)**(-2)) +       &
+   (3.7592282990713963 + tli *(-1.5257988769009816E+02) + (tli**2) * 2.6113805420558802 + (tli**3) *             &
+   (-9.0380721653694363E-03) + (tli**(-1)) *(-1.3974197138171082E-01)) * (LOG(satratli)* LOG(rhoali)**(-1)) +    &
+   (1.8293600730573988E+01 + tli * 1.8344728606002992E+01 + (tli**2) *(-4.0063363221106751E-01) + (tli**3)       &
+   * 1.4842749371258522E-03 + (tli**(-1)) * 1.1848846003282287) * (LOG(satratli)) +                              &
+   (-1.7634531623032314E+02 + tli * 4.9011762441271278 + (tli**2) *(-1.3195821562746339E-02) + (tli**3) *        &
+   (-2.8668619526430859E-05) + (tli**(-1)) *(-2.9823396976393551E-01)) * (LOG(satratli)* LOG(rhoali)) +          &
+   (-3.2944043694275727E+01 + tli * 1.2517571921051887E-01 + (tli**2) * 8.3239769771186714E-05 + (tli**3) *      &
+   2.8191859341519507E-07 + (tli**(-1)) *(-2.7352880736682319E+01)) * (LOG(satratli)* LOG(rhoali)**2) +          &
+   (-1.1451811137553243 + tli * 2.0625997485732494E-03 + (tli**2) *(-3.4225389469233624E-06) + (tli**3) *        &
+   4.4437613496984567E-10 + (tli**(-1)) * 1.8666644332606754E+02) * (LOG(satratli)* LOG(rhoali)**3) +            &
+   (3.2270897099493567E+01 + tli * 7.7898447327513687E-01 + (tli**2) *(-6.5662738484679626E-03) + (tli**3) *     &
+   3.7899330796456790E-06 + (tli**(-1)) * 7.1106427501756542E-01) * (LOG(satratli)**2 * LOG(rhoali)**(-1)) +     &
+   (-2.8901906781697811E+01 + tli *(-1.5356398793054860) + (tli**2) * 1.9267271774384788E-02 + (tli**3) *        &
+   (-5.3886270475516162E-05) + (tli**(-1)) * 5.0490415975693426E-01) * (LOG(satratli)**2) +                      &
+   (3.3365683645733924E+01 + tli *(-3.6114561564894537E-01) + (tli**2) * 9.2977354471929262E-04 + (tli**3) *     &
+   1.9549769069511355E-07 + (tli**(-1)) *(-8.8865930095112855)) * (LOG(satratli)**2 * LOG(rhoali)) +             &
+   (2.4592563042806375 + tli *(-8.3227071743101084E-03) + (tli**2) * 8.2563338043447783E-06 + (tli**3) *         &
+   (-8.4374976698593496E-09) + (tli**(-1)) *(-2.0938173949893473E+02)) * (LOG(satratli)**2 * LOG(rhoali)**2) +   &
+   (4.4099823444352317E+01 + tli * 2.5915665826835252 + (tli**2) *(-1.6449091819482634E-02) + (tli**3) *         &
+   2.6797249816144721E-05 + (tli**(-1)) * 5.5045672663909995E-01)* satratli
         jnuc_i1=EXP(jnuc_i1)
         
         ntot_i = ABS((-4.8324296064013375E+04 + tli * 5.0469120697428906E+02 + (tli**2) *(-1.1528940488496042E+00) +         &
-             & (tli**(-1)) *(-8.6892744676239192E+02) + (tli**(3)) * 4.0030302028120469E-04) +                               &
-             & (-6.7259105232039847E+03 + tli * 1.9197488157452008E+02 + (tli**2) *(-1.3602976930126354E+00) +               &
-             & (tli**(-1)) *(-1.1212637938360332E+02) + (tli**(3)) * 2.8515597265933207E-03) *                               &
-             & LOG(satratli)**(-2) * LOG(rhoali)**(-2) +                                                                     &
-             & (2.6216455217763342E+02 + tli *(-2.3687553252750821E+00) + (tli**2) * 7.4074554767517521E-03 +                &
-             & (tli**(-1)) *(-1.9213956820114927E+03) + (tli**(3)) *(-9.3839114856129453E-06)) * LOG(satratli)**(-2) +       &
-             & (3.9652478944137344E+00 + tli * 1.2469375098256536E-02 + (tli**2) *(-9.9837754694045633E-05) + (tli**(-1)) *  &
-             & (-5.1919499210175138E+02) + (tli**(3)) * 1.6489001324583862E-07) * LOG(satratli)**(-2) * LOG(rhoali) +        &
-             & (2.4975714429096206E+02 + tli * 1.7107594562445172E+02 + (tli**2) *(-7.8988711365135289E-01) + (tli**(-1)) *  &
-             & (-2.2243599782483177E+01) + (tli**(3)) *(-1.6291523004095427E-04)) * LOG(satratli)**(-1) * LOG(rhoali)**(-2) +&
-             & (-8.9270715592533611E+02 + tli * 1.2053538883338946E+02 + (tli**2) *(-1.5490408828541018E+00) + (tli**(-1)) * &
-             & (-1.1243275579419826E+01) + (tli**(3)) * 4.8053105606904655E-03) * LOG(satratli)**(-1) * LOG(rhoali)**(-1) +  &
-             & (7.6426441642091631E+03 + tli *(-7.1785462414656578E+01) + (tli**2) * 2.3851864923199523E-01 + (tli**(-1)) *  &
-             & 8.5591775688708395E+01 + (tli**(3)) *(-3.7000473243342858E-04)) * LOG(satratli)**(-1) +                       &
-             & (-5.1516826398607911E+01 + tli * 9.1385720811460558E-01 + (tli**2) *(-3.5477100262158974E-03) +               &
-             & (tli**(-1)) * 2.7545544507625586E+03 + (tli**(3)) * 5.4708262093640928E-06) * LOG(satratli)**(-1) * LOG(rhoali) + &
-             & (-3.0386767129196176E+02 + tli *(-1.1033438883583569E+04) + (tli**2) * 8.1296859732896067E+01 + (tli**(-1)) * &
-             & 1.2625883141097162E+01 + (tli**(3)) *(-1.2728497822219101E-01)) * LOG(rhoali)**(-2) +                         &
-             & (-3.3763494256461472E+03 + tli * 3.1916579136391006E+03 + (tli**2) *(-2.7234339474441143E+01) + (tli**(-1)) * &
-             & (-2.1897653262707397E+01) + (tli**(3)) * 5.1788505812259071E-02) * LOG(rhoali)**(-1) +                        &
-             & (-1.8817843873687068E+03 + tli * 4.3038072285882070E+00 + (tli**2) * 6.6244087689671860E-03 + (tli**(-1)) *   &
-             & (-2.7133073605696295E+03) + (tli**(3)) *(-1.7951557394285043E-05)) * LOG(rhoali) +                            &
-             & (-1.7668827539244447E+02 + tli * 4.8160932330629913E-01 + (tli**2) *(-6.3133007671100293E-04) + (tli**(-1)) * &
-             & 2.5631774669873157E+04 + (tli**(3)) * 4.1534484127873519E-07) * LOG(rhoali)**(2) +                            &
-             & (-1.6661835889222382E+03 + tli * 1.3708900504682877E+03 + (tli**2) *(-1.7919060052198969E+01) + (tli**(-1)) * &
-             & (-3.5145029804436405E+01) + (tli**(3)) * 5.1047240947371224E-02) * LOG(satratli)* LOG(rhoali)**(-2) +         &
-             & (1.0843549363030939E+04 + tli *(-7.3557073636139577E+01) + (tli**2) * 1.2054625131778862E+00 + (tli**(-1)) *  &
-             & 1.9358737917864391E+02 + (tli**(3)) *(-4.2871620775911338E-03)) * LOG(satratli)* LOG(rhoali)**(-1) +          &
-             & (-2.4269802549752835E+03 + tli * 1.1348265061941714E+01 + (tli**2) *(-5.0430423939495157E-02) + (tli**(-1)) * &
-             & 2.3709874548950634E+03 + (tli**(3)) * 1.4091851828620244E-04) * LOG(satratli) +                               &
-             & (5.2745372575251588E+02 + tli *(-2.6080675912627314E+00) + (tli**2) * 5.6902218056670145E-03 + (tli**(-1)) *  &
-             & (-3.2149319482897838E+04) + (tli**(3)) *(-5.4121996056745853E-06)) * LOG(satratli)* LOG(rhoali) +             &
-             & (-1.6401959518360403E+01 + tli * 2.4322962162439640E-01 + (tli**2) * 1.1744366627725344E-03 + (tli**(-1)) *   &
-             & (-8.2694427518413195E+03) + (tli**(3)) *(-5.0028379203873102E-06))* LOG(satratli)**(2) +                      &
-             & (-2.7556572017167782E+03 + tli * 4.9293344495058264E+01 + (tli**2) *(-2.6503456520676050E-01) + (tli**(-1)) * &
-             & 1.2130698030982167E+03 + (tli**(3)) * 4.3530610668042957E-04)* LOG(satratli)**2 * LOG(rhoali)**(-1) +         &
-             & (-6.3419182228959192E+00 + tli * 4.0636212834605827E-02 + (tli**2) *(-1.0450112687842742E-04) + (tli**(-1)) * &
-             & 3.1035882189759656E+02 + (tli**(3)) * 9.4328418657873500E-08)* LOG(satratli)**(-3) +                          &
-             & (3.0189213304689042E+03 + tli *(-2.3804654203861684E+01) + (tli**2) * 6.8113013411972942E-02 + (tli**(-1)) *  &
-             & 6.3112071081188913E+02 + (tli**(3)) *(-9.4460854261685723E-05))* (satratli) * LOG(rhoali) +                   &
-             & (1.1924791930673702E+04 + tli *(-1.1973824959206000E+02) + (tli**2) * 1.6888713097971020E-01 + (tli**(-1)) *  &
-             & 1.8735938211539585E+02 + (tli**(3)) * 5.0974564680442852E-04)* (satratli) +                                   &
-             & (3.6409071302482083E+01 + tli * 1.7919859306449623E-01 + (tli**2) *(-1.0020116255895206E-03) + (tli**(-1)) *  &
-             & (-8.3521083354432303E+03) + (tli**(3)) * 1.5879900546795635E-06)* satratli * LOG(rhoali)**(2))
+   (tli**(-1)) *(-8.6892744676239192E+02) + (tli**(3)) * 4.0030302028120469E-04) +                               &
+   (-6.7259105232039847E+03 + tli * 1.9197488157452008E+02 + (tli**2) *(-1.3602976930126354E+00) +               &
+   (tli**(-1)) *(-1.1212637938360332E+02) + (tli**(3)) * 2.8515597265933207E-03) *                               &
+   LOG(satratli)**(-2) * LOG(rhoali)**(-2) +                                                                     &
+   (2.6216455217763342E+02 + tli *(-2.3687553252750821E+00) + (tli**2) * 7.4074554767517521E-03 +                &
+   (tli**(-1)) *(-1.9213956820114927E+03) + (tli**(3)) *(-9.3839114856129453E-06)) * LOG(satratli)**(-2) +       &
+   (3.9652478944137344E+00 + tli * 1.2469375098256536E-02 + (tli**2) *(-9.9837754694045633E-05) + (tli**(-1)) *  &
+   (-5.1919499210175138E+02) + (tli**(3)) * 1.6489001324583862E-07) * LOG(satratli)**(-2) * LOG(rhoali) +        &
+   (2.4975714429096206E+02 + tli * 1.7107594562445172E+02 + (tli**2) *(-7.8988711365135289E-01) + (tli**(-1)) *  &
+   (-2.2243599782483177E+01) + (tli**(3)) *(-1.6291523004095427E-04)) * LOG(satratli)**(-1) * LOG(rhoali)**(-2) +&
+   (-8.9270715592533611E+02 + tli * 1.2053538883338946E+02 + (tli**2) *(-1.5490408828541018E+00) + (tli**(-1)) * &
+   (-1.1243275579419826E+01) + (tli**(3)) * 4.8053105606904655E-03) * LOG(satratli)**(-1) * LOG(rhoali)**(-1) +  &
+   (7.6426441642091631E+03 + tli *(-7.1785462414656578E+01) + (tli**2) * 2.3851864923199523E-01 + (tli**(-1)) *  &
+   8.5591775688708395E+01 + (tli**(3)) *(-3.7000473243342858E-04)) * LOG(satratli)**(-1) +                       &
+   (-5.1516826398607911E+01 + tli * 9.1385720811460558E-01 + (tli**2) *(-3.5477100262158974E-03) +               &
+   (tli**(-1)) * 2.7545544507625586E+03 + (tli**(3)) * 5.4708262093640928E-06) * LOG(satratli)**(-1) * LOG(rhoali) + &
+   (-3.0386767129196176E+02 + tli *(-1.1033438883583569E+04) + (tli**2) * 8.1296859732896067E+01 + (tli**(-1)) * &
+   1.2625883141097162E+01 + (tli**(3)) *(-1.2728497822219101E-01)) * LOG(rhoali)**(-2) +                         &
+   (-3.3763494256461472E+03 + tli * 3.1916579136391006E+03 + (tli**2) *(-2.7234339474441143E+01) + (tli**(-1)) * &
+   (-2.1897653262707397E+01) + (tli**(3)) * 5.1788505812259071E-02) * LOG(rhoali)**(-1) +                        &
+   (-1.8817843873687068E+03 + tli * 4.3038072285882070E+00 + (tli**2) * 6.6244087689671860E-03 + (tli**(-1)) *   &
+   (-2.7133073605696295E+03) + (tli**(3)) *(-1.7951557394285043E-05)) * LOG(rhoali) +                            &
+   (-1.7668827539244447E+02 + tli * 4.8160932330629913E-01 + (tli**2) *(-6.3133007671100293E-04) + (tli**(-1)) * &
+   2.5631774669873157E+04 + (tli**(3)) * 4.1534484127873519E-07) * LOG(rhoali)**(2) +                            &
+   (-1.6661835889222382E+03 + tli * 1.3708900504682877E+03 + (tli**2) *(-1.7919060052198969E+01) + (tli**(-1)) * &
+   (-3.5145029804436405E+01) + (tli**(3)) * 5.1047240947371224E-02) * LOG(satratli)* LOG(rhoali)**(-2) +         &
+   (1.0843549363030939E+04 + tli *(-7.3557073636139577E+01) + (tli**2) * 1.2054625131778862E+00 + (tli**(-1)) *  &
+   1.9358737917864391E+02 + (tli**(3)) *(-4.2871620775911338E-03)) * LOG(satratli)* LOG(rhoali)**(-1) +          &
+   (-2.4269802549752835E+03 + tli * 1.1348265061941714E+01 + (tli**2) *(-5.0430423939495157E-02) + (tli**(-1)) * &
+   2.3709874548950634E+03 + (tli**(3)) * 1.4091851828620244E-04) * LOG(satratli) +                               &
+   (5.2745372575251588E+02 + tli *(-2.6080675912627314E+00) + (tli**2) * 5.6902218056670145E-03 + (tli**(-1)) *  &
+   (-3.2149319482897838E+04) + (tli**(3)) *(-5.4121996056745853E-06)) * LOG(satratli)* LOG(rhoali) +             &
+   (-1.6401959518360403E+01 + tli * 2.4322962162439640E-01 + (tli**2) * 1.1744366627725344E-03 + (tli**(-1)) *   &
+   (-8.2694427518413195E+03) + (tli**(3)) *(-5.0028379203873102E-06))* LOG(satratli)**(2) +                      &
+   (-2.7556572017167782E+03 + tli * 4.9293344495058264E+01 + (tli**2) *(-2.6503456520676050E-01) + (tli**(-1)) * &
+   1.2130698030982167E+03 + (tli**(3)) * 4.3530610668042957E-04)* LOG(satratli)**2 * LOG(rhoali)**(-1) +         &
+   (-6.3419182228959192E+00 + tli * 4.0636212834605827E-02 + (tli**2) *(-1.0450112687842742E-04) + (tli**(-1)) * &
+   3.1035882189759656E+02 + (tli**(3)) * 9.4328418657873500E-08)* LOG(satratli)**(-3) +                          &
+   (3.0189213304689042E+03 + tli *(-2.3804654203861684E+01) + (tli**2) * 6.8113013411972942E-02 + (tli**(-1)) *  &
+   6.3112071081188913E+02 + (tli**(3)) *(-9.4460854261685723E-05))* (satratli) * LOG(rhoali) +                   &
+   (1.1924791930673702E+04 + tli *(-1.1973824959206000E+02) + (tli**2) * 1.6888713097971020E-01 + (tli**(-1)) *  &
+   1.8735938211539585E+02 + (tli**(3)) * 5.0974564680442852E-04)* (satratli) +                                   &
+   (3.6409071302482083E+01 + tli * 1.7919859306449623E-01 + (tli**2) *(-1.0020116255895206E-03) + (tli**(-1)) *  &
+   (-8.3521083354432303E+03) + (tli**(3)) * 1.5879900546795635E-06)* satratli * LOG(rhoali)**(2))
           
         rc_i = (-3.6318550637865524E-08 + tli * 2.1740704135789128E-09   + (tli**2) *                            &
-             & (-8.5521429066506161E-12) + (tli**3) *(-9.3538647454573390E-15)) +                                &
-             & (2.1366936839394922E-08 + tli *(-2.4087168827395623E-10) + (tli**2) * 8.7969869277074319E-13 +    &
-             & (tli**3) *(-1.0294466881303291E-15))* LOG(satratli)**(-2) * LOG(rhoali)**(-1) +                   &
-             & (-7.7804007761164303E-10 + tli * 1.0327058173517932E-11 + (tli**2) *(-4.2557697639692428E-14) +   &
-             & (tli**3) * 5.4082507061618662E-17)* LOG(satratli)**(-2) +                                         &
-             & (3.2628927397420860E-12 + tli *(-7.6475692919751066E-14) + (tli**2) * 4.1985816845259788E-16 +    &
-             & (tli**3) *(-6.2281395889592719E-19))* LOG(satratli)**(-2) * LOG(rhoali) +                         &
-             & (2.0442205540818555E-09 + tli * 4.0441858911249830E-08 + (tli**2) *(-3.3423487629482825E-10) +    &
-             & (tli**3) * 6.8000404742985678E-13)* LOG(satratli)**(-1) * LOG(rhoali)**(-2) +                     &
-             & (1.8381489183824627E-08 + tli *(-8.9853322951518919E-09) + (tli**2) * 7.5888799566036185E-11 +    &
-             & (tli**3) *(-1.5823457864755549E-13))* LOG(satratli)**(-1) * LOG(rhoali)**(-1) +                   &
-             & (1.1795760639695057E-07 + tli *(-8.1046722896375875E-10) + (tli**2) * 9.1868604369041857E-14 +    &
-             & (tli**3) * 4.7882428237444610E-15)* LOG(satratli)**(-1) +                                         &
-             & (-4.4028846582545952E-09 + tli * 4.6541269232626618E-11 + (tli**2) *(-1.1939929984285194E-13) +   &
-             & (tli**3) * 2.3602037016614437E-17)* LOG(satratli)**(-1) * LOG(rhoali) +                           &
-             & (2.7885056884209128E-11 + tli *(-4.5167129624119121E-13) + (tli**2) * 1.6558404997394422E-15 +    &
-             & (tli**3) *(-1.2037336621218054E-18))* LOG(satratli)**(-1) * LOG(rhoali)**2 +                      &
-             & (-2.3719627171699983E-09 + tli *(-1.5260127909292053E-07) + (tli**2) * 1.7177017944754134E-09 +   &
-             & (tli**3) *(-4.7031737537526395E-12))* LOG(rhoali)**(-2) +                                         &
-             & (-5.6946433724699646E-09 + tli * 8.4629788237081735E-09 + (tli**2) *(-1.7674135187061521E-10) +   &
-             & (tli**3) * 6.6236547903091862E-13)* LOG(rhoali)**(-1) +                                           &
-             & (-2.2808617930606012E-08 + tli * 1.4773376696847775E-10 + (tli**2) *(-1.3076953119957355E-13) +   &
-             & (tli**3) * 2.3625301497914000E-16)* LOG(rhoali) +                                                 &
-             & (1.4014269939947841E-10 + tli *(-2.3675117757377632E-12) + (tli**2) * 5.1514033966707879E-15 +    &
-             & (tli**3) *(-4.8864233454747856E-18))* LOG(rhoali)**2 +                                            &
-             & (6.5464943868885886E-11 + tli * 1.6494354816942769E-08 + (tli**2) *(-1.7480097393483653E-10) +    &
-             & (tli**3) * 4.7460075628523984E-13)* LOG(satratli)* LOG(rhoali)**(-2) +                            &
-             & (8.4737893183927871E-09 + tli *(-6.0243327445597118E-09) + (tli**2) * 5.8766070529814883E-11 +    &
-             & (tli**3) *(-1.4926748560042018E-13))* LOG(satratli)* LOG(rhoali)**(-1) +                          &
-             & (1.0761964135701397E-07 + tli *(-1.0142496009071148E-09) + (tli**2) * 2.1337312466519190E-12 +    &
-             & (tli**3) * 1.6376014957685404E-15)* LOG(satratli) +                                               &
-             & (-3.5621571395968670E-09 + tli * 4.1175339587760905E-11 + (tli**2) *(-1.3535372357998504E-13) +   &
-             & (tli**3) * 8.9334219536920720E-17)* LOG(satratli)* LOG(rhoali) +                                  &
-             & (2.0700482083136289E-11 + tli *(-3.9238944562717421E-13) + (tli**2) * 1.5850961422040196E-15 +    &
-             & (tli**3) *(-1.5336775610911665E-18))* LOG(satratli)* LOG(rhoali)**2 +                             &
-             & (1.8524255464416206E-09 + tli *(-2.1959816152743264E-11) + (tli**2) *(-6.4478119501677012E-14) +  &
-             & (tli**3) * 5.5135243833766056E-16)* LOG(satratli)**2 * LOG(rhoali)**(-1) +                        &
-             & (1.9349488650922679E-09 + tli *(-2.2647295919976428E-11) + (tli**2) * 9.2917479748268751E-14 +    &
-             & (tli**3) *(-1.2741959892173170E-16))* LOG(satratli)**2 +                                          &
-             & (2.1484978031650972E-11 + tli *(-9.3976642475838013E-14) + (tli**2) *(-4.8892738002751923E-16) +  &
-             & (tli**3) * 1.4676120441783832E-18)* LOG(satratli)**2 * LOG(rhoali) +                              &
-             & (6.7565715216420310E-13 + tli *(-3.5421162549480807E-15) + (tli**2) *(-3.4201196868693569E-18) +  &
-             & (tli**3) * 2.2260187650412392E-20)* LOG(satratli)**3 * LOG(rhoali)
+   (-8.5521429066506161E-12) + (tli**3) *(-9.3538647454573390E-15)) +                                &
+   (2.1366936839394922E-08 + tli *(-2.4087168827395623E-10) + (tli**2) * 8.7969869277074319E-13 +    &
+   (tli**3) *(-1.0294466881303291E-15))* LOG(satratli)**(-2) * LOG(rhoali)**(-1) +                   &
+   (-7.7804007761164303E-10 + tli * 1.0327058173517932E-11 + (tli**2) *(-4.2557697639692428E-14) +   &
+   (tli**3) * 5.4082507061618662E-17)* LOG(satratli)**(-2) +                                         &
+   (3.2628927397420860E-12 + tli *(-7.6475692919751066E-14) + (tli**2) * 4.1985816845259788E-16 +    &
+   (tli**3) *(-6.2281395889592719E-19))* LOG(satratli)**(-2) * LOG(rhoali) +                         &
+   (2.0442205540818555E-09 + tli * 4.0441858911249830E-08 + (tli**2) *(-3.3423487629482825E-10) +    &
+   (tli**3) * 6.8000404742985678E-13)* LOG(satratli)**(-1) * LOG(rhoali)**(-2) +                     &
+   (1.8381489183824627E-08 + tli *(-8.9853322951518919E-09) + (tli**2) * 7.5888799566036185E-11 +    &
+   (tli**3) *(-1.5823457864755549E-13))* LOG(satratli)**(-1) * LOG(rhoali)**(-1) +                   &
+   (1.1795760639695057E-07 + tli *(-8.1046722896375875E-10) + (tli**2) * 9.1868604369041857E-14 +    &
+   (tli**3) * 4.7882428237444610E-15)* LOG(satratli)**(-1) +                                         &
+   (-4.4028846582545952E-09 + tli * 4.6541269232626618E-11 + (tli**2) *(-1.1939929984285194E-13) +   &
+   (tli**3) * 2.3602037016614437E-17)* LOG(satratli)**(-1) * LOG(rhoali) +                           &
+   (2.7885056884209128E-11 + tli *(-4.5167129624119121E-13) + (tli**2) * 1.6558404997394422E-15 +    &
+   (tli**3) *(-1.2037336621218054E-18))* LOG(satratli)**(-1) * LOG(rhoali)**2 +                      &
+   (-2.3719627171699983E-09 + tli *(-1.5260127909292053E-07) + (tli**2) * 1.7177017944754134E-09 +   &
+   (tli**3) *(-4.7031737537526395E-12))* LOG(rhoali)**(-2) +                                         &
+   (-5.6946433724699646E-09 + tli * 8.4629788237081735E-09 + (tli**2) *(-1.7674135187061521E-10) +   &
+   (tli**3) * 6.6236547903091862E-13)* LOG(rhoali)**(-1) +                                           &
+   (-2.2808617930606012E-08 + tli * 1.4773376696847775E-10 + (tli**2) *(-1.3076953119957355E-13) +   &
+   (tli**3) * 2.3625301497914000E-16)* LOG(rhoali) +                                                 &
+   (1.4014269939947841E-10 + tli *(-2.3675117757377632E-12) + (tli**2) * 5.1514033966707879E-15 +    &
+   (tli**3) *(-4.8864233454747856E-18))* LOG(rhoali)**2 +                                            &
+   (6.5464943868885886E-11 + tli * 1.6494354816942769E-08 + (tli**2) *(-1.7480097393483653E-10) +    &
+   (tli**3) * 4.7460075628523984E-13)* LOG(satratli)* LOG(rhoali)**(-2) +                            &
+   (8.4737893183927871E-09 + tli *(-6.0243327445597118E-09) + (tli**2) * 5.8766070529814883E-11 +    &
+   (tli**3) *(-1.4926748560042018E-13))* LOG(satratli)* LOG(rhoali)**(-1) +                          &
+   (1.0761964135701397E-07 + tli *(-1.0142496009071148E-09) + (tli**2) * 2.1337312466519190E-12 +    &
+   (tli**3) * 1.6376014957685404E-15)* LOG(satratli) +                                               &
+   (-3.5621571395968670E-09 + tli * 4.1175339587760905E-11 + (tli**2) *(-1.3535372357998504E-13) +   &
+   (tli**3) * 8.9334219536920720E-17)* LOG(satratli)* LOG(rhoali) +                                  &
+   (2.0700482083136289E-11 + tli *(-3.9238944562717421E-13) + (tli**2) * 1.5850961422040196E-15 +    &
+   (tli**3) *(-1.5336775610911665E-18))* LOG(satratli)* LOG(rhoali)**2 +                             &
+   (1.8524255464416206E-09 + tli *(-2.1959816152743264E-11) + (tli**2) *(-6.4478119501677012E-14) +  &
+   (tli**3) * 5.5135243833766056E-16)* LOG(satratli)**2 * LOG(rhoali)**(-1) +                        &
+   (1.9349488650922679E-09 + tli *(-2.2647295919976428E-11) + (tli**2) * 9.2917479748268751E-14 +    &
+   (tli**3) *(-1.2741959892173170E-16))* LOG(satratli)**2 +                                          &
+   (2.1484978031650972E-11 + tli *(-9.3976642475838013E-14) + (tli**2) *(-4.8892738002751923E-16) +  &
+   (tli**3) * 1.4676120441783832E-18)* LOG(satratli)**2 * LOG(rhoali) +                              &
+   (6.7565715216420310E-13 + tli *(-3.5421162549480807E-15) + (tli**2) *(-3.4201196868693569E-18) +  &
+   (tli**3) * 2.2260187650412392E-20)* LOG(satratli)**3 * LOG(rhoali)
                     
         na_i=x_i*ntot_i

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/so2_to_h2so4.F90

@@ -81 +81 @@
                  ! SO2 (molec/cm3): convert from kg/kgA
                  rrak1 = tr_seri(ilon,ilev,id_SO2_strat) &
-                      & *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mSO2mol
+   *pplay(ilon,ilev)/t_seri(ilon,ilev)/RD/1.E6/mSO2mol
                  
                  IF (rrak1 >= 0.0) THEN

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratdistrib.F90

@@ -41 +41 @@
              alt=altLMDz(k)+float(i_int)*(altLMDz(k+1)-altLMDz(k))/float(n_int_alt)
              f_lay_emiss(k)=f_lay_emiss(k)+1./(sqrt(2.*RPI)*sigma_alt)* &
-                   & exp(-0.5*((alt-altemiss)/sigma_alt)**2.)* &           
-                   & (altLMDz(k+1)-altLMDz(k))/float(n_int_alt)
+   exp(-0.5*((alt-altemiss)/sigma_alt)**2.)* &
+   (altLMDz(k+1)-altLMDz(k))/float(n_int_alt)
           ENDDO
           f_lay_sum=f_lay_sum+f_lay_emiss(k)
@@ -54 +54 @@
        DO k=1, klev
           f_lay_emiss(k)=max(min(altemiss+sigma_alt,altLMDz(k+1))- &
-                      & max(altemiss-sigma_alt, &
-                      & altLMDz(k)),0.)/(2.*sigma_alt)
+   max(altemiss-sigma_alt, &
+   altLMDz(k)),0.)/(2.*sigma_alt)
           f_lay_sum=f_lay_sum+f_lay_emiss(k)
        ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratemit.F90

@@ -54 +54 @@
     IF (is_mpi_root) THEN
        WRITE(*,*) 'IN STRATEMIT: date from phys_cal_mod=',year_cur,'-',&
-                      &  mth_cur,'-',day_cur,'-',hour,' flh2o=',flh2o
+    mth_cur,'-',day_cur,'-',hour,' flh2o=',flh2o
     ENDIF
 
@@ -75 +75 @@
                 
        IF (  xlat(i)>=latmin-dlat_loc .AND. &
-         &   xlat(i)<latmax+dlat_loc .AND. &
-         &   xlon(i)>=lonmin-dlon .AND. &
-         &   xlon(i)<lonmax+dlon ) THEN
+     xlat(i)<latmax+dlat_loc .AND. &
+     xlon(i)>=lonmin-dlon .AND. &
+     xlon(i)<lonmax+dlon ) THEN
                    !
           WRITE(*,*) 'coordinates of volcanic injection point=',&
-            &    xlat(i),xlon(i),day_cur,mth_cur,year_cur
+      xlat(i),xlon(i),day_cur,mth_cur,year_cur
           WRITE(*,*) 'DD m_emiss_vol_daily=', &
-            &    m_emiss_vol_daily
+      m_emiss_vol_daily
           
           !compute altLMDz
@@ -97 +97 @@
           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))
+   (sin(xlat_max_sai/180.*RPI)-sin(xlat_min_sai/180.*RPI))
           ELSE
              theta=1.
@@ -108 +108 @@
             ! stretch emission over stretchlong period
             emission=m_emiss_vol_daily/m_air_gridbox(i,k)*f_lay_emiss(k)/stretchlong/ &
-                 &     (86400.-pdt)*theta
+       (86400.-pdt)*theta
             
              IF(flag_verbose_strataer) WRITE(*,*) 'IN STRATEMIT: emission avant/apres', &
-              &  'alt= ', altLMDz(k), &
-              &  'flh2o= ',flh2o, &
-              &  'id_speac= ',id_spec,id_species_total, &
-              &  'emission= ',emission, &
-              &  'pdtphys= ',pdtphys, &
-              &  'rapport m_emiss/m_air*f_lay= ', m_emiss_vol_daily/m_air_gridbox(i,k)*f_lay_emiss(k), &
-              &   'stretchlong= ', stretchlong, &
-              &   'theta= ', theta
+    'alt= ', altLMDz(k), &
+    'flh2o= ',flh2o, &
+    'id_speac= ',id_spec,id_species_total, &
+    'emission= ',emission, &
+    'pdtphys= ',pdtphys, &
+    'rapport m_emiss/m_air*f_lay= ', m_emiss_vol_daily/m_air_gridbox(i,k)*f_lay_emiss(k), &
+     'stretchlong= ', stretchlong, &
+     'theta= ', theta
              
              IF(emission < 1.E-34) emission = 0.0
@@ -124 +124 @@
              IF (flh2o==0) THEN
                 IF(flag_verbose_strataer) WRITE(*,*) 'IN STRATEMIT: tr_ser avant/apres',&
-                  &  'i= ',i,'k= ',k, 'flh2o= ',flh2o, &
-                  &  tr_seri(i,k,id_spec), &
-                  &  tr_seri(i,k,id_spec)+emission*pdtphys
+    'i= ',i,'k= ',k, 'flh2o= ',flh2o, &
+    tr_seri(i,k,id_spec), &
+    tr_seri(i,k,id_spec)+emission*pdtphys
               
                 tr_seri(i,k,id_spec)=tr_seri(i,k,id_spec)+emission*pdtphys
@@ -141 +141 @@
                 
                 IF(flag_verbose_strataer) WRITE(*,*) 'IN STRATEMIT: ',&
-                     &  'i= ',i,'k= ',k, 'flh2o= ',flh2o, &
-                     &  'emission= ',emission, &
-                     &  'd_q_emiss(i,k)= ',d_q_emiss(i,k)
+    'i= ',i,'k= ',k, 'flh2o= ',flh2o, &
+    'emission= ',emission, &
+    'd_q_emiss(i,k)= ',d_q_emiss(i,k)
                 
                 IF(d_q_emiss(i,k) > 1.E34) THEN

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/sulfate_aer_mod.F90

@@ -84 +84 @@
 !       factor for converting dry to wet radius
         f_r_wet(ilon,ilev) = (dens_aer_dry/(DENSO4(ilon,ilev)*1.e3)/ & 
-                   &    (R2SO4(ilon,ilev)*1.e-2))**third
+      (R2SO4(ilon,ilev)*1.e-2))**third
 !    ***   End of H2SO4-H2O flat surface ***
 
@@ -121 +121 @@
 !            wet radius (m)
              radwet = 1.e-2*RRSI(IK)*(dens_aer_dry/(denso4ik*1.e3)/ & 
-                   &    (r2so4ik*1.e-2))**third
+      (r2so4ik*1.e-2))**third
              fkelvin=exp( 2.*1.e-3*surtens*1.e-6*mvh2o / (radwet*rgas*temp) ) 
              pph2okel=pph2ogas(ilon,ilev) / fkelvin
@@ -133 +133 @@
 !            factor for converting dry to wet radius
              f_r_wetB(ilon,ilev,IK) = (dens_aer_dry/(DENSO4B(ilon,ilev,IK)*1.e3)/ & 
-                   &    (R2SO4B(ilon,ilev,IK)*1.e-2))**third
+      (R2SO4B(ilon,ilev,IK)*1.e-2))**third
 !
 !             print*,'R,Rwet(m),kelvin,h2so4(%),ro=',RRSI(ik),radwet,fkelvin, &
@@ -565 +565 @@
 !   H2SO4 activity 
     DATA X/ & 
-     &   0.0,0.25,0.78,1.437,2.19,3.07,4.03,5.04,6.08 & 
-     &  ,7.13,8.18,14.33,18.59,28.59,39.17,49.49 & 
-     &  ,102.4,157.8,215.7,276.9,341.6,409.8,481.5,556.6 & 
-     &  ,635.5,719.,808.,902.,1000.,1103.,1211.,1322.,1437.,1555. & 
-     &  ,1677.,1800.,1926.,2054.,2183.,2312.,2442.,2572.,2701.,2829. & 
-     &  ,2955.,3080.,3203.,3325.,3446.,3564.,3681.,3796.,3910.,4022. & 
-     &  ,4134.,4351.,4564.,4771.,4974.,5171.,5364.,5551.,5732.,5908. & 
-     &  ,6079.,6244.,6404.,6559.,6709.,6854.,6994.,7131.,7264.,7393. & 
-     &  ,7520.,7821.,8105.,8373.,8627.,8867.,9093.,9308.,9511.,9703. & 
-     &  ,9885.,10060.,10225.,10535.,10819.,11079.,11318.,11537. & 
-     &  ,11740.,12097.,12407.,12676.,12915.,13126.,13564.,13910. & 
-     &  ,14191.,14423.,14617.,14786.,10568.,15299.,15491.,15654. & 
-     &  ,15811./
+     0.0,0.25,0.78,1.437,2.19,3.07,4.03,5.04,6.08 &
+    ,7.13,8.18,14.33,18.59,28.59,39.17,49.49 &
+    ,102.4,157.8,215.7,276.9,341.6,409.8,481.5,556.6 &
+    ,635.5,719.,808.,902.,1000.,1103.,1211.,1322.,1437.,1555. &
+    ,1677.,1800.,1926.,2054.,2183.,2312.,2442.,2572.,2701.,2829. &
+    ,2955.,3080.,3203.,3325.,3446.,3564.,3681.,3796.,3910.,4022. &
+    ,4134.,4351.,4564.,4771.,4974.,5171.,5364.,5551.,5732.,5908. &
+    ,6079.,6244.,6404.,6559.,6709.,6854.,6994.,7131.,7264.,7393. &
+    ,7520.,7821.,8105.,8373.,8627.,8867.,9093.,9308.,9511.,9703. &
+    ,9885.,10060.,10225.,10535.,10819.,11079.,11318.,11537. &
+    ,11740.,12097.,12407.,12676.,12915.,13126.,13564.,13910. &
+    ,14191.,14423.,14617.,14786.,10568.,15299.,15491.,15654. &
+    ,15811./
 !   H2SO4 weight fraction (percent)
     DATA XC/ & 
-     &   100.0,99.982,99.963,99.945,99.927,99.908,99.890,99.872 & 
-     &  ,99.853,99.835,99.817,99.725,99.634,99.452,99.270 & 
-     &  ,99.090,98.196,97.319,96.457,95.610,94.777,93.959,93.156 & 
-     &  ,92.365,91.588,90.824,90.073,89.334,88.607,87.892,87.188 & 
-     &  ,86.495,85.814,85.143,84.482,83.832,83.191,82.560,81.939 & 
-     &  ,81.327,80.724,80.130,79.545,78.968,78.399,77.839,77.286 & 
-     &  ,76.741,76.204,75.675,75.152,74.637,74.129,73.628,73.133 & 
-     &  ,72.164,71.220,70.300,69.404,68.530,67.678,66.847,66.037 & 
-     &  ,65.245,64.472,63.718,62.981,62.261,61.557,60.868,60.195 & 
-     &  ,59.537,58.893,58.263,57.646,56.159,54.747,53.405,52.126 & 
-     &  ,50.908,49.745,48.634,47.572,46.555,45.580,44.646,43.749 & 
-     &  ,42.059,40.495,39.043,37.691,36.430,35.251,33.107,31.209 & 
-     &  ,29.517,27.999,26.629,23.728,21.397,19.482,17.882,16.525 & 
-     &  ,15.360,13.461,11.980,10.792,9.819,8.932/
+     100.0,99.982,99.963,99.945,99.927,99.908,99.890,99.872 &
+    ,99.853,99.835,99.817,99.725,99.634,99.452,99.270 &
+    ,99.090,98.196,97.319,96.457,95.610,94.777,93.959,93.156 &
+    ,92.365,91.588,90.824,90.073,89.334,88.607,87.892,87.188 &
+    ,86.495,85.814,85.143,84.482,83.832,83.191,82.560,81.939 &
+    ,81.327,80.724,80.130,79.545,78.968,78.399,77.839,77.286 &
+    ,76.741,76.204,75.675,75.152,74.637,74.129,73.628,73.133 &
+    ,72.164,71.220,70.300,69.404,68.530,67.678,66.847,66.037 &
+    ,65.245,64.472,63.718,62.981,62.261,61.557,60.868,60.195 &
+    ,59.537,58.893,58.263,57.646,56.159,54.747,53.405,52.126 &
+    ,50.908,49.745,48.634,47.572,46.555,45.580,44.646,43.749 &
+    ,42.059,40.495,39.043,37.691,36.430,35.251,33.107,31.209 &
+    ,29.517,27.999,26.629,23.728,21.397,19.482,17.882,16.525 &
+    ,15.360,13.461,11.980,10.792,9.819,8.932/
 
     DO I=1,klon
@@ -776 +776 @@
       real, intent(in) :: T
       real, parameter ::      &
-              &  b1=1.01325e5, &
-              &  b2=11.5,  &
-              &  b3=1.0156e4,  &
-              &  b4=0.38/545., &
-              &  tref=360.15
+    b1=1.01325e5, &
+    b2=11.5,  &
+    b3=1.0156e4,  &
+    b4=0.38/545., &
+    tref=360.15
 
 !     saturation vapor pressure ( N/m2 = Pa = kg/(m.s2) )
       psh2so4_out=b1*exp(  -b2 +b3*( 1./tref-1./T  &
-           &  +b4*(1.+log(tref/T)-tref/T) )   )  
+    +b4*(1.+log(tref/T)-tref/T) )   )
 
        return
@@ -818 +818 @@
 !        saturation vapor pressure (N/m2 = 1 Pa = 1 kg/(m·s2))
          psh2o_out=exp( 77.34491296  -7235.424651/T &
-             &                 -8.2*log(T) + 5.7133e-3*T )
+                   -8.2*log(T) + 5.7133e-3*T )
       else
 !        Tabazadeh et al., 1997, parameterization for 185<T<260
@@ -825 +825 @@
 ;
          psh2o_out=18.452406985 -3505.1578807/T &
-              &    -330918.55082/(T*T)             &
-              &    +12725068.262/(T*T*T)
+      -330918.55082/(T*T)             &
+      +12725068.262/(T*T*T)
 !        in Pa
          psh2o_out=100.*exp(psh2o_out)
@@ -844 +844 @@
       real, intent(in) :: T, so4mfrac
       real, parameter :: &
-           &      a1= 0.7681724,&
-           &      a2= 2.184714, &
-           &      a3= 7.163002, &
-           &      a4=-44.31447, &
-           &      a5= 88.74606, &
-           &      a6=-75.73729, &
-           &      a7= 23.43228
+        a1= 0.7681724,&
+        a2= 2.184714, &
+        a3= 7.163002, &
+        a4=-44.31447, &
+        a5= 88.74606, &
+        a6=-75.73729, &
+        a7= 23.43228
       real, parameter :: &
-           &      b1= 1.808225e-3, &
-           &      b2=-9.294656e-3, &
-           &      b3=-3.742148e-2, &
-           &      b4= 2.565321e-1, &
-           &      b5=-5.362872e-1, &
-           &      b6= 4.857736e-1, &
-           &      b7=-1.629592e-1
+        b1= 1.808225e-3, &
+        b2=-9.294656e-3, &
+        b3=-3.742148e-2, &
+        b4= 2.565321e-1, &
+        b5=-5.362872e-1, &
+        b6= 4.857736e-1, &
+        b7=-1.629592e-1
       real, parameter :: &
-           &      c1=-3.478524e-6, &
-           &      c2= 1.335867e-5, &
-           &      c3= 5.195706e-5, &
-           &      c4=-3.717636e-4, &
-           &      c5= 7.990811e-4, &
-           &      c6=-7.458060e-4, &
-           &      c7= 2.581390e-4
+        c1=-3.478524e-6, &
+        c2= 1.335867e-5, &
+        c3= 5.195706e-5, &
+        c4=-3.717636e-4, &
+        c5= 7.990811e-4, &
+        c6=-7.458060e-4, &
+        c7= 2.581390e-4
       real :: a,b,c,so4m2,so4m3,so4m4,so4m5,so4m6
       
@@ -876 +876 @@
 
       a=+a1+a2*so4mfrac+a3*so4m2+a4*so4m3 &
-         &     +a5*so4m4+a6*so4m5+a7*so4m6
+       +a5*so4m4+a6*so4m5+a7*so4m6
       b=+b1+b2*so4mfrac+b3*so4m2+b4*so4m3 &
-         &     +b5*so4m4+b6*so4m5+b7*so4m6
+       +b5*so4m4+b6*so4m5+b7*so4m6
       c=+c1+c2*so4mfrac+c3*so4m2+c4*so4m3 &
-         &     +c5*so4m4+c6*so4m5+c7*so4m6
+       +c5*so4m4+c6*so4m5+c7*so4m6
       density_out=(a+b*T+c*T*T) ! units are gm/cm**3
 
@@ -895 +895 @@
       real :: a,b,so4mfrac,so4m2,so4m3,so4m4,so4m5,so4sig
       real, parameter :: &
-            &     a1= 0.11864, &
-            &     a2=-0.11651, &
-            &     a3= 0.76852, &
-            &     a4=-2.40909, &
-            &     a5= 2.95434, &
-            &     a6=-1.25852
+       a1= 0.11864, &
+       a2=-0.11651, &
+       a3= 0.76852, &
+       a4=-2.40909, &
+       a5= 2.95434, &
+       a6=-1.25852
       real, parameter :: &
-            &     b1=-1.5709e-4, &
-            &     b2= 4.0102e-4, &
-            &     b3=-2.3995e-3, &
-            &     b4= 7.611235e-3, &
-            &     b5=-9.37386e-3, &
-            &     b6= 3.89722e-3
+       b1=-1.5709e-4, &
+       b2= 4.0102e-4, &
+       b3=-2.3995e-3, &
+       b4= 7.611235e-3, &
+       b5=-9.37386e-3, &
+       b6= 3.89722e-3
       real, parameter :: convfac=1.e3  ! convert from newton/m to dyne/cm
       real, parameter :: Mw=18.01528, Ma=98.079
@@ -957 +957 @@
             if(aw <= 0.05 .and. aw > 0.) then
                y1=12.372089320*aw**(-0.16125516114) &
-                 &  -30.490657554*aw -2.1133114241
+    -30.490657554*aw -2.1133114241
                y2=13.455394705*aw**(-0.19213122550) &
-                 &  -34.285174607*aw -1.7620073078
+    -34.285174607*aw -1.7620073078
             else if(aw <= 0.85 .and. aw > 0.05) then
                y1=11.820654354*aw**(-0.20786404244) &
-                 &  -4.8073063730*aw -5.1727540348
+    -4.8073063730*aw -5.1727540348
                y2=12.891938068*aw**(-0.23233847708) &
-                 &  -6.4261237757*aw -4.9005471319
+    -6.4261237757*aw -4.9005471319
             else
                y1=-180.06541028*aw**(-0.38601102592) &
-                 &  -93.317846778*aw +273.88132245
+    -93.317846778*aw +273.88132245
                y2=-176.95814097*aw**(-0.36257048154) &
-                 &  -90.469744201*aw +267.45509988
+    -90.469744201*aw +267.45509988
             end if
 !        h2so4 molality (m=moles of h2so4 (solute)/ kg of h2o(solvent))
@@ -1029 +1029 @@
       real, intent(in) :: T, ws
       real, dimension(22),parameter :: x=(/  &
-       & 2.393284E-02,-4.359335E-05,7.961181E-08,0.0,-0.198716351, &
-       & 1.39564574E-03,-2.020633E-06,0.51684706,-3.0539E-03,4.505475E-06, &
-       & -0.30119511,1.840408E-03,-2.7221253742E-06,-0.11331674116, &
-       & 8.47763E-04,-1.22336185E-06,0.3455282,-2.2111E-03,3.503768245E-06, &
-       & -0.2315332,1.60074E-03,-2.5827835E-06/)
+   2.393284E-02,-4.359335E-05,7.961181E-08,0.0,-0.198716351, &
+   1.39564574E-03,-2.020633E-06,0.51684706,-3.0539E-03,4.505475E-06, &
+   -0.30119511,1.840408E-03,-2.7221253742E-06,-0.11331674116, &
+   8.47763E-04,-1.22336185E-06,0.3455282,-2.2111E-03,3.503768245E-06, &
+   -0.2315332,1.60074E-03,-2.5827835E-06/)
       
       real :: w

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/traccoag_mod.F90

@@ -11 +11 @@
     
     USE phys_local_var_mod, ONLY: mdw, R2SO4, DENSO4, f_r_wet, surf_PM25_sulf, & 
-        & budg_emi_ocs, budg_emi_so2, budg_emi_h2so4, budg_emi_part, &
-        & R2SO4B, DENSO4B, f_r_wetB, sulfmmr, SAD_sulfate, sulfmmr_mode, nd_mode
+   budg_emi_ocs, budg_emi_so2, budg_emi_h2so4, budg_emi_part, &
+   R2SO4B, DENSO4B, f_r_wetB, sulfmmr, SAD_sulfate, sulfmmr_mode, nd_mode
     
     USE dimphy
@@ -340 +340 @@
           !and are dry at T = 20 deg. C and 50 perc. humidity
           surf_PM25_sulf(i)=surf_PM25_sulf(i)+tr_seri(i,1,it+nbtr_sulgas) &
-                           & *132./98.*dens_aer_dry*4./3.*RPI*(mdw(it)/2.)**3 &
-                           & *pplay(i,1)/t_seri(i,1)/RD*1.e9
+   *132./98.*dens_aer_dry*4./3.*RPI*(mdw(it)/2.)**3 &
+   *pplay(i,1)/t_seri(i,1)/RD*1.e9
         ENDIF
       ENDDO
@@ -366 +366 @@
               !     equivalent to condensed H2SO4 mmr= H2SO4 kg / kgA in bin it
               sulfmmr_mode(i,j,it) = tr_seri(i,j,it+nbtr_sulgas) &        ! [DRY part/kgA in bin it] 
-                   &  *(4./3.)*RPI*(mdw(it)/2.)**3.   &                   ! [mdw: dry diameter in m] 
-                   &  *dens_aer_dry                                       ! [dry aerosol mass density in kg/m3] 
+    *(4./3.)*RPI*(mdw(it)/2.)**3.   &                   ! [mdw: dry diameter in m]
+    *dens_aer_dry                                       ! [dry aerosol mass density in kg/m3]
               
               !     sulfmmr: Sulfate aerosol concentration (dry mass mixing ratio) 
@@ -375 +375 @@
               !     nd_mode: particle concentration in different modes (DRY part/m3)
               nd_mode(i,j,it) = tr_seri(i,j,it+nbtr_sulgas) &             ! [DRY part/kgA in bin it] 
-                   & *pplay(i,j)/t_seri(i,j)/RD                           ! [air mass concentration in kg air /m3A]
+   *pplay(i,j)/t_seri(i,j)/RD                           ! [air mass concentration in kg air /m3A]
               
               IF(flag_new_strat_compo) THEN
                  !     SAD_sulfate: SAD WET sulfate aerosols (cm2/cm3)
                  SAD_sulfate(i,j) = SAD_sulfate(i,j) + nd_mode(i,j,it) &     ! [DRY part/m3A (in bin it)] 
-                      &  *4.*RPI*( mdw(it)*f_r_wetB(i,j,it)/2. )**2. &       ! [WET SA of part it in m2] 
-                      &  *1.e-2                                              ! conversion from m2/m3 to cm2/cm3A
+    *4.*RPI*( mdw(it)*f_r_wetB(i,j,it)/2. )**2. &       ! [WET SA of part it in m2]
+    *1.e-2                                              ! conversion from m2/m3 to cm2/cm3A
               ELSE
                  !     SAD_sulfate: SAD WET sulfate aerosols (cm2/cm3)
                  SAD_sulfate(i,j) = SAD_sulfate(i,j) + nd_mode(i,j,it) &     ! [DRY part/m3A (in bin it)] 
-                      &  *4.*RPI*( mdw(it)*f_r_wet(i,j)/2. )**2. &           ! [WET SA of part it in m2] 
-                      &  *1.e-2                                              ! conversion from m2/m3 to cm2/cm3A
+    *4.*RPI*( mdw(it)*f_r_wet(i,j)/2. )**2. &           ! [WET SA of part it in m2]
+    *1.e-2                                              ! conversion from m2/m3 to cm2/cm3A
               ENDIF
            ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90

@@ -107 +107 @@
 USE cmp_seri_mod
 USE phys_output_var_mod, ONLY : d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
-  &           , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
+             , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
 IMPLICIT none
 INCLUDE "YOMCST.h"
@@ -390 +390 @@
           print*,'PLANTAGE2 POUR LE POINT i itap lon lat txt jbad zdt t',&
                  i,itap,longitude_deg(i),latitude_deg(i),text,jbad, &
-       &        zdt(i,k),t_seri(i,k)-zdt(i,k)
+          zdt(i,k),t_seri(i,k)-zdt(i,k)
 !!!       if(prt_level.ge.10.and.itap.GE.229.and.i.EQ.3027) THEN 
           print*,'l    T     dT       Q     dQ    '
@@ -408 +408 @@
           print*,'WARNING  : EAU2 POUR LE POINT i itap lon lat txt jqbad zdq q zdql ql',&
                  i,itap,longitude_deg(i),latitude_deg(i),text,jqbad,&
-       &        zdq(i,k), q_seri(i,k)-zdq(i,k), zdql(i,k), ql_seri(i,k)-zdql(i,k)
+          zdq(i,k), q_seri(i,k)-zdq(i,k), zdql(i,k), ql_seri(i,k)-zdql(i,k)
 !!!       if(prt_level.ge.10.and.itap.GE.229.and.i.EQ.3027) THEN 
           print*,'l    T     dT       Q     dQ    '
@@ -508 +508 @@
 USE cmp_seri_mod
 USE phys_output_var_mod, ONLY : d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
-  &           , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
+             , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
 IMPLICIT none
   include "YOMCST.h"
@@ -735 +735 @@
 USE cmp_seri_mod
 USE phys_output_var_mod, ONLY : d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
-  &           , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
+             , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col
 USE phys_local_var_mod, ONLY: evap, sens
 USE phys_local_var_mod, ONLY: u_seri, v_seri, ql_seri, qs_seri, qbs_seri, q_seri, t_seri &
-   &  , rain_lsc, snow_lsc
+    , rain_lsc, snow_lsc
 USE climb_hq_mod, ONLY : d_h_col_vdf, f_h_bnd
 IMPLICIT none
@@ -773 +773 @@
       bilq_bnd = - rain_lsc(1) - snow_lsc(1)
       bilh_bnd = (-(rcw-rcpd)*t_seri(1,1) + rlvtt) * rain_lsc(1) &
-    &         + (-(rcs-rcpd)*t_seri(1,1) + rlstt) * snow_lsc(1)
+           + (-(rcs-rcpd)*t_seri(1,1) + rlstt) * snow_lsc(1)
   CASE("bsss") param
       bilq_bnd = - bs_fall(1)
@@ -780 +780 @@
       bilq_bnd = - rain_con(1) - snow_con(1)
       bilh_bnd = (-(rcw-rcpd)*t_seri(1,1) + rlvtt) * rain_con(1) &
-    &         + (-(rcs-rcpd)*t_seri(1,1) + rlstt) * snow_con(1)
+           + (-(rcs-rcpd)*t_seri(1,1) + rlstt) * snow_con(1)
   CASE("SW") param
       bilh_bnd = topsw(1) - solsw(1)

LMDZ6/branches/Amaury_dev/libf/phylmd/albsno.F90

@@ -56 +56 @@
   DO i = 1, knon
      agesno(i)  = (agesno(i) + (1.-agesno(i)/50.)*dtime/86400.)&
-          &             * EXP(-1.*MAX(0.0,precip_snow(i))*dtime/0.3)
+               * EXP(-1.*MAX(0.0,precip_snow(i))*dtime/0.3)
      agesno(i) =  MAX(agesno(i),0.0)
   ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90

@@ -3 +3 @@
 !
       subroutine calltherm(dtime  &
-     &      ,pplay,paprs,pphi,weak_inversion  &
-     &      ,u_seri_,v_seri_,t_seri_,q_seri_,t_env,q_env,zqsat,debut  &
-     &      ,d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs  &
-     &    ,fm_therm,entr_therm,detr_therm,zqasc,clwcon0,lmax,ratqscth,&
-     &       ratqsdiff,zqsatth,ale_bl,alp_bl,lalim_conv,wght_th, &
-     &       zmax0,f0,zw2,fraca,ztv,zpspsk,ztla,zthl &
+        ,pplay,paprs,pphi,weak_inversion  &
+        ,u_seri_,v_seri_,t_seri_,q_seri_,t_env,q_env,zqsat,debut  &
+        ,d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs  &
+      ,fm_therm,entr_therm,detr_therm,zqasc,clwcon0,lmax,ratqscth,&
+         ratqsdiff,zqsatth,ale_bl,alp_bl,lalim_conv,wght_th, &
+         zmax0,f0,zw2,fraca,ztv,zpspsk,ztla,zthl &
 !!! nrlmd le 10/04/2012
-     &      ,pbl_tke,pctsrf,omega,airephy &
-     &      ,zlcl_th,fraca0,w0,w_conv,therm_tke_max0,env_tke_max0 &
-     &      ,n2,s2,strig,zcong,ale_bl_stat &
-     &      ,therm_tke_max,env_tke_max &
-     &      ,alp_bl_det,alp_bl_fluct_m,alp_bl_fluct_tke &
-     &      ,alp_bl_conv,alp_bl_stat &
+        ,pbl_tke,pctsrf,omega,airephy &
+        ,zlcl_th,fraca0,w0,w_conv,therm_tke_max0,env_tke_max0 &
+        ,n2,s2,strig,zcong,ale_bl_stat &
+        ,therm_tke_max,env_tke_max &
+        ,alp_bl_det,alp_bl_fluct_m,alp_bl_fluct_tke &
+        ,alp_bl_conv,alp_bl_stat &
 !!! fin nrlmd le 10/04/2012
-     &      ,zqla,ztva &
+        ,zqla,ztva &
 #ifdef ISO         
-     &      ,xt_seri,d_xt_ajs &
+        ,xt_seri,d_xt_ajs &
 #ifdef DIAGISO         
-     &      ,q_the,xt_the &
+        ,q_the,xt_the &
 #endif
 #endif         
-     &   )
+     )
 
       USE dimphy
@@ -239 +239 @@
       if (iso_eau.gt.0) then
        call iso_verif_egalite_vect2D( &
-     &           xt_seri,q_seri, &
-     &           'calltherm 174',ntiso,klon,klev) 
+             xt_seri,q_seri, &
+             'calltherm 174',ntiso,klon,klev)
       endif !if (iso_eau.gt.0) then
 #endif    
@@ -251 +251 @@
           if (iflag_thermals>=1000) then
             CALL thermcell_2002(klon,klev,zdt,iflag_thermals   &
-     &      ,pplay,paprs,pphi  &
-     &      ,u_seri,v_seri,t_seri,q_seri  &
-     &      ,d_u_the,d_v_the,d_t_the,d_q_the  &
-     &      ,zfm_therm,zentr_therm,fraca,zw2  &
-     &      ,r_aspect_thermals,30.,w2di_thermals  &
-     &      ,tau_thermals)
+        ,pplay,paprs,pphi  &
+        ,u_seri,v_seri,t_seri,q_seri  &
+        ,d_u_the,d_v_the,d_t_the,d_q_the  &
+        ,zfm_therm,zentr_therm,fraca,zw2  &
+        ,r_aspect_thermals,30.,w2di_thermals  &
+        ,tau_thermals)
           else if (iflag_thermals==2) then
             CALL thermcell_sec(klon,klev,zdt  &
-     &      ,pplay,paprs,pphi,zlev  &
-     &      ,u_seri,v_seri,t_seri,q_seri  &
-     &      ,d_u_the,d_v_the,d_t_the,d_q_the  &
-     &      ,zfm_therm,zentr_therm  &
-     &      ,r_aspect_thermals,30.,w2di_thermals  &
-     &      ,tau_thermals)
+        ,pplay,paprs,pphi,zlev  &
+        ,u_seri,v_seri,t_seri,q_seri  &
+        ,d_u_the,d_v_the,d_t_the,d_q_the  &
+        ,zfm_therm,zentr_therm  &
+        ,r_aspect_thermals,30.,w2di_thermals  &
+        ,tau_thermals)
           else if (iflag_thermals==3) then
             CALL thermcell(klon,klev,zdt  &
-     &      ,pplay,paprs,pphi  &
-     &      ,u_seri,v_seri,t_seri,q_seri  &
-     &      ,d_u_the,d_v_the,d_t_the,d_q_the  &
-     &      ,zfm_therm,zentr_therm  &
-     &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
-     &      ,tau_thermals)
+        ,pplay,paprs,pphi  &
+        ,u_seri,v_seri,t_seri,q_seri  &
+        ,d_u_the,d_v_the,d_t_the,d_q_the  &
+        ,zfm_therm,zentr_therm  &
+        ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
+        ,tau_thermals)
           else if (iflag_thermals==10) then
             CALL thermcell_eau(klon,klev,zdt  &
-     &      ,pplay,paprs,pphi  &
-     &      ,u_seri,v_seri,t_seri,q_seri  &
-     &      ,d_u_the,d_v_the,d_t_the,d_q_the  &
-     &      ,zfm_therm,zentr_therm  &
-     &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
-     &      ,tau_thermals)
+        ,pplay,paprs,pphi  &
+        ,u_seri,v_seri,t_seri,q_seri  &
+        ,d_u_the,d_v_the,d_t_the,d_q_the  &
+        ,zfm_therm,zentr_therm  &
+        ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
+        ,tau_thermals)
           else if (iflag_thermals==11) then
               abort_message = 'cas non prevu dans calltherm'
@@ -286 +286 @@
           else if (iflag_thermals==12) then
             CALL calcul_sec(klon,klev,zdt  &
-     &      ,pplay,paprs,pphi,zlev  &
-     &      ,u_seri,v_seri,t_seri,q_seri  &
-     &      ,zmax_sec,wmax_sec,zw_sec,lmix_sec  &
-     &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
-     &      ,tau_thermals)
+        ,pplay,paprs,pphi,zlev  &
+        ,u_seri,v_seri,t_seri,q_seri  &
+        ,zmax_sec,wmax_sec,zw_sec,lmix_sec  &
+        ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
+        ,tau_thermals)
           else if (iflag_thermals==13.or.iflag_thermals==14) then
               abort_message = 'thermcellV0_main enleve svn>2084'
@@ -296 +296 @@
           else if (new_thermcell) then
             CALL thermcell_main(itap,klon,klev,zdt  &
-     &      ,pplay,paprs,pphi,debut  &
-     &      ,u_seri,v_seri,t_seri,q_seri,t_env,q_env  &
-     &      ,d_u_the,d_v_the,d_t_the,d_q_the  &
-     &      ,zfm_therm,zentr_therm,zdetr_therm,zqasc,zqla,lmax  &
-     &      ,ratqscth,ratqsdiff,zqsatth  &
-     &      ,zmax0,f0,zw2,fraca,ztv,zpspsk &
-     &      ,ztla,zthl,ztva &
-     &      ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax,zcong &
+        ,pplay,paprs,pphi,debut  &
+        ,u_seri,v_seri,t_seri,q_seri,t_env,q_env  &
+        ,d_u_the,d_v_the,d_t_the,d_q_the  &
+        ,zfm_therm,zentr_therm,zdetr_therm,zqasc,zqla,lmax  &
+        ,ratqscth,ratqsdiff,zqsatth  &
+        ,zmax0,f0,zw2,fraca,ztv,zpspsk &
+        ,ztla,zthl,ztva &
+        ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax,zcong &
 #ifdef ISO         
-     &      ,xt_seri,d_xt_the &
+        ,xt_seri,d_xt_the &
 #endif         
-     &   ) 
+     )
 
             CALL thermcell_alp(klon,klev,zdt  &                      ! in
-     &        ,pplay,paprs  &                                        ! in
-     &        ,zfm_therm,zentr_therm,lmax  &                         ! in
-     &        ,pbl_tke,pctsrf,omega,airephy &                        ! in
-     &        ,zw2,fraca &                                           ! in
-     &        ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax &  ! in
-     &        ,zcong,ale,alp,lalim_conv,wght_th &                          ! out
-     &        ,zlcl_th,fraca0,w0,w_conv,therm_tke_max0,env_tke_max0 &! out
-     &        ,n2,s2,strig,ale_bl_stat &                                   ! out
-     &        ,therm_tke_max,env_tke_max &                           ! out
-     &        ,alp_bl_det,alp_bl_fluct_m,alp_bl_fluct_tke &          ! out
-     &        ,alp_bl_conv,alp_bl_stat &                             ! out
-     &        )
+          ,pplay,paprs  &                                        ! in
+          ,zfm_therm,zentr_therm,lmax  &                         ! in
+          ,pbl_tke,pctsrf,omega,airephy &                        ! in
+          ,zw2,fraca &                                           ! in
+          ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax &  ! in
+          ,zcong,ale,alp,lalim_conv,wght_th &                          ! out
+          ,zlcl_th,fraca0,w0,w_conv,therm_tke_max0,env_tke_max0 &! out
+          ,n2,s2,strig,ale_bl_stat &                                   ! out
+          ,therm_tke_max,env_tke_max &                           ! out
+          ,alp_bl_det,alp_bl_fluct_m,alp_bl_fluct_tke &          ! out
+          ,alp_bl_conv,alp_bl_stat &                             ! out
+          )
 
            if (prt_level>10) write(lunout,*)'Apres thermcell_main OK'
@@ -366 +366 @@
             d_q_the(:,k)=d_q_the(:,k)*dtime*fact(:)
             fm_therm(:,k)=fm_therm(:,k)  &
-     &      +zfm_therm(:,k)*fact(:)
+        +zfm_therm(:,k)*fact(:)
             entr_therm(:,k)=entr_therm(:,k)  &
-     &       +zentr_therm(:,k)*fact(:)
+         +zentr_therm(:,k)*fact(:)
             detr_therm(:,k)=detr_therm(:,k)  &
-     &       +zdetr_therm(:,k)*fact(:)
+         +zdetr_therm(:,k)*fact(:)
 #ifdef ISO
             do ixt=1,ntiso
@@ -409 +409 @@
 !     &   d_xt_the(iso_hdo,i,k),d_q_the(i,k)
       call iso_verif_aberrant_enc_vect2D( &
-     &        xt_seri,q_seri, &
-     &        'calltherm 353, apres ajout d_xt_the',ntiso,klon,klev)
+          xt_seri,q_seri, &
+          'calltherm 353, apres ajout d_xt_the',ntiso,klon,klev)
       endif      
 #endif
@@ -451 +451 @@
       if (iso_HDO.gt.0) then
       call iso_verif_aberrant_enc_vect2D( &
-     &        xt_seri,q_seri, &
-     &        'calltherm 393, apres bidouille q<0',ntiso,klon,klev)
+          xt_seri,q_seri, &
+          'calltherm 393, apres bidouille q<0',ntiso,klon,klev)
       endif      
 #endif
@@ -489 +489 @@
                   endif
                   detrc_therm(i,k)=(fmc_therm(i,k+1)-fm_therm(i,k+1))  &
-     &                 -(fmc_therm(i,k)-fm_therm(i,k))
+                   -(fmc_therm(i,k)-fm_therm(i,k))
                enddo
             enddo
@@ -504 +504 @@
             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)
+                +entr_therm(i,k)*q_seri(i,k))/fmc_therm(i,k+1)
 !CR:test on asseche le thermique
 !               zqasc(i,k)=zqasc(i,k)/2.
@@ -520 +520 @@
                    clwcon0(i,k)=zqasc(i,k)-zqsat(i,k)
                    if (clwcon0(i,k)<0. .or.   &
-     &             (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
+               (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
                       clwcon0(i,k)=0.
                    endif
@@ -530 +530 @@
                    clwcon0(i,k)=zqla(i,k)  
                    if (clwcon0(i,k)<0. .or.   &
-     &             (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
+               (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
                    clwcon0(i,k)=0. 
                    endif

LMDZ6/branches/Amaury_dev/libf/phylmd/cdrag_mod.F90

@@ -407 +407 @@
                   PH=0.5802-0.1571*MU+0.0327*(MU**2)-0.0026*(MU**3)
                   CH=CHstar*B*CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i))) &
-                     & * CKAPT/LOG(z0h(i)+zgeop1(i)/(RG*z0h(i)))       &
-                     & * ((zgeop1(i)/(RG*z0h(i)))**PH)
+   * CKAPT/LOG(z0h(i)+zgeop1(i)/(RG*z0h(i)))       &
+   * ((zgeop1(i)/(RG*z0h(i)))**PH)
                   CM=CMstar*B*CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i))) &
-                     & *CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i)))         &
-                     & * ((zgeop1(i)/(RG*z0m(i)))**PM)
+   *CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i)))         &
+   * ((zgeop1(i)/(RG*z0m(i)))**PM)
                   FM(i)=1.-B*zri(i)/(1.+CM*SQRT(ABS(zri(i))))
                   FH(i)=1.-B*zri(i)/(1.+CH*SQRT(ABS(zri(i))))
@@ -561 +561 @@
                 PH=0.5802-0.1571*MU+0.0327*(MU**2)-0.0026*(MU**3)
                 CH=CHstar*B*CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i))) &
-                   & * CKAPT/LOG(z0h(i)+zgeop1(i)/(RG*z0h(i)))       &
-                   & * ((zgeop1(i)/(RG*z0h(i)))**PH)
+   * CKAPT/LOG(z0h(i)+zgeop1(i)/(RG*z0h(i)))       &
+   * ((zgeop1(i)/(RG*z0h(i)))**PH)
                 CM=CMstar*B*CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i))) &
-                   & *CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i)))         &
-                   & * ((zgeop1(i)/(RG*z0m(i)))**PM)
+   *CKAP/LOG(z0m(i)+zgeop1(i)/(RG*z0m(i)))         &
+   * ((zgeop1(i)/(RG*z0m(i)))**PM)
                 FM(i)=1.-B*zri(i)/(1.+CM*SQRT(ABS(zri(i))))
                 FH(i)=1.-B*zri(i)/(1.+CH*SQRT(ABS(zri(i))))

LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/lidar_simulator.F90

@@ -378 +378 @@
 !     opt. thick of each layer
       tau_mol(:,1:nlev) = alpha_mol(:,1:nlev) &
-         & *(zheight(:,2:nlev+1)-zheight(:,1:nlev))
+   *(zheight(:,2:nlev+1)-zheight(:,1:nlev))
 !     opt. thick from TOA
       DO k = nlev-1, 1, -1
@@ -390 +390 @@
 !       opt. thick of each layer
         tau_part(:,:,i) = tau_part(:,:,i) &
-           & * (zheight(:,2:nlev+1)-zheight(:,1:nlev) )
+   * (zheight(:,2:nlev+1)-zheight(:,1:nlev) )
 !       opt. thick from TOA
         DO k = nlev-1, 1, -1 
@@ -400 +400 @@
 !      Upper layer 
        pmol(:,nlev) = beta_mol(:,nlev) / (2.*tau_mol(:,nlev)) &
-            & * (1.-exp(-2.0*tau_mol(:,nlev)))
+   * (1.-exp(-2.0*tau_mol(:,nlev)))
 !      Other layers
        DO k= nlev-1, 1, -1
@@ -406 +406 @@
         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(:)))
+   * (1.-exp(-2.0*tau_mol_lay(:)))
         ELSEWHERE
 !         This must never happend, but just in case, to avoid div. by 0
@@ -429 +429 @@
 !     Upper layer 
       pnorm(:,nlev) = betatot(:,nlev) / (2.*tautot(:,nlev)) &
-            & * (1.-exp(-2.0*tautot(:,nlev)))
+   * (1.-exp(-2.0*tautot(:,nlev)))
 
 !     Other layers
@@ -436 +436 @@
         WHERE (tautot_lay(:)>0.)
           pnorm(:,k) = betatot(:,k) * EXP(-2.0*tautot(:,k+1)) / (2.*tautot_lay(:)) &
-               & * (1.-EXP(-2.0*tautot_lay(:)))
+   * (1.-EXP(-2.0*tautot_lay(:)))
         ELSEWHERE
 !         This must never happend, but just in case, to avoid div. by 0
@@ -468 +468 @@
 !     Upper layer
       pnorm_ice(:,nlev) = betatot_ice(:,nlev) / (2.*tautot_ice(:,nlev)) &
-            & * (1.-exp(-2.0*tautot_ice(:,nlev)))
+   * (1.-exp(-2.0*tautot_ice(:,nlev)))
 
       DO k= nlev-1, 1, -1
@@ -474 +474 @@
         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(:)))
+   * (1.-EXP(-2.0*tautot_lay_ice(:)))
         ELSEWHERE
          pnorm_ice(:,k)=betatot_ice(:,k)*EXP(-2.0*tautot_ice(:,k+1))
@@ -483 +483 @@
 !     Upper layer
       pnorm_liq(:,nlev) = betatot_liq(:,nlev) / (2.*tautot_liq(:,nlev)) &
-            & * (1.-exp(-2.0*tautot_liq(:,nlev)))
+   * (1.-exp(-2.0*tautot_liq(:,nlev)))
 
       DO k= nlev-1, 1, -1
@@ -489 +489 @@
         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(:)))
+   * (1.-EXP(-2.0*tautot_lay_liq(:)))
         ELSEWHERE
           pnorm_liq(:,k)=betatot_liq(:,k)*EXP(-2.0*tautot_liq(:,k+1))
@@ -510 +510 @@
 !     Upper layer 
       beta_perp_ice(:,nlev) = pnorm_perp_ice(:,nlev) * (2.*tautot_ice(:,nlev)) &
-            & / (1.-exp(-2.0*tautot_ice(:,nlev)))
+   / (1.-exp(-2.0*tautot_ice(:,nlev)))
 
       DO k= nlev-1, 1, -1
@@ -516 +516 @@
         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(:)))
+   / (1.-exp(-2.0*tautot_lay_ice(:)))
 
         ELSEWHERE
@@ -526 +526 @@
 !     Upper layer 
       beta_perp_liq(:,nlev) = pnorm_perp_liq(:,nlev) * (2.*tautot_liq(:,nlev)) &
-            & / (1.-exp(-2.0*tautot_liq(:,nlev)))
+   / (1.-exp(-2.0*tautot_liq(:,nlev)))
 
       DO k= nlev-1, 1, -1
@@ -532 +532 @@
         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(:)))
+   * (2.*tautot_lay_liq(:)) / (1.-exp(-2.0*tautot_lay_liq(:)))
 
         ELSEWHERE
@@ -550 +550 @@
           pnorm_perp_tot(:,nlev) = &
               (beta_perp_ice(:,nlev)+beta_perp_liq(:,nlev)-(beta_mol(:,nlev)/(1+1/0.0284))) / (2.*tautot(:,nlev)) &
-              & * (1.-exp(-2.0*tautot(:,nlev)))
+   * (1.-exp(-2.0*tautot(:,nlev)))
     ELSEWHERE
     pnorm_perp_tot(:,nlev) = 0.
@@ -570 +570 @@
                           (beta_perp_ice(:,k)+beta_perp_liq(:,k)-(beta_mol(:,k)/(1+1/0.0284))) * &
                           EXP(-2.0*tautot(:,k+1)) / (2.*tautot_lay(:)) &
-                          & * (1.-EXP(-2.0*tautot_lay(:)))
+   * (1.-EXP(-2.0*tautot_lay(:)))
                     ELSEWHERE
           !         This must never happen, but just in case, to avoid div. by 0

LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_optics.F90

@@ -391 +391 @@
           ! Optical thickness of each layer (particles)
           tau_part(1:npoints,icol,1:nlev,i) = tau_part(1:npoints,icol,1:nlev,i) &
-               & * (zheight(1:npoints,1:nlev)-zheight(1:npoints,2:nlev+1) )
+   * (zheight(1:npoints,1:nlev)-zheight(1:npoints,2:nlev+1) )
           ! Optical thickness from TOA to layer k (particles)
           do k=2,nlev

LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_optics.F90

@@ -440 +440 @@
           ! Optical thickness of each layer (particles)
           tau_part(1:npoints,1:nlev,i) = tau_part(1:npoints,1:nlev,i) &
-               & * (zheight(1:npoints,1:nlev)-zheight(1:npoints,2:nlev+1) )
+   * (zheight(1:npoints,1:nlev)-zheight(1:npoints,2:nlev+1) )
           ! Optical thickness from TOA to layer k (particles)
           do k=zi,zf,zinc

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/mod_1D_amma_read.F90

@@ -125 +125 @@
         print*,'Allocations OK'
         call read_amma(nid,nlev_amma,nt_amma                                  &
-     &     ,z_amma,plev_amma,th_amma,q_amma,u_amma,v_amma,vitw_amma         &
-     &     ,ht_amma,hq_amma,sens_amma,lat_amma)
+       ,z_amma,plev_amma,th_amma,q_amma,u_amma,v_amma,vitw_amma         &
+       ,ht_amma,hq_amma,sens_amma,lat_amma)
 
 END SUBROUTINE read_1D_cases
@@ -172 +172 @@
 !=====================================================================
       subroutine read_amma(nid,nlevel,ntime                          &
-     &     ,zz,pp,temp,qv,u,v,dw                   &
-     &     ,dt,dq,sens,flat)
+       ,zz,pp,temp,qv,u,v,dw                   &
+       ,dt,dq,sens,flat)
 
 !program reading forcings of the AMMA case study
@@ -345 +345 @@
 !======================================================================
         SUBROUTINE interp_amma_time(day,day1,annee_ref                     &
-     &         ,year_ini_amma,day_ini_amma,nt_amma,dt_amma,nlev_amma       &
-     &         ,vitw_amma,ht_amma,hq_amma,lat_amma,sens_amma               &
-     &         ,vitw_prof,ht_prof,hq_prof,lat_prof,sens_prof)
+           ,year_ini_amma,day_ini_amma,nt_amma,dt_amma,nlev_amma       &
+           ,vitw_amma,ht_amma,hq_amma,lat_amma,sens_amma               &
+           ,vitw_prof,ht_prof,hq_prof,lat_prof,sens_prof)
         implicit none
 
@@ -426 +426 @@
        if (it_amma1 > nt_amma) then
         write(*,*) 'PB-stop: day, it_amma1, it_amma2, timeit: '            &
-     &        ,day,day_ini_amma,it_amma1,it_amma2,timeit/86400.
+          ,day,day_ini_amma,it_amma1,it_amma2,timeit/86400.
         stop
        endif
@@ -439 +439 @@
 
        lat_prof = lat_amma(it_amma2)                                       &
-     &          -frac*(lat_amma(it_amma2)-lat_amma(it_amma1)) 
+            -frac*(lat_amma(it_amma2)-lat_amma(it_amma1))
        sens_prof = sens_amma(it_amma2)                                     &
-     &          -frac*(sens_amma(it_amma2)-sens_amma(it_amma1))
+            -frac*(sens_amma(it_amma2)-sens_amma(it_amma1))
 
        do k=1,nlev_amma
         vitw_prof(k) = vitw_amma(k,it_amma2)                               &
-     &          -frac*(vitw_amma(k,it_amma2)-vitw_amma(k,it_amma1))
+            -frac*(vitw_amma(k,it_amma2)-vitw_amma(k,it_amma1))
         ht_prof(k) = ht_amma(k,it_amma2)                                   &
-     &          -frac*(ht_amma(k,it_amma2)-ht_amma(k,it_amma1))
+            -frac*(ht_amma(k,it_amma2)-ht_amma(k,it_amma1))
         hq_prof(k) = hq_amma(k,it_amma2)                                   &
-     &          -frac*(hq_amma(k,it_amma2)-hq_amma(k,it_amma1))
+            -frac*(hq_amma(k,it_amma2)-hq_amma(k,it_amma1))
         enddo
 

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/mod_1D_cases_read.F90

@@ -184 +184 @@
         print*,'Allocations OK'
         call read_cas(nid,nlev_cas,nt_cas                                       &
-     &     ,z_cas,plev_cas,t_cas,q_cas,rh_cas,th_cas,rv_cas,u_cas,v_cas         &
-     &     ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas,dv_cas,hv_cas,vv_cas    &
-     &     ,dt_cas,dtrad_cas,ht_cas,vt_cas,dq_cas,hq_cas,vq_cas                 &
-     &     ,dth_cas,hth_cas,vth_cas,dr_cas,hr_cas,vr_cas,sens_cas,lat_cas,ts_cas&
-     &     ,ustar_cas,uw_cas,vw_cas,q1_cas,q2_cas)
+       ,z_cas,plev_cas,t_cas,q_cas,rh_cas,th_cas,rv_cas,u_cas,v_cas         &
+       ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas,dv_cas,hv_cas,vv_cas    &
+       ,dt_cas,dtrad_cas,ht_cas,vt_cas,dq_cas,hq_cas,vq_cas                 &
+       ,dth_cas,hth_cas,vth_cas,dr_cas,hr_cas,vr_cas,sens_cas,lat_cas,ts_cas&
+       ,ustar_cas,uw_cas,vw_cas,q1_cas,q2_cas)
         print*,'Read cas OK'
 
@@ -255 +255 @@
   !=====================================================================
       subroutine read_cas(nid,nlevel,ntime                          &
-     &     ,zz,pp,temp,qv,rh,theta,rv,u,v,ug,vg,w,                   &
-     &     du,hu,vu,dv,hv,vv,dt,dtrad,ht,vt,dq,hq,vq,                     &
-     &     dth,hth,vth,dr,hr,vr,sens,flat,ts,ustar,uw,vw,q1,q2)
+       ,zz,pp,temp,qv,rh,theta,rv,u,v,ug,vg,w,                   &
+       du,hu,vu,dv,hv,vv,dt,dtrad,ht,vt,dq,hq,vq,                     &
+       dth,hth,vth,dr,hr,vr,sens,flat,ts,ustar,uw,vw,q1,q2)
 
 !program reading forcing of the case study
@@ -804 +804 @@
         SUBROUTINE interp_case_time(day,day1,annee_ref                &
 !    &         ,year_cas,day_cas,nt_cas,pdt_forc,nlev_cas      &
-     &         ,nt_cas,nlev_cas                                       &
-     &         ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas               &
-     &         ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas           &
-     &         ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas   &
-     &         ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas       &
-     &         ,uw_cas,vw_cas,q1_cas,q2_cas                           &
-     &         ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas       &
-     &         ,u_prof_cas,v_prof_cas,ug_prof_cas,vg_prof_cas         &
-     &         ,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas     &
-     &         ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas       &
-     &         ,ht_prof_cas,vt_prof_cas,dtrad_prof_cas,dq_prof_cas    &
-     &         ,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas    &
-     &         ,ustar_prof_cas,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas)
+           ,nt_cas,nlev_cas                                       &
+           ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas               &
+           ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas           &
+           ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas   &
+           ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas       &
+           ,uw_cas,vw_cas,q1_cas,q2_cas                           &
+           ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas       &
+           ,u_prof_cas,v_prof_cas,ug_prof_cas,vg_prof_cas         &
+           ,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas     &
+           ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas       &
+           ,ht_prof_cas,vt_prof_cas,dtrad_prof_cas,dq_prof_cas    &
+           ,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas    &
+           ,ustar_prof_cas,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas)
 
 
@@ -931 +931 @@
        if (it_cas1 > nt_cas) then
         write(*,*) 'PB-stop: day, day_ju_ini_cas,it_cas1, it_cas2, timeit: '            &
-     &        ,day,day_ju_ini_cas,it_cas1,it_cas2,timeit
+          ,day,day_ju_ini_cas,it_cas1,it_cas2,timeit
         stop
        endif
@@ -944 +944 @@
 
        lat_prof_cas = lat_cas(it_cas2)                                       &
-     &          -frac*(lat_cas(it_cas2)-lat_cas(it_cas1))
+            -frac*(lat_cas(it_cas2)-lat_cas(it_cas1))
        sens_prof_cas = sens_cas(it_cas2)                                     &
-     &          -frac*(sens_cas(it_cas2)-sens_cas(it_cas1))
+            -frac*(sens_cas(it_cas2)-sens_cas(it_cas1))
        ts_prof_cas = ts_cas(it_cas2)                                         &
-     &          -frac*(ts_cas(it_cas2)-ts_cas(it_cas1))
+            -frac*(ts_cas(it_cas2)-ts_cas(it_cas1))
        ustar_prof_cas = ustar_cas(it_cas2)                                   &
-     &          -frac*(ustar_cas(it_cas2)-ustar_cas(it_cas1))
+            -frac*(ustar_cas(it_cas2)-ustar_cas(it_cas1))
 
        do k=1,nlev_cas
         plev_prof_cas(k) = plev_cas(k,it_cas2)                               &
-     &          -frac*(plev_cas(k,it_cas2)-plev_cas(k,it_cas1))
+            -frac*(plev_cas(k,it_cas2)-plev_cas(k,it_cas1))
         t_prof_cas(k) = t_cas(k,it_cas2)                               &
-     &          -frac*(t_cas(k,it_cas2)-t_cas(k,it_cas1))
+            -frac*(t_cas(k,it_cas2)-t_cas(k,it_cas1))
         q_prof_cas(k) = q_cas(k,it_cas2)                               &
-     &          -frac*(q_cas(k,it_cas2)-q_cas(k,it_cas1))
+            -frac*(q_cas(k,it_cas2)-q_cas(k,it_cas1))
         u_prof_cas(k) = u_cas(k,it_cas2)                               &
-     &          -frac*(u_cas(k,it_cas2)-u_cas(k,it_cas1))
+            -frac*(u_cas(k,it_cas2)-u_cas(k,it_cas1))
         v_prof_cas(k) = v_cas(k,it_cas2)                               &
-     &          -frac*(v_cas(k,it_cas2)-v_cas(k,it_cas1))
+            -frac*(v_cas(k,it_cas2)-v_cas(k,it_cas1))
         ug_prof_cas(k) = ug_cas(k,it_cas2)                               &
-     &          -frac*(ug_cas(k,it_cas2)-ug_cas(k,it_cas1))
+            -frac*(ug_cas(k,it_cas2)-ug_cas(k,it_cas1))
         vg_prof_cas(k) = vg_cas(k,it_cas2)                               &
-     &          -frac*(vg_cas(k,it_cas2)-vg_cas(k,it_cas1))
+            -frac*(vg_cas(k,it_cas2)-vg_cas(k,it_cas1))
         vitw_prof_cas(k) = vitw_cas(k,it_cas2)                               &
-     &          -frac*(vitw_cas(k,it_cas2)-vitw_cas(k,it_cas1))
+            -frac*(vitw_cas(k,it_cas2)-vitw_cas(k,it_cas1))
         du_prof_cas(k) = du_cas(k,it_cas2)                                   &
-     &          -frac*(du_cas(k,it_cas2)-du_cas(k,it_cas1))
+            -frac*(du_cas(k,it_cas2)-du_cas(k,it_cas1))
         hu_prof_cas(k) = hu_cas(k,it_cas2)                                   &
-     &          -frac*(hu_cas(k,it_cas2)-hu_cas(k,it_cas1))
+            -frac*(hu_cas(k,it_cas2)-hu_cas(k,it_cas1))
         vu_prof_cas(k) = vu_cas(k,it_cas2)                                   &
-     &          -frac*(vu_cas(k,it_cas2)-vu_cas(k,it_cas1))
+            -frac*(vu_cas(k,it_cas2)-vu_cas(k,it_cas1))
         dv_prof_cas(k) = dv_cas(k,it_cas2)                                   &
-     &          -frac*(dv_cas(k,it_cas2)-dv_cas(k,it_cas1))
+            -frac*(dv_cas(k,it_cas2)-dv_cas(k,it_cas1))
         hv_prof_cas(k) = hv_cas(k,it_cas2)                                   &
-     &          -frac*(hv_cas(k,it_cas2)-hv_cas(k,it_cas1))
+            -frac*(hv_cas(k,it_cas2)-hv_cas(k,it_cas1))
         vv_prof_cas(k) = vv_cas(k,it_cas2)                                   &
-     &          -frac*(vv_cas(k,it_cas2)-vv_cas(k,it_cas1))
+            -frac*(vv_cas(k,it_cas2)-vv_cas(k,it_cas1))
         dt_prof_cas(k) = dt_cas(k,it_cas2)                                   &
-     &          -frac*(dt_cas(k,it_cas2)-dt_cas(k,it_cas1))
+            -frac*(dt_cas(k,it_cas2)-dt_cas(k,it_cas1))
         ht_prof_cas(k) = ht_cas(k,it_cas2)                                   &
-     &          -frac*(ht_cas(k,it_cas2)-ht_cas(k,it_cas1))
+            -frac*(ht_cas(k,it_cas2)-ht_cas(k,it_cas1))
         vt_prof_cas(k) = vt_cas(k,it_cas2)                                   &
-     &          -frac*(vt_cas(k,it_cas2)-vt_cas(k,it_cas1))
+            -frac*(vt_cas(k,it_cas2)-vt_cas(k,it_cas1))
         dtrad_prof_cas(k) = dtrad_cas(k,it_cas2)                                   &
-     &          -frac*(dtrad_cas(k,it_cas2)-dtrad_cas(k,it_cas1))
+            -frac*(dtrad_cas(k,it_cas2)-dtrad_cas(k,it_cas1))
         dq_prof_cas(k) = dq_cas(k,it_cas2)                                   &
-     &          -frac*(dq_cas(k,it_cas2)-dq_cas(k,it_cas1))
+            -frac*(dq_cas(k,it_cas2)-dq_cas(k,it_cas1))
         hq_prof_cas(k) = hq_cas(k,it_cas2)                                   &
-     &          -frac*(hq_cas(k,it_cas2)-hq_cas(k,it_cas1))
+            -frac*(hq_cas(k,it_cas2)-hq_cas(k,it_cas1))
         vq_prof_cas(k) = vq_cas(k,it_cas2)                                   &
-     &          -frac*(vq_cas(k,it_cas2)-vq_cas(k,it_cas1))
+            -frac*(vq_cas(k,it_cas2)-vq_cas(k,it_cas1))
        uw_prof_cas(k) = uw_cas(k,it_cas2)                                   &
-     &          -frac*(uw_cas(k,it_cas2)-uw_cas(k,it_cas1))
+            -frac*(uw_cas(k,it_cas2)-uw_cas(k,it_cas1))
        vw_prof_cas(k) = vw_cas(k,it_cas2)                                   &
-     &          -frac*(vw_cas(k,it_cas2)-vw_cas(k,it_cas1))
+            -frac*(vw_cas(k,it_cas2)-vw_cas(k,it_cas1))
        q1_prof_cas(k) = q1_cas(k,it_cas2)                                   &
-     &          -frac*(q1_cas(k,it_cas2)-q1_cas(k,it_cas1))
+            -frac*(q1_cas(k,it_cas2)-q1_cas(k,it_cas1))
        q2_prof_cas(k) = q2_cas(k,it_cas2)                                   &
-     &          -frac*(q2_cas(k,it_cas2)-q2_cas(k,it_cas1))
+            -frac*(q2_cas(k,it_cas2)-q2_cas(k,it_cas1))
         enddo
 

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/old_lmdz1d.F90

@@ -458 +458 @@
         type_ts_forcing = 0
         if (forcing_toga.or.forcing_sandu.or.forcing_astex .or. forcing_dice)                 &
-     &    type_ts_forcing = 1
+      type_ts_forcing = 1
 !
 ! Initialization of the logical switch for nudging
@@ -549 +549 @@
 ! Convert the initial date of Toga-Coare to Julian day
       call ymds2ju                                                          &
-     & (year_ini_toga,mth_ini_toga,day_ini_toga,heure,day_ju_ini_toga)
+   (year_ini_toga,mth_ini_toga,day_ini_toga,heure,day_ju_ini_toga)
 
       ELSEIF (forcing_type ==4) THEN
 ! Convert the initial date of TWPICE to Julian day
       call ymds2ju                                                          &
-     & (year_ini_twpi,mth_ini_twpi,day_ini_twpi,heure_ini_twpi              &
-     & ,day_ju_ini_twpi)
+   (year_ini_twpi,mth_ini_twpi,day_ini_twpi,heure_ini_twpi              &
+   ,day_ju_ini_twpi)
       ELSEIF (forcing_type ==6) THEN
 ! Convert the initial date of AMMA to Julian day
       call ymds2ju                                                          &
-     & (year_ini_amma,mth_ini_amma,day_ini_amma,heure_ini_amma              &
-     & ,day_ju_ini_amma)
+   (year_ini_amma,mth_ini_amma,day_ini_amma,heure_ini_amma              &
+   ,day_ju_ini_amma)
       ELSEIF (forcing_type ==7) THEN
 ! Convert the initial date of DICE to Julian day
       call ymds2ju                                                         &
-     & (year_ini_dice,mth_ini_dice,day_ini_dice,heure_ini_dice             & 
-     & ,day_ju_ini_dice)
+   (year_ini_dice,mth_ini_dice,day_ini_dice,heure_ini_dice             &
+   ,day_ju_ini_dice)
  ELSEIF (forcing_type ==8 ) THEN
 ! Convert the initial date of GABLS4 to Julian day
       call ymds2ju                                                         &
-     & (year_ini_gabls4,mth_ini_gabls4,day_ini_gabls4,heure_ini_gabls4     & 
-     & ,day_ju_ini_gabls4)
+   (year_ini_gabls4,mth_ini_gabls4,day_ini_gabls4,heure_ini_gabls4     &
+   ,day_ju_ini_gabls4)
       ELSEIF (forcing_type >100) THEN
 ! Convert the initial date to Julian day
@@ -576 +576 @@
       print*,'time case',year_ini_cas,mth_ini_cas,day_ini_cas
       call ymds2ju                                                         &
-     & (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas*3600            &
-     & ,day_ju_ini_cas)
+   (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas*3600            &
+   ,day_ju_ini_cas)
       print*,'time case 2',day_ini_cas,day_ju_ini_cas
       ELSEIF (forcing_type ==59) THEN
 ! Convert the initial date of Sandu case to Julian day
       call ymds2ju                                                          &
-     &   (year_ini_sandu,mth_ini_sandu,day_ini_sandu,                       &
-     &    time_ini*3600.,day_ju_ini_sandu)
+     (year_ini_sandu,mth_ini_sandu,day_ini_sandu,                       &
+      time_ini*3600.,day_ju_ini_sandu)
 
       ELSEIF (forcing_type ==60) THEN
 ! Convert the initial date of Astex case to Julian day
       call ymds2ju                                                          &
-     &   (year_ini_astex,mth_ini_astex,day_ini_astex,                        &
-     &    time_ini*3600.,day_ju_ini_astex)
+     (year_ini_astex,mth_ini_astex,day_ini_astex,                        &
+      time_ini*3600.,day_ju_ini_astex)
 
       ELSEIF (forcing_type ==61) THEN
 ! Convert the initial date of Arm_cu case to Julian day
       call ymds2ju                                                          &
-     & (year_ini_armcu,mth_ini_armcu,day_ini_armcu,heure_ini_armcu          &
-     & ,day_ju_ini_armcu)
+   (year_ini_armcu,mth_ini_armcu,day_ini_armcu,heure_ini_armcu          &
+   ,day_ju_ini_armcu)
       ENDIF
 
@@ -606 +606 @@
       call ju2ymds(daytime,year_print, month_print,day_print,sec_print)
       print *,' Time of beginning : ',                                      &
-     &        year_print, month_print, day_print, sec_print
+          year_print, month_print, day_print, sec_print
 
 !---------------------------------------------------------------------
@@ -852 +852 @@
 
         print*,'nat_surf,pctsrf(1,is_oce),pctsrf(1,is_ter)',nat_surf         &
-     &        ,pctsrf(1,is_oce),pctsrf(1,is_ter)
+          ,pctsrf(1,is_oce),pctsrf(1,is_ter)
 
         zmasq=pctsrf(1,is_ter)+pctsrf(1,is_lic)
@@ -989 +989 @@
 ! fabrication de limit.nc
       call writelim (1,phy_nat,phy_alb,phy_sst,phy_bil,phy_rug,             &
-     &               phy_ice,phy_fter,phy_foce,phy_flic,phy_fsic)
+                 phy_ice,phy_fter,phy_foce,phy_flic,phy_fsic)
 
 
@@ -997 +997 @@
         print*,'call to restart dyn 1d'
         Call dyn1deta0("start1dyn.nc",plev,play,phi,phis,presnivs,          &
-     &              u,v,temp,q,omega2)
+                u,v,temp,q,omega2)
 
        print*,'fnday,annee_ref,day_ref,day_ini',                            &
-     &     fnday,annee_ref,day_ref,day_ini
+       fnday,annee_ref,day_ref,day_ini
 !**      call ymds2ju(annee_ref,mois,day_ini,heure,day)
        day = day_ini
@@ -1052 +1052 @@
        if (prt_level>=1) then
          print*,'XXXXXXXXXXXXXXXXXXX ITAP,day,time=',                       &
-     &             it,day,time,it_end,day_step
+               it,day,time,it_end,day_step
          print*,'PAS DE TEMPS ',timestep
        endif
@@ -1065 +1065 @@
         do l = 1, llm-1
           phi(l+1)=phi(l)+RD*(temp(l)+temp(l+1))*                           &
-     &    (play(l)-play(l+1))/(play(l)+play(l+1))
+      (play(l)-play(l+1))/(play(l)+play(l+1))
         enddo
 
@@ -1095 +1095 @@
          print *,' avant physiq : -------- day time ',day,time
          write(*,*) 'firstcall,lastcall,phis',                               &
-     &               firstcall,lastcall,phis
+                 firstcall,lastcall,phis
        end if
        if (prt_level>=5) then
          write(*,'(a10,2a4,4a13)') 'BEFOR1 IT=','it','l',                   &
-     &        'presniv','plev','play','phi'
+          'presniv','plev','play','phi'
          write(*,'(a10,2i4,4f13.2)') ('BEFOR1 IT= ',it,l,                   &
-     &         presnivs(l),plev(l),play(l),phi(l),l=1,llm)
+           presnivs(l),plev(l),play(l),phi(l),l=1,llm)
          write(*,'(a11,2a4,a11,6a8)') 'BEFOR2','it','l',                    &
-     &         'presniv','u','v','temp','q1','q2','omega2'
+           'presniv','u','v','temp','q1','q2','omega2'
          write(*,'(a11,2i4,f11.2,5f8.2,e10.2)') ('BEFOR2 IT= ',it,l,         &
-     &   presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
+     presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
        endif
 
@@ -1123 +1123 @@
         if (prt_level>=5) then
           write(*,'(a11,2a4,4a13)') 'AFTER1 IT=','it','l',                  &
-     &        'presniv','plev','play','phi'
+          'presniv','plev','play','phi'
           write(*,'(a11,2i4,4f13.2)') ('AFTER1 it= ',it,l,                  &
-     &    presnivs(l),plev(l),play(l),phi(l),l=1,llm)
+      presnivs(l),plev(l),play(l),phi(l),l=1,llm)
           write(*,'(a11,2a4,a11,6a8)') 'AFTER2','it','l',                   &
-     &         'presniv','u','v','temp','q1','q2','omega2'
+           'presniv','u','v','temp','q1','q2','omega2'
           write(*,'(a11,2i4,f11.2,5f8.2,e10.2)') ('AFTER2 it= ',it,l,       &
-     &    presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
+      presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
           write(*,'(a11,2a4,a11,5a8)') 'AFTER3','it','l',                   &
-     &         'presniv','du_phys','dv_phys','dt_phys','dq1','dq2'    
+           'presniv','du_phys','dv_phys','dt_phys','dq1','dq2'
            write(*,'(a11,2i4,f11.2,5f8.2)') ('AFTER3 it= ',it,l,            &
-     &      presnivs(l),86400*du_phys(l),86400*dv_phys(l),                   &
-     &       86400*dt_phys(l),86400*dq(l,1),dq(l,2),l=1,llm)
+        presnivs(l),86400*du_phys(l),86400*dv_phys(l),                   &
+         86400*dt_phys(l),86400*dq(l,1),dq(l,2),l=1,llm)
           write(*,*) 'dpsrf',dpsrf
         endif
@@ -1151 +1151 @@
 
        if (forcing_toga .or. forcing_GCSSold .or. forcing_twpice            &
-     &    .or.forcing_amma .or. forcing_type==101) then
+      .or.forcing_amma .or. forcing_type==101) then
          fcoriolis=0.0 ; ug=0. ; vg=0.
        endif
@@ -1198 +1198 @@
 !
         du_age(1:mxcalc)= -2.*sfdt/timestep*                                &
-     &          (sfdt*(u(1:mxcalc)-ug(1:mxcalc)) -                          &
-     &           cfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
+            (sfdt*(u(1:mxcalc)-ug(1:mxcalc)) -                          &
+             cfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
 !!     : fcoriolis*(v(1:mxcalc)-vg(1:mxcalc))
 !
        dv_age(1:mxcalc)= -2.*sfdt/timestep*                                 &
-     &          (cfdt*(u(1:mxcalc)-ug(1:mxcalc)) +                           &
-     &           sfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
+            (cfdt*(u(1:mxcalc)-ug(1:mxcalc)) +                           &
+             sfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
 !!     : -fcoriolis*(u(1:mxcalc)-ug(1:mxcalc))
 !
@@ -1216 +1216 @@
       if (nudge(inudge_RHT)) then
         call nudge_RHT(timestep,plev,play,t_targ,rh_targ,temp,q(:,1),     &
-    &                  d_t_nudge,d_q_nudge(:,1))
+                    d_t_nudge,d_q_nudge(:,1))
       endif
       if (nudge(inudge_UV)) then
         call nudge_UV(timestep,plev,play,u_targ,v_targ,u,v,     &
-    &                  d_u_nudge,d_v_nudge)
+                    d_u_nudge,d_v_nudge)
       endif
 !
@@ -1263 +1263 @@
       else
         u(1:mxcalc)=u(1:mxcalc) + timestep*(                                &
-     &              du_phys(1:mxcalc)                                       &
-     &             +du_age(1:mxcalc)+du_adv(1:mxcalc)                       &
-     &             +d_u_nudge(1:mxcalc) )            
+                du_phys(1:mxcalc)                                       &
+               +du_age(1:mxcalc)+du_adv(1:mxcalc)                       &
+               +d_u_nudge(1:mxcalc) )
         v(1:mxcalc)=v(1:mxcalc) + timestep*(                                 &
-     &              dv_phys(1:mxcalc)                                       &
-     &             +dv_age(1:mxcalc)+dv_adv(1:mxcalc)                       &
-     &             +d_v_nudge(1:mxcalc) )
+                dv_phys(1:mxcalc)                                       &
+               +dv_age(1:mxcalc)+dv_adv(1:mxcalc)                       &
+               +d_v_nudge(1:mxcalc) )
         q(1:mxcalc,:)=q(1:mxcalc,:)+timestep*(                              &
-     &                dq(1:mxcalc,:)                                        &
-     &               +d_q_adv(1:mxcalc,:)                                   &
-     &               +d_q_nudge(1:mxcalc,:) )
+                  dq(1:mxcalc,:)                                        &
+                 +d_q_adv(1:mxcalc,:)                                   &
+                 +d_q_nudge(1:mxcalc,:) )
 
         if (prt_level>=3) then
           print *,                                                          &
-     &    'physiq-> temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1) ',         &
-     &              temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1)
+      'physiq-> temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1) ',         &
+                temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1)
            print* ,'dv_phys=',dv_phys
            print* ,'dv_age=',dv_age
@@ -1288 +1288 @@
 
         temp(1:mxcalc)=temp(1:mxcalc)+timestep*(                            &
-     &              dt_phys(1:mxcalc)                                       &
-     &             +d_t_adv(1:mxcalc)                                      &
-     &             +d_t_nudge(1:mxcalc)                                      &
-     &             +dt_cooling(1:mxcalc))  ! Taux de chauffage ou refroid.
+                dt_phys(1:mxcalc)                                       &
+               +d_t_adv(1:mxcalc)                                      &
+               +d_t_nudge(1:mxcalc)                                      &
+               +dt_cooling(1:mxcalc))  ! Taux de chauffage ou refroid.
 
 #ifdef OUTPUT_PHYS_SCM
@@ -1308 +1308 @@
       IF (nudge_tsoil .AND. .NOT. lastcall) THEN
        ftsoil(1,isoil_nudge,:) = ftsoil(1,isoil_nudge,:)                     &
-     &  -timestep/tau_soil_nudge*(ftsoil(1,isoil_nudge,:)-Tsoil_nudge)
+    -timestep/tau_soil_nudge*(ftsoil(1,isoil_nudge,:)-Tsoil_nudge)
       ENDIF
 
@@ -1358 +1358 @@
 ! -------------------------------------
        call dyn1dredem("restart1dyn.nc",                                    &
-     &              plev,play,phi,phis,presnivs,                            &
-     &              u,v,temp,q,omega2)
+                plev,play,phi,phis,presnivs,                            &
+                u,v,temp,q,omega2)
 
         CALL abort_gcm ('lmdz1d   ','The End  ',0)

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/replay1d.F90

@@ -143 +143 @@
  
       IF(ngrid/=2+(jm-2)*(im-1).AND.ngrid/=1)                          &
-     &    STOP 'probleme de dim'
+      STOP 'probleme de dim'
 !   traitement des poles
       CALL SCOPY(nfield,pdyn,im*jm,pfi,ngrid)

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/scm.F90

@@ -376 +376 @@
       print*,'time case',year_ini_cas,mth_ini_cas,day_ini_cas
       call ymds2ju                                                         &
-     & (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas*3600            &
-     & ,day_ju_ini_cas)
+   (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas*3600            &
+   ,day_ju_ini_cas)
       print*,'time case 2',day_ini_cas,day_ju_ini_cas
       daytime = day + heure_ini_cas/24. ! 1st day and initial time of the simulation 
@@ -384 +384 @@
       call ju2ymds(daytime,year_print, month_print,day_print,sec_print)
       print *,' Time of beginning : ',                                      &
-     &        year_print, month_print, day_print, sec_print
+          year_print, month_print, day_print, sec_print
 
 !---------------------------------------------------------------------
@@ -615 +615 @@
 
         print*,'nat_surf,pctsrf(1,is_oce),pctsrf(1,is_ter)',nat_surf         &
-     &        ,pctsrf(1,is_oce),pctsrf(1,is_ter)
+          ,pctsrf(1,is_oce),pctsrf(1,is_ter)
 
         zmasq=pctsrf(1,is_ter)+pctsrf(1,is_lic)
@@ -746 +746 @@
 ! fabrication de limit.nc
       call writelim (1,phy_nat,phy_alb,phy_sst,phy_bil,phy_rug,             &
-     &               phy_ice,phy_fter,phy_foce,phy_flic,phy_fsic)
+                 phy_ice,phy_fter,phy_foce,phy_flic,phy_fsic)
 
 
@@ -754 +754 @@
         print*,'call to restart dyn 1d'
         Call dyn1deta0("start1dyn.nc",plev,play,phi,phis,presnivs,          &
-     &              u,v,temp,q,omega2)
+                u,v,temp,q,omega2)
 
        print*,'fnday,annee_ref,day_ref,day_ini',                            &
-     &     fnday,annee_ref,day_ref,day_ini
+       fnday,annee_ref,day_ref,day_ini
 !**      call ymds2ju(annee_ref,mois,day_ini,heure,day)
        day = day_ini
@@ -800 +800 @@
        if (prt_level>=1) then
          print*,'XXXXXXXXXXXXXXXXXXX ITAP,day,time=',                       &
-     &             it,day,time,it_end,day_step
+               it,day,time,it_end,day_step
          print*,'PAS DE TEMPS ',timestep
        endif
@@ -822 +822 @@
         do l = 1, llm-1
           phi(l+1)=phi(l)+RD*(temp(l)+temp(l+1))*                           &
-     &    (play(l)-play(l+1))/(play(l)+play(l+1))
+      (play(l)-play(l+1))/(play(l)+play(l+1))
         enddo
 
@@ -861 +861 @@
          print *,' avant physiq : -------- day time ',day,time
          write(*,*) 'firstcall,lastcall,phis',                               &
-     &               firstcall,lastcall,phis
+                 firstcall,lastcall,phis
        end if
        if (prt_level>=5) then
          write(*,'(a10,2a4,4a13)') 'BEFOR1 IT=','it','l',                   &
-     &        'presniv','plev','play','phi'
+          'presniv','plev','play','phi'
          write(*,'(a10,2i4,4f13.2)') ('BEFOR1 IT= ',it,l,                   &
-     &         presnivs(l),plev(l),play(l),phi(l),l=1,llm)
+           presnivs(l),plev(l),play(l),phi(l),l=1,llm)
          write(*,'(a11,2a4,a11,6a8)') 'BEFOR2','it','l',                    &
-     &         'presniv','u','v','temp','q1','q2','omega2'
+           'presniv','u','v','temp','q1','q2','omega2'
          write(*,'(a11,2i4,f11.2,5f8.2,e10.2)') ('BEFOR2 IT= ',it,l,         &
-     &   presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
+     presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
        endif
 
@@ -889 +889 @@
         if (prt_level>=5) then
           write(*,'(a11,2a4,4a13)') 'AFTER1 IT=','it','l',                  &
-     &        'presniv','plev','play','phi'
+          'presniv','plev','play','phi'
           write(*,'(a11,2i4,4f13.2)') ('AFTER1 it= ',it,l,                  &
-     &    presnivs(l),plev(l),play(l),phi(l),l=1,llm)
+      presnivs(l),plev(l),play(l),phi(l),l=1,llm)
           write(*,'(a11,2a4,a11,6a8)') 'AFTER2','it','l',                   &
-     &         'presniv','u','v','temp','q1','q2','omega2'
+           'presniv','u','v','temp','q1','q2','omega2'
           write(*,'(a11,2i4,f11.2,5f8.2,e10.2)') ('AFTER2 it= ',it,l,       &
-     &    presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
+      presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
           write(*,'(a11,2a4,a11,5a8)') 'AFTER3','it','l',                   &
-     &         'presniv','du_phys','dv_phys','dt_phys','dq1','dq2'    
+           'presniv','du_phys','dv_phys','dt_phys','dq1','dq2'
            write(*,'(a11,2i4,f11.2,5f8.2)') ('AFTER3 it= ',it,l,            &
-     &      presnivs(l),86400*du_phys(l),86400*dv_phys(l),                   &
-     &       86400*dt_phys(l),86400*dq(l,1),dq(l,2),l=1,llm)
+        presnivs(l),86400*du_phys(l),86400*dv_phys(l),                   &
+         86400*dt_phys(l),86400*dq(l,1),dq(l,2),l=1,llm)
           write(*,*) 'dpsrf',dpsrf
         endif
@@ -924 +924 @@
 
         d_u_age(1:mxcalc)= -2.*sfdt/timestep*                                &
-     &          (sfdt*(u(1:mxcalc)-ug(1:mxcalc)) -                          &
-     &           cfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
+            (sfdt*(u(1:mxcalc)-ug(1:mxcalc)) -                          &
+             cfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
 !!     : fcoriolis*(v(1:mxcalc)-vg(1:mxcalc))
 !
        d_v_age(1:mxcalc)= -2.*sfdt/timestep*                                 &
-     &          (cfdt*(u(1:mxcalc)-ug(1:mxcalc)) +                           &
-     &           sfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
+            (cfdt*(u(1:mxcalc)-ug(1:mxcalc)) +                           &
+             sfdt*(v(1:mxcalc)-vg(1:mxcalc))  )
 !!     : -fcoriolis*(u(1:mxcalc)-ug(1:mxcalc))
       ENDIF
@@ -953 +953 @@
 
              IF ( play(l) < p_nudging_u .AND. nint(nudging_u) /= 0 ) &
-             & d_u_nudge(l)=(u_nudg_mod_cas(l)-u(l))/nudging_u
+   d_u_nudge(l)=(u_nudg_mod_cas(l)-u(l))/nudging_u
 
          ENDIF 
@@ -966 +966 @@
 
              IF ( play(l) < p_nudging_v .AND. nint(nudging_v) /= 0 ) &
-             & d_v_nudge(l)=(v_nudg_mod_cas(l)-v(l))/nudging_v
+   d_v_nudge(l)=(v_nudg_mod_cas(l)-v(l))/nudging_v
 
          ENDIF
@@ -979 +979 @@
 
              IF ( play(l) < p_nudging_t .AND. nint(nudging_t) /= 0 ) &
-             & d_t_nudge(l)=(temp_nudg_mod_cas(l)-temp(l))/nudging_t
+   d_t_nudge(l)=(temp_nudg_mod_cas(l)-temp(l))/nudging_t
 
           ENDIF
@@ -991 +991 @@
 
              IF ( play(l) < p_nudging_qv .AND. nint(nudging_qv) /= 0 ) &
-             & d_q_nudge(l,1)=(qv_nudg_mod_cas(l)-q(l,1))/nudging_qv
+   d_q_nudge(l,1)=(qv_nudg_mod_cas(l)-q(l,1))/nudging_qv
 
          ENDIF
@@ -1021 +1021 @@
 
         u(1:mxcalc)=u(1:mxcalc) + timestep*(                                &
-     &              du_phys(1:mxcalc)                                       &
-     &             +d_u_age(1:mxcalc)+d_u_adv(1:mxcalc)                       &
-     &             +d_u_nudge(1:mxcalc) )            
+                du_phys(1:mxcalc)                                       &
+               +d_u_age(1:mxcalc)+d_u_adv(1:mxcalc)                       &
+               +d_u_nudge(1:mxcalc) )
         v(1:mxcalc)=v(1:mxcalc) + timestep*(                                 &
-     &              dv_phys(1:mxcalc)                                       &
-     &             +d_v_age(1:mxcalc)+d_v_adv(1:mxcalc)                       &
-     &             +d_v_nudge(1:mxcalc) )
+                dv_phys(1:mxcalc)                                       &
+               +d_v_age(1:mxcalc)+d_v_adv(1:mxcalc)                       &
+               +d_v_nudge(1:mxcalc) )
         q(1:mxcalc,:)=q(1:mxcalc,:)+timestep*(                              &
-     &                dq(1:mxcalc,:)                                        &
-     &               +d_q_adv(1:mxcalc,:)                                   &
-     &               +d_q_nudge(1:mxcalc,:) )
+                  dq(1:mxcalc,:)                                        &
+                 +d_q_adv(1:mxcalc,:)                                   &
+                 +d_q_nudge(1:mxcalc,:) )
 
         if (prt_level>=3) then
           print *,                                                          &
-     &    'physiq-> temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1) ',         &
-     &              temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1)
+      'physiq-> temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1) ',         &
+                temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1)
            print* ,'dv_phys=',dv_phys
            print* ,'d_v_age=',d_v_age
@@ -1046 +1046 @@
 
         temp(1:mxcalc)=temp(1:mxcalc)+timestep*(                            &
-     &              dt_phys(1:mxcalc)                                       &
-     &             +d_t_adv(1:mxcalc)                                       &
-     &             +d_t_nudge(1:mxcalc)                                     &
-     &             +dt_cooling(1:mxcalc))  ! Taux de chauffage ou refroid.
+                dt_phys(1:mxcalc)                                       &
+               +d_t_adv(1:mxcalc)                                       &
+               +d_t_nudge(1:mxcalc)                                     &
+               +dt_cooling(1:mxcalc))  ! Taux de chauffage ou refroid.
 
 
@@ -1064 +1064 @@
       IF (nudge_tsoil .AND. .NOT. lastcall) THEN
        ftsoil(1,isoil_nudge,:) = ftsoil(1,isoil_nudge,:)                     &
-     &  -timestep/tau_soil_nudge*(ftsoil(1,isoil_nudge,:)-Tsoil_nudge)
+    -timestep/tau_soil_nudge*(ftsoil(1,isoil_nudge,:)-Tsoil_nudge)
       ENDIF
 
@@ -1110 +1110 @@
 ! ---------------------------------------------------------------------------
        call dyn1dredem("restart1dyn.nc",                                    &
-     &              plev,play,phi,phis,presnivs,                            &
-     &              u,v,temp,q,omega2)
+                plev,play,phi,phis,presnivs,                            &
+                u,v,temp,q,omega2)
 
         CALL abort_gcm ('lmdz1d   ','The End  ',0)

LMDZ6/branches/Amaury_dev/libf/phylmd/ener_conserv.F90

@@ -1 +1 @@
 subroutine ener_conserv(klon,klev,pdtphys, &
- &                      puo,pvo,pto,qx,ivap,iliq,isol, &
- &                      pun,pvn,ptn,pqn,pqln,pqsn,dtke,masse,exner,d_t_ec)
+                        puo,pvo,pto,qx,ivap,iliq,isol, &
+                        pun,pvn,ptn,pqn,pqln,pqsn,dtke,masse,exner,d_t_ec)
 
 !=============================================================
@@ -21 +21 @@
 ! From module
 USE phys_local_var_mod, ONLY : d_u_vdf,d_v_vdf,d_t_vdf,d_u_ajs,d_v_ajs,d_t_ajs, &
- &                             d_u_con,d_v_con,d_t_con,d_t_diss
+                               d_u_con,d_v_con,d_t_con,d_t_diss
 USE phys_local_var_mod, ONLY : d_t_eva,d_t_lsc,d_q_eva,d_q_lsc
 USE phys_local_var_mod, ONLY : d_u_oro,d_v_oro,d_u_lif,d_v_lif
@@ -79 +79 @@
      ENDIF
      d_t_ec(i,k)=0.5/ZRCPD &
- &     *(puo(i,k)**2+pvo(i,k)**2-pun(i,k)**2-pvn(i,k)**2)
+       *(puo(i,k)**2+pvo(i,k)**2-pun(i,k)**2-pvn(i,k)**2)
    ENDDO
    ENDDO
@@ -233 +233 @@
         bils_diss(:)=bils_diss(:)-d_t_diss(:,k)*masse(:,k)
         bils_kinetic(:)=bils_kinetic(:)+masse(:,k)* &
-     &           (pun(:,k)*pun(:,k)+pvn(:,k)*pvn(:,k) &
-     &            -puo(:,k)*puo(:,k)-pvo(:,k)*pvo(:,k))
+             (pun(:,k)*pun(:,k)+pvn(:,k)*pvn(:,k) &
+              -puo(:,k)*puo(:,k)-pvo(:,k)*pvo(:,k))
         bils_enthalp(:)= &
-     &  bils_enthalp(:)+masse(:,k)*(ptn(:,k)-pto(:,k)+d_t_ec(:,k)-d_t_eva(:,k)-d_t_lsc(:,k))
+    bils_enthalp(:)+masse(:,k)*(ptn(:,k)-pto(:,k)+d_t_ec(:,k)-d_t_eva(:,k)-d_t_lsc(:,k))
 !    &  bils_enthalp(:)+masse(:,k)*(ptn(:,k)-pto(:,k)+d_t_ec(:,k))
         bils_latent(:)=bils_latent(:)+masse(:,k)* &
 !    &             (pqn(:,k)-pqo(:,k))
-     &             (pqn(:,k)-pqo(:,k)-d_q_eva(:,k)-d_q_lsc(:,k))
+               (pqn(:,k)-pqo(:,k)-d_q_eva(:,k)-d_q_lsc(:,k))
       ENDDO
       bils_ec(:)=rcpd*bils_ec(:)/pdtphys

LMDZ6/branches/Amaury_dev/libf/phylmd/evappot.F90

@@ -1 +1 @@
 SUBROUTINE evappot(klon,nbsrf,ftsol,pplay,cdragh,  &
-       &    t_seri,q_seri,u_seri,v_seri,evap_pot)
+      t_seri,q_seri,u_seri,v_seri,evap_pot)
 
 IMPLICIT NONE

LMDZ6/branches/Amaury_dev/libf/phylmd/fonte_neige_mod.F90

@@ -178 +178 @@
       IF (iso_eau > 0) THEN   
         CALL iso_verif_egalite_vect1D( &
-     &           xtrun_off_lic_0,run_off_lic_0,'fonte_neige 100', &
-     &           niso,klon)
+             xtrun_off_lic_0,run_off_lic_0,'fonte_neige 100', &
+             niso,klon)
       ENDIF !IF (iso_eau > 0) THEN
 #endif        
@@ -233 +233 @@
        snow, qsol, tsurf_new, evap &
 #ifdef ISO    
-     & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
-     & ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag   &
-#endif
-     &   )
+   ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
+   ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag   &
+#endif
+     )
 
     USE indice_sol_mod
@@ -471 +471 @@
   SUBROUTINE fonte_neige_final(restart_runoff &
 #ifdef ISO      
-     &                        ,xtrestart_runoff &
+                          ,xtrestart_runoff &
 #endif   
-     &                        )
+                          )
 !
 ! This subroutine returns run_off_lic_0 for later writing to restart file.
@@ -505 +505 @@
       DO i=1,klon
         IF (iso_verif_egalite_nostop(run_off_lic_0(i) &
-     &                              ,xtrun_off_lic_0(iso_eau,i) &
-     &                              ,'fonte_neige 413') &
-     &      == 1) then
+                                ,xtrun_off_lic_0(iso_eau,i) &
+                                ,'fonte_neige 413') &
+        == 1) then
           WRITE(*,*) 'i=',i
           STOP
@@ -546 +546 @@
               fqfonte_out, ffonte_out, run_off_lic_out &
 #ifdef ISO     
-     &       ,fxtcalving_out, fxtfonte_out,xtrun_off_lic_out &
+         ,fxtcalving_out, fxtfonte_out,xtrun_off_lic_out &
 #endif     
-     &       )
+         )
 
 
@@ -626 +626 @@
 #ifdef ISO
   SUBROUTINE gestion_neige_besoin_varglob_fonte_neige(klon,knon, &
-     &           xtprecip_snow,xtprecip_rain, &
-     &           fxtfonte_neige,fxtcalving, &
-     &           knindex,nisurf,run_off_lic_diag,coeff_rel_diag)
+             xtprecip_snow,xtprecip_rain, &
+             fxtfonte_neige,fxtcalving, &
+             knindex,nisurf,run_off_lic_diag,coeff_rel_diag)
 
         ! dans cette routine, on a besoin des variables globales de
@@ -661 +661 @@
            j = knindex(i)
            CALL iso_verif_egalite(xtrun_off_lic_0(iso_eau,j), &
-     &             run_off_lic_0(j),'gestion_neige_besoin_varglob_fonte_neige 625')
+               run_off_lic_0(j),'gestion_neige_besoin_varglob_fonte_neige 625')
         ENDDO
       ENDIF
@@ -676 +676 @@
         DO ixt = 1, niso
           xtrun_off_lic(ixt,i)   = (coeff_rel_diag *  fxtcalving(ixt,i)) &
-     &                            +(1. - coeff_rel_diag) * xtrun_off_lic_0(ixt,j)
+                              +(1. - coeff_rel_diag) * xtrun_off_lic_0(ixt,j)
           xtrun_off_lic_0(ixt,j) = xtrun_off_lic(ixt,i)
           xtrun_off_lic(ixt,i)   = xtrun_off_lic(ixt,i) + fxtfonte_neige(ixt,i) + xtprecip_rain(ixt,i)
@@ -683 +683 @@
           IF (iso_eau > 0) THEN             
             IF (iso_verif_egalite_choix_nostop(xtrun_off_lic(iso_eau,i), &
-     &                  run_off_lic_diag(i),'gestion_neige_besoin_varglob_fonte_neige 1201a', &
-     &                  errmax,errmaxrel) == 1) THEN 
+                    run_off_lic_diag(i),'gestion_neige_besoin_varglob_fonte_neige 1201a', &
+                    errmax,errmaxrel) == 1) THEN
                WRITE(*,*) 'i,j=',i,j   
                WRITE(*,*) 'coeff_rel_diag=',coeff_rel_diag

LMDZ6/branches/Amaury_dev/libf/phylmd/grid_noro_m.F90

@@ -160 +160 @@
       zxtzxusn(i,j)=(zusn(i+1,j)-zusn(i-1,j))**2/zdeltax**2
       zxtzyusn(i,j)=(zusn(i,j+1)-zusn(i,j-1))   /zdeltay  &
-     &             *(zusn(i+1,j)-zusn(i-1,j))   /zdeltax
+               *(zusn(i+1,j)-zusn(i-1,j))   /zdeltax
     END DO
   END DO

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/VARdSV.F90

@@ -57 +57 @@
 
       REAL,PARAMETER    ::   etadSV(0:nsot) = (/ 1.000,0.395,0.410,     &
-     &     0.435,0.485,0.451,0.420,0.477,0.476,0.426,0.492,0.482,0.001 /)      
+       0.435,0.485,0.451,0.420,0.477,0.476,0.426,0.492,0.482,0.001 /)
                                                   ! Water Content at Saturation  [m3/m3]
 
       REAL,PARAMETER    ::   psidSV(0:nsot) = (/ 1.000,0.121,0.090,     &
-     &     0.218,0.786,0.478,0.299,0.356,0.630,0.153,0.490,0.405,0.001 /)
+       0.218,0.786,0.478,0.299,0.356,0.630,0.153,0.490,0.405,0.001 /)
                                                   ! Water Succion at Saturation      [m]
 
       REAL,PARAMETER    ::   Ks_dSV(0:nsot) = (/ 0.e00, 176.0e-6,       &
-     &          156.3e-6,  34.1e-6,   7.2e-6,   7.0e-6,   6.3e-6,       &
-     &            1.7e-6,   2.5e-6,   2.2e-6,   1.0e-6,   1.3e-6,0.0e0 /)
+            156.3e-6,  34.1e-6,   7.2e-6,   7.0e-6,   6.3e-6,       &
+              1.7e-6,   2.5e-6,   2.2e-6,   1.0e-6,   1.3e-6,0.0e0 /)
                                                   ! Hydraulic Conductivity
                                                   !               at Saturation    [m/s]
       REAL,PARAMETER    ::   bCHdSV(0:nsot) = (/ 1.00, 4.05, 4.38,      &
-     &      4.90, 5.30, 5.39, 7.12, 7.75, 8.52,10.40,10.40,11.40, 0.02 /)
+        4.90, 5.30, 5.39, 7.12, 7.75, 8.52,10.40,10.40,11.40, 0.02 /)
                                                   ! Clapp-Hornberger Coefficient b   [-]
 

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/VARphy.F90

@@ -26 +26 @@
       INTEGER, PARAMETER ::  iun=1                                             
       REAL, PARAMETER    ::  zer0 = 0.0e+0, half = 0.5e+0, un_1 = 1.0e+0,     &
-     &                       eps6 = 1.0e-6, R_1000=1.e3   
+                         eps6 = 1.0e-6, R_1000=1.e3
       REAL, PARAMETER    ::  zero = 0.0e+0, demi = 0.5e+0, unun = 1.0e+0,     &
-     &                       epsi = 1.0e-6, eps9 = 1.0e-9         
+                         epsi = 1.0e-6, eps9 = 1.0e-9
       REAL               ::  ea_MAX,ea_MIN                                                                               
       REAL, PARAMETER    ::  pi = 3.141592653589793238462643e0
@@ -40 +40 @@
                                                                                
       REAL, PARAMETER    ::  gravit = 9.81e0,      gravi2 = gravit**2 ,       &
-     &                       grvinv = 1./gravit                       
+                         grvinv = 1./gravit
 !C +                   gravit: Earth Gravity Acceleration    = 9.81    m/s2    
 !C +                   gravi2: idem (squared)                                  
@@ -55 +55 @@
                                                        
       REAL, PARAMETER    ::  RVapor=461.e0, Lv_H2O=2.5008e+6,&
-     &                       Ls_H2O=2.8345e+6, r_LvCp=2490.04,r_LcCp=332.27,  &
-     &                       r_LsCp=2822.31            
+                         Ls_H2O=2.8345e+6, r_LvCp=2490.04,r_LcCp=332.27,  &
+                         r_LsCp=2822.31
 !C +                   cp    : dry air specific heat at constant p (1004 J/kg/K) 
 
       REAL, PARAMETER    ::  LhfH2O=3.34e+5, LhvH2O=2.5008e+6,&
-     &                       LhsH2O=2.8345e+6     
+                         LhsH2O=2.8345e+6
       REAL, PARAMETER    ::  rhoWat=1000.00e0    
 !C +                   rhoWat: Water Specific Mass            = 1000.00d+0 kg/m3 
@@ -81 +81 @@
                                                                                 
       REAL, PARAMETER    ::  TfSnow=273.15e+0,csnow=2105.00e+0,r0sno=3.00e+1, &
-     &                       blsno=3.30e+2,   Lf_H2O=3.337e+5                          
+                         blsno=3.30e+2,   Lf_H2O=3.337e+5
 !C +...                TfSnow:        Snow melting Temperature=  273.15d+0 K     
 !C +                    csnow:Heat Capacity of Snow             2105      J/kg/K 

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

@@ -501 +501 @@
                 write(un_outfor, *) fn_outfor, ikl, dt__SV, rlon(ikl2i(ikl)), rlat(ikl2i(ikl))
                 write(un_outfor, *) 'nsnow - albedo - z0m - z0h , dz [m,30], temp [K,41], rho [kg/m3,41], eta [kg/kg,41] &
-                        & G1 [-,30], G2 [-,30], agesnow [d,30], history [-,30], DOP [m,30]'
+   G1 [-,30], G2 [-,30], agesnow [d,30], history [-,30], DOP [m,30]'
             END IF
 
@@ -963 +963 @@
             dz_8SV(isl) = 0.125 * dz_dSV(isl)
             dzAvSV(isl) = 0.125 * dz_dSV(islmSV(isl))                        &
-                    & + 0.750 * dz_dSV(isl)                                &
-                    & + 0.125 * dz_dSV(islpSV(isl))
+   + 0.750 * dz_dSV(isl)                                &
+   + 0.125 * dz_dSV(islpSV(isl))
             zz_dSV = zz_dSV + dz_dSV(isl)
         END DO
@@ -986 +986 @@
             rocsSV(ist) = (1.0 - etadSV(ist)) * 1.2E+6   ! Soil Contrib. to (ro c)_s
             s1__SV(ist) = bCHdSV(ist)          & ! Factor of (eta)**(b+2)
-                    & * psidSV(ist) * Ks_dSV(ist)          & !    in DR97, Eqn.(3.36)
-                    & / (etadSV(ist)**(bCHdSV(ist) + 3.))     !
+   * psidSV(ist) * Ks_dSV(ist)          & !    in DR97, Eqn.(3.36)
+   / (etadSV(ist)**(bCHdSV(ist) + 3.))     !
             s2__SV(ist) = Ks_dSV(ist)          & ! Factor of (eta)**(2b+3)
-                    & / (etadSV(ist)**(2. * bCHdSV(ist) + 3.))     !    in DR97, Eqn.(3.35)
+   / (etadSV(ist)**(2. * bCHdSV(ist) + 3.))     !    in DR97, Eqn.(3.35)
 
             !C +--Soil Minimum Humidity (from a prescribed minimum relative Humidity)
@@ -995 +995 @@
             Psimax = -(log(RHsMin)) / 7.2E-5        ! DR97, Eqn 3.15 Inversion
             etamSV(ist) = etadSV(ist)                                      &
-                    & * (PsiMax / psidSV(ist))**(-min(10., 1. / bCHdSV(ist)))
+   * (PsiMax / psidSV(ist))**(-min(10., 1. / bCHdSV(ist)))
         END DO
         etamSV(12) = 0.
@@ -1008 +1008 @@
             DO ikh = 0, nkhy
                 Khyd_1 = s2__SV(ist)             & ! DR97, Eqn.(3.35)
-                        & * (eta__1      **(2. * bCHdSV(ist) + 3.))        !
+   * (eta__1      **(2. * bCHdSV(ist) + 3.))        !
                 Khyd_2 = s2__SV(ist)             &!
-                        & * (eta__2      **(2. * bCHdSV(ist) + 3.))        !
+   * (eta__2      **(2. * bCHdSV(ist) + 3.))        !
 
                 a_Khyd = (Khyd_2 - Khyd_1) / d__eta   !

LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_ini.F90

@@ -148 +148 @@
       WRITE(date0,'(i4.4,"-",i2.2,"-",i2.2)') an0,mois0,jour0
       ierr=NF_PUT_ATT_TEXT(nid, nvarid,'units',33, &
-     & "seconds since "//date0//" 00:00:00")
+   "seconds since "//date0//" 00:00:00")
       ierr = NF_PUT_ATT_TEXT(nid,nvarid,'calendar',9,calendrier)
       !ierr = NF_PUT_ATT_TEXT(nid,nvarid,'calendar',4,'360d')
@@ -155 +155 @@
       WRITE(date0b,'(i4.4,"-",a3,"-",i2.2)') an0,cmois(mois0),jour0
       ierr = NF_PUT_ATT_TEXT(nid,nvarid,'time_origin',20, &
-     &        date0b//' 00:00:00')
+          date0b//' 00:00:00')
       ierr=NF_ENDDEF(nid)
 

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_call_cloud_optics_prop.F90

@@ -101 +101 @@
         IF (ok_new_lscp) THEN
           CALL icefrac_lscp(klon,temp(:,k),iflag_ice_thermo,distcltop(:,k),temp_cltop(:,k), &
-   &         icefrac_optics(:,k),dzfice(:,k))
+           icefrac_optics(:,k),dzfice(:,k))
         ELSE
           CALL icefrac_lsc(klon,temp(:,k),pplay(1:klon,k)/paprs(1:klon,1),icefrac_optics(:,k))

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloud_optics_prop.F90

@@ -306 +306 @@
             iwc=icefrac_optics(i, k)*radocond(i, k)/pclc(i,k)*zrho(i,k)*1000. !in cloud ice water content in g/m3
             dei=(1.2351+0.0105*(temp(i,k)-273.15))*(45.8966*(iwc**0.2214) + &
-               & 0.7957*(iwc**0.2535)*(temp(i,k)-83.15))
+   0.7957*(iwc**0.2535)*(temp(i,k)-83.15))
             !deimax=155.0
             !deimin=20.+40*cos(abs(latitude_deg(i))/180.*RPI)
@@ -414 +414 @@
             iwc=icefrac_optics(i, k)*radocond(i, k)/pclc(i,k)*zrho(i,k)*1000. !in cloud ice water content in g/m3
             dei=(1.2351+0.0105*(temp(i,k)-273.15))*(45.8966*(iwc**0.2214) + &
-               &0.7957*(iwc**0.2535)*(temp(i,k)-83.15))
+  0.7957*(iwc**0.2535)*(temp(i,k)-83.15))
             !deimax=155.0
             !deimin=20.+40*cos(abs(latitude_deg(i))/180.*RPI)
@@ -633 +633 @@
             IF (first) THEN
               WRITE (*, *) 'Hypothese de recouvrement: MAXIMUM_ &
-                &                                             &
-                &                                          RANDOM'
+
+                                            RANDOM'
               first = .FALSE.
             ENDIF

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloud_optics_prop_ini.F90

@@ -44 +44 @@
 
   SUBROUTINE cloud_optics_prop_ini(klon, prt_level_in, lunout_in, flag_aerosol_in, &
-       & ok_cdnc_in, bl95_b0_in, &
-       & bl95_b1_in, latitude_deg_in, rpi_in, rg_in, rd_in, zepsec_in, novlp_in, &
-       & iflag_ice_thermo_in, ok_new_lscp_in)
+   ok_cdnc_in, bl95_b0_in, &
+   bl95_b1_in, latitude_deg_in, rpi_in, rg_in, rd_in, zepsec_in, novlp_in, &
+   iflag_ice_thermo_in, ok_new_lscp_in)
 
     USE ioipsl_getin_p_mod, ONLY : getin_p

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.F90

@@ -7 +7 @@
 
        SUBROUTINE cloudth(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,t, &
-     &           cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,t, &
+             cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
 
 
@@ -81 +81 @@
       IF (iflag_cloudth_vert>=1) THEN
       CALL cloudth_vert(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,t)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,t)
       RETURN
       ENDIF
@@ -254 +254 @@
 !===========================================================================
      SUBROUTINE cloudth_vert(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,t)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,t)
 
 !===========================================================================
@@ -581 +581 @@
 
        SUBROUTINE cloudth_v3(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,t, &
-     &           cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,t, &
+             cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
 
       use lmdz_cloudth_ini, only: iflag_cloudth_vert
@@ -653 +653 @@
       IF (iflag_cloudth_vert>=1) THEN
       CALL cloudth_vert_v3(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,t, &
-     &           cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,t, &
+             cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
       RETURN
       ENDIF
@@ -808 +808 @@
 !===========================================================================
      SUBROUTINE cloudth_vert_v3(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,t, &
-     &           cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,t, &
+             cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
 
 !===========================================================================
@@ -970 +970 @@
 
       sigma1s_fraca = (sigma1s_factor**0.5)*(fraca(ind1,ind2)**sigma1s_power) / &
-     &                (1-fraca(ind1,ind2))*((sth-senv)**2)**0.5
+                  (1-fraca(ind1,ind2))*((sth-senv)**2)**0.5
 !     sigma1s_fraca = (1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5
       IF (cloudth_ratqsmin>0.) THEN
@@ -1239 +1239 @@
 
        SUBROUTINE cloudth_v6(ngrid,klev,ind2,  &
-     &           ztv,po,zqta,fraca, & 
-     &           qcloud,ctot_surf,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
-     &           ratqs,zqs,T, &
-     &           cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
+             ztv,po,zqta,fraca, &
+             qcloud,ctot_surf,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
+             ratqs,zqs,T, &
+             cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
 
       use lmdz_cloudth_ini, only: iflag_cloudth_vert
@@ -1691 +1691 @@
 
            sigma1s_fraca = (sigma1s_factor**0.5)*(frac_th(ind1)**sigma1s_power) / &
-           &                (1-frac_th(ind1))*((sth-senv)**2)**0.5
+                  (1-frac_th(ind1))*((sth-senv)**2)**0.5
 
            IF (cloudth_ratqsmin>0.) THEN

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp.F90

@@ -1010 +1010 @@
             ! temperature update due to phase change
             zt(i) = zt(i) + (1.-zfice(i))*zcond(i) & 
-            &     * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i))) &
+       * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i))) &
                   +zfice(i)*zcond(i) * RLSTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i)))
         ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_lscp_old.F90

@@ -709 +709 @@
            zdqs(i) = FOEDE(zt(i),zdelta,zcvm5,zqs(i),zcor)
            zdqsdT_raw(i) = zdqs(i)*  &
-         &         RCPD*(1.0+RVTMP2*zq(i)) / (RLVTT*(1.-zdelta) + RLSTT*zdelta)
+           RCPD*(1.0+RVTMP2*zq(i)) / (RLVTT*(1.-zdelta) + RLSTT*zdelta)
         ENDDO
      ELSE
@@ -966 +966 @@
                     zfice(i) = zfice(i)**exposant_glace_old
                     dzfice(i)= exposant_glace_old * zfice(i)**(exposant_glace_old-1) &
-          &                     / (t_glace_min_old - RTT)
+                       / (t_glace_min_old - RTT)
                  endif
                  
                  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)
+                      / (t_glace_min - t_glace_max)
                  endif
                
@@ -987 +987 @@
                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)
+            +zfice(i)*RLSTT)/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))*qlbef(i)
                  denom = 1.+rneb(i,k)*((1-zfice(i))*RLVTT+zfice(i)*RLSTT)/cste*zdqs(i) &
                          -(RLSTT-RLVTT)/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)))*rneb(i,k)    &
-           &               *qlbef(i)*dzfice(i)
+                 *qlbef(i)*dzfice(i)
                else
                  num = -Tbef(i)+zt(i)+rneb(i,k)*((1-zfice(i))*RLVTT &
-           &         +zfice(i)*RLSTT)/RCPD/(1.0+RVTMP2*zq(i))*qlbef(i)
+           +zfice(i)*RLSTT)/RCPD/(1.0+RVTMP2*zq(i))*qlbef(i)
                  denom = 1.+rneb(i,k)*((1-zfice(i))*RLVTT+zfice(i)*RLSTT)/cste*zdqs(i) &
                          -(RLSTT-RLVTT)/RCPD/(1.0+RVTMP2*zq(i))*rneb(i,k)*qlbef(i)*dzfice(i)
@@ -1151 +1151 @@
         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))) &
+               * RLVTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i))) &
                       +zfice(i)*zcond(i) * RLSTT/RCPD/(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i)))
         else 

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_multi.F90

@@ -105 +105 @@
       po(:,:) = q_seri(:,:)
       call thermcell_dq(klon,klev,dqimpl,pdtphys,fm0,entr0,zmasse,  &
-     &                   po,pdoadj,zoa,lev_out)
+                     po,pdoadj,zoa,lev_out)
       do k=1,klev
          do i=1,klon
@@ -112 +112 @@
       enddo
       call thermcell_dq(klon,klev,dqimpl,pdtphys,fm0,entr0,zmasse,  &
-      &                   pocarre,pdocarreadj,zocarrea,lev_out) 
+                     pocarre,pdocarreadj,zocarrea,lev_out)
 
 

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alim.F90

@@ -45 +45 @@
             if (ztv(ig,l)> ztv(ig,l+1) .and. ztv(ig,1)>=ztv(ig,l) ) then
                alim_star(ig,l)=MAX((ztv(ig,l)-ztv(ig,l+1)),0.)  &
-     &                       *sqrt(zlev(ig,l+1)) 
+                         *sqrt(zlev(ig,l+1))
                lalim(ig)=l+1
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_alp.F90

@@ -5 +5 @@
 
       SUBROUTINE thermcell_alp(ngrid,nlay,ptimestep  &                         ! in
-     &                  ,pplay,pplev  &                                        ! in
-     &                  ,fm0,entr0,lmax  &                                     ! in
-     &                  ,pbl_tke,pctsrf,omega,airephy &                        ! in
-     &                  ,zw2,fraca &                                           ! in
-     &                  ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax &  ! in
+                    ,pplay,pplev  &                                        ! in
+                    ,fm0,entr0,lmax  &                                     ! in
+                    ,pbl_tke,pctsrf,omega,airephy &                        ! in
+                    ,zw2,fraca &                                           ! in
+                    ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax &  ! in
 !
-     &                  ,zcong,ale_bl,alp_bl,lalim_conv,wght_th &                    ! out
-     &                  ,zlcl,fraca0,w0,w_conv,therm_tke_max0,env_tke_max0 &   ! out
-     &                  ,n2,s2,strig,ale_bl_stat &                                   ! out
-     &                  ,therm_tke_max,env_tke_max &                           ! out
-     &                  ,alp_bl_det,alp_bl_fluct_m,alp_bl_fluct_tke &          ! out
-     &                  ,alp_bl_conv,alp_bl_stat &                             ! out
-     &)
+                    ,zcong,ale_bl,alp_bl,lalim_conv,wght_th &                    ! out
+                    ,zlcl,fraca0,w0,w_conv,therm_tke_max0,env_tke_max0 &   ! out
+                    ,n2,s2,strig,ale_bl_stat &                                   ! out
+                    ,therm_tke_max,env_tke_max &                           ! out
+                    ,alp_bl_det,alp_bl_fluct_m,alp_bl_fluct_tke &          ! out
+                    ,alp_bl_conv,alp_bl_stat &                             ! out
+  )
 
       USE indice_sol_mod
@@ -161 +161 @@
      if (ok_lcl(ig)) then 
       rhobarz0(ig)=rhobarz(ig,klcl(ig))+(rhobarz(ig,klcl(ig)+1) &
- &               -rhobarz(ig,klcl(ig)))*interp(ig)
+                 -rhobarz(ig,klcl(ig)))*interp(ig)
       zlcl(ig)=(pplev(ig,1)-pcon(ig))/(rhobarz0(ig)*RG)
       zlcl(ig)=min(zlcl(ig),zmax(ig))   ! Si zlcl > zmax alors on pose zlcl = zmax
@@ -200 +200 @@
 !-----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
+             rg,pplev,therm_tke_max)                               ! out
 !   print *,' thermcell_tke_transport -> '   !!jyg
 
@@ -216 +216 @@
    if (ok_lcl(ig)) then
      fraca0(ig)=fraca(ig,klcl(ig))+(fraca(ig,klcl(ig)+1) &
- &             -fraca(ig,klcl(ig)))*interp(ig)
+               -fraca(ig,klcl(ig)))*interp(ig)
      w0(ig)=zw2(ig,klcl(ig))+(zw2(ig,klcl(ig)+1) &
- &         -zw2(ig,klcl(ig)))*interp(ig)
+           -zw2(ig,klcl(ig)))*interp(ig)
      w_conv(ig)=w_ls(ig,klcl(ig))+(w_ls(ig,klcl(ig)+1) &
- &             -w_ls(ig,klcl(ig)))*interp(ig)
+               -w_ls(ig,klcl(ig)))*interp(ig)
      therm_tke_max0(ig)=therm_tke_max(ig,klcl(ig)) &
- &                     +(therm_tke_max(ig,klcl(ig)+1)-therm_tke_max(ig,klcl(ig)))*interp(ig)
+                       +(therm_tke_max(ig,klcl(ig)+1)-therm_tke_max(ig,klcl(ig)))*interp(ig)
      env_tke_max0(ig)=env_tke_max(ig,klcl(ig))+(env_tke_max(ig,klcl(ig)+1) &
- &                   -env_tke_max(ig,klcl(ig)))*interp(ig)
+                     -env_tke_max(ig,klcl(ig)))*interp(ig)
      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)
+                     -pbl_tke_max(ig,klcl(ig)))*interp(ig)
      if (therm_tke_max0(ig)>=20.) therm_tke_max0(ig)=20.
      if (env_tke_max0(ig)>=20.) env_tke_max0(ig)=20.
@@ -316 +316 @@
   alp_bl_det(ig)=0.5*coef_m*rhobarz0(ig)*(w0(ig)**3)*fraca0(ig)*(1.-2.*fraca0(ig))/((1.-fraca0(ig))**2)
   alp_bl_fluct_m(ig)=1.5*rhobarz0(ig)*fraca0(ig)*(w_conv(ig)+coef_m*w0(ig))* &
- &                   (w0(ig)**2)
+                     (w0(ig)**2)
   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)
+                      +3.*rhobarz0(ig)*w_conv(ig)*pbl_tke_max0(ig)
     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)
+                     (w0(ig)**2)
     else
     alp_bl_conv(ig)=0.

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_closure.F90

@@ -6 +6 @@
 
       SUBROUTINE thermcell_closure(ngrid,nlay,r_aspect,ptimestep,rho,  &
-     &   zlev,lalim,alim_star,zmax,wmax,f)
+     zlev,lalim,alim_star,zmax,wmax,f)
 
 !-------------------------------------------------------------------------

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_down.F90

@@ -219 +219 @@
 
    SUBROUTINE thermcell_down(ngrid,nlay,po,pt,pu,pv,pplay,pplev,  &
-     &           lmax,fup,eup,dup,theta)
+             lmax,fup,eup,dup,theta)
 
 !--------------------------------------------------------------

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dq.F90

@@ -3 +3 @@
 
       subroutine thermcell_dq(ngrid,nlay,impl,ptimestep,fm,entr,  &
-     &           masse,q,dq,qa,lev_out)
+             masse,q,dq,qa,lev_out)
       USE print_control_mod, ONLY: prt_level
 
@@ -46 +46 @@
 
          call thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
-     &           masse,q,dq,qa,lev_out)
+             masse,q,dq,qa,lev_out)
 
 else
@@ -99 +99 @@
          do ig=1,ngrid
             if ((fm(ig,k+1)+detr(ig,k))*ptimestep>  &
-     &         1.e-5*masse(ig,k)) then
+           1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
-     &         /(fm(ig,k+1)+detr(ig,k))
+           /(fm(ig,k+1)+detr(ig,k))
             else
                qa(ig,k)=q(ig,k)
@@ -125 +125 @@
       do k=1,nlay-1
          q(:,k)=q(:,k)+(fqa(:,k)-fqa(:,k+1)-fm(:,k)*q(:,k)+fm(:,k+1)*q(:,k+1)) &
-     &               *ptimestep/masse(:,k)
+                 *ptimestep/masse(:,k)
       enddo
    else
@@ -135 +135 @@
 !    &               /(fm(:,k)+masse(:,k)/ptimestep)
          q(:,k)=(q(:,k)+ptimestep/masse(:,k)*(fqa(:,k)-fqa(:,k+1)+fm(:,k+1)*q(:,k+1))) &
-      &               /(1.+fm(:,k)*ptimestep/masse(:,k))
+                 /(1.+fm(:,k)*ptimestep/masse(:,k))
 ! FH fin de modif.
       enddo
@@ -158 +158 @@
 
       subroutine thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
-     &           masse,q,dq,qa,lev_out)
+             masse,q,dq,qa,lev_out)
       USE print_control_mod, ONLY: prt_level
       implicit none
@@ -254 +254 @@
          do ig=1,ngrid
             if ((fm(ig,k+1)+detr(ig,k))*ztimestep>  &
-     &         1.e-5*masse(ig,k)) then
+           1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
-     &         /(fm(ig,k+1)+detr(ig,k))
+           /(fm(ig,k+1)+detr(ig,k))
             else
                qa(ig,k)=q(ig,k)
@@ -307 +307 @@
          do ig=1,ngrid
             q(ig,k)=q(ig,k)+(detr(ig,k)*qa(ig,k)-entr(ig,k)*q(ig,k)  &
-     &               -wqd(ig,k)+wqd(ig,k+1))  &
-     &               *ztimestep/masse(ig,k)
+                 -wqd(ig,k)+wqd(ig,k+1))  &
+                 *ztimestep/masse(ig,k)
 !            if (dq(ig,k).lt.0.) then
 !               print*,'dq<0!!!'

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dry.F90

@@ -6 +6 @@
 
        SUBROUTINE thermcell_dry(ngrid,nlay,zlev,pphi,ztv,alim_star,  &
-     &                            lalim,lmin,zmax,wmax)
+                              lalim,lmin,zmax,wmax)
 
 !--------------------------------------------------------------------------
@@ -81 +81 @@
 
                zw2(ig,l+1)=2.*RG*(ztv(ig,l)-ztv(ig,l+1))/ztv(ig,l+1)  &
-     &                     *(zlev(ig,l+1)-zlev(ig,l))  &
-     &                     *0.4*pphi(ig,l)/(pphi(ig,l+1)-pphi(ig,l))
+                       *(zlev(ig,l+1)-zlev(ig,l))  &
+                       *0.4*pphi(ig,l)/(pphi(ig,l+1)-pphi(ig,l))
 
 !------------------------------------------------------------------------
@@ -96 +96 @@
 
                ztva(ig,l)=(f_star(ig,l)*ztva(ig,l-1)+alim_star(ig,l)  &
-     &                    *ztv(ig,l))/f_star(ig,l+1)
+                      *ztv(ig,l))/f_star(ig,l+1)
                zw2(ig,l+1)=zw2(ig,l)*(f_star(ig,l)/f_star(ig,l+1))**2+  &
-     &                     2.*RG*(ztva(ig,l)-ztv(ig,l))/ztv(ig,l)  &
-     &                     *(zlev(ig,l+1)-zlev(ig,l))
+                       2.*RG*(ztva(ig,l)-ztv(ig,l))/ztv(ig,l)  &
+                       *(zlev(ig,l+1)-zlev(ig,l))
             endif
 ! determination de zmax continu par interpolation lineaire
@@ -114 +114 @@
             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))/(zw2(ig,l+1)-zw2(ig,l))
                zw2(ig,l+1)=0.
                lmax(ig)=l
@@ -121 +121 @@
             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))
+             -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
                zw2(ig,l+1)=0.
                lmax(ig)=l
@@ -161 +161 @@
 ! calcul de zlevinter
           zlevinter(ig)=zlev(ig,lmax(ig)) + &
-     &    (linter(ig)-lmax(ig))*(zlev(ig,lmax(ig)+1)-zlev(ig,lmax(ig)))
+      (linter(ig)-lmax(ig))*(zlev(ig,lmax(ig)+1)-zlev(ig,lmax(ig)))
            zmax(ig)=max(zmax(ig),zlevinter(ig)-zlev(ig,lmin(ig)))
       enddo

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dtke.F90

@@ -3 +3 @@
 
       subroutine thermcell_dtke(ngrid,nlay,nsrf,ptimestep,fm0,entr0,  &
-     &           rg,pplev,tke)
+             rg,pplev,tke)
       USE print_control_mod, ONLY: prt_level
       implicit none
@@ -74 +74 @@
          do ig=1,ngrid
             if ((fm(ig,k+1)+detr(ig,k))*ptimestep>  &
-     &         1.e-5*masse(ig,k)) then
+           1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
-     &         /(fm(ig,k+1)+detr(ig,k))
+           /(fm(ig,k+1)+detr(ig,k))
             else
                qa(ig,k)=q(ig,k)
@@ -109 +109 @@
          do ig=1,ngrid
             q(ig,k)=q(ig,k)+(detr(ig,k)*qa(ig,k)-entr(ig,k)*q(ig,k)  &
-     &               -wqd(ig,k)+wqd(ig,k+1))  &
-     &               *ptimestep/masse(ig,k)
+                 -wqd(ig,k)+wqd(ig,k+1))  &
+                 *ptimestep/masse(ig,k)
          enddo
       enddo

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_dv2.F90

@@ -3 +3 @@
 
       subroutine thermcell_dv2(ngrid,nlay,ptimestep,fm,entr,masse  &
-     &    ,fraca,larga  &
-     &    ,u,v,du,dv,ua,va,lev_out)
+      ,fraca,larga  &
+      ,u,v,du,dv,ua,va,lev_out)
       USE print_control_mod, ONLY: prt_level,lunout
       implicit none
@@ -68 +68 @@
 
       IF(prt_level>9)WRITE(lunout,*)                                    &
-     &      'WARNING on initialise gamma(1:ngrid,1)=0.'
+        'WARNING on initialise gamma(1:ngrid,1)=0.'
       gamma(1:ngrid,1)=0.
       do k=2,nlay
@@ -75 +75 @@
             if(ltherm(ig,k).and.larga(ig)>0.) then
                gamma0(ig,k)=masse(ig,k)  &
-     &         *sqrt( 0.5*(fraca(ig,k+1)+fraca(ig,k)) )  &
-     &         *0.5/larga(ig)  &
-     &         *1.
+           *sqrt( 0.5*(fraca(ig,k+1)+fraca(ig,k)) )  &
+           *0.5/larga(ig)  &
+           *1.
             else
                gamma0(ig,k)=0.
@@ -122 +122 @@
                   gamma(ig,k)=gamma0(ig,k)*sqrt(dua(ig,k)**2+dva(ig,k)**2)
                   ua(ig,k)=(fm(ig,k)*ua(ig,k-1)  &
-     &               +(zf2*entr(ig,k)+gamma(ig,k))*u(ig,k))  &
-     &               /(fm(ig,k+1)+detr(ig,k)+entr(ig,k)*zf*zf2  &
-     &                 +gamma(ig,k))
+                 +(zf2*entr(ig,k)+gamma(ig,k))*u(ig,k))  &
+                 /(fm(ig,k+1)+detr(ig,k)+entr(ig,k)*zf*zf2  &
+                   +gamma(ig,k))
                   va(ig,k)=(fm(ig,k)*va(ig,k-1)  &
-     &               +(zf2*entr(ig,k)+gamma(ig,k))*v(ig,k))  &
-     &               /(fm(ig,k+1)+detr(ig,k)+entr(ig,k)*zf*zf2  &
-     &                 +gamma(ig,k))
+                 +(zf2*entr(ig,k)+gamma(ig,k))*v(ig,k))  &
+                 /(fm(ig,k+1)+detr(ig,k)+entr(ig,k)*zf*zf2  &
+                   +gamma(ig,k))
 !                 print*,k,ua(ig,k),va(ig,k),u(ig,k),v(ig,k),dua(ig,k),dva(ig,k)
                   dua(ig,k)=ua(ig,k)-u(ig,k)
@@ -163 +163 @@
          do ig=1,ngrid
             du(ig,k)=((detr(ig,k)+gamma(ig,k))*ua(ig,k)  &
-     &               -(entr(ig,k)+gamma(ig,k))*ue(ig,k)  &
-     &               -wud(ig,k)+wud(ig,k+1))  &
-     &               /masse(ig,k)
+                 -(entr(ig,k)+gamma(ig,k))*ue(ig,k)  &
+                 -wud(ig,k)+wud(ig,k+1))  &
+                 /masse(ig,k)
             dv(ig,k)=((detr(ig,k)+gamma(ig,k))*va(ig,k)  &
-     &               -(entr(ig,k)+gamma(ig,k))*ve(ig,k)  &
-     &               -wvd(ig,k)+wvd(ig,k+1))  &
-     &               /masse(ig,k)
+                 -(entr(ig,k)+gamma(ig,k))*ve(ig,k)  &
+                 -wvd(ig,k)+wvd(ig,k+1))  &
+                 /masse(ig,k)
          enddo
       enddo
@@ -181 +181 @@
          do ig=1,ngrid
            print*,'th_dv2 ig k gamma entr detr ua ue va ve wud wvd masse',ig,k,gamma(ig,k), &
-     &   entr(ig,k),detr(ig,k),ua(ig,k),ue(ig,k),va(ig,k),ve(ig,k),wud(ig,k),wvd(ig,k),wud(ig,k+1),wvd(ig,k+1), &
-     &   masse(ig,k)
+     entr(ig,k),detr(ig,k),ua(ig,k),ue(ig,k),va(ig,k),ve(ig,k),wud(ig,k),wvd(ig,k),wud(ig,k+1),wvd(ig,k+1), &
+     masse(ig,k)
          enddo
       enddo

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_env.F90

@@ -3 +3 @@
 
    SUBROUTINE thermcell_env(ngrid,nlay,po,pt,pu,pv,pplay,  &
-     &           pplev,zo,zh,zl,ztv,zthl,zu,zv,zpspsk,pqsat,lcong,lintercong,lev_out)
+             pplev,zo,zh,zl,ztv,zthl,zu,zv,zpspsk,pqsat,lcong,lintercong,lev_out)
 
 !--------------------------------------------------------------
@@ -89 +89 @@
             lcong(ig)=ll+1
             lintercong(ig)=(ll*(zh(ig,ll+1)-zh(ig,ll))  &
-     &               -zh(ig,ll)+273.15)/(zh(ig,ll+1)-zh(ig,ll))
+                 -zh(ig,ll)+273.15)/(zh(ig,ll+1)-zh(ig,ll))
          endif
       enddo

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_flux2.F90

@@ -6 +6 @@
 
       SUBROUTINE thermcell_flux2(ngrid,nlay,ptimestep,masse, &
-     &       lalim,lmax,alim_star,  &
-     &       entr_star,detr_star,f,rhobarz,zlev,zw2,fm,entr,  &
-     &       detr,zqla,lev_out,lunout1,igout)
+         lalim,lmax,alim_star,  &
+         entr_star,detr_star,f,rhobarz,zlev,zw2,fm,entr,  &
+         detr,zqla,lev_out,lunout1,igout)
 !IM 060508    &       detr,zqla,zmax,lev_out,lunout,igout)
 
@@ -79 +79 @@
          write(lunout1,*) ' l E*    A*     D*  '
          write(lunout1,'(i4,3e15.5)') (l,entr_star(igout,l),alim_star(igout,l),detr_star(igout,l) &
-     &    ,l=1,lmax(igout))
+      ,l=1,lmax(igout))
       endif
 
@@ -133 +133 @@
          write(lunout1,*) ' l   E    D     W2'
          write(lunout1,'(i4,3e15.5)') (l,entr(igout,l),detr(igout,l) &
-     &    ,zw2(igout,l+1),l=1,lmax(igout))
+      ,zw2(igout,l+1),l=1,lmax(igout))
       endif
 
@@ -210 +210 @@
 
       if (prt_level>=10) &
-     &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
-     &     entr(igout,l),detr(igout,l),fm(igout,l+1)
+     write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
+       entr(igout,l),detr(igout,l),fm(igout,l+1)
 
 !-------------------------------------------------------------------------
@@ -220 +220 @@
          do ig=1,ngrid
           if (l>=lalim(ig).and.l<=lmax(ig) &
-     &    .and.(zw2(ig,l+1)>1.e-10).and.(zw2(ig,l)>1.e-10) ) then
+      .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))
+                            /(rhobarz(ig,l)*zw2(ig,l))
              if (fm(ig,l+1)>zzz) then
                 detr(ig,l)=detr(ig,l)+fm(ig,l+1)-zzz
@@ -235 +235 @@
 
       if (prt_level>=10) &
-     &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
-     &     entr(igout,l),detr(igout,l),fm(igout,l+1)
+     write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
+       entr(igout,l),detr(igout,l),fm(igout,l+1)
 
 
@@ -256 +256 @@
 
       if (prt_level>=10) &
-     &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
-     &     entr(igout,l),detr(igout,l),fm(igout,l+1)
+     write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
+       entr(igout,l),detr(igout,l),fm(igout,l+1)
 
 !fin 1.eq.0
@@ -332 +332 @@
 
       if (prt_level>=10) &
-     &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
-     &     entr(igout,l),detr(igout,l),fm(igout,l+1)
+     write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
+       entr(igout,l),detr(igout,l),fm(igout,l+1)
 
 !-------------------------------------------------------------------------
@@ -366 +366 @@
 
       if (prt_level>=10) &
-     &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
-     &     entr(igout,l),detr(igout,l),fm(igout,l+1)
+     write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
+       entr(igout,l),detr(igout,l),fm(igout,l+1)
 
 !-----------------------------------------------------------------------
@@ -408 +408 @@
 
       if (prt_level>=10) &
-     &   write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
-     &     entr(igout,l),detr(igout,l),fm(igout,l+1)
+     write(lunout1,'(i4,4e14.4)') l,masse(igout,l)/ptimestep, &
+       entr(igout,l),detr(igout,l),fm(igout,l+1)
 
 ! Fin de la grande boucle sur les niveaux verticaux

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_height.F90

@@ -3 +3 @@
 
       SUBROUTINE thermcell_height(ngrid,nlay,lalim,lmin,linter,lcong,lintercong,lmix,  &
-     &           zw2,zlev,lmax,zmax,zmax0,zmix,wmax,zcong)
+             zw2,zlev,lmax,zmax,zmax0,zmix,wmax,zcong)
       IMPLICIT NONE
 
@@ -105 +105 @@
 ! calcul de zlevinter
           zlevinter(ig)=(zlev(ig,lmax(ig)+1)-zlev(ig,lmax(ig)))*  &
-     &    linter(ig)+zlev(ig,lmax(ig))-lmax(ig)*(zlev(ig,lmax(ig)+1)  &
-     &    -zlev(ig,lmax(ig)))
+      linter(ig)+zlev(ig,lmax(ig))-lmax(ig)*(zlev(ig,lmax(ig)+1)  &
+      -zlev(ig,lmax(ig)))
 !pour le cas ou on prend tjs lmin=1
 !       zmax(ig)=max(zmax(ig),zlevinter(ig)-zlev(ig,lmin(ig)))
@@ -117 +117 @@
 ! calcul de zlevintercong
          zlevintercong(ig)=(zlev(ig,lcong(ig)+1)-zlev(ig,lcong(ig)))*  &
-     &    lintercong(ig)+zlev(ig,lcong(ig))-lcong(ig)*(zlev(ig,lcong(ig)+1)  &
-     &    -zlev(ig,lcong(ig)))
+      lintercong(ig)+zlev(ig,lcong(ig))-lcong(ig)*(zlev(ig,lcong(ig)+1)  &
+      -zlev(ig,lcong(ig)))
          zcong(ig)=zlevintercong(ig)-zlev(ig,1)
 !         print*,"calcul zcong",lcong(ig),lintercong(ig),zlevintercong(ig),zcong(ig)
@@ -131 +131 @@
 ! 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)))))>1e-10)  &
-     &        then
+          *((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)))))>1e-10)  &
+          then
 !             
             zmix(ig)=((zw2(ig,lmix(ig)-1)-zw2(ig,lmix(ig)))  &
-     &        *((zlev(ig,lmix(ig)))**2-(zlev(ig,lmix(ig)+1))**2)  &
-     &        -(zw2(ig,lmix(ig))-zw2(ig,lmix(ig)+1))  &
-     &        *((zlev(ig,lmix(ig)-1))**2-(zlev(ig,lmix(ig)))**2))  &
-     &        /(2.*((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))))))
+          *((zlev(ig,lmix(ig)))**2-(zlev(ig,lmix(ig)+1))**2)  &
+          -(zw2(ig,lmix(ig))-zw2(ig,lmix(ig)+1))  &
+          *((zlev(ig,lmix(ig)-1))**2-(zlev(ig,lmix(ig)))**2))  &
+          /(2.*((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))))))
               else
               zmix(ig)=zlev(ig,lmix(ig))
@@ -162 +162 @@
          do l=1,nlay
             if (zmix(ig)>=zlev(ig,l).and.  &
-     &          zmix(ig)<zlev(ig,l+1)) then
+            zmix(ig)<zlev(ig,l+1)) then
               lmix(ig)=l
              endif

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_ini.F90

@@ -48 +48 @@
 
 SUBROUTINE thermcell_ini(iflag_thermals,prt_level_in,tau_thermals_in,lunout_in, &
-   &    RG_in,RD_in,RCPD_in,RKAPPA_in,RLVTT_in,RETV_in)
+      RG_in,RD_in,RCPD_in,RKAPPA_in,RLVTT_in,RETV_in)
 
    USE ioipsl_getin_p_mod, ONLY : getin_p

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_main.F90

@@ -8 +8 @@
 
       subroutine thermcell_main(itap,ngrid,nlay,ptimestep  &
-     &                  ,pplay,pplev,pphi,debut  &
-     &                  ,puwind,pvwind,ptemp,p_o,ptemp_env, po_env  &
-     &                  ,pduadj,pdvadj,pdtadj,pdoadj  &
-     &                  ,fm0,entr0,detr0,zqta,zqla,lmax  &
-     &                  ,ratqscth,ratqsdiff,zqsatth  &
-     &                  ,zmax0, f0,zw2,fraca,ztv &
-     &                  ,zpspsk,ztla,zthl,ztva &
-     &                  ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax,zcong &
+                    ,pplay,pplev,pphi,debut  &
+                    ,puwind,pvwind,ptemp,p_o,ptemp_env, po_env  &
+                    ,pduadj,pdvadj,pdtadj,pdoadj  &
+                    ,fm0,entr0,detr0,zqta,zqla,lmax  &
+                    ,ratqscth,ratqsdiff,zqsatth  &
+                    ,zmax0, f0,zw2,fraca,ztv &
+                    ,zpspsk,ztla,zthl,ztva &
+                    ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax,zcong &
 #ifdef ISO         
-     &      ,xtpo,xtpdoadj &
+        ,xtpo,xtpdoadj &
 #endif         
-     &   )
+     )
 
 
@@ -227 +227 @@
 
           CALL thermcell_env(ngrid,nlay,p_o,ptemp_env,puwind,pvwind,pplay,  &
-         &           pplev,z_o,ztemp_env,zl,ztv,zthl,zu,zv,zpspsk,zqsat,lcong,lintercong,lev_out)
+             pplev,z_o,ztemp_env,zl,ztv,zthl,zu,zv,zpspsk,zqsat,lcong,lintercong,lev_out)
 
       else
@@ -417 +417 @@
 !         print*,'THERM NOUVELLE/NOUVELLE Arnaud'
          CALL thermcell_plume_6A(itap,ngrid,nlay,ptimestep,ztv,zthl,p_o,zl,rhobarz,&
-     &    zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
-     &    lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
-     &    ztla,zqla,zqta,zha,zw2,zw_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
-     &    ,lev_out,lunout1,igout)
+      zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
+      lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
+      ztla,zqla,zqta,zha,zw2,zw_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
+      ,lev_out,lunout1,igout)
 
       elseif (iflag_thermals_ed<=19) then
 !        print*,'THERM RIO et al 2010, version d Arnaud'
          CALL thermcell_plume_5B(itap,ngrid,nlay,ptimestep,ztv,zthl,p_o,zl,rhobarz,&
-     &    zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
-     &    lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
-     &    ztla,zqla,zqta,zha,zw2,zw_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
-     &    ,lev_out,lunout1,igout)
+      zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
+      lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
+      ztla,zqla,zqta,zha,zw2,zw_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
+      ,lev_out,lunout1,igout)
       else
          CALL thermcell_plume(itap,ngrid,nlay,ptimestep,ztv,zthl,p_o,zl,rhobarz,&
-     &    zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
-     &    lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
-     &    ztla,zqla,zqta,zha,zw2,zw_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
-     &    ,lev_out,lunout1,igout)
+      zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
+      lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
+      ztla,zqla,zqta,zha,zw2,zw_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
+      ,lev_out,lunout1,igout)
       endif
 
@@ -449 +449 @@
          write(lunout1,*) ' ig l alim_star entr_star detr_star f_star '
          write(lunout1,'(i6,i4,4e15.5)') (igout,l,alim_star(igout,l),entr_star(igout,l),detr_star(igout,l) &
-     &    ,f_star(igout,l+1),l=1,nint(linter(igout))+5)
+      ,f_star(igout,l+1),l=1,nint(linter(igout))+5)
       endif
 
@@ -457 +457 @@
 !
       CALL thermcell_height(ngrid,nlay,lalim,lmin,linter,lcong,lintercong,lmix,zw2,  &
-     &           zlev,lmax,zmax,zmax0,zmix,wmax,zcong)
+             zlev,lmax,zmax,zmax0,zmix,wmax,zcong)
 ! Attention, w2 est transforme en sa racine carree dans cette routine
 ! Le probleme vient du fait que linter et lmix sont souvent egaux a 1.
@@ -481 +481 @@
 !
       CALL thermcell_dry(ngrid,nlay,zlev,pphi,ztv,alim_star,  &
-    &                      lalim,lmin,zmax_sec,wmax_sec)
+                        lalim,lmin,zmax_sec,wmax_sec)
 
  
@@ -494 +494 @@
          write(lunout1,*) ' ig l alim_star entr_star detr_star f_star '
          write(lunout1,'(i6,i4,e15.5)') (igout,l,alim_star(igout,l) &
-     &    ,l=1,lalim(igout)+4)
+      ,l=1,lalim(igout)+4)
       endif
 
@@ -509 +509 @@
 
      CALL thermcell_closure(ngrid,nlay,r_aspect_thermals,ptimestep,rho,  &
-    &   zlev,lalim,alim_star_clos,zmax_sec,wmax_sec,f)
+     zlev,lalim,alim_star_clos,zmax_sec,wmax_sec,f)
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -517 +517 @@
 
      CALL thermcell_closure(ngrid,nlay,r_aspect_thermals,ptimestep,rho,  &
-    &   zlev,lalim,alim_star,zmax,wmax,f)
+     zlev,lalim,alim_star,zmax,wmax,f)
 
 
@@ -543 +543 @@
 
       CALL thermcell_flux2(ngrid,nlay,ptimestep,masse, &
-     &       lalim,lmax,alim_star,  &
-     &       entr_star,detr_star,f,rhobarz,zlev,zw2,fm,entr,  &
-     &       detr,zqla,lev_out,lunout1,igout)
+         lalim,lmax,alim_star,  &
+         entr_star,detr_star,f,rhobarz,zlev,zw2,fm,entr,  &
+         detr,zqla,lev_out,lunout1,igout)
 
 !IM 060508    &       detr,zqla,zmax,lev_out,lunout,igout)
@@ -609 +609 @@
         enddo
         call thermcell_dq(ngrid,nlay,dqimpl,ptimestep,fm0,entr0,masse,  &
-        &                    zthl,zdthladj,zta,lev_out)
+                      zthl,zdthladj,zta,lev_out)
 
         do ll=1,nlay
@@ -617 +617 @@
         enddo
         call thermcell_dq(ngrid,nlay,dqimpl,ptimestep,fm0,entr0,masse,  &
-        &                   z_o,pdoadj,z_oa,lev_out)
+                     z_o,pdoadj,z_oa,lev_out)
 
 #ifdef ISO
@@ -629 +629 @@
           enddo
           call thermcell_dq(ngrid,nlay,dqimpl,ptimestep,fm0,entr0,masse,  &
-     &                   xtpo_tmp,xtpdoadj_tmp,xtzo_tmp,lev_out)
+                     xtpo_tmp,xtpdoadj_tmp,xtzo_tmp,lev_out)
           do ll=1,nlay
             DO ig=1,ngrid
@@ -644 +644 @@
           if (iso_eau.gt.0) then
               call iso_verif_egalite(xtpo(iso_eau,ig,ll), &
-     &          p_o(ig,ll),'thermcell_main 594')
+            p_o(ig,ll),'thermcell_main 594')
               call iso_verif_egalite(xtpdoadj(iso_eau,ig,ll), &
-     &          pdoadj(ig,ll),'thermcell_main 596')
+            pdoadj(ig,ll),'thermcell_main 596')
           endif
           if (iso_HDO.gt.0) then
               call iso_verif_aberrant_encadre(xtpo(iso_hdo,ig,ll) &
-     &           /p_o(ig,ll),'thermcell_main 610')
+             /p_o(ig,ll),'thermcell_main 610')
           endif
         enddo
@@ -671 +671 @@
          call thermcell_dv2(ngrid,nlay,ptimestep,fm0,entr0,masse  &
 !    &    ,fraca*dvdq,zmax &
-     &    ,fraca,zmax &
-     &    ,zu,zv,pduadj,pdvadj,zua,zva,lev_out)
+      ,fraca,zmax &
+      ,zu,zv,pduadj,pdvadj,zua,zva,lev_out)
 
       else
@@ -678 +678 @@
 ! calcul purement conservatif pour le transport de V
          call thermcell_dq(ngrid,nlay,dqimpl,ptimestep,fm0,entr0,masse  &
-     &    ,zu,pduadj,zua,lev_out)
+      ,zu,pduadj,zua,lev_out)
          call thermcell_dq(ngrid,nlay,dqimpl,ptimestep,fm0,entr0,masse  &
-     &    ,zv,pdvadj,zva,lev_out)
+      ,zv,pdvadj,zva,lev_out)
 
       endif
@@ -716 +716 @@
          do ig=1,ngrid
          if ((pcon(ig)<=pplay(ig,k))  &
-     &      .and.(pcon(ig)>pplay(ig,k+1))) then
+        .and.(pcon(ig)>pplay(ig,k+1))) then
             zcon2(ig)=zlay(ig,k)-(pcon(ig)-pplay(ig,k))/(RG*rho(ig,k))/100.
          endif
@@ -757 +757 @@
       if (prt_level>=1) print*,'14d OK convect8'
       if (prt_level>=10)write(lunout,*)                                &
-    &     'WARNING thermcell_main wth2=0. si zw2 > 1.e-10'
+       'WARNING thermcell_main wth2=0. si zw2 > 1.e-10'
       do l=1,nlay
          do ig=1,ngrid
@@ -770 +770 @@
             endif
             wth3(ig,l)=zf2*(1-2.*fraca(ig,l))/(1-fraca(ig,l))  &
-     &                *zw2(ig,l)*zw2(ig,l)*zw2(ig,l)
+                  *zw2(ig,l)*zw2(ig,l)*zw2(ig,l)
             q2(ig,l)=zf2*(zqta(ig,l)*1000.-p_o(ig,l)*1000.)**2
 !test: on calcul q2/p_o=ratqsc
@@ -829 +829 @@
 !=============================================================================
       subroutine test_ltherm(ngrid,nlay,pplay,long,ztv,p_o,ztva, &  ! in
-    &            zqla,f_star,zw2,comment)                          ! in
+              zqla,f_star,zw2,comment)                          ! in
 !=============================================================================
       USE lmdz_thermcell_ini, ONLY: prt_level
@@ -873 +873 @@
 
       subroutine thermcell_tke_transport( &
-     &     ngrid,nlay,ptimestep,fm0,entr0,rg,pplev,  &   ! in
-     &     therm_tke_max)                                ! out
+       ngrid,nlay,ptimestep,fm0,entr0,rg,pplev,  &   ! in
+       therm_tke_max)                                ! out
       USE lmdz_thermcell_ini, ONLY: prt_level
       implicit none
@@ -942 +942 @@
          do ig=1,ngrid
             if ((fm(ig,k+1)+detr(ig,k))*ptimestep>  &
-     &         1.e-5*masse(ig,k)) then
+           1.e-5*masse(ig,k)) then
          qa(ig,k)=(fm(ig,k)*qa(ig,k-1)+entr(ig,k)*q(ig,k))  &
-     &         /(fm(ig,k+1)+detr(ig,k))
+           /(fm(ig,k+1)+detr(ig,k))
             else
                qa(ig,k)=q(ig,k)
@@ -976 +976 @@
          do ig=1,ngrid
             q(ig,k)=q(ig,k)+(detr(ig,k)*qa(ig,k)-entr(ig,k)*q(ig,k)  &
-     &               -wqd(ig,k)+wqd(ig,k+1))  &
-     &               *ptimestep/masse(ig,k)
+                 -wqd(ig,k)+wqd(ig,k+1))  &
+                 *ptimestep/masse(ig,k)
          enddo
       enddo

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume.F90

@@ -6 +6 @@
 
       SUBROUTINE thermcell_plume(itap,ngrid,nlay,ptimestep,ztv,zthl,po,zl,rhobarz,  &
-     &           zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
-     &           lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
-     &           ztla,zqla,zqta,zha,zw2,w_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
-    &           ,lev_out,lunout1,igout)
+             zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
+             lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
+             ztla,zqla,zqta,zha,zw2,w_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
+             ,lev_out,lunout1,igout)
 !     &           ,lev_out,lunout1,igout,zbuoy,zbuoyjam)
 !--------------------------------------------------------------------------
@@ -227 +227 @@
         ztva_est(ig,l) = ztva_est(ig,l)/zpspsk(ig,l)
         ztva_est(ig,l) = ztva_est(ig,l)*(1.+RETV*(zqta(ig,l-1)  &
-     &      -zqla_est(ig,l))-zqla_est(ig,l))
+        -zqla_est(ig,l))-zqla_est(ig,l))
  
 
@@ -265 +265 @@
         coefzlmel=Min(1.,(zlmelup-zltdwn)/zdz)
         zbuoyjam(ig,l)=1.*RG*(coefzlmel*(ztva_est(ig,l)- & 
-    &   ztv(ig,lt))/ztv(ig,lt)+(1.-coefzlmel)*(ztva_est(ig,l)- &
-    &   ztv(ig,lt-1))/ztv(ig,lt-1))+0.*zbuoy(ig,l)
+     ztv(ig,lt))/ztv(ig,lt)+(1.-coefzlmel)*(ztva_est(ig,l)- &
+     ztv(ig,lt-1))/ztv(ig,lt-1))+0.*zbuoy(ig,l)
 
 !------------------------------------------------
@@ -303 +303 @@
 
           detr_star(ig,l)=f_star(ig,l)*zdz             &
-    &     *( mix0 * 0.1 / (zalpha+0.001)               &
-    &     + MAX(detr_min, -afact*zbetalpha*zbuoyjam(ig,l)/zw2m   &
-    &     + detr_q_coef*(zdqt(ig,l)/zw2m)**detr_q_power))
+       *( mix0 * 0.1 / (zalpha+0.001)               &
+       + MAX(detr_min, -afact*zbetalpha*zbuoyjam(ig,l)/zw2m   &
+       + detr_q_coef*(zdqt(ig,l)/zw2m)**detr_q_power))
 
           if ( iflag_thermals_ed == 20 ) then
              entr_star(ig,l)=f_star(ig,l)*zdz* (         &
-    &          mix0 * 0.1 / (zalpha+0.001)               &
-    &        + zbetalpha*MAX(entr_min,                   &
-    &        afact*zbuoyjam(ig,l)/zw2m - fact_epsilon))
+            mix0 * 0.1 / (zalpha+0.001)               &
+          + zbetalpha*MAX(entr_min,                   &
+          afact*zbuoyjam(ig,l)/zw2m - fact_epsilon))
           else
              entr_star(ig,l)=f_star(ig,l)*zdz* (         &
-    &          mix0 * 0.1 / (zalpha+0.001)               &
-    &        + zbetalpha*MAX(entr_min,                   &
-    &        afact*zbuoy(ig,l)/zw2m - fact_epsilon))
+            mix0 * 0.1 / (zalpha+0.001)               &
+          + zbetalpha*MAX(entr_min,                   &
+          afact*zbuoy(ig,l)/zw2m - fact_epsilon))
           endif
           
@@ -326 +326 @@
         endif
         f_star(ig,l+1)=f_star(ig,l)+alim_star(ig,l)+entr_star(ig,l)  &
-     &              -detr_star(ig,l)
+                -detr_star(ig,l)
 
       endif
@@ -341 +341 @@
            Zsat=.false.
            ztla(ig,l)=(f_star(ig,l)*ztla(ig,l-1)+  &
-     &            (alim_star(ig,l)+entr_star(ig,l))*zthl(ig,l))  &
-     &            /(f_star(ig,l+1)+detr_star(ig,l))
+              (alim_star(ig,l)+entr_star(ig,l))*zthl(ig,l))  &
+              /(f_star(ig,l+1)+detr_star(ig,l))
            zqta(ig,l)=(f_star(ig,l)*zqta(ig,l-1)+  &
-     &            (alim_star(ig,l)+entr_star(ig,l))*po(ig,l))  &
-     &            /(f_star(ig,l+1)+detr_star(ig,l))
+              (alim_star(ig,l)+entr_star(ig,l))*po(ig,l))  &
+              /(f_star(ig,l+1)+detr_star(ig,l))
 
         endif
@@ -362 +362 @@
            zha(ig,l) = ztva(ig,l)
            ztva(ig,l) = ztva(ig,l)*(1.+RETV*(zqta(ig,l)  &
-     &              -zqla(ig,l))-zqla(ig,l))
+                -zqla(ig,l))-zqla(ig,l))
            zbuoy(ig,l)=RG*(ztva(ig,l)-ztv(ig,l))/ztv(ig,l)
            zdz=zlev(ig,l+1)-zlev(ig,l)
@@ -393 +393 @@
         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))/(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)<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))
+                 -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
            zw2(ig,l+1)=0.
 !fin CR:04/05/12

LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_thermcell_plume_6A.F90

@@ -6 +6 @@
 
       SUBROUTINE thermcell_plume_6A(itap,ngrid,nlay,ptimestep,ztv,zthl,po,zl,rhobarz,  &
-     &           zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
-     &           lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
-     &           ztla,zqla,zqta,zha,zw2,w_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
-    &           ,lev_out,lunout1,igout)
+             zlev,pplev,pphi,zpspsk,alim_star,alim_star_tot,  &
+             lalim,f0,detr_star,entr_star,f_star,csc,ztva,  &
+             ztla,zqla,zqta,zha,zw2,w_est,ztva_est,zqsatth,lmix,lmix_bis,linter &
+             ,lev_out,lunout1,igout)
 !     &           ,lev_out,lunout1,igout,zbuoy,zbuoyjam)
 !--------------------------------------------------------------------------
@@ -225 +225 @@
         ztva_est(ig,l) = ztva_est(ig,l)/zpspsk(ig,l)
         ztva_est(ig,l) = ztva_est(ig,l)*(1.+RETV*(zqta(ig,l-1)  &
-     &      -zqla_est(ig,l))-zqla_est(ig,l))
+        -zqla_est(ig,l))-zqla_est(ig,l))
  
 
@@ -278 +278 @@
             atv1=(ztv(ig,lt-1)-ztv(ig,lt-2))/(zlev(ig,lt-1)-zlev(ig,lt-2))
             btv1=(ztv(ig,lt-2)*zlev(ig,lt-1)-ztv(ig,lt-1)*zlev(ig,lt-2)) &
-    &          /(zlev(ig,lt-1)-zlev(ig,lt-2))
+            /(zlev(ig,lt-1)-zlev(ig,lt-2))
             atv2=(ztv(ig,lt+2)-ztv(ig,lt+1))/(zlev(ig,lt+2)-zlev(ig,lt+1))
             btv2=(ztv(ig,lt+1)*zlev(ig,lt+2)-ztv(ig,lt+2)*zlev(ig,lt+1)) &
-    &          /(zlev(ig,lt+2)-zlev(ig,lt+1))
+            /(zlev(ig,lt+2)-zlev(ig,lt+1))
 
              ztv1=atv1*zlt+btv1
@@ -299 +299 @@
                    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)
+                      +(1.-fact_shell)*zbuoy(ig,l)
                 elseif (zlmelup>=zinv) then
                  ztv_est2=atv2*0.5*(zlmelup+zinv)+btv2
@@ -306 +306 @@
 
                    zbuoyjam(ig,l)=fact_shell*RG*(((zlmelup-zinv)/zdz)*(ztva_est(ig,l)- & 
-    &            ztv_est2)/ztv_est2+((zinv-zlmeldwn)/zdz)*(ztva_est(ig,l)- &
-    &            ztv_est1)/ztv_est1)+(1.-fact_shell)*zbuoy(ig,l)
+              ztv_est2)/ztv_est2+((zinv-zlmeldwn)/zdz)*(ztva_est(ig,l)- &
+              ztv_est1)/ztv_est1)+(1.-fact_shell)*zbuoy(ig,l)
 
                 else 
                    ztv_est(ig,l)=atv1*zlmel+btv1
                    zbuoyjam(ig,l)=fact_shell*RG*(ztva_est(ig,l)-ztv_est(ig,l))/ztv_est(ig,l) & 
-    &                           +(1.-fact_shell)*zbuoy(ig,l)
+                             +(1.-fact_shell)*zbuoy(ig,l)
                 endif
 
@@ -319 +319 @@
                 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)
+                  ztv(ig,lt))/ztv(ig,lt))+(1.-fact_shell)*zbuoy(ig,l)
                 else
                    zbuoyjam(ig,l)=fact_shell*RG*(((zlmelup-zltdwn)/zdz)*(ztva_est(ig,l)- & 
-    &                ztv(ig,lt))/ztv(ig,lt)+((zltdwn-zlmeldwn)/zdz)*(ztva_est(ig,l)- &
-    &                ztv(ig,lt-1))/ztv(ig,lt-1))+(1.-fact_shell)*zbuoy(ig,l)
+                  ztv(ig,lt))/ztv(ig,lt)+((zltdwn-zlmeldwn)/zdz)*(ztva_est(ig,l)- &
+                  ztv(ig,lt-1))/ztv(ig,lt-1))+(1.-fact_shell)*zbuoy(ig,l)
 
                 endif
@@ -350 +350 @@
            coefzlmel=Min(1.,(zlmelup-zltdwn)/zdz)
            zbuoyjam(ig,l)=1.*RG*(coefzlmel*(ztva_est(ig,l)- & 
-    &          ztv(ig,lt))/ztv(ig,lt)+(1.-coefzlmel)*(ztva_est(ig,l)- &
-    &          ztv(ig,lt-1))/ztv(ig,lt-1))+0.*zbuoy(ig,l)
+            ztv(ig,lt))/ztv(ig,lt)+(1.-coefzlmel)*(ztva_est(ig,l)- &
+            ztv(ig,lt-1))/ztv(ig,lt-1))+0.*zbuoy(ig,l)
         endif !   if (iflag_thermals_ed.lt.8) then
 
@@ -488 +488 @@
 
           detr_star(ig,l)=f_star(ig,l)*zdz             &
-    &     *( mix0 * 0.1 / (zalpha+0.001)               &
-    &     + MAX(detr_min, -afact*zbetalpha*zbuoyjam(ig,l)/zw2m   &
-    &     + detr_q_coef*(zdqt(ig,l)/zw2m)**detr_q_power))
+       *( mix0 * 0.1 / (zalpha+0.001)               &
+       + MAX(detr_min, -afact*zbetalpha*zbuoyjam(ig,l)/zw2m   &
+       + detr_q_coef*(zdqt(ig,l)/zw2m)**detr_q_power))
 
 !          detr_star(ig,l)=(zdz/zdzbis)*detr_star(ig,l)+ &
@@ -498 +498 @@
 
           entr_star(ig,l)=f_star(ig,l)*zdz* (         &
-    &       mix0 * 0.1 / (zalpha+0.001)               &
-    &     + zbetalpha*MAX(entr_min,                   &
-    &     afact*zbuoyjam(ig,l)/zw2m - fact_epsilon))
+         mix0 * 0.1 / (zalpha+0.001)               &
+       + zbetalpha*MAX(entr_min,                   &
+       afact*zbuoyjam(ig,l)/zw2m - fact_epsilon))
 
 
@@ -531 +531 @@
 ! Calcul du flux montant normalise
       f_star(ig,l+1)=f_star(ig,l)+alim_star(ig,l)+entr_star(ig,l)  &
-     &              -detr_star(ig,l)
+                -detr_star(ig,l)
 
       endif
@@ -546 +546 @@
            Zsat=.false.
            ztla(ig,l)=(f_star(ig,l)*ztla(ig,l-1)+  &
-     &            (alim_star(ig,l)+entr_star(ig,l))*zthl(ig,l))  &
-     &            /(f_star(ig,l+1)+detr_star(ig,l))
+              (alim_star(ig,l)+entr_star(ig,l))*zthl(ig,l))  &
+              /(f_star(ig,l+1)+detr_star(ig,l))
            zqta(ig,l)=(f_star(ig,l)*zqta(ig,l-1)+  &
-     &            (alim_star(ig,l)+entr_star(ig,l))*po(ig,l))  &
-     &            /(f_star(ig,l+1)+detr_star(ig,l))
+              (alim_star(ig,l)+entr_star(ig,l))*po(ig,l))  &
+              /(f_star(ig,l+1)+detr_star(ig,l))
 
         endif
@@ -567 +567 @@
            zha(ig,l) = ztva(ig,l)
            ztva(ig,l) = ztva(ig,l)*(1.+RETV*(zqta(ig,l)  &
-     &              -zqla(ig,l))-zqla(ig,l))
+                -zqla(ig,l))-zqla(ig,l))
            zbuoy(ig,l)=RG*(ztva(ig,l)-ztv(ig,l))/ztv(ig,l)
            zdz=zlev(ig,l+1)-zlev(ig,l)
@@ -639 +639 @@
         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))/(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)<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))
+                 -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
            zw2(ig,l+1)=0.
 !fin CR:04/05/12
@@ -860 +860 @@
             if (ztv(ig,l)> ztv(ig,l+1) .and. ztv(ig,1)>=ztv(ig,l) ) then
                alim_star(ig,l)=MAX((ztv(ig,l)-ztv(ig,l+1)),0.)  &
-     &                       *sqrt(zlev(ig,l+1)) 
+                         *sqrt(zlev(ig,l+1))
                lalim(ig)=l+1
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)
@@ -939 +939 @@
         ztva_est(ig,l) = ztva_est(ig,l)/zpspsk(ig,l)
         ztva_est(ig,l) = ztva_est(ig,l)*(1.+RETV*(zqta(ig,l-1)  &
-     &      -zqla_est(ig,l))-zqla_est(ig,l))
+        -zqla_est(ig,l))-zqla_est(ig,l))
 
 !------------------------------------------------
@@ -977 +977 @@
           
           entr_star(ig,l)=f_star(ig,l)*zdz*  zbetalpha*MAX(0.,  &
-    &     afact*zbuoybis/zw2m - fact_epsilon )
+       afact*zbuoybis/zw2m - fact_epsilon )
 
 
           detr_star(ig,l)=f_star(ig,l)*zdz                        &
-    &     *MAX(1.e-3, -afact*zbetalpha*zbuoy(ig,l)/zw2m          &
-    &     + 0.012*(zdqt(ig,l)/zw2m)**0.5 )
+       *MAX(1.e-3, -afact*zbetalpha*zbuoy(ig,l)/zw2m          &
+       + 0.012*(zdqt(ig,l)/zw2m)**0.5 )
           
 ! En dessous de lalim, on prend le max de alim_star et entr_star pour
@@ -993 +993 @@
 ! Calcul du flux montant normalise
       f_star(ig,l+1)=f_star(ig,l)+alim_star(ig,l)+entr_star(ig,l)  &
-     &              -detr_star(ig,l)
+                -detr_star(ig,l)
 
       endif
@@ -1007 +1007 @@
            Zsat=.false.
            ztla(ig,l)=(f_star(ig,l)*ztla(ig,l-1)+  &
-     &            (alim_star(ig,l)+entr_star(ig,l))*zthl(ig,l))  &
-     &            /(f_star(ig,l+1)+detr_star(ig,l))
+              (alim_star(ig,l)+entr_star(ig,l))*zthl(ig,l))  &
+              /(f_star(ig,l+1)+detr_star(ig,l))
            zqta(ig,l)=(f_star(ig,l)*zqta(ig,l-1)+  &
-     &            (alim_star(ig,l)+entr_star(ig,l))*po(ig,l))  &
-     &            /(f_star(ig,l+1)+detr_star(ig,l))
+              (alim_star(ig,l)+entr_star(ig,l))*po(ig,l))  &
+              /(f_star(ig,l+1)+detr_star(ig,l))
 
         endif
@@ -1029 +1029 @@
            zha(ig,l) = ztva(ig,l)
            ztva(ig,l) = ztva(ig,l)*(1.+RETV*(zqta(ig,l)  &
-     &              -zqla(ig,l))-zqla(ig,l))
+                -zqla(ig,l))-zqla(ig,l))
            zbuoy(ig,l)=RG*(ztva(ig,l)-ztv(ig,l))/ztv(ig,l)
            zdz=zlev(ig,l+1)-zlev(ig,l)
@@ -1058 +1058 @@
         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))/(zw2(ig,l+1)-zw2(ig,l))
            zw2(ig,l+1)=0.
         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))
+                 -f_star(ig,l))/(f_star(ig,l+1)-f_star(ig,l))
 !           print*,"linter plume", linter(ig)
            zw2(ig,l+1)=0.

LMDZ6/branches/Amaury_dev/libf/phylmd/methox.F90

@@ -60 +60 @@
 
 USE YOEMETH   , ONLY : RALPHA1 ,RALPHA2  ,RQLIM   ,&
- & RPBOTOX,  RPBOTPH ,RPTOPOX  ,RPTOPPH ,&
- & RALPHA3,  RLOGPPH  
+   RPBOTOX,  RPBOTPH ,RPTOPOX  ,RPTOPPH ,&
+   RALPHA3,  RLOGPPH
 
 IMPLICIT NONE

LMDZ6/branches/Amaury_dev/libf/phylmd/ocean_forced_mod.F90

@@ -126 +126 @@
       IF (iso_eau > 0) THEN         
         CALL iso_verif_egalite_choix(xtspechum(iso_eau,i), &
-     &                  spechum(i),'ocean_forced_mod 111', &
-     &                  errmax,errmaxrel)     
+                    spechum(i),'ocean_forced_mod 111', &
+                    errmax,errmaxrel)
         CALL iso_verif_egalite_choix(snow(i), &
-     &                  xtsnow(iso_eau,i),'ocean_forced_mod 117', &
-     &                  errmax,errmaxrel)
+                    xtsnow(iso_eau,i),'ocean_forced_mod 117', &
+                    errmax,errmaxrel)
       ENDIF !IF (iso_eau > 0) THEN
     ENDDO !DO i=1,knon
@@ -153 +153 @@
       CALL limit_read_sst(knon,knindex,tsurf_lim &
 #ifdef ISO
-     &     ,Roce,rlat &
+       ,Roce,rlat &
 #endif     
-     &     )
+       )
     endif ! knon
 !sb--
@@ -215 +215 @@
 #ifdef ISO     
     CALL calcul_iso_surf_oce_vectall(klon, knon,t_coup, &
-     &    ps,tsurf_new,spechum,u1_lay, v1_lay, xtspechum, &
-     &    evap, Roce,xtevap,h1 &
+      ps,tsurf_new,spechum,u1_lay, v1_lay, xtspechum, &
+      evap, Roce,xtevap,h1 &
 #ifdef ISOTRAC
-     &    ,knindex &
-#endif
-     &    )
+      ,knindex &
+#endif
+      )
 #endif         
 
@@ -229 +229 @@
       DO i = 1, knon               
         CALL iso_verif_egalite_choix(snow(i), &
-     &          xtsnow(iso_eau,i),'ocean_forced_mod 180', &
-     &          errmax,errmaxrel)
+            xtsnow(iso_eau,i),'ocean_forced_mod 180', &
+            errmax,errmaxrel)
       ENDDO ! DO j=1,knon
     ENDIF !IF (iso_eau > 0) THEN
@@ -378 +378 @@
 ! update tsoil and calculate soilcap and soilflux
        CALL soil(dtime, is_sic, knon, snow, tsurf_tmp, qsol, &
-        & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil,soilcap, soilflux)
+   longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil,soilcap, soilflux)
        cal(1:knon) = RCPD / soilcap(1:knon)
        radsol(1:knon) = radsol(1:knon)  + soilflux(1:knon)
@@ -430 +430 @@
         IF (snow(i) > ridicule) THEN
           CALL iso_verif_egalite_choix(xtsnow(iso_eau,i),snow(i), &
-   &              'interfsurf 964',errmax,errmaxrel)
+                'interfsurf 964',errmax,errmaxrel)
         ENDIF !IF ((snow(i) > ridicule)) THEN
       ENDIF !IF (iso_eau > 0) THEN      
@@ -454 +454 @@
          snow, qsol, tsurf_new, evap &
 #ifdef ISO    
-     &  ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
-     &  ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag   &
-#endif
-     &   )
+    ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
+    ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag   &
+#endif
+     )
 
 
@@ -467 +467 @@
 !#endif
     CALL calcul_iso_surf_sic_vectall(klon,knon, &
-     &          evap,snow_evap_diag,Tsurf_new,Roce,snow, &
-     &          fq_fonte_diag,fqfonte_diag,dtime,t_coup, &
-     &          precip_snow,xtprecip_snow,xtprecip_rain, snow_prec,xtsnow_prec, &
-     &          xtspechum,spechum,ps, &
-     &          xtevap,xtsnow,fqcalving_diag, &
-     &          knindex,is_sic,run_off_lic_diag,coeff_rel_diag,Rland_ice &
-     &   )
+            evap,snow_evap_diag,Tsurf_new,Roce,snow, &
+            fq_fonte_diag,fqfonte_diag,dtime,t_coup, &
+            precip_snow,xtprecip_snow,xtprecip_rain, snow_prec,xtsnow_prec, &
+            xtspechum,spechum,ps, &
+            xtevap,xtsnow,fqcalving_diag, &
+            knindex,is_sic,run_off_lic_diag,coeff_rel_diag,Rland_ice &
+     )
 #ifdef ISOVERIF
         !write(*,*) 'ocean_forced_mod 391: sortie calcul_iso_surf_sic_vectall'
@@ -479 +479 @@
       DO i = 1, knon  
         CALL iso_verif_egalite_choix(snow(i), &
-     &           xtsnow(iso_eau,i),'ocean_forced_mod 396', &
-     &           errmax,errmaxrel)
+             xtsnow(iso_eau,i),'ocean_forced_mod 396', &
+             errmax,errmaxrel)
       ENDDO ! DO j=1,knon
     ENDIF !IF (iso_eau > 0) then

LMDZ6/branches/Amaury_dev/libf/phylmd/open_climoz_m.F90

@@ -64 +64 @@
     IF(daily.AND.ntim/=year_len) THEN
       WRITE(msg,'(a,3(i4,a))')TRIM(sub)//': Expecting a daily ozone file with',&
-     &year_len,' records (year ',year_cur,') ; found ',ntim,' instead'
+  year_len,' records (year ',year_cur,') ; found ',ntim,' instead'
       CALL abort_physic(sub, msg, 1)
     ELSE IF(ALL([360,14]/=ntim)) THEN
       WRITE(msg,'(a,i4,a)')TRIM(sub)//': Expecting an ozone file with 14 (mont'&
-     &//'hly case) or 360 (old style files) records ; found ',ntim,' instead'
+  //'hly case) or 360 (old style files) records ; found ',ntim,' instead'
       CALL abort_physic(sub, msg, 1)
     ELSE

LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90

@@ -241 +241 @@
       IF (iso_eau >= 0) THEN
          CALL iso_verif_egalite_vect2D( &
-     &           xtsnow,snow, &
-     &           'pbl_surface_mod 170',niso,klon,nbsrf)
+             xtsnow,snow, &
+             'pbl_surface_mod 170',niso,klon,nbsrf)
          DO i=1,klon  
             IF (iso_eau >= 0) THEN  
               CALL iso_verif_egalite(Rland_ice(iso_eau,i),1.0, &
-     &         'pbl_surf_mod 177')
+           'pbl_surf_mod 177')
             ENDIF
          ENDDO
@@ -319 +319 @@
 !!!
 #ifdef ISO
-     &   ,xtrain_f, xtsnow_f,xt, &
-     &   wake_dlxt,zxxtevap,xtevap, &
-     &   d_xt,d_xt_w,d_xt_x, &
-     &   xtsol,dflux_xt,zxxtsnow,zxfluxxt,flux_xt, &
-     &   h1_diag,runoff_diag,xtrunoff_diag &
+     ,xtrain_f, xtsnow_f,xt, &
+     wake_dlxt,zxxtevap,xtevap, &
+     d_xt,d_xt_w,d_xt_x, &
+     xtsol,dflux_xt,zxxtsnow,zxfluxxt,flux_xt, &
+     h1_diag,runoff_diag,xtrunoff_diag &
 #endif      
-     &   )
+     )
 !****************************************************************************************
 ! Auteur(s) Z.X. Li (LMD/CNRS) date: 19930818
@@ -1102 +1102 @@
         IF (iso_eau >= 0) THEN  
           CALL iso_verif_egalite_choix(Rland_ice(iso_eau,i),1.0, &
-     &         'pbl_surf_mod 585',errmax,errmaxrel)
+           'pbl_surf_mod 585',errmax,errmaxrel)
           CALL iso_verif_egalite_choix(xtsnow_f(iso_eau,i),snow_f(i), &
-     &         'pbl_surf_mod 594',errmax,errmaxrel)
+           'pbl_surf_mod 594',errmax,errmaxrel)
           IF (iso_verif_egalite_choix_nostop(xtsol(iso_eau,i),qsol(i), &
-     &         'pbl_surf_mod 596',errmax,errmaxrel) == 1) THEN
+           'pbl_surf_mod 596',errmax,errmaxrel) == 1) THEN
                 WRITE(*,*) 'i=',i
                 STOP
@@ -1112 +1112 @@
           DO nsrf=1,nbsrf
             CALL iso_verif_egalite_choix(xtsnow(iso_eau,i,nsrf),snow(i,nsrf), &
-     &         'pbl_surf_mod 598',errmax,errmaxrel)
+           'pbl_surf_mod 598',errmax,errmaxrel)
           ENDDO
         ENDIF !IF (iso_eau >= 0) THEN   
@@ -1120 +1120 @@
           IF (iso_eau >= 0) THEN  
             CALL iso_verif_egalite_choix(xt(iso_eau,i,k),q(i,k), &
-     &           'pbl_surf_mod 595',errmax,errmaxrel)
+             'pbl_surf_mod 595',errmax,errmaxrel)
           ENDIF !IF (iso_eau >= 0) THEN  
         ENDDO !DO i=1,knon  
@@ -1708 +1708 @@
           IF (iso_eau >= 0) THEN
               call iso_verif_egalite_choix(ysnow_f(j), &
-     &          yxtsnow_f(iso_eau,j),'pbl_surf_mod 862', &
-     &          errmax,errmaxrel)
+            yxtsnow_f(iso_eau,j),'pbl_surf_mod 862', &
+            errmax,errmaxrel)
               call iso_verif_egalite_choix(ysnow(j), &
-     &          yxtsnow(iso_eau,j),'pbl_surf_mod 872', &
-     &          errmax,errmaxrel)
+            yxtsnow(iso_eau,j),'pbl_surf_mod 872', &
+            errmax,errmaxrel)
           ENDIF
 #endif
@@ -2144 +2144 @@
             AcoefH, AcoefQ, BcoefH, BcoefQ &
 #ifdef ISO
-         &   ,yxt, CcoefXT, DcoefXT, gama_xt, AcoefXT, BcoefXT & 
+     ,yxt, CcoefXT, DcoefXT, gama_xt, AcoefXT, BcoefXT &
 #endif               
-         &   )
+     )
        ELSE  !(iflag_split .eq.0)
         CALL climb_hq_down(knon, ycoefh_x, ypaprs, ypplay, &
@@ -2156 +2156 @@
             AcoefH_x, AcoefQ_x, BcoefH_x, BcoefQ_x &
 #ifdef ISO
-         &   ,yxt_x, CcoefXT_x, DcoefXT_x, gama_xt_x, AcoefXT_x, BcoefXT_x & 
+     ,yxt_x, CcoefXT_x, DcoefXT_x, gama_xt_x, AcoefXT_x, BcoefXT_x &
 #endif               
-         &   )
+     )
 !!!
        IF (prt_level >=10) THEN
@@ -2175 +2175 @@
             AcoefH_w, AcoefQ_w, BcoefH_w, BcoefQ_w &
 #ifdef ISO
-         &   ,yxt_w, CcoefXT_w, DcoefXT_w, gama_xt_w, AcoefXT_w, BcoefXT_w & 
+     ,yxt_w, CcoefXT_w, DcoefXT_w, gama_xt_w, AcoefXT_w, BcoefXT_w &
 #endif               
-         &   )
+     )
 !!!
        IF (prt_level >=10) THEN
@@ -2431 +2431 @@
                yveget,ylai,yheight   &
 #ifdef ISO
-         &      ,yxtrain_f, yxtsnow_f,yxt1, &
-         &      yxtsnow,yxtsol,yxtevap,h1, &
-         &      yrunoff_diag,yxtrunoff_diag,yRland_ice &
+        ,yxtrain_f, yxtsnow_f,yxt1, &
+        yxtsnow,yxtsol,yxtevap,h1, &
+        yrunoff_diag,yxtrunoff_diag,yRland_ice &
 #endif               
-         &      )
+        )
  
 !FC quid qd yveget ylai yheight ne sont pas definit
@@ -2470 +2470 @@
           DO ixt=1,ntraciso
             CALL iso_verif_noNaN(yxtevap(ixt,j), &
-         &      'pbl_surface 1056a: apres surf_land')
+        'pbl_surface 1056a: apres surf_land')
           ENDDO
           DO ixt=1,niso
             CALL iso_verif_noNaN(yxtsol(ixt,j), &
-         &      'pbl_surface 1056b: apres surf_land')
+        'pbl_surface 1056b: apres surf_land')
           ENDDO
         ENDDO
@@ -2483 +2483 @@
           IF (iso_eau >= 0) THEN     
                  CALL iso_verif_egalite(yxtsnow(iso_eau,j), &
-     &                                  ysnow(j),'pbl_surf_mod 1043')
+                                    ysnow(j),'pbl_surf_mod 1043')
           ENDIF !if (iso_eau.gt.0) then
         ENDDO !DO i=1,klon
@@ -2510 +2510 @@
                   y_flux_u1, y_flux_v1 &
 #ifdef ISO
-                  &    ,yxtrain_f, yxtsnow_f,yxt1,yRland_ice &
-                  &    ,yxtsnow,yxtsol,yxtevap &
+      ,yxtrain_f, yxtsnow_f,yxt1,yRland_ice &
+      ,yxtsnow,yxtsol,yxtevap &
 #endif              
-                  &    )
+      )
              
              !jyg<
@@ -2540 +2540 @@
                DO ixt=1,ntraciso
                  CALL iso_verif_noNaN(yxtevap(ixt,j), &
-                        &             'pbl_surface 1095a: apres surf_landice')
+               'pbl_surface 1095a: apres surf_landice')
                ENDDO
                 do ixt=1,niso
                    call iso_verif_noNaN(yxtsol(ixt,j), &
-                        &      'pbl_surface 1095b: apres surf_landice')
+        'pbl_surface 1095b: apres surf_landice')
                 enddo
              enddo
@@ -2553 +2553 @@
                IF (iso_eau >= 0) THEN     
                  CALL iso_verif_egalite(yxtsnow(iso_eau,j), &
-                        &               ysnow(j),'pbl_surf_mod 1064')
+                 ysnow(j),'pbl_surf_mod 1064')
                ENDIF !if (iso_eau >= 0) THEN
              ENDDO !DO i=1,klon
@@ -2576 +2576 @@
                ydt_ds(:knon), ytkt(:knon), ytks(:knon), ytaur(:knon), ysss &
 #ifdef ISO
-         &      ,yxtrain_f, yxtsnow_f,yxt1,Roce, &
-         &      yxtsnow,yxtevap,h1 &
+        ,yxtrain_f, yxtsnow_f,yxt1,Roce, &
+        yxtsnow,yxtevap,h1 &
 #endif               
-         &      )
+        )
       IF (prt_level >=10) THEN
           print *,'arg de surf_ocean: ycdragh ',ycdragh(1:knon)
@@ -2622 +2622 @@
                y_flux_u1, y_flux_v1 &
 #ifdef ISO
-         &      ,yxtrain_f, yxtsnow_f,yxt1,Roce, &
-         &      yxtsnow,yxtsol,yxtevap,Rland_ice &
+        ,yxtrain_f, yxtsnow_f,yxt1,Roce, &
+        yxtsnow,yxtsol,yxtevap,Rland_ice &
 #endif               
-         &      )
+        )
           
 ! Special DICE MPL 05082013 puis BOMEX MPL 20150410
@@ -2639 +2639 @@
           DO ixt=1,ntraciso
             CALL iso_verif_noNaN(yxtevap(ixt,j), &
-         &                       'pbl_surface 1165a: apres surf_seaice')
+                         'pbl_surface 1165a: apres surf_seaice')
           ENDDO
           DO ixt=1,niso
             CALL iso_verif_noNaN(yxtsol(ixt,j), &
-         &      'pbl_surface 1165b: apres surf_seaice')
+        'pbl_surface 1165b: apres surf_seaice')
           ENDDO
         ENDDO
@@ -2652 +2652 @@
           IF (iso_eau >= 0) THEN     
                  CALL iso_verif_egalite(yxtsnow(iso_eau,j), &
-     &                                  ysnow(j),'pbl_surf_mod 1106')
+                                    ysnow(j),'pbl_surf_mod 1106')
           ENDIF !IF (iso_eau >= 0) THEN
         ENDDO !DO i=1,klon
@@ -2763 +2763 @@
            DO j=1,knon
             print*,'y_flux_t1,yfluxlat,wakes' &
- &                ,  y_flux_t1(j), yfluxlat(j), ywake_s(j)
+                  ,  y_flux_t1(j), yfluxlat(j), ywake_s(j)
             print*,'beta_prev, beta, ytsurf_new', ybeta_prev(j), ybeta(j), ytsurf_new(j)
             print*,'inertia,facteur,cstar', inertia, facteur,wake_cstar(j)
@@ -2937 +2937 @@
          print*,'Khx,Khw,Kh', Kech_h_x(j), Kech_h_w(j), Kech_h(j)
          print*,'t1x, t1w, t1, t1_ancien', &
- &               yt_x(j,1), yt_w(j,1),  yt(j,1), t(j,1)
+                 yt_x(j,1), yt_w(j,1),  yt(j,1), t(j,1)
          print*,'delta_coef,delta_flux,delta_tsurf,tau', delta_coef(j), y_delta_flux_t1(j), y_delta_tsurf(j), tau_eq(j) 
         ENDDO
@@ -2943 +2943 @@
         DO j=1,knon
          print*,'fluxT_x, fluxT_w, y_flux_t1, fluxQ_x, fluxQ_w, yfluxlat, wakes' &
- &             , y_flux_t1_x(j), y_flux_t1_w(j), y_flux_t1(j), y_flux_q1_x(j)*RLVTT, y_flux_q1_w(j)*RLVTT, yfluxlat(j), ywake_s(j)
+               , y_flux_t1_x(j), y_flux_t1_w(j), y_flux_t1(j), y_flux_q1_x(j)*RLVTT, y_flux_q1_w(j)*RLVTT, yfluxlat(j), ywake_s(j)
          print*,'beta, ytsurf_new ', ybeta(j), ytsurf_new(j)
          print*,'inertia, facteur, cstar', inertia, facteur,wake_cstar(j)
@@ -2966 +2966 @@
             y_flux_q(:,:), y_flux_t(:,:), y_d_q(:,:), y_d_t(:,:) &
 #ifdef ISO
-        &    ,yxt,y_flux_xt1 &
-        &    ,AcoefXT,BcoefXT,CcoefXT,DcoefXT,gama_xt &
-        &    ,y_flux_xt(:,:,:),y_d_xt(:,:,:) &
-#endif
-        &    )    
+      ,yxt,y_flux_xt1 &
+      ,AcoefXT,BcoefXT,CcoefXT,DcoefXT,gama_xt &
+      ,y_flux_xt(:,:,:),y_d_xt(:,:,:) &
+#endif
+      )
        ELSE  !(iflag_split .eq.0)
         CALL climb_hq_up(knon, dtime, yt_x, yq_x, &
@@ -2981 +2981 @@
             y_flux_q_x(:,:), y_flux_t_x(:,:), y_d_q_x(:,:), y_d_t_x(:,:) &
 #ifdef ISO
-        &    ,yxt_x,y_flux_xt1_x &
-        &    ,AcoefXT_x,BcoefXT_x,CcoefXT_x,DcoefXT_x,gama_xt_x &
-        &    ,y_flux_xt_x(:,:,:),y_d_xt_x(:,:,:) &
-#endif
-        &    )    
+      ,yxt_x,y_flux_xt1_x &
+      ,AcoefXT_x,BcoefXT_x,CcoefXT_x,DcoefXT_x,gama_xt_x &
+      ,y_flux_xt_x(:,:,:),y_d_xt_x(:,:,:) &
+#endif
+      )
 !
        CALL climb_hq_up(knon, dtime, yt_w, yq_w, &
@@ -2996 +2996 @@
             y_flux_q_w(:,:), y_flux_t_w(:,:), y_d_q_w(:,:), y_d_t_w(:,:) &
 #ifdef ISO
-        &    ,yxt_w,y_flux_xt1_w &
-        &    ,AcoefXT_w,BcoefXT_w,CcoefXT_w,DcoefXT_w,gama_xt_w &
-        &    ,y_flux_xt_w(:,:,:),y_d_xt_w(:,:,:) &
-#endif
-        &    )    
+      ,yxt_w,y_flux_xt1_w &
+      ,AcoefXT_w,BcoefXT_w,CcoefXT_w,DcoefXT_w,gama_xt_w &
+      ,y_flux_xt_w(:,:,:),y_d_xt_w(:,:,:) &
+#endif
+      )
 !!!
        ENDIF  ! (iflag_split .eq.0)
@@ -3019 +3019 @@
      IF (iflag_pbl>=20 .and. iflag_pbl<30) THEN
         CALL yamada_c(knon,dtime,ypaprs,ypplay &
-    &   ,yu,yv,yt,y_d_u,y_d_v,y_d_t,ycdragm,ytke,ycoefm,ycoefh,ycoefq,y_d_t_diss,yustar &
-    &   ,iflag_pbl)
+     ,yu,yv,yt,y_d_u,y_d_v,y_d_t,ycdragm,ytke,ycoefm,ycoefh,ycoefq,y_d_t_diss,yustar &
+     ,iflag_pbl)
      ENDIF
 !     print*,'yamada_c OK'
@@ -3036 +3036 @@
      IF (iflag_pbl>=20 .and. iflag_pbl<30) THEN
         CALL yamada_c(knon,dtime,ypaprs,ypplay &
-    &   ,yu_x,yv_x,yt_x,y_d_u_x,y_d_v_x,y_d_t_x,ycdragm_x,ytke_x,ycoefm_x,ycoefh_x &
+     ,yu_x,yv_x,yt_x,y_d_u_x,y_d_v_x,y_d_t_x,ycdragm_x,ytke_x,ycoefm_x,ycoefh_x &
         ,ycoefq_x,y_d_t_diss_x,yustar_x &
-    &   ,iflag_pbl)
+     ,iflag_pbl)
      ENDIF
 !     print*,'yamada_c OK'
@@ -3053 +3053 @@
      IF (iflag_pbl>=20 .and. iflag_pbl<30) THEN
         CALL yamada_c(knon,dtime,ypaprs,ypplay &
-    &   ,yu_w,yv_w,yt_w,y_d_u_w,y_d_v_w,y_d_t_w,ycdragm_w,ytke_w,ycoefm_w,ycoefh_w &
+     ,yu_w,yv_w,yt_w,y_d_u_w,y_d_v_w,y_d_t_w,ycdragm_w,ytke_w,ycoefm_w,ycoefh_w &
         ,ycoefq_w,y_d_t_diss_w,yustar_w &
-    &   ,iflag_pbl)
+     ,iflag_pbl)
      ENDIF
 !     print*,'yamada_c OK'
@@ -3277 +3277 @@
         IF (iso_eau.gt.0) THEN  
           call iso_verif_egalite_choix(Rland_ice(iso_eau,i),1.0, &
-     &         'pbl_surf_mod 1230',errmax,errmaxrel)
+           'pbl_surf_mod 1230',errmax,errmaxrel)
         ENDIF !if (iso_eau.gt.0) then
 #endif        
@@ -3489 +3489 @@
 !        write(*,*) 'iso_eau.gt.0=',iso_eau.gt.0
         call iso_verif_noNaN_vect2D( &
-     &           d_xt, &
-     &           'pbl_surface 1385',ntraciso,klon,klev)  
+             d_xt, &
+             'pbl_surface 1385',ntraciso,klon,klev)
      IF (iso_eau >= 0) THEN
         call iso_verif_egalite_vect2D( &

LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_var_mod.F90

@@ -164 +164 @@
   
   REAL, SAVE, ALLOCATABLE:: tkt(:) ! (klon)
-  ! épaisseur (m) de la couche de diffusion thermique (microlayer)
+  ! �paisseur (m) de la couche de diffusion thermique (microlayer)
   ! cool skin thickness
 
   REAL, SAVE, ALLOCATABLE:: tks(:) ! (klon)
-  ! épaisseur (m) de la couche de diffusion de masse (microlayer)
+  ! �paisseur (m) de la couche de diffusion de masse (microlayer)
   
   REAL, SAVE, ALLOCATABLE:: taur(:) ! (klon) momentum flux due to rain, in Pa
@@ -206 +206 @@
     allocate (bils_ec(klon),bils_ech(klon),bils_tke(klon),bils_diss(klon),bils_kinetic(klon),bils_enthalp(klon),bils_latent(klon))
     allocate (d_qw_col(klon), d_ql_col(klon), d_qs_col(klon), d_qbs_col(klon), d_qt_col(klon), d_ek_col(klon), d_h_dair_col(klon) &
-  &         , d_h_qw_col(klon), d_h_ql_col(klon), d_h_qs_col(klon), d_h_qbs_col(klon), d_h_col(klon))
+           , d_h_qw_col(klon), d_h_ql_col(klon), d_h_qs_col(klon), d_h_qbs_col(klon), d_h_col(klon))
     d_qw_col=0. ; d_ql_col=0. ; d_qs_col=0. ; d_qbs_col=0. ; d_qt_col=0. ; d_ek_col=0. ; d_h_dair_col =0.
     d_h_qw_col=0. ; d_h_ql_col=0. ; d_h_qs_col=0. ; d_h_qbs_col=0. ; d_h_col=0.
@@ -274 +274 @@
     deallocate (bils_ec,bils_ech,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
     deallocate (d_qw_col, d_ql_col, d_qs_col, d_qbs_col, d_qt_col, d_ek_col, d_h_dair_col &
-  &           , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col)
+             , d_h_qw_col, d_h_ql_col, d_h_qs_col, d_h_qbs_col, d_h_col)
 
     ! Outputs used in cloudth_vert

LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

@@ -23 +23 @@
     USE aero_mod
     USE add_phys_tend_mod, only : add_pbl_tend, add_phys_tend, diag_phys_tend, prt_enerbil, &
-  &      fl_ebil, fl_cor_ebil
+        fl_ebil, fl_cor_ebil
     USE assert_m, only: assert
     USE change_srf_frac_mod
@@ -1859 +1859 @@
        CALL atke_ini(RG, RD, RPI, RCPD, RV, viscom, viscoh)
        CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
-   &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
+      RG,RD,RCPD,RKAPPA,RLVTT,RETV)
        CALL ratqs_ini(klon,klev,iflag_thermals,lunout,nbsrf,is_lic,is_ter,RG,RV,RD,RCPD,RLSTT,RLVTT,RTT)
        CALL lscp_ini(pdtphys,lunout,prt_level,ok_ice_sursat,iflag_ratqs,fl_cor_ebil,RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RG,RV,RPI)
@@ -1881 +1881 @@
        ENDIF   
        CALL cloud_optics_prop_ini(klon, prt_level, lunout, flag_aerosol, &
-                                  & ok_cdnc, bl95_b0, &
-                                  & bl95_b1, latitude_deg, rpi, rg, rd, &
-                                  & zepsec, novlp, iflag_ice_thermo, ok_new_lscp)
+   ok_cdnc, bl95_b0, &
+   bl95_b1, latitude_deg, rpi, rg, rd, &
+   zepsec, novlp, iflag_ice_thermo, ok_new_lscp)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -2673 +2673 @@
     !
      CALL reevap (klon,klev,iflag_ice_thermo,t_seri,q_seri,ql_seri,qs_seri, &
-   &         d_t_eva,d_q_eva,d_ql_eva,d_qi_eva)
+           d_t_eva,d_q_eva,d_ql_eva,d_qi_eva)
 
      CALL add_phys_tend &
@@ -5259 +5259 @@
      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,&
-        & map_prop_hc,map_prop_hist,&
-        & map_emis_hc,map_iwp_hc,map_deltaz_hc,map_pcld_hc,map_tcld_hc,&
-        & map_emis_Cb,map_pcld_Cb,map_tcld_Cb,&
-        & map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi,&
-        & map_emis_Anv,map_pcld_Anv,map_tcld_Anv,&
-        & map_emis_hist,map_iwp_hist,map_deltaz_hist,map_rad_hist,&
-        & map_ntot,map_hc,map_hist,&
-        & map_Cb,map_ThCi,map_Anv,&
-        & alt_tropo )
+   map_prop_hc,map_prop_hist,&
+   map_emis_hc,map_iwp_hc,map_deltaz_hc,map_pcld_hc,map_tcld_hc,&
+   map_emis_Cb,map_pcld_Cb,map_tcld_Cb,&
+   map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi,&
+   map_emis_Anv,map_pcld_Anv,map_tcld_Anv,&
+   map_emis_hist,map_iwp_hist,map_deltaz_hist,map_rad_hist,&
+   map_ntot,map_hc,map_hist,&
+   map_Cb,map_ThCi,map_Anv,&
+   alt_tropo )
   ENDIF
 

LMDZ6/branches/Amaury_dev/libf/phylmd/physiqex_mod.F90

@@ -7 +7 @@
 
       SUBROUTINE physiqex (nlon,nlev, &
-     &            debut,lafin,pdtphys, &
-     &            paprs,pplay,pphi,pphis,presnivs, &
-     &            u,v,rot,t,qx, &
-     &            flxmass_w, &
-     &            d_u, d_v, d_t, d_qx, d_ps)
+              debut,lafin,pdtphys, &
+              paprs,pplay,pphi,pphis,presnivs, &
+              u,v,rot,t,qx, &
+              flxmass_w, &
+              d_u, d_v, d_t, d_qx, d_ps)
 
       USE dimphy, only : klon,klev

LMDZ6/branches/Amaury_dev/libf/phylmd/phytrac_mod.F90

@@ -754 +754 @@
            IF (it==id_OCS_strat) THEN
              budg_dep_wet_ocs(i)=budg_dep_wet_ocs(i)+d_tr_cv(i,k,it)*(mSatom/mOCSmol) &
-                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
            ELSEIF (it==id_SO2_strat) THEN
              budg_dep_wet_so2(i)=budg_dep_wet_so2(i)+d_tr_cv(i,k,it)*(mSatom/mSO2mol) &
-                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
            ELSEIF (it==id_H2SO4_strat) THEN
              budg_dep_wet_h2so4(i)=budg_dep_wet_h2so4(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol) &
-                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
            ELSEIF (it.GT.nbtr_sulgas) THEN
              budg_dep_wet_part(i)=budg_dep_wet_part(i)+d_tr_cv(i,k,it)*(mSatom/mH2SO4mol)  &
-                            & *dens_aer_dry*4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3 &
-                            & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *dens_aer_dry*4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3 &
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
            ENDIF
          ENDDO
@@ -832 +832 @@
          ! from IPSL note 23, 2002)
          v_dep_dry(:) =  pctsrf(:,is_ter) * 2.5e-3 &
-                     & + pctsrf(:,is_oce) * 0.5e-3 &
-                     & + pctsrf(:,is_lic) * 2.5e-3 &
-                     & + pctsrf(:,is_sic) * 2.5e-3
+   + pctsrf(:,is_oce) * 0.5e-3 &
+   + pctsrf(:,is_lic) * 2.5e-3 &
+   + pctsrf(:,is_sic) * 2.5e-3
 
          ! compute surface dry deposition flux
@@ -868 +868 @@
                ELSEIF (it.GT.nbtr_sulgas) THEN
                  budg_dep_dry_part(:)=budg_dep_dry_part(:)-source(:,it)*(mSatom/mH2SO4mol)*dens_aer_dry &
-                                & *4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3
+   *4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3
                ENDIF
              ENDIF
@@ -948 +948 @@
              IF (it==id_OCS_strat) THEN
                budg_dep_wet_ocs(i)=budg_dep_wet_ocs(i)+d_tr_ls(i,k,it)*(mSatom/mOCSmol) &
-                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
              ELSEIF (it==id_SO2_strat) THEN
                budg_dep_wet_so2(i)=budg_dep_wet_so2(i)+d_tr_ls(i,k,it)*(mSatom/mSO2mol) &
-                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
              ELSEIF (it==id_H2SO4_strat) THEN
                budg_dep_wet_h2so4(i)=budg_dep_wet_h2so4(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol) &
-                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
              ELSEIF (it.GT.nbtr_sulgas) THEN
                budg_dep_wet_part(i)=budg_dep_wet_part(i)+d_tr_ls(i,k,it)*(mSatom/mH2SO4mol)  &
-                              & *dens_aer_dry*4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3 &
-                              & *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+   *dens_aer_dry*4./3.*RPI*(mdw(it-nbtr_sulgas)/2.)**3 &
+   *(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
              ENDIF
            ENDDO

LMDZ6/branches/Amaury_dev/libf/phylmd/printflag.F90

@@ -21 +21 @@
   PRINT 100
   PRINT *, ' ******************************************************* &
-    &                                                         &
-    &  ************'
+
+    ************'
   PRINT *, ' ********   Choix  des principales  cles de la physique &
-    &                                                         &
-    &      *********'
+
+        *********'
   PRINT *, ' ******************************************************* &
-    &                                                         &
-    &  ************'
+
+    ************'
   PRINT 100
   PRINT 10, iflag_cycle_diurne>=1, soil_model
@@ -35 +35 @@
   IF (iflag_con==1) THEN
     PRINT *, ' *****           Shema  convection   LMD        &
-      &                                                       &
-      &                   ******'
+
+                     ******'
   ELSE IF (iflag_con==2) THEN
     PRINT *, ' *****           Shema  convection  Tiedtke     &
-      &                                                       &
-      &                   ******'
+
+                     ******'
   ELSE IF (iflag_con>=3) THEN
     PRINT *, ' *****           Shema  convection    Emanuel   &
-      &                                                       &
-      &                   ******'
+
+                     ******'
   END IF
   PRINT 100
@@ -80 +80 @@
 
   PRINT *, ' $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ &
-    &                                                         &
-    & $$$$$$$$$$$$$'
+
+   $$$$$$$$$$$$$'
   PRINT 100
 
@@ -135 +135 @@
   PRINT 100
   PRINT *, ' ******************************************************* &
-    &                                                         &
-    &  ************'
+
+    ************'
   PRINT 100
 

LMDZ6/branches/Amaury_dev/libf/phylmd/radlwsw_m.F90

@@ -1297 +1297 @@
              DO i = 1, kdlon
                 ZTH_i(i,K)=&
-                     & (t_i(i,K-1)*pplay_i(i,K-1)*(pplay_i(i,K)-paprs_i(i,K))&
-                     & +t_i(i,K)*pplay_i(i,K)*(paprs_i(i,K)-pplay_i(i,K-1)))&
-                     & *(1.0/(paprs_i(i,K)*(pplay_i(i,K)-pplay_i(i,K-1))))
+   (t_i(i,K-1)*pplay_i(i,K-1)*(pplay_i(i,K)-paprs_i(i,K))&
+   +t_i(i,K)*pplay_i(i,K)*(paprs_i(i,K)-pplay_i(i,K-1)))&
+   *(1.0/(paprs_i(i,K)*(pplay_i(i,K)-pplay_i(i,K-1))))
              ENDDO
           ENDDO
@@ -1305 +1305 @@
              ! Sommet
              ZTH_i(i,1)=t_i(i,1)-pplay_i(i,1)*(t_i(i,1)-ZTH_i(i,2))&
-                  & /(pplay_i(i,1)-paprs_i(i,2))
+   /(pplay_i(i,1)-paprs_i(i,2))
              ! Vers le sol
              ZTH_i(i,KLEV+1)=t_i(i,KLEV) + 0.5 * &
@@ -1361 +1361 @@
                   ok_3Deffect, namelist_ecrad_file    
              CALL RADIATION_SCHEME &
-                  & (ist, iend, klon, klev, naero_spc, NSW, &
-                  & namelist_ecrad_file, ok_3Deffect, &
-                  & debut, ok_volcan, flag_aerosol_strat, &
-                  & day_cur, current_time, & 
+   (ist, iend, klon, klev, naero_spc, NSW, &
+   namelist_ecrad_file, ok_3Deffect, &
+   debut, ok_volcan, flag_aerosol_strat, &
+   day_cur, current_time, &
                   !       Cste solaire/(d_Terre-Soleil)**2
-                  & SOLARIRAD, &
+   SOLARIRAD, &
                   !       Cos(angle zin), temp sol              
-                  & rmu0, tsol, &
+   rmu0, tsol, &
                   !       Albedo diffuse et directe
-                  & PALBD_NEW,PALBP_NEW, &   
+   PALBD_NEW,PALBP_NEW, &
                   !       Emessivite : PEMIS_WINDOW (???), &
-                  & ZEMIS, ZEMISW, &
+   ZEMIS, ZEMISW, &
                   !       longitude(rad), sin(latitude), PMASQ_ ???
-                  & ZGELAM, ZGEMU, &
+   ZGELAM, ZGEMU, &
                   !       Temp et pres aux interf, vapeur eau, Satur spec humid 
-                  & paprs_i, ZTH_i, q_i, qsat_i, & 
+   paprs_i, ZTH_i, q_i, qsat_i, &
                   !       Gas
-                  & ZCO2, ZCH4, ZN2O, ZNO2, ZCFC11, ZCFC12, ZHCFC22, &
-                  & ZCCL4, POZON_i(:,:,1), ZO2, &
+   ZCO2, ZCH4, ZN2O, ZNO2, ZCFC11, ZCFC12, ZHCFC22, &
+   ZCCL4, POZON_i(:,:,1), ZO2, &
                   !       nuages :
-                  & cldfra_i, flwc_i, fiwc_i, ZQ_SNOW, &
+   cldfra_i, flwc_i, fiwc_i, ZQ_SNOW, &
                   !       rayons effectifs des gouttelettes              
-                  & ref_liq_i, ref_ice_i, &
+   ref_liq_i, ref_ice_i, &
                   !       aerosols
-                  & ZAEROSOL_OLD, ZAEROSOL, &
+   ZAEROSOL_OLD, ZAEROSOL, &
                   ! Outputs
                   !       Net flux :
-                  & ZSWFT_i, ZLWFT_i, ZSWFT0_ii, ZLWFT0_ii, &
+   ZSWFT_i, ZLWFT_i, ZSWFT0_ii, ZLWFT0_ii, &
                   !       DWN flux :
-                  & ZFSDWN_i, ZFLUX_i(:,2,:), ZFCDWN_i, ZFLUC_i(:,2,:), &
+   ZFSDWN_i, ZFLUX_i(:,2,:), ZFCDWN_i, ZFLUC_i(:,2,:), &
                   !       UP flux :
-                  & ZFSUP_i, ZFLUX_i(:,1,:), ZFCUP_i, ZFLUC_i(:,1,:), &
+   ZFSUP_i, ZFLUX_i(:,1,:), ZFCUP_i, ZFLUC_i(:,1,:), &
                   !       Surf Direct flux : ATTENTION
-                  & ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_INTO_SUN, &
+   ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_INTO_SUN, &
                   !       UV and para flux
-                  & ZFLUX_UV, ZFLUX_PAR, ZFLUX_PAR_CLEAR, &
+   ZFLUX_UV, ZFLUX_PAR, ZFLUX_PAR_CLEAR, &
                   !      & ZFLUX_SW_DN_TOA, 
-                  & ZEMIS_OUT, ZLWDERIVATIVE, &
-                  & PSFSWDIF, PSFSWDIR, &
-                  & cloud_cover_sw)
+   ZEMIS_OUT, ZLWDERIVATIVE, &
+   PSFSWDIF, PSFSWDIR, &
+   cloud_cover_sw)
           else
              print*,' 2e apell Ecrad : ok_3Deffect, namelist_ecrad_file = ', &
                   ok_3Deffect, namelist_ecrad_file       
              CALL RADIATION_SCHEME_S2 &
-                  & (ist, iend, klon, klev, naero_grp, NSW, &
-                  & namelist_ecrad_file, ok_3Deffect, &
-                  & debut, ok_volcan, flag_aerosol_strat, &
-                  & day_cur, current_time, &
+   (ist, iend, klon, klev, naero_grp, NSW, &
+   namelist_ecrad_file, ok_3Deffect, &
+   debut, ok_volcan, flag_aerosol_strat, &
+   day_cur, current_time, &
                   !       Cste solaire/(d_Terre-Soleil)**2
-                  & SOLARIRAD, &
+   SOLARIRAD, &
                   !       Cos(angle zin), temp sol              
-                  & rmu0, tsol, &
+   rmu0, tsol, &
                   !       Albedo diffuse et directe
-                  & PALBD_NEW,PALBP_NEW, &
+   PALBD_NEW,PALBP_NEW, &
                   !       Emessivite : PEMIS_WINDOW (???), &
-                  & ZEMIS, ZEMISW, &
+   ZEMIS, ZEMISW, &
                   !       longitude(rad), sin(latitude), PMASQ_ ???
-                  & ZGELAM, ZGEMU, &
+   ZGELAM, ZGEMU, &
                   !       Temp et pres aux interf, vapeur eau, Satur spec humid 
-                  & paprs_i, ZTH_i, q_i, qsat_i, & 
+   paprs_i, ZTH_i, q_i, qsat_i, &
                   !       Gas
-                  & ZCO2, ZCH4, ZN2O, ZNO2, ZCFC11, ZCFC12, ZHCFC22, &
-                  & ZCCL4, POZON_i(:,:,1), ZO2, &
+   ZCO2, ZCH4, ZN2O, ZNO2, ZCFC11, ZCFC12, ZHCFC22, &
+   ZCCL4, POZON_i(:,:,1), ZO2, &
                   !       nuages :
-                  & cldfra_i, flwc_i, fiwc_i, ZQ_SNOW, &
+   cldfra_i, flwc_i, fiwc_i, ZQ_SNOW, &
                   !       rayons effectifs des gouttelettes              
-                  & ref_liq_i, ref_ice_i, &
+   ref_liq_i, ref_ice_i, &
                   !       aerosols
-                  & ZAEROSOL_OLD, ZAEROSOL, &
+   ZAEROSOL_OLD, ZAEROSOL, &
                   ! Outputs
                   !       Net flux :
-                  & ZSWFT_i, ZLWFT_i, ZSWFT0_ii, ZLWFT0_ii, &
+   ZSWFT_i, ZLWFT_i, ZSWFT0_ii, ZLWFT0_ii, &
                   !       DWN flux :
-                  & ZFSDWN_i, ZFLUX_i(:,2,:), ZFCDWN_i, ZFLUC_i(:,2,:), &
+   ZFSDWN_i, ZFLUX_i(:,2,:), ZFCDWN_i, ZFLUC_i(:,2,:), &
                   !       UP flux :
-                  & ZFSUP_i, ZFLUX_i(:,1,:), ZFCUP_i, ZFLUC_i(:,1,:), &
+   ZFSUP_i, ZFLUX_i(:,1,:), ZFCUP_i, ZFLUC_i(:,1,:), &
                   !       Surf Direct flux : ATTENTION
-                  & ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_INTO_SUN, &
+   ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_INTO_SUN, &
                   !       UV and para flux
-                  & ZFLUX_UV, ZFLUX_PAR, ZFLUX_PAR_CLEAR, &
+   ZFLUX_UV, ZFLUX_PAR, ZFLUX_PAR_CLEAR, &
                   !      & ZFLUX_SW_DN_TOA,
-                  & ZEMIS_OUT, ZLWDERIVATIVE, &
-                  & PSFSWDIF, PSFSWDIR, &
-                  & cloud_cover_sw)
+   ZEMIS_OUT, ZLWDERIVATIVE, &
+   PSFSWDIF, PSFSWDIR, &
+   cloud_cover_sw)
           endif
 

LMDZ6/branches/Amaury_dev/libf/phylmd/reevap.F90

@@ -1 +1 @@
   SUBROUTINE reevap (klon,klev,iflag_ice_thermo,t_seri,q_seri,ql_seri,qs_seri, &
-   &         d_t_eva,d_q_eva,d_ql_eva,d_qs_eva)
+           d_t_eva,d_q_eva,d_ql_eva,d_qs_eva)
 
     ! flag to include modifications to ensure energy conservation (if flag >0)

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_horiz_time_climoz_m.F90

@@ -660 +660 @@
     CALL NF95_PUT_ATT(fID_ou, vID_ou(1), "long_name", "ozone mole fraction")
     CALL NF95_PUT_ATT(fID_ou, vID_ou(1), "standard_name", "mole_fraction_of_ozone&
-      &_in_air")
+  _in_air")
     IF(SIZE(vID_ou) == 2) THEN
       CALL NF95_DEF_VAR(fID_ou, vars_in(2), NF90_FLOAT, dIDs(1:ndims), vID_ou(2))
       CALL NF95_PUT_ATT(fID_ou, vID_ou(2), "long_name","ozone mole fraction in da&
-        &ylight")
+  ylight")
     END IF
 

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_lat_time_coefoz_m.F90

@@ -299 +299 @@
 
        ncerr = nf90_copy_att(ncid_in, varid_in(i), "long_name",&
-            & ncid_out, varid_out(i))
+   ncid_out, varid_out(i))
        call handle_err_copy_att("long_name")
 
        ncerr = nf90_copy_att(ncid_in, varid_in(i), "units", ncid_out,&
-            & varid_out(i))
+   varid_out(i))
        call handle_err_copy_att("units")
 
        ncerr = nf90_copy_att(ncid_in, varid_in(i), "standard_name", ncid_out,&
-            & varid_out(i))
+   varid_out(i))
        call handle_err_copy_att("standard_name")
     END DO

LMDZ6/branches/Amaury_dev/libf/phylmd/screenp_mod.F90

@@ -15 +15 @@
 !
       SUBROUTINE screenp(klon, knon, nsrf, &
-     &                   speed, tair, qair, &
-     &                   ts, qsurf, rugos, lmon, &
-     &                   ustar, testar, qstar, zref, &
-     &                   delu, delte, delq) 
+                     speed, tair, qair, &
+                     ts, qsurf, rugos, lmon, &
+                     ustar, testar, qstar, zref, &
+                     delu, delte, delq)
       IMPLICIT none
 !-------------------------------------------------------------------------
@@ -73 +73 @@
 !
           IF (speed(i)>1.5.AND.lmon(i)<=1.0                        &
-     &                      .AND. rugos(i)<=1.0) THEN
+                        .AND. rugos(i)<=1.0) THEN
             delu(i) = (ustar(i)/RKAR)* &
                       (log(zref/(rugos(i))+1.) + &
@@ -122 +122 @@
 !
       SUBROUTINE screenpn(klon, knon, nsrf, &
-     &                   speed, tair, qair, &
-     &                   ts, qsurf, rugos, zri1, &
-     &                   zref, &
-     &                   delu, delte, delq) 
+                     speed, tair, qair, &
+                     ts, qsurf, rugos, zri1, &
+                     zref, &
+                     delu, delte, delq)
       IMPLICIT none
 !-------------------------------------------------------------------------

LMDZ6/branches/Amaury_dev/libf/phylmd/simu_airs.F90

@@ -23 +23 @@
         REAL P(N),T(N),alt(N),slope(N)
         REAL P_min, P_max, slope_limit,slope_2km, &
-     & delta_alt_limit,tmp,delta_alt
+   delta_alt_limit,tmp,delta_alt
         PARAMETER(P_min=75.0, P_max=470.0)   ! hPa
         PARAMETER(slope_limit=0.002)         ! 2 K/km converted to K/m
@@ -66 +66 @@
         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))
+   slope(first_point))*(P(first_point+1)-P(first_point))
         P_tropo=P(first_point)+tmp
         ! print*, 'P_tropo= ', tmp, P(first_point), P_tropo
@@ -82 +82 @@
 
         subroutine cloud_structure(len_cs, rneb_cs, temp_cs, &
-     & emis_cs, iwco_cs, &
-     & pres_cs, dz_cs, rhodz_cs, rad_cs, &
-     & cc_tot_cs, cc_hc_cs, cc_hist_cs, &
-     & cc_Cb_cs, cc_ThCi_cs, cc_Anv_cs, &
-     & pcld_hc_cs, tcld_hc_cs, &
-     & em_hc_cs, iwp_hc_cs, deltaz_hc_cs, &
-     & pcld_Cb_cs, tcld_Cb_cs, em_Cb_cs, &
-     & pcld_ThCi_cs, tcld_ThCi_cs, em_ThCi_cs, &
-     & pcld_Anv_cs, tcld_Anv_cs, em_Anv_cs, &
-     & em_hist_cs, iwp_hist_cs, deltaz_hist_cs, rad_hist_cs)
+   emis_cs, iwco_cs, &
+   pres_cs, dz_cs, rhodz_cs, rad_cs, &
+   cc_tot_cs, cc_hc_cs, cc_hist_cs, &
+   cc_Cb_cs, cc_ThCi_cs, cc_Anv_cs, &
+   pcld_hc_cs, tcld_hc_cs, &
+   em_hc_cs, iwp_hc_cs, deltaz_hc_cs, &
+   pcld_Cb_cs, tcld_Cb_cs, em_Cb_cs, &
+   pcld_ThCi_cs, tcld_ThCi_cs, em_ThCi_cs, &
+   pcld_Anv_cs, tcld_Anv_cs, em_Anv_cs, &
+   em_hist_cs, iwp_hist_cs, deltaz_hist_cs, rad_hist_cs)
 
 
@@ -103 +103 @@
 
         REAL, intent(out) :: cc_tot_cs, cc_hc_cs, cc_hist_cs, &
-     & cc_Cb_cs, cc_ThCi_cs, cc_Anv_cs, &
-     & pcld_hc_cs, tcld_hc_cs, em_hc_cs, iwp_hc_cs, &
-     & pcld_Cb_cs, tcld_Cb_cs, em_Cb_cs, &
-     & pcld_ThCi_cs, tcld_ThCi_cs, em_ThCi_cs, &
-     & pcld_Anv_cs, tcld_Anv_cs, em_Anv_cs, &
-     & em_hist_cs, iwp_hist_cs, &
-     & deltaz_hc_cs, deltaz_hist_cs, rad_hist_cs
+   cc_Cb_cs, cc_ThCi_cs, cc_Anv_cs, &
+   pcld_hc_cs, tcld_hc_cs, em_hc_cs, iwp_hc_cs, &
+   pcld_Cb_cs, tcld_Cb_cs, em_Cb_cs, &
+   pcld_ThCi_cs, tcld_ThCi_cs, em_ThCi_cs, &
+   pcld_Anv_cs, tcld_Anv_cs, em_Anv_cs, &
+   em_hist_cs, iwp_hist_cs, &
+   deltaz_hc_cs, deltaz_hist_cs, rad_hist_cs
 
         REAL, DIMENSION(len_cs) :: rneb_ord
@@ -117 +117 @@
         REAL, DIMENSION(:), allocatable :: sCb, sThCi, sAnv
         REAL, DIMENSION(:), allocatable :: iwp_ss, pcld_ss, tcld_ss,&
-     & emis_ss
+   emis_ss
         REAL, DIMENSION(:), allocatable :: deltaz_ss, rad_ss
 
@@ -185 +185 @@
         do i = 1, nss
          call sous_section(len_cs, rneb_cs, temp_cs, &
-     &  emis_cs, iwco_cs, &
-     &  pres_cs, dz_cs, rhodz_cs, rad_cs, rneb_ord, &
-     &  rneb_max(i),s(i),s_hc(i),s_hist(i), &
-     &  sCb(i), sThCi(i), sAnv(i), &
-     &  emis_ss(i), &
-     &  pcld_ss(i), tcld_ss(i), iwp_ss(i), deltaz_ss(i), rad_ss(i))
+    emis_cs, iwco_cs, &
+    pres_cs, dz_cs, rhodz_cs, rad_cs, rneb_ord, &
+    rneb_max(i),s(i),s_hc(i),s_hist(i), &
+    sCb(i), sThCi(i), sAnv(i), &
+    emis_ss(i), &
+    pcld_ss(i), tcld_ss(i), iwp_ss(i), deltaz_ss(i), rad_ss(i))
         enddo
 
@@ -304 +304 @@
 
         if (cc_tot_cs > maxval(rneb_cs) .and. &
-     & abs(cc_tot_cs-maxval(rneb_cs)) > 1.e-4 )  then
+   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)
@@ -347 +347 @@
 
         subroutine sous_section(len_cs, rneb_cs, temp_cs, &
-     & emis_cs, iwco_cs, &
-     & pres_cs, dz_cs, rhodz_cs, rad_cs, rneb_ord, &
-     & rnebmax, stot, shc, shist, &
-     & sCb, sThCi, sAnv, &
-     & emis, pcld, tcld, iwp, deltaz, rad)
+   emis_cs, iwco_cs, &
+   pres_cs, dz_cs, rhodz_cs, rad_cs, rneb_ord, &
+   rnebmax, stot, shc, shist, &
+   sCb, sThCi, sAnv, &
+   emis, pcld, tcld, iwp, deltaz, rad)
 
         INTEGER, intent(in) :: len_cs
         REAL, DIMENSION(len_cs), intent(in) :: rneb_cs, temp_cs
         REAL, DIMENSION(len_cs), intent(in) :: emis_cs, iwco_cs, &
-     & rneb_ord
+   rneb_ord
         REAL, DIMENSION(len_cs), intent(in) :: pres_cs, dz_cs, rad_cs
         REAL, DIMENSION(len_cs), intent(in) :: rhodz_cs
@@ -417 +417 @@
 
         call caract(ibeg, iend, temp_cs, tau_cs, iwco_cs, &
-     & pres_cs, dz_cs, rhodz_cs, rad_cs, pcld, tcld, &
-     & som_tau, som_iwc, som_dz, som_rad)
+   pres_cs, dz_cs, rhodz_cs, rad_cs, pcld, tcld, &
+   som_tau, som_iwc, som_dz, som_rad)
 
 ! On masque le nuage s'il n'est pas detectable
@@ -437 +437 @@
 
         call caract(ibeg, iend, temp_cs, tau_cs, iwco_cs, &
-     & pres_cs, dz_cs, rhodz_cs, rad_cs, pcld, tcld, &
-     & som_tau, som_iwc, som_dz, som_rad)
+   pres_cs, dz_cs, rhodz_cs, rad_cs, pcld, tcld, &
+   som_tau, som_iwc, som_dz, som_rad)
 
         tau = som_tau
@@ -457 +457 @@
 
         if (emis < em_min .or. emis > em_max  &
-     & .or. tcld > 230.) then
+   .or. tcld > 230.) then
         shist = 0.
         endif
@@ -515 +515 @@
 
         subroutine masque (ibeg, iend, som_tau, &
-     & visible, w)
+   visible, w)
 
         INTEGER, intent(in) :: ibeg, iend
@@ -556 +556 @@
 
          subroutine caract (ibeg, iend, temp_cs, tau_cs, iwco_cs, &
-     & pres_cs, dz_cs, rhodz_cs, rad_cs, pcld, tcld, &
-     & som_tau, som_iwc, som_dz, som_rad)
+   pres_cs, dz_cs, rhodz_cs, rad_cs, pcld, tcld, &
+   som_tau, som_iwc, som_dz, som_rad)
 
         INTEGER, intent(in) :: ibeg, iend
@@ -686 +686 @@
  
         subroutine sim_mesh(rneb_1D, temp_1D, emis_1D, &
-     & iwcon_1D, rad_1D, &
-     & pres, dz, &
-     & rhodz_1D, cc_tot_mesh, cc_hc_mesh, cc_hist_mesh, pcld_hc_mesh,&
-     & tcld_hc_mesh, &
-     & em_hc_mesh, iwp_hc_mesh, deltaz_hc_mesh, &
-     & cc_Cb_mesh, cc_ThCi_mesh, cc_Anv_mesh, &
-     & pcld_Cb_mesh, tcld_Cb_mesh, em_Cb_mesh, &
-     & pcld_ThCi_mesh, tcld_ThCi_mesh, em_ThCi_mesh, &
-     & pcld_Anv_mesh, tcld_Anv_mesh, em_Anv_mesh, &
-     & em_hist_mesh, iwp_hist_mesh, deltaz_hist_mesh, rad_hist_mesh)
+   iwcon_1D, rad_1D, &
+   pres, dz, &
+   rhodz_1D, cc_tot_mesh, cc_hc_mesh, cc_hist_mesh, pcld_hc_mesh,&
+   tcld_hc_mesh, &
+   em_hc_mesh, iwp_hc_mesh, deltaz_hc_mesh, &
+   cc_Cb_mesh, cc_ThCi_mesh, cc_Anv_mesh, &
+   pcld_Cb_mesh, tcld_Cb_mesh, em_Cb_mesh, &
+   pcld_ThCi_mesh, tcld_ThCi_mesh, em_ThCi_mesh, &
+   pcld_Anv_mesh, tcld_Anv_mesh, em_Anv_mesh, &
+   em_hist_mesh, iwp_hist_mesh, deltaz_hist_mesh, rad_hist_mesh)
 
        USE dimphy
 
        REAL, DIMENSION(klev), intent(in) :: rneb_1D, temp_1D, emis_1D, &
-     & iwcon_1D, rad_1D
+   iwcon_1D, rad_1D
         REAL, DIMENSION(klev), intent(in) :: pres, dz, rhodz_1D
         REAL, intent(out) :: cc_tot_mesh, cc_hc_mesh, cc_hist_mesh
         REAL, intent(out) :: cc_Cb_mesh, cc_ThCi_mesh, cc_Anv_mesh
         REAL, intent(out) :: em_hc_mesh, pcld_hc_mesh, tcld_hc_mesh, &
-     & iwp_hc_mesh
+   iwp_hc_mesh
 
         REAL, intent(out) :: pcld_Cb_mesh, tcld_Cb_mesh, em_Cb_mesh
         REAL, intent(out) :: pcld_ThCi_mesh, tcld_ThCi_mesh, &
-     & em_ThCi_mesh
+   em_ThCi_mesh
         REAL, intent(out) :: pcld_Anv_mesh, tcld_Anv_mesh, em_Anv_mesh
 
@@ -716 +716 @@
 
         REAL, DIMENSION(:), allocatable :: rneb_cs, temp_cs, emis_cs, &
-     & iwco_cs
+   iwco_cs
         REAL, DIMENSION(:), allocatable :: pres_cs, dz_cs, rad_cs, &
-     & rhodz_cs
+   rhodz_cs
 
         INTEGER :: i,j,l
@@ -724 +724 @@
 
         REAL :: som_emi_hc,som_pcl_hc,som_tcl_hc,som_iwp_hc,som_hc,&
-     & som_hist
+   som_hist
         REAL :: som_emi_hist, som_iwp_hist, som_deltaz_hc, &
-     & som_deltaz_hist
+   som_deltaz_hist
         REAL :: som_rad_hist
         REAL :: som_Cb, som_ThCi, som_Anv
@@ -849 +849 @@
 
         call cloud_structure(len_cs,rneb_cs,temp_cs,emis_cs,iwco_cs,&
-     & pres_cs, dz_cs, rhodz_cs, rad_cs, &
-     & cc_tot_cs, cc_hc_cs, cc_hist_cs, &
-     & cc_Cb_cs, cc_ThCi_cs, cc_Anv_cs, &
-     & pcld_hc_cs, tcld_hc_cs, &
-     & em_hc_cs, iwp_hc_cs, deltaz_hc_cs, &
-     & pcld_Cb_cs, tcld_Cb_cs, em_Cb_cs, &
-     & pcld_ThCi_cs, tcld_ThCi_cs, em_ThCi_cs, &
-     & pcld_Anv_cs, tcld_Anv_cs, em_Anv_cs, &
-     & em_hist_cs, iwp_hist_cs, deltaz_hist_cs, rad_hist_cs)
+   pres_cs, dz_cs, rhodz_cs, rad_cs, &
+   cc_tot_cs, cc_hc_cs, cc_hist_cs, &
+   cc_Cb_cs, cc_ThCi_cs, cc_Anv_cs, &
+   pcld_hc_cs, tcld_hc_cs, &
+   em_hc_cs, iwp_hc_cs, deltaz_hc_cs, &
+   pcld_Cb_cs, tcld_Cb_cs, em_Cb_cs, &
+   pcld_ThCi_cs, tcld_ThCi_cs, em_ThCi_cs, &
+   pcld_Anv_cs, tcld_Anv_cs, em_Anv_cs, &
+   em_hist_cs, iwp_hist_cs, deltaz_hist_cs, rad_hist_cs)
 
 
@@ -897 +897 @@
         som_iwp_hist = som_iwp_hist + iwp_hist_cs*cc_hist_cs*prod_hh
         som_deltaz_hist = som_deltaz_hist + &
-     & deltaz_hist_cs*cc_hist_cs*prod_hh
+   deltaz_hist_cs*cc_hist_cs*prod_hh
         som_rad_hist = som_rad_hist + rad_hist_cs*cc_hist_cs*prod_hh
 
@@ -956 +956 @@
 
         call normal2_undef(pcld_hc_mesh,som_pcl_hc, &
-     & cc_hc_mesh)
+   cc_hc_mesh)
         call normal2_undef(tcld_hc_mesh,som_tcl_hc, &
-     & cc_hc_mesh)
+   cc_hc_mesh)
         call normal2_undef(em_hc_mesh,som_emi_hc, &
-     & cc_hc_mesh)
+   cc_hc_mesh)
         call normal2_undef(iwp_hc_mesh,som_iwp_hc, &
-     & cc_hc_mesh)
+   cc_hc_mesh)
         call normal2_undef(deltaz_hc_mesh,som_deltaz_hc, &
-     & cc_hc_mesh)
+   cc_hc_mesh)
 
         call normal2_undef(em_Cb_mesh,som_emi_Cb, &
-     & cc_Cb_mesh)
+   cc_Cb_mesh)
         call normal2_undef(tcld_Cb_mesh,som_tcld_Cb, &
-     & cc_Cb_mesh)
+   cc_Cb_mesh)
         call normal2_undef(pcld_Cb_mesh,som_pcld_Cb, &
-     & cc_Cb_mesh)
+   cc_Cb_mesh)
 
         call normal2_undef(em_ThCi_mesh,som_emi_ThCi, &
-     & cc_ThCi_mesh)
+   cc_ThCi_mesh)
         call normal2_undef(tcld_ThCi_mesh,som_tcld_ThCi, &
-     & cc_ThCi_mesh)
+   cc_ThCi_mesh)
         call normal2_undef(pcld_ThCi_mesh,som_pcld_ThCi, &
-     & cc_ThCi_mesh)
+   cc_ThCi_mesh)
 
        call normal2_undef(em_Anv_mesh,som_emi_Anv, &
-     & cc_Anv_mesh)
+   cc_Anv_mesh)
         call normal2_undef(tcld_Anv_mesh,som_tcld_Anv, &
-     & cc_Anv_mesh)
+   cc_Anv_mesh)
         call normal2_undef(pcld_Anv_mesh,som_pcld_Anv, &
-     & cc_Anv_mesh)
+   cc_Anv_mesh)
 
 
         call normal2_undef(em_hist_mesh,som_emi_hist, &
-     & cc_hist_mesh)
+   cc_hist_mesh)
         call normal2_undef(iwp_hist_mesh,som_iwp_hist, &
-     & cc_hist_mesh)
+   cc_hist_mesh)
         call normal2_undef(deltaz_hist_mesh,som_deltaz_hist, &
-     & cc_hist_mesh)
+   cc_hist_mesh)
         call normal2_undef(rad_hist_mesh,som_rad_hist, &
-     & cc_hist_mesh)
+   cc_hist_mesh)
 
 
@@ -1003 +1003 @@
 
        if (cc_tot_mesh > tsom_tot .and. &
-     & abs(cc_tot_mesh-tsom_tot) > 1.e-4) then
+   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)
@@ -1009 +1009 @@
 
         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
+   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)
@@ -1015 +1015 @@
 
         if (cc_hc_mesh > tsom_hc .and. &
-     & abs(cc_hc_mesh-tsom_hc) > 1.e-4) then
+   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)
@@ -1021 +1021 @@
 
         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
+   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)
@@ -1027 +1027 @@
 
         if (cc_hist_mesh > tsom_hist .and. &
-     & abs(cc_hist_mesh-tsom_hist) > 1.e-4) then
+   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)
@@ -1038 +1038 @@
 
         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
+   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))
+   minval(test_pcld(1:N_CS))
            CALL abort_physic(modname,abort_message,1)
         endif
 
        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
+   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))
+   minval(test_tcld(1:N_CS))
            CALL abort_physic(modname,abort_message,1)
         endif
 
         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
+   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))
+   minval(test_em(1:N_CS))
            CALL abort_physic(modname,abort_message,1)
         endif
@@ -1122 +1122 @@
 
         subroutine simu_airs &
-     & (itap, rneb_airs, temp_airs, cldemi_airs, iwcon0_airs, rad_airs, &
-     & geop_airs, pplay_airs, paprs_airs, &
-     & map_prop_hc,map_prop_hist,&
-     & map_emis_hc,map_iwp_hc,map_deltaz_hc,map_pcld_hc,map_tcld_hc,&
-     & map_emis_Cb,map_pcld_Cb,map_tcld_Cb,&
-     & map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi,&
-     & map_emis_Anv,map_pcld_Anv,map_tcld_Anv,&
-     & map_emis_hist,map_iwp_hist,map_deltaz_hist,map_rad_hist,&
-     & map_ntot,map_hc,map_hist,&
-     & map_Cb,map_ThCi,map_Anv,alt_tropo )
+   (itap, rneb_airs, temp_airs, cldemi_airs, iwcon0_airs, rad_airs, &
+   geop_airs, pplay_airs, paprs_airs, &
+   map_prop_hc,map_prop_hist,&
+   map_emis_hc,map_iwp_hc,map_deltaz_hc,map_pcld_hc,map_tcld_hc,&
+   map_emis_Cb,map_pcld_Cb,map_tcld_Cb,&
+   map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi,&
+   map_emis_Anv,map_pcld_Anv,map_tcld_Anv,&
+   map_emis_hist,map_iwp_hist,map_deltaz_hist,map_rad_hist,&
+   map_ntot,map_hc,map_hist,&
+   map_Cb,map_ThCi,map_Anv,alt_tropo )
 
         USE dimphy
@@ -1143 +1143 @@
 
         REAL, DIMENSION(klon,klev), intent(in) :: &
-     & rneb_airs, temp_airs, cldemi_airs, iwcon0_airs, &
-     & rad_airs, geop_airs, pplay_airs, paprs_airs
+   rneb_airs, temp_airs, cldemi_airs, iwcon0_airs, &
+   rad_airs, geop_airs, pplay_airs, paprs_airs
 
        REAL, DIMENSION(klon,klev) :: &
-     & rhodz_airs, rho_airs, iwcon_airs
+   rhodz_airs, rho_airs, iwcon_airs
 
         REAL, DIMENSION(klon),intent(out) :: alt_tropo
 
         REAL, DIMENSION(klev) :: rneb_1D, temp_1D, &
-     & emis_1D, rad_1D, pres_1D, alt_1D, &
-     & rhodz_1D, dz_1D, iwcon_1D
+   emis_1D, rad_1D, pres_1D, alt_1D, &
+   rhodz_1D, dz_1D, iwcon_1D
 
         INTEGER :: i, j
@@ -1172 +1172 @@
         REAL, DIMENSION(klon),intent(out) :: map_emis_Cb,map_pcld_Cb,map_tcld_Cb 
         REAL, DIMENSION(klon),intent(out) :: &
-     & map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi
+   map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi
         REAL, DIMENSION(klon),intent(out) :: &
-     & map_emis_Anv,map_pcld_Anv,map_tcld_Anv
+   map_emis_Anv,map_pcld_Anv,map_tcld_Anv
         REAL, DIMENSION(klon),intent(out) :: &
-     & map_emis_hist,map_iwp_hist,map_deltaz_hist,&
-     & map_rad_hist
+   map_emis_hist,map_iwp_hist,map_deltaz_hist,&
+   map_rad_hist
         REAL, DIMENSION(klon),intent(out) :: map_ntot,map_hc,map_hist
         REAL, DIMENSION(klon),intent(out) :: map_Cb,map_ThCi,map_Anv
@@ -1192 +1192 @@
         do j = 1, klev-1
         rhodz_airs(i,j) = &
-     & (paprs_airs(i,j)-paprs_airs(i,j+1))/RG
+   (paprs_airs(i,j)-paprs_airs(i,j+1))/RG
         enddo
         rhodz_airs(i,klev) = 0.
@@ -1200 +1200 @@
         do j = 1,klev
         rho_airs(i,j) = &
-     & pplay_airs(i,j)/(temp_airs(i,j)*RD)
+   pplay_airs(i,j)/(temp_airs(i,j)*RD)
 
         if (rneb_airs(i,j) > 0.001) then
@@ -1232 +1232 @@
 
         alt_tropo(i) = &
-     & search_tropopause(pres_1D/100.,temp_1D,alt_1D,klev)
+   search_tropopause(pres_1D/100.,temp_1D,alt_1D,klev)
 
 
@@ -1240 +1240 @@
 
         call sim_mesh(rneb_1D, temp_1D, emis_1D, iwcon_1D, rad_1D, &
-     & pres_1D, dz_1D, rhodz_1D, &
-     & cc_tot_mesh, cc_hc_mesh, cc_hist_mesh, &
-     & pcld_hc_mesh, tcld_hc_mesh, em_hc_mesh, iwp_hc_mesh, &
-     & deltaz_hc_mesh,&
-     & cc_Cb_mesh, cc_ThCi_mesh, cc_Anv_mesh, &
-     & pcld_Cb_mesh, tcld_Cb_mesh, em_Cb_mesh, &
-     & pcld_ThCi_mesh, tcld_ThCi_mesh, em_ThCi_mesh, &
-     & pcld_Anv_mesh, tcld_Anv_mesh, em_Anv_mesh, &
-     & em_hist_mesh, iwp_hist_mesh, deltaz_hist_mesh, rad_hist_mesh)
+   pres_1D, dz_1D, rhodz_1D, &
+   cc_tot_mesh, cc_hc_mesh, cc_hist_mesh, &
+   pcld_hc_mesh, tcld_hc_mesh, em_hc_mesh, iwp_hc_mesh, &
+   deltaz_hc_mesh,&
+   cc_Cb_mesh, cc_ThCi_mesh, cc_Anv_mesh, &
+   pcld_Cb_mesh, tcld_Cb_mesh, em_Cb_mesh, &
+   pcld_ThCi_mesh, tcld_ThCi_mesh, em_ThCi_mesh, &
+   pcld_Anv_mesh, tcld_Anv_mesh, em_Anv_mesh, &
+   em_hist_mesh, iwp_hist_mesh, deltaz_hist_mesh, rad_hist_mesh)
 
          write(*,*) '===================================='
          write(*,*) 'itap, i:', itap, i 
          write(*,*) 'cc_tot, cc_hc, cc_hist, pcld_hc, tcld_hc, em_hc, &
-     & iwp_hc, em_hist, iwp_hist ='
+   iwp_hc, em_hist, iwp_hist ='
          write(*,*) cc_tot_mesh, cc_hc_mesh, cc_hist_mesh
          write(*,*) pcld_hc_mesh, tcld_hc_mesh, em_hc_mesh, iwp_hc_mesh
@@ -1263 +1263 @@
 
         call normal2_undef(map_prop_hc(i),cc_hc_mesh, &
-     & cc_tot_mesh)
+   cc_tot_mesh)
         call normal2_undef(map_prop_hist(i),cc_hist_mesh, &
-     & cc_tot_mesh)
+   cc_tot_mesh)
 
        map_emis_hc(i) = em_hc_mesh

LMDZ6/branches/Amaury_dev/libf/phylmd/stdlevvar_mod.F90

@@ -123 +123 @@
 
       CALL cdrag(knon, nsrf, &
- &                   speed, t1, q1, z1, &
- &                   psol, s_pblh, ts1, qsurf, z0m, z0h, &
- &                   zri_zero, 0, &
- &                   cdram, cdrah, zri1, pref, prain, tsol, pat1)
+                     speed, t1, q1, z1, &
+                     psol, s_pblh, ts1, qsurf, z0m, z0h, &
+                     zri_zero, 0, &
+                     cdram, cdrah, zri1, pref, prain, tsol, pat1)
 
 ! --- special Dice: on force cdragm ( a defaut de forcer ustar) MPL 05082013
@@ -153 +153 @@
         qstar(i) = (cdrah(i) * zdq(i) * speed(i))/ustar(i)
         lmon(i) = (ustar(i) * ustar(i) * tpot(i))/ &
- &                (RKAR * RG * testar(i))
+                  (RKAR * RG * testar(i))
       ENDDO
 !
@@ -159 +159 @@
       zref = 2.0
       CALL screenp(klon, knon, nsrf, speed, tpot, q1, &
- &                 ts1, qsurf, z0m, lmon, &
- &                 ustar, testar, qstar, zref, &
- &                 delu, delte, delq)
+                   ts1, qsurf, z0m, lmon, &
+                   ustar, testar, qstar, zref, &
+                   delu, delte, delq)
 !
       DO i = 1, knon
@@ -179 +179 @@
         okri=.TRUE.
         CALL screenc(klon, knon, nsrf, zxli, &
- &                   u_zref, temp, q_zref, zref, &
- &                   ts1, qsurf, z0m, z0h, psol, &           
- &                   ustar, testar, qstar, okri, ri1, &
- &                   pref, delu, delte, delq, s_pblh ,prain, tsol, pat1) 
+                     u_zref, temp, q_zref, zref, &
+                     ts1, qsurf, z0m, z0h, psol, &
+                     ustar, testar, qstar, okri, ri1, &
+                     pref, delu, delte, delq, s_pblh ,prain, tsol, pat1)
 !
         DO i = 1, knon
@@ -261 +261 @@
       zref = 10.0
       CALL screenp(klon, knon, nsrf, speed, tpot, q1, &
- &                 ts1, qsurf, z0m, lmon, &
- &                 ustar, testar, qstar, zref, &
- &                 delu, delte, delq)
+                   ts1, qsurf, z0m, lmon, &
+                   ustar, testar, qstar, zref, &
+                   delu, delte, delq)
 !
       DO i = 1, knon
@@ -281 +281 @@
         okri=.TRUE.
         CALL screenc(klon, knon, nsrf, zxli, &
- &                   u_zref, temp, q_zref, zref, &
- &                   ts1, qsurf, z0m, z0h, psol, &
- &                   ustar, testar, qstar, okri, ri1, &
- &                   pref, delu, delte, delq, s_pblh ,prain, tsol, pat1)
+                     u_zref, temp, q_zref, zref, &
+                     ts1, qsurf, z0m, z0h, psol, &
+                     ustar, testar, qstar, okri, ri1, &
+                     pref, delu, delte, delq, s_pblh ,prain, tsol, pat1)
 !
         DO i = 1, knon
@@ -451 +451 @@
       okri=.FALSE.
       CALL cdrag(knon, nsrf, &
- &                   speed, t1, q1, z1, &
- &                   psol, s_pblh, ts1, qsurf, z0m, z0h, &
- &                   zri_zero, 0, &
- &                   cdram, cdrah, zri1, pref, prain, tsol, pat1)
+                     speed, t1, q1, z1, &
+                     psol, s_pblh, ts1, qsurf, z0m, z0h, &
+                     zri_zero, 0, &
+                     cdram, cdrah, zri1, pref, prain, tsol, pat1)
 
 !
@@ -472 +472 @@
 !
        CALL screencn(klon, knon, nsrf, zxli, &
- &                   speed, tpot, q1, zref, &
- &                   ts1, qsurf, z0m, z0h, psol, &           
- &                   cdram, cdrah,  okri, &
- &                   ri1, 1, &
- &                   pref_new, delm_new, delh_new, ri2m, &
- &                   s_pblh, prain, tsol, pat1      )
+                     speed, tpot, q1, zref, &
+                     ts1, qsurf, z0m, z0h, psol, &
+                     cdram, cdrah,  okri, &
+                     ri1, 1, &
+                     pref_new, delm_new, delh_new, ri2m, &
+                     s_pblh, prain, tsol, pat1      )
 !
        DO i = 1, knon
@@ -483 +483 @@
          u_zref_p(i) = u_zref(i)
          q_zref(i) = delh_new(i)*max(q1(i),0.0) + &
-         &           max(qsurf(i),0.0)*(1-delh_new(i))
+             max(qsurf(i),0.0)*(1-delh_new(i))
          q_zref_p(i) = q_zref(i)
          te_zref(i) = delh_new(i)*tpot(i) + ts1(i)*(1-delh_new(i))
@@ -495 +495 @@
 !
          ok_t2m_toosmall(i)=te_zref(i)<tpot(i).AND. &
-         & te_zref(i)<ts1(i)
+   te_zref(i)<ts1(i)
          ok_t2m_toobig(i)=te_zref(i)>tpot(i).AND. &
-         & te_zref(i)>ts1(i)
+   te_zref(i)>ts1(i)
          ok_q2m_toosmall(i)=q_zref(i)<q1(i).AND. &
-         & q_zref(i)<qsurf(i)
+   q_zref(i)<qsurf(i)
          ok_q2m_toobig(i)=q_zref(i)>q1(i).AND. &
-         & q_zref(i)>qsurf(i)
+   q_zref(i)>qsurf(i)
          ok_u2m_toobig(i)=u_zref(i)>speed(i)
 !
@@ -515 +515 @@
 !
          IF(ok_t2m_toosmall(i).OR.ok_t2m_toobig(i).OR. &
-          & ok_q2m_toosmall(i).OR.ok_q2m_toobig(i).OR. &
-          & ok_u2m_toobig(i)) THEN 
+   ok_q2m_toosmall(i).OR.ok_q2m_toobig(i).OR. &
+   ok_u2m_toobig(i)) THEN
              delm_new(i)=min(max(delm_new(i),0.),1.)
              delh_new(i)=min(max(delh_new(i),0.),1.)
@@ -522 +522 @@
              u_zref_p(i) = u_zref(i)
              q_zref(i) = delh_new(i)*max(q1(i),0.0) + &
-         &               max(qsurf(i),0.0)*(1-delh_new(i))
+                 max(qsurf(i),0.0)*(1-delh_new(i))
              q_zref_p(i) = q_zref(i)
              te_zref(i) = delh_new(i)*tpot(i) + ts1(i)*(1-delh_new(i))
@@ -540 +540 @@
         okri=.TRUE.
         CALL screencn(klon, knon, nsrf, zxli, &
- &                   u_zref, temp, q_zref, zref, &
- &                   ts1, qsurf, z0m, z0h, psol, &
- &                   cdram, cdrah,  okri, &
- &                   ri1, 0, &
- &                   pref, delm, delh, ri2m, &
- &                   s_pblh, prain, tsol, pat1      )
+                     u_zref, temp, q_zref, zref, &
+                     ts1, qsurf, z0m, z0h, psol, &
+                     cdram, cdrah,  okri, &
+                     ri1, 0, &
+                     pref, delm, delh, ri2m, &
+                     s_pblh, prain, tsol, pat1      )
 !
         DO i = 1, knon
           u_zref(i) = delm(i)*speed(i)
           q_zref(i) = delh(i)*max(q1(i),0.0) + &
-          &           max(qsurf(i),0.0)*(1-delh(i))
+             max(qsurf(i),0.0)*(1-delh(i))
           te_zref(i) = delh(i)*tpot(i) + ts1(i)*(1-delh(i))
 !
@@ -559 +559 @@
 !
           ok_t2m_toosmall(i)=te_zref(i)<tpot(i).AND. &
-          & te_zref(i)<ts1(i)
+   te_zref(i)<ts1(i)
           ok_t2m_toobig(i)=te_zref(i)>tpot(i).AND. &
-          & te_zref(i)>ts1(i)
+   te_zref(i)>ts1(i)
           ok_q2m_toosmall(i)=q_zref(i)<q1(i).AND. &
-          & q_zref(i)<qsurf(i)
+   q_zref(i)<qsurf(i)
           ok_q2m_toobig(i)=q_zref(i)>q1(i).AND. &
-          & q_zref(i)>qsurf(i)
+   q_zref(i)>qsurf(i)
           ok_u2m_toobig(i)=u_zref(i)>speed(i)
 !
@@ -579 +579 @@
 !
           IF(ok_t2m_toosmall(i).OR.ok_t2m_toobig(i).OR. &
-           & ok_q2m_toosmall(i).OR.ok_q2m_toobig(i).OR. &
-           & ok_u2m_toobig(i)) THEN 
+   ok_q2m_toosmall(i).OR.ok_q2m_toobig(i).OR. &
+   ok_u2m_toobig(i)) THEN
               delm(i)=min(max(delm(i),0.),1.)
               delh(i)=min(max(delh(i),0.),1.)
               u_zref(i) = delm(i)*speed(i)
               q_zref(i) = delh(i)*max(q1(i),0.0) + &
-          &           max(qsurf(i),0.0)*(1-delh(i))
+             max(qsurf(i),0.0)*(1-delh(i))
               te_zref(i) = delh(i)*tpot(i) + ts1(i)*(1-delh(i))
               temp(i) = te_zref(i) * (psol(i)/pref(i))**(-RKAPPA)
@@ -620 +620 @@
 !
        CALL screencn(klon, knon, nsrf, zxli, &
- &                   speed, tpot, q1, zref, &
- &                   ts1, qsurf, z0m, z0h, psol, &           
- &                   cdram, cdrah,  okri, &
- &                   ri1, 1, &
- &                   pref_new, delm_new, delh_new, ri10m, &
- &                   s_pblh, prain, tsol, pat1      )
+                     speed, tpot, q1, zref, &
+                     ts1, qsurf, z0m, z0h, psol, &
+                     cdram, cdrah,  okri, &
+                     ri1, 1, &
+                     pref_new, delm_new, delh_new, ri10m, &
+                     s_pblh, prain, tsol, pat1      )
 !
        DO i = 1, knon
          u_zref(i) = delm_new(i)*speed(i)
          q_zref(i) = delh_new(i)*max(q1(i),0.0) + &
-         &           max(qsurf(i),0.0)*(1-delh_new(i))
+             max(qsurf(i),0.0)*(1-delh_new(i))
          te_zref(i) = delh_new(i)*tpot(i) + ts1(i)*(1-delh_new(i))
          temp(i) = te_zref(i) * (psol(i)/pref_new(i))**(-RKAPPA)
@@ -638 +638 @@
 !
          ok_t10m_toosmall(i)=te_zref(i)<tpot(i).AND. &
-         & te_zref(i)<ts1(i)
+   te_zref(i)<ts1(i)
          ok_t10m_toobig(i)=te_zref(i)>tpot(i).AND. &
-         & te_zref(i)>ts1(i)
+   te_zref(i)>ts1(i)
          ok_q10m_toosmall(i)=q_zref(i)<q1(i).AND. &
-         & q_zref(i)<qsurf(i)
+   q_zref(i)<qsurf(i)
          ok_q10m_toobig(i)=q_zref(i)>q1(i).AND. &
-         & q_zref(i)>qsurf(i)
+   q_zref(i)>qsurf(i)
          ok_u10m_toobig(i)=u_zref(i)>speed(i)
 !
@@ -658 +658 @@
 !
          IF(ok_t10m_toosmall(i).OR.ok_t10m_toobig(i).OR. &
-          & ok_q10m_toosmall(i).OR.ok_q10m_toobig(i).OR. &
-          & ok_u10m_toobig(i)) THEN 
+   ok_q10m_toosmall(i).OR.ok_q10m_toobig(i).OR. &
+   ok_u10m_toobig(i)) THEN
              delm_new(i)=min(max(delm_new(i),0.),1.)
              delh_new(i)=min(max(delh_new(i),0.),1.)
@@ -665 +665 @@
              u_zref_p(i) = u_zref(i)
              q_zref(i) = delh_new(i)*max(q1(i),0.0) + &
-         &               max(qsurf(i),0.0)*(1-delh_new(i))
+                 max(qsurf(i),0.0)*(1-delh_new(i))
              te_zref(i) = delh_new(i)*tpot(i) + ts1(i)*(1-delh_new(i))
              temp(i) = te_zref(i) * (psol(i)/pref_new(i))**(-RKAPPA)
@@ -678 +678 @@
         okri=.TRUE.
         CALL screencn(klon, knon, nsrf, zxli, &
- &                   u_zref, temp, q_zref, zref, &
- &                   ts1, qsurf, z0m, z0h, psol, &
- &                   cdram, cdrah,  okri, &
- &                   ri1, 0, &
- &                   pref, delm, delh, ri10m, &
- &                   s_pblh, prain, tsol, pat1      )
+                     u_zref, temp, q_zref, zref, &
+                     ts1, qsurf, z0m, z0h, psol, &
+                     cdram, cdrah,  okri, &
+                     ri1, 0, &
+                     pref, delm, delh, ri10m, &
+                     s_pblh, prain, tsol, pat1      )
 !
         DO i = 1, knon
           u_zref(i) = delm(i)*speed(i)
           q_zref(i) = delh(i)*max(q1(i),0.0) + &
-          &           max(qsurf(i),0.0)*(1-delh(i))
+             max(qsurf(i),0.0)*(1-delh(i))
           te_zref(i) = delh(i)*tpot(i) + ts1(i)*(1-delh(i))
 !
@@ -697 +697 @@
 !
           ok_t10m_toosmall(i)=te_zref(i)<tpot(i).AND. &
-          & te_zref(i)<ts1(i)
+   te_zref(i)<ts1(i)
           ok_t10m_toobig(i)=te_zref(i)>tpot(i).AND. &
-          & te_zref(i)>ts1(i)
+   te_zref(i)>ts1(i)
           ok_q10m_toosmall(i)=q_zref(i)<q1(i).AND. &
-          & q_zref(i)<qsurf(i)
+   q_zref(i)<qsurf(i)
           ok_q10m_toobig(i)=q_zref(i)>q1(i).AND. &
-          & q_zref(i)>qsurf(i)
+   q_zref(i)>qsurf(i)
           ok_u10m_toobig(i)=u_zref(i)>speed(i)
 !
@@ -717 +717 @@
 !
           IF(ok_t10m_toosmall(i).OR.ok_t10m_toobig(i).OR. &
-           & ok_q10m_toosmall(i).OR.ok_q10m_toobig(i).OR. &
-           & ok_u10m_toobig(i)) THEN 
+   ok_q10m_toosmall(i).OR.ok_q10m_toobig(i).OR. &
+   ok_u10m_toobig(i)) THEN
               delm(i)=min(max(delm(i),0.),1.)
               delh(i)=min(max(delh(i),0.),1.)
               u_zref(i) = delm(i)*speed(i)
               q_zref(i) = delh(i)*max(q1(i),0.0) + &
-          &           max(qsurf(i),0.0)*(1-delh(i))
+             max(qsurf(i),0.0)*(1-delh(i))
               te_zref(i) = delh(i)*tpot(i) + ts1(i)*(1-delh(i))
               temp(i) = te_zref(i) * (psol(i)/pref(i))**(-RKAPPA)

LMDZ6/branches/Amaury_dev/libf/phylmd/sumethox.F90

@@ -46 +46 @@
 
 USE YOEMETH   , ONLY : RALPHA1 ,RALPHA2  ,RQLIM   ,&
- & RPBOTOX,  RPBOTPH ,RPTOPOX  ,RPTOPPH ,&
- & RALPHA3,  RLOGPPH  
+   RPBOTOX,  RPBOTPH ,RPTOPOX  ,RPTOPPH ,&
+   RALPHA3,  RLOGPPH
 
 !*       1.    SET VALUES

LMDZ6/branches/Amaury_dev/libf/phylmd/suphel.F90

@@ -103 +103 @@
   WRITE (UNIT=6, FMT='('' ***        Radiation       ***'')')
   WRITE (UNIT=6, FMT='('' Stefan-Bol.  = '',E13.7,'' W m-2 K-4'' &
-    &                                                         &
-    &         )') rsigma
+
+           )') rsigma
   ! IM init. dans conf_phys.F90   WRITE(UNIT=6,FMT='('' Solar const. =
   ! '',E13.7,'' W m-2'')')

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_bucket_mod.F90

@@ -130 +130 @@
           IF (iso_eau > 0) THEN
             CALL iso_verif_egalite_choix(precip_snow(i), &
-     &                                   xtprecip_snow(iso_eau,i),'surf_land_bucket 131', &
-     &                                   errmax,errmaxrel)
+                                     xtprecip_snow(iso_eau,i),'surf_land_bucket 131', &
+                                     errmax,errmaxrel)
             CALL iso_verif_egalite_choix(qsol(i), &
-     &                                   xtsol(iso_eau,i),'surf_land_bucket 134', &
-     &                                   errmax,errmaxrel)
+                                     xtsol(iso_eau,i),'surf_land_bucket 134', &
+                                     errmax,errmaxrel)
           ENDIF
         ENDDO
@@ -171 +171 @@
     IF (soil_model) THEN
        CALL soil(dtime, is_ter, knon, snow, tsurf, qsol,  & 
-        & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
+   longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
 
        DO i=1, knon
@@ -204 +204 @@
       IF (iso_eau > 0) THEN
         CALL iso_verif_egalite_choix(xtsnow(iso_eau,i), &
-     &           snow(i),'surf_land_bucket 522', &
-     &           errmax,errmaxrel) 
+             snow(i),'surf_land_bucket 522', &
+             errmax,errmaxrel)
       ENDIF !IF (iso_eau > 0) then
     ENDDO !DO i=1,knon 
@@ -229 +229 @@
       IF (iso_eau > 0) THEN
         CALL iso_verif_egalite(qsol_prec(i),xtsol_prec(iso_eau,i), &
-    &                              'surf_land_bucket 141')
+                                'surf_land_bucket 141')
       ENDIF
     ENDDO !DO i=1,knon
@@ -241 +241 @@
          snow, qsol, tsurf_new, evap &
 #ifdef ISO    
-     & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
-     & ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag   &
-#endif
-     &   )
+   ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
+   ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag   &
+#endif
+     )
 
 #ifdef ISO
@@ -259 +259 @@
           IF (iso_eau > 0) THEN
             CALL iso_verif_egalite_choix(qsol_prec(i), &
-     &                                   xtsol_prec(iso_eau,i),'surf_land_bucket 628', &
-     &                                   errmax,errmaxrel)
+                                     xtsol_prec(iso_eau,i),'surf_land_bucket 628', &
+                                     errmax,errmaxrel)
             CALL iso_verif_egalite_choix(precip_snow(i), &
-     &                                   xtprecip_snow(iso_eau,i),'surf_land_bucket 227', &
-     &                                   errmax,errmaxrel)
+                                     xtprecip_snow(iso_eau,i),'surf_land_bucket 227', &
+                                     errmax,errmaxrel)
              ! attention, dans fonte_neige, on modifie snow sans modifier
              ! xtsnow
@@ -270 +270 @@
 !            write(*,*) 'snow(i)=',snow(i)
             CALL iso_verif_egalite_choix(xtsnow(iso_eau,i), &
-     &                                   snow_prec(i),'surf_land_bucket 245', &
-     &                                   errmax,errmaxrel) 
+                                     snow_prec(i),'surf_land_bucket 245', &
+                                     errmax,errmaxrel)
           ENDIF  
           IF ((iso_O17 > 0).AND.(iso_O18 > 0)) THEN
               IF (qsol_prec(i) > ridicule_qsol) THEN
                 CALL iso_verif_aberrant_o17(xtsol_prec(iso_O17,i)/qsol_prec(i) &
-     &                                     ,xtsol_prec(iso_O18,i)/qsol_prec(i) &
-     &                                     ,'surf_land_bucket 642')
+                                       ,xtsol_prec(iso_O18,i)/qsol_prec(i) &
+                                       ,'surf_land_bucket 642')
               ENDIF !IF ((qsol_prec(i) > ridicule_qsol) &
           ENDIF !IF ((iso_O17 > 0).AND.(iso_O18 > 0)) THEN
@@ -285 +285 @@
 #endif          
         CALL calcul_iso_surf_ter_vectall(klon,knon, &
-     &           evap,snow_evap_diag,snow, &
-     &           fq_fonte_diag,fqfonte_diag,dtime,precip_rain,xtprecip_rain, &
-     &           precip_snow,xtprecip_snow, snow_prec,xtsnow_prec, &
-     &           tsurf_new,xtspechum,pref,spechum,t_coup,u1_lay,v1_lay,p1lay, &
-     &           qsol,xtsol,qsol_prec,xtsol_prec, &
-     &           max_eau_sol_diag, &
-     &           xtevap,xtsnow,h1,runoff_diag,xtrunoff_diag,fqcalving_diag, &
-     &           knindex,is_ter,run_off_lic_diag,coeff_rel_diag,Rland_ice &
-     &   )
+             evap,snow_evap_diag,snow, &
+             fq_fonte_diag,fqfonte_diag,dtime,precip_rain,xtprecip_rain, &
+             precip_snow,xtprecip_snow, snow_prec,xtsnow_prec, &
+             tsurf_new,xtspechum,pref,spechum,t_coup,u1_lay,v1_lay,p1lay, &
+             qsol,xtsol,qsol_prec,xtsol_prec, &
+             max_eau_sol_diag, &
+             xtevap,xtsnow,h1,runoff_diag,xtrunoff_diag,fqcalving_diag, &
+             knindex,is_ter,run_off_lic_diag,coeff_rel_diag,Rland_ice &
+     )
 !#ifdef ISOVERIF
 !        write(*,*) 'surf_land_bucket 303'

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_mod.F90

@@ -181 +181 @@
           if (iso_eau.gt.0) then
             call iso_verif_egalite_choix(precip_snow(i), &
-     &          xtprecip_snow(iso_eau,i),'surf_land_mod 129', &
-     &          errmax,errmaxrel)
+            xtprecip_snow(iso_eau,i),'surf_land_mod 129', &
+            errmax,errmaxrel)
             call iso_verif_egalite_choix(qsol(i), &
-     &          xtsol(iso_eau,i),'surf_land_mod 139', &
-     &          errmax,errmaxrel)
+            xtsol(iso_eau,i),'surf_land_mod 139', &
+            errmax,errmaxrel)
           endif  
         enddo
@@ -254 +254 @@
         if (iso_eau.gt.0) then
              call iso_verif_egalite_choix(xtevap(iso_eau,i),evap(i), &
-    &            'surf_land 197',errmax,errmaxrel)
+              'surf_land 197',errmax,errmaxrel)
         endif !if (iso_eau.gt.0) then      
       enddo !do i=1,knon  
@@ -275 +275 @@
 !       write(*,*) 'surf_land 247'
         call iso_verif_egalite_vect1D( &
-     &           xtsnow,snow,'surf_land_mod 207',niso,klon)
+             xtsnow,snow,'surf_land_mod 207',niso,klon)
 #endif
 #endif
@@ -295 +295 @@
             ,xtprecip_rain, xtprecip_snow,xtspechum, &
             xtsnow, xtsol,xtevap,h1, &
-     &      runoff_diag, xtrunoff_diag,Rland_ice &
+        runoff_diag, xtrunoff_diag,Rland_ice &
 #endif           
-     &       )
+         )
         z0h(1:knon)=z0m(1:knon) ! En attendant mieux
 
@@ -326 +326 @@
         IF (iso_eau >= 0) THEN
              call iso_verif_egalite_choix(xtsnow(iso_eau,i),snow(i), &
-    &            'surf_land 241',errmax,errmaxrel)
+              'surf_land 241',errmax,errmaxrel)
         ENDIF !if (iso_eau.gt.0) then      
       ENDDO !do i=1,knon  
@@ -398 +398 @@
     DO i=1,knon
       IF ((rlat(knindex(i)) >= lat_min_nudge_qsol).and. &
-  &       (rlat(knindex(i)) <= lat_max_nudge_qsol).and. &
-  &       (rlon(knindex(i)) >= lon_min_nudge_qsol).and. &
-  &       (rlon(knindex(i)) <= lon_max_nudge_qsol)) THEN
+         (rlat(knindex(i)) <= lat_max_nudge_qsol).and. &
+         (rlon(knindex(i)) >= lon_min_nudge_qsol).and. &
+         (rlon(knindex(i)) <= lon_max_nudge_qsol)) THEN
 !        write(*,*) 'surf_land 324: bon domaine: rlat,rlon,qsol=', &
 !  &             rlat(knindex(i)),rlon(knindex(i)),qsol(knindex(i))

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_landice_mod.F90

@@ -25 +25 @@
        flux_u1, flux_v1 &
 #ifdef ISO
-         &      ,xtprecip_rain, xtprecip_snow,xtspechum,Rland_ice &
-         &      ,xtsnow,xtsol,xtevap &
+        ,xtprecip_rain, xtprecip_snow,xtspechum,Rland_ice &
+        ,xtsnow,xtsol,xtevap &
 #endif               
-           &    )
+      )
 
     USE dimphy
@@ -216 +216 @@
     IF (iso_eau > 0) THEN
       CALL iso_verif_egalite_choix(xtsnow(iso_eau,i),snow(i), &
-    &                              'surf_land_ice 126',errmax,errmaxrel)
+                                'surf_land_ice 126',errmax,errmaxrel)
     ENDIF !IF (iso_eau > 0) THEN      
   ENDDO !DO i=1,knon  
@@ -357 +357 @@
     IF (soil_model) THEN 
        CALL soil(dtime, is_lic, knon, snow, tsurf, qsol, &
-        & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
+   longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
        cal(1:knon) = RCPD / soilcap(1:knon)
        radsol(1:knon)  = radsol(1:knon) + soilflux(1:knon)
@@ -393 +393 @@
          IF (snow(i) > ridicule) THEN
            CALL iso_verif_egalite_choix(xtsnow(iso_eau,i),snow(i), &
-    &                                   'surf_land_ice 1151',errmax,errmaxrel)
+                                     'surf_land_ice 1151',errmax,errmaxrel)
          ENDIF !IF ((snow(i) > ridicule)) THEN
        ENDIF !IF (iso_eau > 0) THEN
@@ -614 +614 @@
          snow, qsol, tsurf_new, evap_totsnow &
 #ifdef ISO    
-     &  ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag     &
-     &  ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag &
-#endif
-     &   )
+    ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag     &
+    ,max_eau_sol_diag,runoff_diag,run_off_lic_diag,coeff_rel_diag &
+#endif
+     )
 
 
@@ -625 +625 @@
       IF (iso_eau > 0) THEN  
         CALL iso_verif_egalite_choix(Rland_ice(iso_eau,i),1.0, &
-     &                               'surf_landice_mod 217',errmax,errmaxrel)
+                                 'surf_landice_mod 217',errmax,errmaxrel)
       ENDIF !IF (iso_eau > 0) THEN
     ENDDO !DO i=1,knon
@@ -631 +631 @@
 
     CALL calcul_iso_surf_lic_vectall(klon,knon, &
-     &    evap,snow_evap_diag,Tsurf_new,snow, &
-     &    fq_fonte_diag,fqfonte_diag,dtime,t_coup, &
-     &    precip_snow,xtprecip_snow,precip_rain,xtprecip_rain, snow_prec,xtsnow_prec, &
-     &    xtspechum,spechum,ps,Rland_ice, &
-     &    xtevap,xtsnow,fqcalving_diag, &
-     &    knindex,is_lic,run_off_lic_diag,coeff_rel_diag &
-     &   ) 
+      evap,snow_evap_diag,Tsurf_new,snow, &
+      fq_fonte_diag,fqfonte_diag,dtime,t_coup, &
+      precip_snow,xtprecip_snow,precip_rain,xtprecip_rain, snow_prec,xtsnow_prec, &
+      xtspechum,spechum,ps,Rland_ice, &
+      xtevap,xtsnow,fqcalving_diag, &
+      knindex,is_lic,run_off_lic_diag,coeff_rel_diag &
+     )
 
 !        call fonte_neige_export_xtrun_off_lic_0(knon,xtrun_off_lic_0_diag)

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_ocean_mod.F90

@@ -23 +23 @@
        dt_ds, tkt, tks, taur, sss &
 #ifdef ISO
-        &       ,xtprecip_rain, xtprecip_snow,xtspechum,Roce, &
-        &       xtsnow,xtevap,h1 &
+         ,xtprecip_rain, xtprecip_snow,xtspechum,Roce, &
+         xtsnow,xtevap,h1 &
 #endif               
-        &       )
+         )
 
     use albedo, only: alboc, alboc_cd
@@ -184 +184 @@
       IF (iso_eau > 0) THEN         
         CALL iso_verif_egalite_choix(xtspechum(iso_eau,i), &
-     &          spechum(i),'surf_ocean_mod 117', &
-     &          errmax,errmaxrel)          
+            spechum(i),'surf_ocean_mod 117', &
+            errmax,errmaxrel)
         CALL iso_verif_egalite_choix(xtsnow(iso_eau,i), &
-     &          snow(i),'surf_ocean_mod 127', &
-     &          errmax,errmaxrel) 
+            snow(i),'surf_ocean_mod 127', &
+            errmax,errmaxrel)
       ENDIF !IF (iso_eau > 0) then
     ENDDO !DO i=1,klon

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_seaice_mod.F90

@@ -23 +23 @@
        flux_u1, flux_v1 &
 #ifdef ISO
-         &      ,xtprecip_rain, xtprecip_snow,xtspechum,Roce, &
-         &      xtsnow,xtsol,xtevap,Rland_ice &
+        ,xtprecip_rain, xtprecip_snow,xtspechum,Roce, &
+        xtsnow,xtsol,xtevap,Rland_ice &
 #endif               
-         &      )
+        )
 
   USE dimphy

LMDZ6/branches/Amaury_dev/libf/phylmd/yamada4.F90

@@ -393 +393 @@
          tkeprov=q2(ig,k)/ydeux
          tkeprov= tkeprov*                           &
-           &  (tkeprov+dt*(shear(ig,k)+max(0.,buoy(ig,k))))/ &
-           &  (tkeprov+dt*((-1.)*min(0.,buoy(ig,k))+dissip(ig,k)+drgpro(ig,k)*tkeprov))
+    (tkeprov+dt*(shear(ig,k)+max(0.,buoy(ig,k))))/ &
+    (tkeprov+dt*((-1.)*min(0.,buoy(ig,k))+dissip(ig,k)+drgpro(ig,k)*tkeprov))
          q2(ig,k)=tkeprov*ydeux
         ENDDO
@@ -430 +430 @@
          tkeprov= tkeprov+dt*(shear(ig,k)+max(0.,buoy(ig,k)))
          tkeprov= tkeprov*                           &
-           &  tkeprov/ &
-           &  (tkeprov+dt*((-1.)*min(0.,buoy(ig,k))+dissip(ig,k)))
+    tkeprov/ &
+    (tkeprov+dt*((-1.)*min(0.,buoy(ig,k))+dissip(ig,k)))
          q2(ig,k)=tkeprov*ydeux
          ! En cas stable, on traite la flotabilite comme la
@@ -453 +453 @@
          winds(ig,k)=sqrt(u(ig,k)**2+v(ig,k)**2)
          tkeprov= (shear(ig,k)+ &
-          & drgpro(ig,k)*(winds(ig,k))**3)*tkeprov/disseff*(1.-tkeexp)+tkeprov*tkeexp
+   drgpro(ig,k)*(winds(ig,k))**3)*tkeprov/disseff*(1.-tkeexp)+tkeprov*tkeexp
          q2(ig,k)=tkeprov*ydeux
          ! En cas stable, on traite la flotabilite comme la

LMDZ6/branches/Amaury_dev/libf/phylmd/yamada_c.F90

@@ -3 +3 @@
 !
       SUBROUTINE yamada_c(ngrid,timestep,plev,play &
-     &   ,pu,pv,pt,d_u,d_v,d_t,cd,q2,km,kn,kq,d_t_diss,ustar &
-     &   ,iflag_pbl)
+     ,pu,pv,pt,d_u,d_v,d_t,cd,q2,km,kn,kq,d_t_diss,ustar &
+     ,iflag_pbl)
       USE dimphy, ONLY: klon, klev
       USE print_control_mod, ONLY: prt_level
@@ -129 +129 @@
       fsm(ri)=1.96*(0.1912-ri)*(0.2341-ri)/((1.-ri)*(0.2231-ri))
       fl(zzz,zl0,zq2,zn2)= &
-     &     max(min(l0(ig)*kap*zlev(ig,k)/(kap*zlev(ig,k)+l0(ig)) &
-     &     ,0.5*sqrt(q2(ig,k))/sqrt(max(n2(ig,k),1.e-10))) ,1.)
+       max(min(l0(ig)*kap*zlev(ig,k)/(kap*zlev(ig,k)+l0(ig)) &
+       ,0.5*sqrt(q2(ig,k))/sqrt(max(n2(ig,k),1.e-10))) ,1.)
 
 
@@ -242 +242 @@
                                                       DO ig=1,ngrid
             zlev(ig,nlev)=zlay(ig,nlay) &
-     &             +( zlay(ig,nlay) - zlev(ig,nlev-1) )
+               +( zlay(ig,nlay) - zlev(ig,nlev-1) )
                                                       ENDDO
 !!!!!! <----