Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/wake.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/wake.F90 (modified) (4 diffs)

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

@@ -2 +2 @@
 ! $Id$
 
-SUBROUTINE wake(p, ph, pi, dtime, sigd_con, te0, qe0, omgb, dtdwn, dqdwn, &
-    amdwn, amup, dta, dqa, wdtpbl, wdqpbl, udtpbl, udqpbl, deltatw, deltaqw, &
-    dth, hw, sigmaw, wape, fip, gfl, dtls, dqls, ktopw, omgbdth, dp_omgb, &
-    wdens, tu, qu, dtke, dqke, dtpbl, dqpbl, omg, dp_deltomg, spread, cstar, &
-    d_deltat_gw, d_deltatw2, d_deltaqw2)
+SUBROUTINE wake(p, ph, pi, dtime, sigd_con, &
+                te0, qe0, omgb, &
+                dtdwn, dqdwn, amdwn, amup, dta, dqa, &
+                wdtpbl, wdqpbl, udtpbl, udqpbl, &
+                deltatw, deltaqw, dth, hw, sigmaw, wape, fip, gfl, &
+                dtls, dqls, ktopw, omgbdth, dp_omgb, wdens, tu, qu, &
+                dtke, dqke, dtpbl, dqpbl, omg, dp_deltomg, spread, cstar, &
+                d_deltat_gw, d_deltatw2, d_deltaqw2)
 
 
@@ -20 +23 @@
   USE dimphy
   use mod_phys_lmdz_para
+  USE print_control_mod, ONLY: prt_level
   IMPLICIT NONE
   ! ============================================================================
@@ -110 +114 @@
   ! -------------------------------------------------------------------------
 
-  include "dimensions.h"
   include "YOMCST.h"
   include "cvthermo.h"
-  include "iniprint.h"
 
   ! Arguments en entree
   ! --------------------
 
-  REAL, DIMENSION (klon, klev) :: p, pi
-  REAL, DIMENSION (klon, klev+1) :: ph, omgb
-  REAL dtime
-  REAL, DIMENSION (klon, klev) :: te0, qe0
-  REAL, DIMENSION (klon, klev) :: dtdwn, dqdwn
-  REAL, DIMENSION (klon, klev) :: wdtpbl, wdqpbl
-  REAL, DIMENSION (klon, klev) :: udtpbl, udqpbl
-  REAL, DIMENSION (klon, klev) :: amdwn, amup
-  REAL, DIMENSION (klon, klev) :: dta, dqa
-  REAL, DIMENSION (klon) :: sigd_con
+  REAL, DIMENSION (klon, klev),     INTENT(IN)          :: p, pi
+  REAL, DIMENSION (klon, klev+1),   INTENT(IN)          :: ph, omgb
+  REAL,                             INTENT(IN)          :: dtime
+  REAL, DIMENSION (klon, klev),     INTENT(IN)          :: te0, qe0
+  REAL, DIMENSION (klon, klev),     INTENT(IN)          :: dtdwn, dqdwn
+  REAL, DIMENSION (klon, klev),     INTENT(IN)          :: wdtpbl, wdqpbl, udtpbl, udqpbl ! UNUSED
+  REAL, DIMENSION (klon, klev),     INTENT(IN)          :: amdwn, amup
+  REAL, DIMENSION (klon, klev),     INTENT(IN)          :: dta, dqa
+  REAL, DIMENSION (klon),           INTENT(IN)          :: sigd_con
+
+  !
+  ! Input/Output
+  REAL, DIMENSION (klon, klev),     INTENT(INOUT)       :: deltatw, deltaqw
+  REAL, DIMENSION (klon),           INTENT(INOUT)       :: sigmaw
 
   ! Sorties
   ! --------
 
-  REAL, DIMENSION (klon, klev) :: deltatw, deltaqw, dth
-  REAL, DIMENSION (klon, klev) :: tu, qu
-  REAL, DIMENSION (klon, klev) :: dtls, dqls
-  REAL, DIMENSION (klon, klev) :: dtke, dqke
-  REAL, DIMENSION (klon, klev) :: dtpbl, dqpbl
-  REAL, DIMENSION (klon, klev) :: spread
-  REAL, DIMENSION (klon, klev) :: d_deltatgw
-  REAL, DIMENSION (klon, klev) :: d_deltatw2, d_deltaqw2
-  REAL, DIMENSION (klon, klev+1) :: omgbdth, omg
-  REAL, DIMENSION (klon, klev) :: dp_omgb, dp_deltomg
-  REAL, DIMENSION (klon, klev) :: d_deltat_gw
-  REAL, DIMENSION (klon) :: hw, sigmaw, wape, fip, gfl, cstar
-  REAL, DIMENSION (klon) :: wdens
-  INTEGER, DIMENSION (klon) :: ktopw
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: dth
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: tu, qu
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: dtls, dqls
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: dtke, dqke
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: dtpbl, dqpbl
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: spread
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: d_deltatw2, d_deltaqw2
+  REAL, DIMENSION (klon, klev+1),   INTENT(OUT)         :: omgbdth, omg
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: dp_omgb, dp_deltomg
+  REAL, DIMENSION (klon, klev),     INTENT(OUT)         :: d_deltat_gw
+  REAL, DIMENSION (klon),           INTENT(OUT)         :: hw, wape, fip, gfl, cstar
+  REAL, DIMENSION (klon),           INTENT(OUT)         :: wdens
+  INTEGER, DIMENSION (klon),        INTENT(OUT)         :: ktopw
 
   ! Variables internes
@@ -1734 +1739 @@
       wape(i) = 0.
       cstar(i) = 0.
-      hw(i) = hwmin
-      sigmaw(i) = sigmad
+!!jyg   Outside subroutine "Wake" hw and sigmaw are zero when there are no wakes
+!!      hw(i) = hwmin                       !jyg
+!!      sigmaw(i) = sigmad                  !jyg
+      hw(i) = 0.                            !jyg
+      sigmaw(i) = 0.                        !jyg
       fip(i) = 0.
     ELSE