Index: LMDZ6/trunk/libf/phylmd/cloudth_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/cloudth_mod.F90 (revision 4259) +++ LMDZ6/trunk/libf/phylmd/cloudth_mod.F90 (revision 4260) @@ -1146,5 +1146,7 @@ ELSE IF (iflag_cloudth_vert == 5) THEN - sigma1s=(0.71794+0.000498239*dz(ind1,ind2))*(fraca(ind1,ind2)**0.5)/(1-fraca(ind1,ind2))*(((sth-senv)**2)**0.5)+ratqs(ind1,ind2)*po(ind1) !Environment + sigma1s=(0.71794+0.000498239*dz(ind1,ind2))*(fraca(ind1,ind2)**0.5) & + /(1-fraca(ind1,ind2))*(((sth-senv)**2)**0.5) & + +ratqs(ind1,ind2)*po(ind1) !Environment sigma2s=(0.03218+0.000092655*dz(ind1,ind2))/((fraca(ind1,ind2)+0.02)**0.5)*(((sth-senv)**2)**0.5)+0.002*zqta(ind1,ind2) !Thermals !sigma1s=(1.1**0.5)*(fraca(ind1,ind2)**0.6)/(1-fraca(ind1,ind2))*((sth-senv)**2)**0.5+0.002*po(ind1) @@ -1414,5 +1416,7 @@ !-------------------------------------------- sigma_th=(0.03218+0.000092655*dz(ind1,ind2))/((fraca(ind1,ind2)+0.01)**0.5)*(((sth-senv)**2)**0.5)+0.002*zqta(ind1,ind2) - sigma_env=(0.71794+0.000498239*dz(ind1,ind2))*(fraca(ind1,ind2)**0.5)/(1-fraca(ind1,ind2))*(((sth-senv)**2)**0.5)+ratqs(ind1,ind2)*po(ind1) + sigma_env=(0.71794+0.000498239*dz(ind1,ind2))*(fraca(ind1,ind2)**0.5) & + /(1-fraca(ind1,ind2))*(((sth-senv)**2)**0.5) & + +ratqs(ind1,ind2)*po(ind1) xth=sth/(sqrt2*sigma_th) xenv=senv/(sqrt2*sigma_env) @@ -2020,5 +2024,7 @@ + (1.-1./(1.+C_mpc*qith(ind1,ind2))) * athl*(qsith(ind1,ind2)-qslth(ind1)) - sigma2sc=(sigma2s_factor*((MAX((sthlc-senvl),0.)**2)**0.5)/((fraca(ind1,ind2)+0.02)**sigma2s_power))+0.002*zqta(ind1,ind2) + sigma2sc=(sigma2s_factor*((MAX((sthlc-senvl),0.)**2)**0.5) & + /((fraca(ind1,ind2)+0.02)**sigma2s_power)) & + +0.002*zqta(ind1,ind2) deltasthc=athl*vert_alpha_th*sigma2sc @@ -2166,5 +2172,7 @@ ctot_vol(ind1,ind2)=fraca(ind1,ind2)*cth_vol(ind1,ind2)+(1.-1.*fraca(ind1,ind2))*cenv_vol(ind1,ind2) IF (qcth(ind1,ind2) .GT. 0) THEN - icefrac(ind1,ind2)=fraca(ind1,ind2)*qith(ind1,ind2)/(fraca(ind1,ind2)*qcth(ind1,ind2)+(1.-1.*fraca(ind1,ind2))*qcenv(ind1,ind2)) + icefrac(ind1,ind2)=fraca(ind1,ind2)*qith(ind1,ind2) & + /(fraca(ind1,ind2)*qcth(ind1,ind2) & + +(1.-1.*fraca(ind1,ind2))*qcenv(ind1,ind2)) icefrac(ind1,ind2)=MAX(MIN(1.,icefrac(ind1,ind2)),0.) ELSE @@ -2386,5 +2394,7 @@ AA=RLSTT/Ka/temp(ind2p1)*(RLSTT/RV/temp(ind2p1)-1.) BB=1./(rho(ind2p1)*Dv*qsith(ind2p1)) - unsurtaustardep=C_cap*(Ni**0.66)*(qth(ind2p1)-qsith(ind2p1))/qsith(ind2p1)*4.*RPI/(AA+BB)*(6.*rho(ind2p1)/rhoi/RPI/Gamma(4.))**(0.33) + unsurtaustardep=C_cap*(Ni**0.66)*(qth(ind2p1)-qsith(ind2p1)) & + /qsith(ind2p1)*4.*RPI/(AA+BB) & + *(6.*rho(ind2p1)/rhoi/RPI/Gamma(4.))**(0.33) dep_term=rho(ind2p1)*fraca(ind2p1)*(qith(ind2p1)**0.33)*unsurtaustardep Index: LMDZ6/trunk/libf/phylmd/fisrtilp.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/fisrtilp.F90 (revision 4259) +++ LMDZ6/trunk/libf/phylmd/fisrtilp.F90 (revision 4260) @@ -1565,5 +1565,7 @@ DO i=1, klon IF (zrflclr(i) + ziflclr(i) .GT. 0 ) THEN - znebprecipclr(i) = min(znebprecipclr(i), max(zrflclr(i)/(znebprecipclr(i)*rain_int_min), ziflclr(i)/(znebprecipclr(i)*rain_int_min))) + znebprecipclr(i) = min(znebprecipclr(i), max(zrflclr(i) & + /(znebprecipclr(i)*rain_int_min), & + ziflclr(i)/(znebprecipclr(i)*rain_int_min))) ELSE znebprecipclr(i)=0. @@ -1571,5 +1573,7 @@ IF (zrflcld(i) + ziflcld(i) .GT. 0 ) THEN - znebprecipcld(i) = min(znebprecipcld(i), max(zrflcld(i)/(znebprecipcld(i)*rain_int_min), ziflcld(i)/(znebprecipcld(i)*rain_int_min))) + znebprecipcld(i) = min(znebprecipcld(i), & + max(zrflcld(i)/(znebprecipcld(i)*rain_int_min), & + ziflcld(i)/(znebprecipcld(i)*rain_int_min))) ELSE znebprecipcld(i)=0. Index: LMDZ6/trunk/libf/phylmd/ice_sursat_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/ice_sursat_mod.F90 (revision 4259) +++ LMDZ6/trunk/libf/phylmd/ice_sursat_mod.F90 (revision 4260) @@ -431,5 +431,7 @@ ! On approxime en serie entiere erf-1(x) qvc = 2.*rneb-1. - qvc = qvc + PI/12.*qvc**3 + 7.*PI**2/480.*qvc**5 + 127.*PI**3/40320.*qvc**7 + 4369.*PI**4/5806080.*qvc**9 + 34807.*PI**5/182476800.*qvc**11 + qvc = qvc + PI/12.*qvc**3 + 7.*PI**2/480.*qvc**5 & + + 127.*PI**3/40320.*qvc**7 + 4369.*PI**4/5806080.*qvc**9 & + + 34807.*PI**5/182476800.*qvc**11 qvc = sqrt(PI)/2.*qvc qvc = (qvc-pdf_b)*pdf_k*sqrt(2.) Index: LMDZ6/trunk/libf/phylmd/iophy.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/iophy.F90 (revision 4259) +++ LMDZ6/trunk/libf/phylmd/iophy.F90 (revision 4260) @@ -1048,5 +1048,7 @@ !Et sinon on.... écrit - IF (SIZE(field)/=klon .AND. SIZE(field)/=klev .AND. SIZE(field)/=klev+1) CALL abort_physic('iophy::histwrite2d_phy','Field first DIMENSION not equal to klon/klev',1) + IF (SIZE(field)/=klon .AND. SIZE(field)/=klev .AND. SIZE(field)/=klev+1) & + CALL abort_physic('iophy::histwrite2d_phy',& + 'Field first DIMENSION not equal to klon/klev',1) IF (prt_level >= 10) THEn WRITE (lunout,*)"histwrite2d_phy: .not.vars_defined ; time to gather and write ", trim(var%name) @@ -1246,5 +1248,8 @@ !Et sinon on.... écrit - IF (SIZE(field,1)/=klon .AND. SIZE(field,1)/=klev .AND. SIZE(field,1)/=klev+1) CALL abort_physic('iophy::histwrite3d_phy','Field first DIMENSION not equal to klon/klev',1) + IF (SIZE(field,1)/=klon .AND. SIZE(field,1)/=klev & + .AND. SIZE(field,1)/=klev+1) & + CALL abort_physic('iophy::histwrite3d_phy', & + 'Field first DIMENSION not equal to klon/klev',1) nlev=SIZE(field,2) Index: LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90 (revision 4259) +++ LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90 (revision 4260) @@ -226,5 +226,7 @@ DO i=1, klon - fco2_ocean_cor(i)=(var_fco2_ocean_cor*(RMCO2/RMC)*(pctsrf(i,is_oce)+pctsrf(i,is_sic))/ocean_area_tot/(secinday*year_len))*1.e12 + fco2_ocean_cor(i)=(var_fco2_ocean_cor*(RMCO2/RMC) & + *(pctsrf(i,is_oce)+pctsrf(i,is_sic))/ocean_area_tot & + /(secinday*year_len))*1.e12 ENDDO