Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/add_wake_tend.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/add_wake_tend.F90

@@ -1 @@
-SUBROUTINE add_wake_tend(zddeltat, zddeltaq, zds, zddensaw, zddensw, zoccur, text, abortphy)
+SUBROUTINE add_wake_tend(zddeltat, zddeltaq, zds, zddens, zoccur, text, abortphy)
 !===================================================================
 ! Ajoute les tendances liées aux diverses parametrisations physiques aux
@@ -9 +9 @@
 
 USE dimphy, ONLY: klon, klev
-USE phys_state_var_mod, ONLY: wake_deltat, wake_deltaq, wake_s,  &
-                              awake_dens, wake_dens
+USE phys_state_var_mod, ONLY: wake_deltat, wake_deltaq, wake_s, wake_dens
 
 USE print_control_mod, ONLY: prt_level
@@ -18 +17 @@
 !------------
   REAL, DIMENSION(klon, klev),   INTENT (IN)         :: zddeltat, zddeltaq
-  REAL, DIMENSION(klon),         INTENT (IN)         :: zds, zddensaw, zddensw
+  REAL, DIMENSION(klon),         INTENT (IN)         :: zds, zddens
   INTEGER, DIMENSION(klon),      INTENT (IN)         :: zoccur
   CHARACTER*(*),                 INTENT (IN)         :: text
@@ -54 +53 @@
          DO i = 1, klon
            IF (zoccur(i) .GE. 1) THEN
-             wake_s(i)     = wake_s(i)    + zds(i)
-             awake_dens(i) = awake_dens(i) + zddensaw(i)
-             wake_dens(i)  = wake_dens(i) + zddensw(i)
+             wake_s(i)    = wake_s(i)    + zds(i)
+             wake_dens(i) = wake_dens(i) + zddens(i)
            ELSE
-             wake_s(i)     = 0.
-             awake_dens(i) = 0.
-             wake_dens(i)  = 0.
+             wake_s(i)    = 0.
+             wake_dens(i) = 0.
            ENDIF   ! (zoccur(i) .GE. 1)
          END DO