Changeset 2554 for LMDZ5/trunk

Timestamp:

Jun 9, 2016, 2:24:17 PM (9 years ago)

Author:

jyg

Message:

1/ Correcting a bug in alpale.F90: now ale_wk and
alp_wk are arguments of subroutine alpale;
their values are present in the output files.

2/ Minor changes to alpale_th.F90: (i) the
(commented) part relative to TKE transport is put
back in "physiq"; (ii) the part dealing with
iflag_coupl=2 terminates with a STOP.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• alpale.F90 (modified) (3 diffs)
• alpale_th.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/alpale.F90

@@ -4 +4 @@
                     wake_pe, wake_fip,  &
                     Ale_bl, Ale_bl_trig, Alp_bl, &
-                    Ale, Alp )
+                    Ale, Alp, Ale_wake, Alp_wake )
 
 ! **************************************************************
@@ -46 +46 @@
 !----------------
   REAL, DIMENSION(klon), INTENT(OUT)                         :: Ale, Alp
+  REAL, DIMENSION(klon), INTENT(OUT)                         :: Ale_wake, Alp_wake
 
   include "thermcell.h"
@@ -55 +56 @@
   INTEGER                                                    :: i, k
   REAL, DIMENSION(klon)                                      :: www
-  REAL, DIMENSION(klon)                                      :: ale_wake, alp_wake
   REAL, SAVE                                                 :: ale_max=1000.
   REAL, SAVE                                                 :: alp_max=2.

LMDZ5/trunk/libf/phylmd/alpale_th.F90

@@ -160 +160 @@
 
           !cc fin nrlmd le 10/04/2012
-
-          ! ------------------------------------------------------------------
-          ! Transport de la TKE par les panaches thermiques.
-          ! FH : 2010/02/01
-          !     if (iflag_pbl.eq.10) then
-          !     call thermcell_dtke(klon,klev,nbsrf,pdtphys,fm_therm,entr_therm,
-          !    s           rg,paprs,pbl_tke)
-          !     endif
-          ! -------------------------------------------------------------------
+!
           !IM/FH: 2011/02/23 
           ! Couplage Thermiques/Emanuel seulement si T<0
@@ -180 +172 @@
                 endif
              enddo
+    print *,'In order to run with iflag_coupl=2, you have to comment out the following stop'
+             STOP
           endif
-!
    RETURN
    END

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -2294 +2294 @@
                     wake_pe, wake_fip,  &
                     Ale_bl, Ale_bl_trig, Alp_bl, &
-                    Ale, Alp )
+                    Ale, Alp , Ale_wake, Alp_wake)
 !>jyg
 !
@@ -2781 +2781 @@
                           alp_bl, alp_bl_stat )
 
+          ! ------------------------------------------------------------------
+          ! Transport de la TKE par les panaches thermiques.
+          ! FH : 2010/02/01
+          !     if (iflag_pbl.eq.10) then
+          !     call thermcell_dtke(klon,klev,nbsrf,pdtphys,fm_therm,entr_therm,
+          !    s           rg,paprs,pbl_tke)
+          !     endif
+          ! -------------------------------------------------------------------
+
           do i=1,klon
              !           zmax_th(i)=pphi(i,lmax_th(i))/rg