Changeset 2187 for LMDZ5/branches/testing/libf/phylmd/climb_wind_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_wind_mod.F90 (modified) (11 diffs)

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

@@ -44 +44 @@
 
     ALLOCATE(alf1(klon), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm(modname,'Pb in allocate alf2',1)
+    IF (ierr /= 0) CALL abort_gcm(modname,'Pb in allocate alf1',1)
 
     ALLOCATE(alf2(klon), stat=ierr)
@@ -74 +74 @@
 !
   SUBROUTINE climb_wind_down(knon, dtime, coef_in, pplay, paprs, temp, delp, u_old, v_old, &
+!!! nrlmd le 02/05/2011
+       Ccoef_U_out, Ccoef_V_out, Dcoef_U_out, Dcoef_V_out, &
+       Kcoef_m_out, alf_1_out, alf_2_out, &
+!!!
        Acoef_U_out, Acoef_V_out, Bcoef_U_out, Bcoef_V_out)
 !
@@ -81 +85 @@
 !
 !
-    INCLUDE "YOMCST.h"
+
 ! Input arguments
 !****************************************************************************************
@@ -101 +105 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: Bcoef_V_out
 
+!!! nrlmd le 02/05/2011
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Ccoef_U_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Ccoef_V_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Dcoef_U_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Dcoef_V_out
+    REAL, DIMENSION(klon,klev), INTENT(OUT)  :: Kcoef_m_out
+    REAL, DIMENSION(klon), INTENT(OUT)       :: alf_1_out
+    REAL, DIMENSION(klon), INTENT(OUT)       :: alf_2_out
+!!!
+
 ! Local variables
 !****************************************************************************************
@@ -106 +120 @@
     INTEGER                                  :: k, i
 
+! Include
+!****************************************************************************************
+    INCLUDE "YOMCST.h"
+    INCLUDE "compbl.h"    
 
 !****************************************************************************************
@@ -148 +166 @@
     Bcoef_V_out = Bcoef_V
 
+!****************************************************************************************
+! 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_U_out(i,k) = Ccoef_U(i,k)
+        Ccoef_V_out(i,k) = Ccoef_V(i,k)
+        Dcoef_U_out(i,k) = Dcoef_U(i,k)
+        Dcoef_V_out(i,k) = Dcoef_V(i,k)
+        Kcoef_m_out(i,k) = Kcoefm(i,k)
+      ENDDO
+    ENDDO
+    DO i= 1, klon
+      alf_1_out(i)   = alf1(i)
+      alf_2_out(i)   = alf2(i)
+    ENDDO
+!!!      
+       ENDIF  ! (mod(iflag_pbl_split,2) .eq.1)
+!!!
+
   END SUBROUTINE climb_wind_down
 !
@@ -209 +252 @@
        Bcoef(i) = -RG/buf
     END DO
-    acoef(knon+1: klon) = 0.
-    bcoef(knon+1: klon) = 0.
 
   END SUBROUTINE calc_coef
@@ -218 +259 @@
 
   SUBROUTINE climb_wind_up(knon, dtime, u_old, v_old, flx_u1, flx_v1,  &
+!!! nrlmd le 02/05/2011
+       Acoef_U_in, Acoef_V_in, Bcoef_U_in, Bcoef_V_in, &
+       Ccoef_U_in, Ccoef_V_in, Dcoef_U_in, Dcoef_V_in, &
+       Kcoef_m_in, &
+!!!
        flx_u_new, flx_v_new, d_u_new, d_v_new)
 !
@@ -228 +274 @@
 !
 !****************************************************************************************
-    INCLUDE "YOMCST.h"
 
 ! Input arguments
@@ -238 +283 @@
     REAL, DIMENSION(klon), INTENT(IN)       :: flx_u1, flx_v1 ! momentum flux
 
+!!! nrlmd le 02/05/2011
+    REAL, DIMENSION(klon), INTENT(IN)       :: Acoef_U_in,Acoef_V_in, Bcoef_U_in, Bcoef_V_in
+    REAL, DIMENSION(klon,klev), INTENT(IN)  :: Ccoef_U_in, Ccoef_V_in, Dcoef_U_in, Dcoef_V_in
+    REAL, DIMENSION(klon,klev), INTENT(IN)  :: Kcoef_m_in
+!!!
+
 ! Output arguments
 !****************************************************************************************
@@ -247 +298 @@
     REAL, DIMENSION(klon,klev)              :: u_new, v_new
     INTEGER                                 :: k, i
+
+! Include
+!****************************************************************************************
+    INCLUDE "YOMCST.h"
+    INCLUDE "compbl.h"    
     
 !
 !****************************************************************************************
+
+!!! jyg le 07/02/2012
+       IF (mod(iflag_pbl_split,2) .eq.1) THEN
+!!! nrlmd le 02/05/2011
+    DO i = 1, knon
+      Acoef_U(i)=Acoef_U_in(i)
+      Acoef_V(i)=Acoef_V_in(i)
+      Bcoef_U(i)=Bcoef_U_in(i)
+      Bcoef_V(i)=Bcoef_V_in(i)
+    ENDDO
+    DO k = 1, klev
+      DO i = 1, knon
+        Ccoef_U(i,k)=Ccoef_U_in(i,k)
+        Ccoef_V(i,k)=Ccoef_V_in(i,k)
+        Dcoef_U(i,k)=Dcoef_U_in(i,k)
+        Dcoef_V(i,k)=Dcoef_V_in(i,k)
+        Kcoefm(i,k)=Kcoef_m_in(i,k)
+      ENDDO
+    ENDDO
+!!!
+       ENDIF  ! (mod(iflag_pbl_split,2) .eq.1)
+!!!
 
 ! Niveau 1