Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/phys_local_var_mod.F90

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_local_var_mod.F90 (modified) (3 diffs)

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

@@ -342 +342 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: dnwd, dnwd0, upwd, omega
 !$OMP THREADPRIVATE(dnwd, dnwd0, upwd, omega)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: epmax_diag ! epmax_cape
+!$OMP THREADPRIVATE(epmax_diag)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: ep ! epmax_cape
+!$OMP THREADPRIVATE(ep)
 !      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: coefh, coefm, lambda_th
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: lambda_th
@@ -560 +564 @@
 !      ALLOCATE(upwd(klon, klev), omega(klon, klev), coefh(klon, klev))
       ALLOCATE(upwd(klon, klev), omega(klon, klev))
+      ALLOCATE(epmax_diag(klon)) ! epmax_cape
+      ALLOCATE(ep(klon,klev)) ! epmax_cape
 !      ALLOCATE(coefm(klon, klev), lambda_th(klon, klev), cldemi(klon, klev))
       ALLOCATE(lambda_th(klon, klev), cldemi(klon, klev))
@@ -761 +767 @@
 !      DEALLOCATE(upwd, omega, coefh)
       DEALLOCATE(upwd, omega)
+      DEALLOCATE(epmax_diag)
+      DEALLOCATE(ep)
 !      DEALLOCATE(coefm, lambda_th, cldemi)
       DEALLOCATE(lambda_th, cldemi)