Changeset 704 for LMDZ4/branches/V3_test/libf/phylmd/yamada4.F

Timestamp:

Aug 17, 2006, 5:41:51 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Inclusion des modifs de Y. Meurdesoif pour la version V3
LF

File:

• LMDZ4/branches/V3_test/libf/phylmd/yamada4.F (modified) (7 diffs)

LMDZ4/branches/V3_test/libf/phylmd/yamada4.F

@@ -5 +5 @@
      s   ,zlev,zlay,u,v,teta,cd,q2,km,kn,kq,ustar
      s   ,iflag_pbl)
+      use dimphy
       IMPLICIT NONE
 c.......................................................................
-#include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimensions.h"
+cym#include "dimphy.h"
 c.......................................................................
 c
@@ -64 +65 @@
 
       integer nlay,nlev
-      PARAMETER (nlay=klev)
-      PARAMETER (nlev=klev+1)
+cym      PARAMETER (nlay=klev)
+cym      PARAMETER (nlev=klev+1)
 
       logical first
@@ -71 +72 @@
       save first,ipas
       data first,ipas/.true.,0/
-
+c$OMP THREADPRIVATE( first,ipas)
 
       integer ig,k
@@ -82 +83 @@
       real dtetadz(klon,klev+1)
       real m2cstat,mcstat,kmcstat
-      real l(klon,klev+1),l0(klon)
-      save l0
-
+      real l(klon,klev+1)
+      real,allocatable,save :: l0(:)
+c$OMP THREADPRIVATE(l0)      
       real sq(klon),sqz(klon),zz(klon,klev+1)
       integer iter
@@ -91 +92 @@
       save ric,rifc,b1,kap
       data ric,rifc,b1,kap/0.195,0.191,16.6,0.4/
-
+c$OMP THREADPRIVATE(ric,rifc,b1,kap)
       real frif,falpha,fsm
       real fl,zzz,zl0,zq2,zn2
 
-      real rino(klon,klev+1),smyam(klon,klev),styam(klon,klev)
-     s  ,lyam(klon,klev),knyam(klon,klev)
-     s  ,w2yam(klon,klev),t2yam(klon,klev)
-      common/pbldiag/rino,smyam,styam,lyam,knyam,w2yam,t2yam
-
+cym      real rino(klon,klev+1),smyam(klon,klev),styam(klon,klev)
+cym     s  ,lyam(klon,klev),knyam(klon,klev)
+cym     s  ,w2yam(klon,klev),t2yam(klon,klev)
+      real,allocatable,save,dimension(:,:) :: rino,smyam,styam,lyam,
+     s                                        knyam,w2yam,t2yam
+cym      common/pbldiag/rino,smyam,styam,lyam,knyam,w2yam,t2yam
+c$OMP THREADPRIVATE(rino,smyam,styam,lyam,knyam,w2yam,t2yam)
+      logical,save :: firstcall=.true.
+c$OMP THREADPRIVATE(firstcall)       
       frif(ri)=0.6588*(ri+0.1776-sqrt(ri*ri-0.3221*ri+0.03156))
       falpha(ri)=1.318*(0.2231-ri)/(0.2341-ri)
@@ -106 +111 @@
      s     max(min(l0(ig)*kap*zlev(ig,k)/(kap*zlev(ig,k)+l0(ig))
      s     ,0.5*sqrt(q2(ig,k))/sqrt(max(n2(ig,k),1.e-10))) ,1.)
+
+
+      nlay=klev
+      nlev=klev+1
+      
+      if (firstcall) then
+        allocate(rino(klon,klev+1),smyam(klon,klev),styam(klon,klev))
+        allocate(lyam(klon,klev),knyam(klon,klev))
+        allocate(w2yam(klon,klev),t2yam(klon,klev))
+        allocate(l0(klon))
+        firstcall=.false.
+      endif
+
 
       if (.not.(iflag_pbl.ge.6.and.iflag_pbl.le.9)) then
@@ -378 +396 @@
 
 c====================================================================
-c   Calcul des coefficients de mélange
+c   Calcul des coefficients de m�ange
 c====================================================================
       do k=2,klev