Changeset 2187 for LMDZ5/branches/testing/libf/phylmd/climb_hq_mod.F90

Timestamp:

Jan 30, 2015, 2:57:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2158:2186 into testing branch.

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/climb_hq_mod.F90 (modified) (10 diffs)

LMDZ5/branches/testing/libf/phylmd/climb_hq_mod.F90

@@ -30 +30 @@
   SUBROUTINE climb_hq_down(knon, coefhq, paprs, pplay, &
        delp, temp, q, dtime, &
+!!! nrlmd le 02/05/2011
+       Ccoef_H_out, Ccoef_Q_out, Dcoef_H_out, Dcoef_Q_out, &
+       Kcoef_hq_out, gama_q_out, gama_h_out, &
+!!!
        Acoef_H_out, Acoef_Q_out, Bcoef_H_out, Bcoef_Q_out)
 
-    INCLUDE "YOMCST.h"
 ! This routine calculates recursivly the coefficients C and D
 ! for the quantity X=[Q,H] in equation X(k) = C(k) + D(k)*X(k-1), where k is
@@ -54 +57 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: Bcoef_Q_out
 
+!!! nrlmd le 02/05/2011
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Ccoef_H_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Ccoef_Q_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Dcoef_H_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Dcoef_Q_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Kcoef_hq_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: gama_q_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: gama_h_out
+!!!
+
 ! Local variables
 !****************************************************************************************
@@ -65 +78 @@
 ! Include
 !****************************************************************************************
+    INCLUDE "YOMCST.h"
     INCLUDE "compbl.h"    
 
@@ -186 +200 @@
     Bcoef_Q_out = Bcoef_Q
 
+!****************************************************************************************
+! 7)
+! If Pbl is split, return also the other layers in output variables
+!
+!****************************************************************************************
+!!! jyg le 07/02/2012
+       IF (mod(iflag_pbl_split,2) .eq.1) THEN
+!!! nrlmd le 02/05/2011
+    DO k= 1, klev
+      DO i= 1, klon
+        Ccoef_H_out(i,k) = Ccoef_H(i,k)
+        Dcoef_H_out(i,k) = Dcoef_H(i,k)
+        Ccoef_Q_out(i,k) = Ccoef_Q(i,k)
+        Dcoef_Q_out(i,k) = Dcoef_Q(i,k)
+        Kcoef_hq_out(i,k) = Kcoefhq(i,k)
+          IF (k.eq.1) THEN
+            gama_h_out(i,k)  = 0.
+            gama_q_out(i,k)  = 0.
+          ELSE
+            gama_h_out(i,k)  = gamah(i,k)
+            gama_q_out(i,k)  = gamaq(i,k)
+          ENDIF
+      ENDDO
+    ENDDO
+!!!      
+       ENDIF  ! (mod(iflag_pbl_split,2) .eq.1)
+!!!
+
   END SUBROUTINE climb_hq_down
 !
@@ -252 +294 @@
        Bcoef(i) = -1. * RG / buf
     END DO
-    acoef(knon+1: klon) = 0.
-    bcoef(knon+1: klon) = 0.
 
   END SUBROUTINE calc_coef
@@ -261 +301 @@
   SUBROUTINE climb_hq_up(knon, dtime, t_old, q_old, &
        flx_q1, flx_h1, paprs, pplay, &
+!!! nrlmd le 02/05/2011
+       Acoef_H_in, Acoef_Q_in, Bcoef_H_in, Bcoef_Q_in, &
+       Ccoef_H_in, Ccoef_Q_in, Dcoef_H_in, Dcoef_Q_in, &
+       Kcoef_hq_in, gama_q_in, gama_h_in, &
+!!!
        flux_q, flux_h, d_q, d_t)
 ! 
@@ -269 +314 @@
 ! C and D are known from before and k is index of the vertical layer.
 !   
-    INCLUDE "YOMCST.h"
+
 ! Input arguments
 !****************************************************************************************
@@ -279 +324 @@
     REAL, DIMENSION(klon,klev), INTENT(IN)   :: pplay
 
+!!! nrlmd le 02/05/2011
+    REAL, DIMENSION(klon), INTENT(IN)        :: Acoef_H_in,Acoef_Q_in, Bcoef_H_in, Bcoef_Q_in
+    REAL, DIMENSION(klon,klev), INTENT(IN)   :: Ccoef_H_in, Ccoef_Q_in, Dcoef_H_in, Dcoef_Q_in
+    REAL, DIMENSION(klon,klev), INTENT(IN)   :: Kcoef_hq_in, gama_q_in, gama_h_in
+!!!
+
 ! Output arguments
 !****************************************************************************************
@@ -289 +340 @@
     REAL, DIMENSION(klon)                    :: psref         
     INTEGER                                  :: k, i, ierr
+ 
+! Include
+!****************************************************************************************
+    INCLUDE "YOMCST.h"
+    INCLUDE "compbl.h"    
 
 !****************************************************************************************
@@ -301 +357 @@
 
     psref(1:knon) = paprs(1:knon,1)  
+
+!!! jyg le 07/02/2012
+       IF (mod(iflag_pbl_split,2) .eq.1) THEN
+!!! nrlmd le 02/05/2011
+    DO i = 1, knon
+      Acoef_H(i)=Acoef_H_in(i)
+      Acoef_Q(i)=Acoef_Q_in(i)
+      Bcoef_H(i)=Bcoef_H_in(i)
+      Bcoef_Q(i)=Bcoef_Q_in(i)
+    ENDDO
+    DO k = 1, klev
+      DO i = 1, knon
+        Ccoef_H(i,k)=Ccoef_H_in(i,k)
+        Ccoef_Q(i,k)=Ccoef_Q_in(i,k)
+        Dcoef_H(i,k)=Dcoef_H_in(i,k)
+        Dcoef_Q(i,k)=Dcoef_Q_in(i,k)
+        Kcoefhq(i,k)=Kcoef_hq_in(i,k)
+          IF (k.gt.1) THEN
+            gamah(i,k)=gama_h_in(i,k)
+            gamaq(i,k)=gama_q_in(i,k)
+          ENDIF
+      ENDDO
+    ENDDO
+!!!      
+       ENDIF  ! (mod(iflag_pbl_split,2) .eq.1)
+!!!
 
 !****************************************************************************************