Changeset 2641 for LMDZ5/branches/testing/libf/phylmd/phys_state_var_mod.F90

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -203 +203 @@
       REAL,ALLOCATABLE,SAVE :: cin(:)
 !$OMP THREADPRIVATE(cin)
-! ftd : differential heating between wake and environment
+! ftd : convective heating due to unsaturated downdraughts
       REAL,ALLOCATABLE,SAVE :: ftd(:,:)
 !$OMP THREADPRIVATE(ftd)
-! fqd : differential moistening between wake and environment
+! fqd : convective moistening due to unsaturated downdraughts
       REAL,ALLOCATABLE,SAVE :: fqd(:,:)     
 !$OMP THREADPRIVATE(fqd)
@@ -232 +232 @@
 ! wake_deltat : ecart de temperature avec la zone non perturbee
 ! wake_deltaq : ecart d'humidite avec la zone non perturbee
+! wake_s      : fraction surfacique occupee par la poche froide
+! wake_dens   : number of wakes per unit area
+! wake_occ    : occurence of wakes (= 1 if wakes occur, =0 otherwise)
 ! wake_Cstar  : vitesse d'etalement de la poche
-! wake_s      : fraction surfacique occupee par la poche froide
 ! wake_pe     : wake potential energy - WAPE
 ! wake_fip    : Gust Front Impinging power - ALP
-! dt_wake, dq_wake: LS tendencies due to wake
       REAL,ALLOCATABLE,SAVE :: wake_deltat(:,:)
 !$OMP THREADPRIVATE(wake_deltat)
       REAL,ALLOCATABLE,SAVE :: wake_deltaq(:,:)
 !$OMP THREADPRIVATE(wake_deltaq)
+      REAL,ALLOCATABLE,SAVE :: wake_s(:)
+!$OMP THREADPRIVATE(wake_s)
+      REAL,ALLOCATABLE,SAVE :: wake_dens(:)
+!$OMP THREADPRIVATE(wake_dens)
       REAL,ALLOCATABLE,SAVE :: wake_Cstar(:)
 !$OMP THREADPRIVATE(wake_Cstar)
-      REAL,ALLOCATABLE,SAVE :: wake_s(:)
-!$OMP THREADPRIVATE(wake_s)
       REAL,ALLOCATABLE,SAVE :: wake_pe(:)
 !$OMP THREADPRIVATE(wake_pe)
       REAL,ALLOCATABLE,SAVE :: wake_fip(:)
 !$OMP THREADPRIVATE(wake_fip)
-      REAL,ALLOCATABLE,SAVE :: dt_wake(:,:)
-!$OMP THREADPRIVATE(dt_wake)
-      REAL,ALLOCATABLE,SAVE :: dq_wake(:,:)
-!$OMP THREADPRIVATE(dq_wake)
 !
 !jyg<
@@ -524 +523 @@
       ALLOCATE(wght_th(klon,klev))
       ALLOCATE(wake_deltat(klon,klev), wake_deltaq(klon,klev))
-      ALLOCATE(wake_Cstar(klon), wake_s(klon))
+      ALLOCATE(wake_s(klon), wake_dens(klon))
+      ALLOCATE(wake_Cstar(klon))
       ALLOCATE(wake_pe(klon), wake_fip(klon))
-      ALLOCATE(dt_wake(klon,klev), dq_wake(klon,klev))
 !jyg<
       ALLOCATE(wake_delta_pbl_TKE(klon,klev+1,nbsrf+1))
@@ -664 +663 @@
       deallocate(lalim_conv, wght_th)
       deallocate(wake_deltat, wake_deltaq)
-      deallocate(wake_Cstar, wake_s, wake_pe, wake_fip)
-      deallocate(dt_wake, dq_wake)
+      deallocate(wake_s, wake_dens)
+      deallocate(wake_Cstar, wake_pe, wake_fip)
 !jyg<
       deallocate(wake_delta_pbl_TKE)