Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/yamada4.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/yamada4.F90 (modified) (7 diffs)

LMDZ6/branches/DYNAMICO-conv/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
@@ -131 +136 @@
   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)
@@ -144 +147 @@
   !$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), &
@@ -222 +225 @@
   nlay = klev
   nlev = klev + 1
+  ipas = ipas + 1
 
 
@@ -655 +659 @@
 
 ! Ajout d'une viscosite moleculaire
-   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
+   km(:,:)=km(:,:)+viscom
+   kn(:,:)=kn(:,:)+viscoh
+   kq(:,:)=kq(:,:)+viscoh
 
   IF (prt_level>1) THEN
@@ -721 +725 @@
 !============================================================================
 
+  first = .FALSE.
   RETURN
 
@@ -969 +974 @@
  REAL     hlim(klon)
  REAL, SAVE :: kap=0.4,kapb=0.4
-  !$OMP THREADPRIVATE(kap,kapb)
  REAL zq
  REAL sq(klon), sqz(klon)