Changeset 3042

Timestamp:

Oct 25, 2017, 11:54:04 AM (7 years ago)

Author:

Laurent Fairhead

Message:

Applying r3041 to the branch and cleanup
LF

File:

• LMDZ6/branches/IPSLCM6.0.13/libf/phylmd/yamada4.F90 (modified) (7 diffs)

LMDZ6/branches/IPSLCM6.0.13/libf/phylmd/yamada4.F90

@@ -117 +117 @@
   REAL aa(klon, klev+1), aa0, aa1
   INTEGER nlay, nlev
-  LOGICAL first
-  INTEGER ipas
-  SAVE first, ipas
-  ! FH/IM     data first,ipas/.true.,0/
-  DATA first, ipas/.FALSE., 0/
-  !$OMP THREADPRIVATE( first,ipas)
+
   LOGICAL,SAVE :: hboville=.TRUE.
   REAL,SAVE :: viscom,viscoh
@@ -136 +131 @@
   INTEGER iter
   REAL dissip(klon,klev), tkeprov,tkeexp, shear(klon,klev), buoy(klon,klev)
+  REAL :: disseff
+
   REAL,SAVE :: ric0,ric,rifc, b1, kap
   !$OMP THREADPRIVATE(ric0,ric,rifc,b1,kap)
@@ -147 +144 @@
   !$OMP THREADPRIVATE(new_yamada4,yamada4_num)
   REAL, SAVE :: yun,ydeux
-  REAL :: disseff
   !$OMP THREADPRIVATE(yun,ydeux)
+
   REAL frif, falpha, fsm
   REAL rino(klon, klev+1), smyam(klon, klev), styam(klon, klev), &
@@ -225 +222 @@
   nlay = klev
   nlev = klev + 1
-  ipas = ipas + 1
 
 
@@ -659 +655 @@
 
 ! Ajout d'une viscosite moleculaire
-   km(1:ngrid,:)=km(1:ngrid,:)+viscom
-   kn(1:ngrid,:)=kn(1:ngrid,:)+viscoh
-   kq(1:ngrid,:)=kq(1:ngrid,:)+viscoh
+   km(1:ngrid,2:klev)=km(1:ngrid,2:klev)+viscom
+   kn(1:ngrid,2:klev)=kn(1:ngrid,2:klev)+viscoh
+   kq(1:ngrid,2:klev)=kq(1:ngrid,2:klev)+viscoh
 
   IF (prt_level>1) THEN
@@ -725 +721 @@
 !============================================================================
 
-  first = .FALSE.
   RETURN
 
@@ -978 +973 @@
  REAL     hlim(klon)
  REAL, SAVE :: kap=0.4,kapb=0.4
+  !$OMP THREADPRIVATE(kap,kapb)
  REAL zq
  REAL sq(klon), sqz(klon)