Changeset 878 for LMDZ4/trunk/libf/phylmd/coef_diff_turb_mod.F90

Timestamp:

Jan 14, 2008, 1:03:39 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Bascule de la physique du LMD vers la physique avec thermiques
LF

File:

• LMDZ4/trunk/libf/phylmd/coef_diff_turb_mod.F90 (modified) (8 diffs)

LMDZ4/trunk/libf/phylmd/coef_diff_turb_mod.F90

@@ -18 +18 @@
   SUBROUTINE coef_diff_turb(dtime, nsrf, knon, ni, &
        ypaprs, ypplay, yu, yv, yq, yt, yts, yrugos, yqsurf, &
-       ycoefm, ycoefh)
+       ycoefm, ycoefh ,yq2)
 ! 
 ! Calculate coefficients(ycoefm, ycoefh) for turbulent diffusion in the 
@@ -35 +35 @@
     REAL, DIMENSION(klon,klev), INTENT(IN)     :: yq, yt
     REAL, DIMENSION(klon), INTENT(IN)          :: yts, yrugos, yqsurf
+    REAL, DIMENSION(klon,klev+1)               :: yq2
   
 ! Output arguments
@@ -41 +42 @@
     REAL, DIMENSION(klon,klev), INTENT(OUT)    :: ycoefm
 
-! Local variables with attribute SAVE
-!****************************************************************************************
-    REAL, DIMENSION(:,:,:), ALLOCATABLE, SAVE  :: q2save
-    !$OMP THREADPRIVATE(q2save)
-    LOGICAL, SAVE                              :: first_call=.TRUE.
-    !$OMP THREADPRIVATE(first_call)    
-
 ! Other local variables
 !****************************************************************************************
     INTEGER                                    :: k, i, j
     REAL, DIMENSION(klon,klev)                 :: ycoefm0, ycoefh0, yzlay, yteta
-    REAL, DIMENSION(klon,klev+1)               :: yzlev, yq2, q2diag, ykmm, ykmn, ykmq
+    REAL, DIMENSION(klon,klev+1)               :: yzlev, q2diag, ykmm, ykmn, ykmq
     REAL, DIMENSION(klon)                      :: y_cd_h, y_cd_m
     REAL, DIMENSION(klon)                      :: yustar
@@ -94 +88 @@
             ycoefm0, ycoefh0)
 
-       DO k = 1, klev
+       DO k = 2, klev
           DO i = 1, knon
              ycoefm(i,k) = MAX(ycoefm(i,k),ycoefm0(i,k))
@@ -121 +115 @@
             ycoefm0,ycoefh0)
        
-       DO k = 1, klev
+       DO k = 2, klev
           DO i = 1, knon
              ycoefm(i,k) = MAX(ycoefm(i,k),ycoefm0(i,k))
@@ -137 +131 @@
 
     IF (iflag_pbl.GE.3) THEN
-
-       IF (first_call) THEN
-          PRINT*, "Using method MELLOR&YAMADA"
-          ! NB! q2save could/should be read and written from (re)startphy.nc
-          ALLOCATE(q2save(klon,klev+1,nbsrf))
-          q2save(:,:,:) = 1.e-8
-          first_call=.FALSE.
-       END IF
 
        yzlay(1:knon,1)= &
@@ -173 +159 @@
        END DO
 
-! Compresse q2save
-       DO k = 1, klev+1
-          DO j = 1, knon
-             i = ni(j)
-             yq2(j,k)=q2save(i,k,nsrf)
-          ENDDO
-       ENDDO
-         
-!   Bug introduit volontairement pour converger avec les resultats
-!   du papier sur les thermiques.
-       IF (1.EQ.1) THEN
-          y_cd_m(1:knon) = ycoefm(1:knon,1)
-          y_cd_h(1:knon) = ycoefh(1:knon,1)
-       ELSE
-          y_cd_h(1:knon) = ycoefm(1:knon,1)
-          y_cd_m(1:knon) = ycoefh(1:knon,1)
-       ENDIF
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Pour memoire, le papier Hourdin et al. 2002 a ete obtenur avec un
+! bug sur les coefficients de surface :
+!          y_cd_h(1:knon) = ycoefm(1:knon,1)
+!          y_cd_m(1:knon) = ycoefh(1:knon,1)
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+       y_cd_m(1:knon) = ycoefm(1:knon,1)
+       y_cd_h(1:knon) = ycoefh(1:knon,1)
        
        CALL ustarhb(knon,yu,yv,y_cd_m, yustar)
@@ -215 +193 @@
        ycoefh(1:knon,2:klev)=ykmn(1:knon,2:klev)
                 
-! update q2save with yq2
-       DO j=1,knon
-          DO k=1,klev+1
-             i=ni(j)
-             q2save(i,k,nsrf) = yq2(j,k)
-          END DO
-       END DO
-       
     ENDIF !(iflag_pbl.ge.3)