Changeset 2573 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jun 15, 2016, 2:49:48 AM (9 years ago)

Author:

fhourdin

Message:

Reactivation du parametre lmixmin

File:

• LMDZ5/trunk/libf/phylmd/yamada4.F90 (modified) (8 diffs)

LMDZ5/trunk/libf/phylmd/yamada4.F90

@@ -5 +5 @@
 
   USE dimphy
+  USE ioipsl_getin_p_mod, ONLY : getin_p
+
   IMPLICIT NONE
   include "iniprint.h"
@@ -129 +131 @@
   DATA ric, rifc, b1, kap/0.195, 0.191, 16.6, 0.4/
   !$OMP THREADPRIVATE(ric,rifc,b1,kap)
-  REAL seuilsm, seuilalpha, lmixmin
+  REAL seuilsm, seuilalpha
+  REAL,SAVE :: lmixmin
+  !$OMP THREADPRIVATE(lmixmin)
   REAL frif, falpha, fsm
   REAL rino(klon, klev+1), smyam(klon, klev), styam(klon, klev), &
@@ -145 +149 @@
   
 
+  IF (firstcall) THEN
+    firstcall = .FALSE.
+    lmixmin=1.
+    CALL getin_p('lmixmin',lmixmin)
+  END IF
+
+
+
 !===============================================================================
 ! Flags, tests et ??valuations de constantes
@@ -160 +172 @@
  seuilalpha=1.12
  seuilsm=0.085
- lmixmin=1.
 
   nlay = klev
@@ -239 +250 @@
 
  
-  CALL mixinglength(ni,nsrf,ngrid,iflag_pbl,pbl_lmixmin_alpha,lmixmin,zlay,zlev,u,v,q2,n2, firstcall, l)
+  CALL mixinglength(ni,nsrf,ngrid,iflag_pbl,pbl_lmixmin_alpha,lmixmin,zlay,zlev,u,v,q2,n2, l)
 
 
@@ -680 +691 @@
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-SUBROUTINE mixinglength(ni, nsrf, ngrid,iflag_pbl,pbl_lmixmin_alpha,lmixmin,zlay,zlev,u,v,q2,n2, firstcall, lmix)
+SUBROUTINE mixinglength(ni, nsrf, ngrid,iflag_pbl,pbl_lmixmin_alpha,lmixmin,zlay,zlev,u,v,q2,n2, lmix)
 
 
@@ -746 +757 @@
 !-------
 
- LOGICAL            firstcall          ! premier appel au code
+  LOGICAL, SAVE :: firstcall = .TRUE.
+  !$OMP THREADPRIVATE(firstcall)
 
 ! Outputs
@@ -970 +982 @@
 
 END SUBROUTINE mixinglength
-
-!+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++