Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/thermcell_plume.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/thermcell_plume.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/thermcell_plume.F90

@@ -359 +359 @@
                    zbuoyjam(ig,l)=fact_shell*RG*(ztva_est(ig,l)-ztv_est(ig,l))/ztv_est(ig,l) &
     &                    +(1.-fact_shell)*zbuoy(ig,l)
-         print*,'on est pass?? par l??1',l,lt,ztv1,ztv2,ztv(ig,lt),ztv_est(ig,l),ztva_est(ig,l),ztv(ig,l), &
-   &                                   zinv,zlmelup,zbuoy(ig,l),zbuoyjam(ig,l)
                 elseif (zlmelup.ge.zinv) then
                  ztv_est2=atv2*0.5*(zlmelup+zinv)+btv2
@@ -370 +368 @@
     &            ztv_est1)/ztv_est1)+(1.-fact_shell)*zbuoy(ig,l)
 
-         print*,'on est pass?? par l??2',l,lt,ztv_est1,ztv_est2,ztv(ig,lt),ztv_est(ig,l),ztva_est(ig,l),ztv(ig,l), &
-   &                                   zinv,zlmelup,zbuoy(ig,l),zbuoyjam(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)
-                 print*,'on est pass?? par l??3',l,lt,ztv1,ztv2,ztv(ig,lt),ztv_est(ig,l),ztva_est(ig,l),ztv(ig,l), &
-   &                                   zinv,zlmelup,zbuoy(ig,l),zbuoyjam(ig,l) 
                 endif
 
@@ -392 +386 @@
                 endif
 
-                 print*,'on est pass?? par l??4',l,lt,ztv1,ztv2,ztv(ig,lt),ztv(ig,l),ztva_est(ig,l), &
-   &                                   zlmelup,zbuoy(ig,l),zbuoyjam(ig,l) 
 !          zbuoyjam(ig,l)=fact_shell*RG*(((zlmelup-zltdwn)/zdz)*(ztva_est(ig,l)- & 
 !    &          ztv1)/ztv1+((zltdwn-zlmeldwn)/zdz)*(ztva_est(ig,l)- &
@@ -417 +409 @@
     &          ztv(ig,lt))/ztv(ig,lt)+((zdz2-lmel)/zdz3)*(ztva_est(ig,l)- &
     &          ztv(ig,lt-1))/ztv(ig,lt-1))+0.*zbuoy(ig,l)
-         print*,'on est pass?? par l??',l,lt,ztv(ig,lt),ztva_est(ig,l),ztv(ig,l), &
-   &                                   zbuoy(ig,l),zbuoyjam(ig,l)
         endif !   if (iflag_thermals_ed.lt.8) then