Changeset 1279 for LMDZ4/trunk/libf/phylmd/phys_local_var_mod.F90

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

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

LMDZ4/trunk/libf/phylmd/phys_local_var_mod.F90

@@ +1 @@
+!
+! $Id$
+!
       MODULE phys_local_var_mod
+
 ! Variables locales pour effectuer les appels en serie
 !======================================================================
@@ -66 +70 @@
       REAL, SAVE, ALLOCATABLE :: d_ts(:,:), d_tr(:,:,:)
       !$OMP THREADPRIVATE(d_ts, d_tr)
+
+! diagnostique pour le rayonnement
+      REAL, SAVE, ALLOCATABLE :: topswad_aero(:),  solswad_aero(:)      ! diag
+      !$OMP THREADPRIVATE(topswad_aero,solswad_aero)
+      REAL, SAVE, ALLOCATABLE :: topswai_aero(:),  solswai_aero(:)      ! diag
+      !$OMP THREADPRIVATE(topswai_aero,solswai_aero)
+      REAL, SAVE, ALLOCATABLE :: topswad0_aero(:), solswad0_aero(:)     ! diag
+      !$OMP THREADPRIVATE(topswad0_aero,solswad0_aero)
+      REAL, SAVE, ALLOCATABLE :: topsw_aero(:,:),  solsw_aero(:,:)      ! diag
+      !$OMP THREADPRIVATE(topsw_aero,solsw_aero)
+      REAL, SAVE, ALLOCATABLE :: topsw0_aero(:,:), solsw0_aero(:,:)     ! diag
+      !$OMP THREADPRIVATE(topsw0_aero,solsw0_aero)
+      REAL, SAVE, ALLOCATABLE :: topswcf_aero(:,:),  solswcf_aero(:,:)  ! diag
+      !$OMP THREADPRIVATE(topswcf_aero,solswcf_aero)
+      REAL, SAVE, ALLOCATABLE :: tausum_aero(:,:,:) 
+      !$OMP THREADPRIVATE(tausum_aero) 
+      REAL, SAVE, ALLOCATABLE :: tau3d_aero(:,:,:,:) 
+      !$OMP THREADPRIVATE(tau3d_aero) 
+
 CONTAINS
 
@@ -72 +95 @@
 use dimphy
 use infotrac, ONLY : nbtr
+USE aero_mod
+
 IMPLICIT NONE
 #include "indicesol.h"
@@ -97 +122 @@
       allocate(d_u_lif(klon,klev),d_v_lif(klon,klev))
       allocate(d_ts(klon,klev), d_tr(klon,klev,nbtr))
+      allocate(topswad_aero(klon), solswad_aero(klon))
+      allocate(topswai_aero(klon), solswai_aero(klon))
+      allocate(topswad0_aero(klon), solswad0_aero(klon))
+      allocate(topsw_aero(klon,naero_grp), solsw_aero(klon,naero_grp))
+      allocate(topsw0_aero(klon,naero_grp), solsw0_aero(klon,naero_grp))
+      allocate(topswcf_aero(klon,3), solswcf_aero(klon,3))
+      allocate(d_u_hin(klon,klev),d_v_hin(klon,klev),d_t_hin(klon,klev))
+      allocate(tausum_aero(klon,nwave,naero_spc))
+      allocate(tau3d_aero(klon,klev,nwave,naero_spc)) 
+
 END SUBROUTINE phys_local_var_init
 
@@ -127 +162 @@
       deallocate(d_u_lif,d_v_lif)
       deallocate(d_ts, d_tr)
+      deallocate(topswad_aero,solswad_aero)
+      deallocate(topswai_aero,solswai_aero)
+      deallocate(topswad0_aero,solswad0_aero)
+      deallocate(topsw_aero,solsw_aero)
+      deallocate(topsw0_aero,solsw0_aero)
+      deallocate(topswcf_aero,solswcf_aero)
+      deallocate(tausum_aero) 
+      deallocate(tau3d_aero) 
+      deallocate(d_u_hin,d_v_hin,d_t_hin)
+
 END SUBROUTINE phys_local_var_end