Changeset 1373 for LMDZ4/branches

Timestamp:

Apr 28, 2010, 4:27:15 PM (15 years ago)

Author:

musat

Message:

Some changes for new physics :

• new formulation for wakes' alp_offset (physiq)
• bug fix for lalim in thermals plume
• add iflag_pbl=9 option (yamada4)

FH/IM

Location:

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

Files:

• physiq.F (modified) (1 diff)
• thermcell_plume.F90 (modified) (2 diffs)
• yamada4.F (modified) (2 diffs)

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

@@ -2105 +2105 @@
        else
          IF(prt_level>9)WRITE(lunout,*)'ALE et ALP couples au thermique'
-          do i = 1,klon
-              ALE(i) = max(ale_wake(i),Ale_bl(i))
-c avant        ALP(i) = alp_wake(i) + Alp_bl(i)
-              ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
-c         write(20,*)'ALE',ALE(i),Ale_bl(i),ale_wake(i)
-c         write(21,*)'ALP',ALP(i),Alp_bl(i),alp_wake(i)
-          enddo
+!         do i = 1,klon
+!             ALE(i) = max(ale_wake(i),Ale_bl(i))
+! avant        ALP(i) = alp_wake(i) + Alp_bl(i)
+!             ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
+!         write(20,*)'ALE',ALE(i),Ale_bl(i),ale_wake(i)
+!         write(21,*)'ALP',ALP(i),Alp_bl(i),alp_wake(i)
+!         enddo
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Modif FH 2010/04/27. Sans doute temporaire.
+! Deux options pour le alp_offset : constant si >Â 0 ou proportionnel Ãa
+! w si <0
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       do i = 1,klon
+          ALE(i) = max(ale_wake(i),Ale_bl(i))
+          if (alp_offset>=0.) then
+            ALP(i) = alp_wake(i) + Alp_bl(i) + alp_offset ! modif sb
+          else
+            ALP(i)=alp_wake(i)+Alp_bl(i)+alp_offset*min(omega(i,6),0.)
+            if (alp(i)<0.) then
+               print*,'ALP ',alp(i),alp_wake(i)
+     s         ,Alp_bl(i),alp_offset*min(omega(i,6),0.)
+            endif
+          endif
+       enddo
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
        endif
        do i=1,klon

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

@@ -168 +168 @@
                alim_star(ig,l)=MAX((ztv(ig,l)-ztv(ig,l+1)),0.)  &
      &                       *sqrt(zlev(ig,l+1)) 
-               lalim(:)=l+1
+               lalim(ig)=l+1
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)
             endif
@@ -651 +651 @@
                alim_star(ig,l)=MAX((ztv(ig,l)-ztv(ig,l+1)),0.)  &
      &                       *sqrt(zlev(ig,l+1)) 
-               lalim(:)=l+1
+               lalim(ig)=l+1
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)
             endif

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