Changeset 1371 for LMDZ4/branches/LMDZ4V5.0-dev/libf

Timestamp:

Apr 23, 2010, 4:09:31 PM (15 years ago)

Author:

idelkadi

Message:

• Corrections d'erreurs
• Declarations de variables additionnelles pour les sorties 1D

Location:

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

Files:

• thermcellV0_main.F90 (modified) (2 diffs)
• thermcell_plume.F90 (modified) (2 diffs)
• yamada4.F (modified) (3 diffs)

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

@@ -150 +150 @@
        real seuil
 
+! Declaration uniquement pour les sorties dans thermcell_out3d.
+! Inutilise en 3D
+      real wthl(klon,klev)
+      real wthv(klon,klev)
+      real wq(klon,klev)
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
 !
       !nouvelles variables pour la convection
@@ -185 +193 @@
 
 
-! #define wrgrads_thermcell
 #undef wrgrads_thermcell
 #ifdef wrgrads_thermcell

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

@@ -593 +593 @@
 
 !      print*,'THERM 31B'
-      print*,'THERMCELL_PLUME OPTIMISE V1 CCC '
+      print*,'THERMCELL_PLUME OPTIMISE OOOO'
 
 ! Initialisations des variables reeles
@@ -765 +765 @@
           zalpha=f0(ig)*f_star(ig,l)/sqrt(w_est(ig,l+1))/rhobarz(ig,l)
           zdqt(ig,l)=max(zqta(ig,l-1)-po(ig,l),0.)/po(ig,l)
-          zdqt(ig,l)=0.
 
           

LMDZ4/branches/LMDZ4V5.0-dev/libf/phylmd/yamada4.F

@@ -366 +366 @@
 c     print*,'0L=',k,l(ig,k),delta(ig,k),km(ig,k)
          qpre=sqrt(q2(ig,k))
-         if (iflag_pbl.eq.8 ) then
+!        if (iflag_pbl.eq.8 ) then
             if (aa(ig,k).gt.0.) then
                q2(ig,k)=(qpre+aa(ig,k)*qpre*qpre)**2
@@ -372 +372 @@
                q2(ig,k)=(qpre/(1.-aa(ig,k)*qpre))**2
             endif
-         else ! iflag_pbl=9
-            if (aa(ig,k)*qpre.gt.0.9) then
-               q2(ig,k)=(qpre*10.)**2
-            else
-               q2(ig,k)=(qpre/(1.-aa(ig,k)*qpre))**2
-            endif
-         endif
+!        else ! iflag_pbl=9
+!           if (aa(ig,k)*qpre.gt.0.9) then
+!              q2(ig,k)=(qpre*10.)**2
+!           else
+!              q2(ig,k)=(qpre/(1.-aa(ig,k)*qpre))**2
+!           endif
+!        endif
          q2(ig,k)=min(max(q2(ig,k),1.e-10),1.e4)
 c     print*,'Q2 L=',k,q2(ig,k),qpre*qpre
@@ -403 +403 @@
       enddo
 
+! Transport diffusif vertical de la TKE.
       if (iflag_pbl.ge.9) then
 !       print*,'YAMADA VDIF'