Changeset 1294 for LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/calltherm.F90

Timestamp:

Jan 14, 2010, 3:35:30 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Modifications pour la nouvelle version des thermiques (2009/2010) CR et FH

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/calltherm.F90 (modified) (4 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/calltherm.F90

@@ -45 +45 @@
 !********************************************************
 !     declarations
+      LOGICAL flag_bidouille_stratocu
       real fmc_therm(klon,klev+1),zqasc(klon,klev)
       real zqla(klon,klev)
@@ -187 +188 @@
      &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.ge.13) then
-            CALL thermcell_main(itap,klon,klev,zdt  &
+          else if (iflag_thermals==13.or.iflag_thermals==14) then
+            CALL thermcellV0_main(itap,klon,klev,zdt  &
      &      ,pplay,paprs,pphi,debut  &
      &      ,u_seri,v_seri,t_seri,q_seri  &
@@ -197 +198 @@
      &      ,tau_thermals,Ale,Alp,lalim_conv,wght_th &
      &      ,zmax0,f0,zw2,fraca)
+          else if (iflag_thermals==15.or.iflag_thermals==16) then
+            CALL thermcell_main(itap,klon,klev,zdt  &
+     &      ,pplay,paprs,pphi,debut  &
+     &      ,u_seri,v_seri,t_seri,q_seri  &
+     &      ,d_u_the,d_v_the,d_t_the,d_q_the  &
+     &      ,zfm_therm,zentr_therm,zdetr_therm,zqasc,zqla,lmax  &
+     &      ,ratqscth,ratqsdiff,zqsatth  &
+     &      ,r_aspect_thermals,l_mix_thermals  &
+     &      ,tau_thermals,Ale,Alp,lalim_conv,wght_th &
+     &      ,zmax0,f0,zw2,fraca)
+           if (prt_level.gt.10) write(lunout,*)'Apres thermcell_main OK'
+         else
+            STOP'Cas des thermiques non prevu'
          endif
 
+       flag_bidouille_stratocu=iflag_thermals.lt.14.or.iflag_thermals.lt.16
 
       fact(:)=0.
       DO i=1,klon
-       logexpr1(i)=iflag_thermals.lt.14.or.weak_inversion(i).gt.0.5
+       logexpr1(i)=flag_bidouille_stratocu.or.weak_inversion(i).gt.0.5
        IF(logexpr1(i)) fact(i)=1./float(nsplit_thermals)
       ENDDO
@@ -235 +250 @@
             qmemoire(:,:)=q_seri(:,:)
             q_seri(:,:) = q_seri(:,:) + d_q_the(:,:)
+           if (prt_level.gt.10) write(lunout,*)'Apres apres thermcell_main OK'
 
        DO i=1,klon