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

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• libf (modified) (1 prop)
• libf/phylmd (modified) (1 prop)
• libf/phylmd/phys_local_var_mod.F90 (modified) (6 diffs, 1 prop)

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

@@ -41 +41 @@
       REAL, SAVE, ALLOCATABLE :: d_u_ajs(:,:), d_v_ajs(:,:)
       !$OMP THREADPRIVATE(d_u_ajs, d_v_ajs)
+      REAL, SAVE, ALLOCATABLE :: d_u_ajsb(:,:), d_v_ajsb(:,:)
+      !$OMP THREADPRIVATE(d_u_ajsb, d_v_ajsb)
       REAL, SAVE, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:)
       !$OMP THREADPRIVATE(d_t_eva,d_q_eva)
@@ -264 +266 @@
 !$OMP THREADPRIVATE(rneb)
 
+! variables de sorties MM
+      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: zxsnow,snowhgt,qsnow,to_ice
+      REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sissnow,runoff,albsol3_lic
+!$OMP THREADPRIVATE(zxsnow,snowhgt,qsnow,to_ice)
+!$OMP THREADPRIVATE(sissnow,runoff,albsol3_lic)
+
 CONTAINS
 
@@ -291 +299 @@
       allocate(d_t_ajs(klon,klev),d_q_ajs(klon,klev))
       allocate(d_u_ajs(klon,klev),d_v_ajs(klon,klev))
+      allocate(d_u_ajsb(klon,klev),d_v_ajsb(klon,klev))
       allocate(d_t_eva(klon,klev),d_q_eva(klon,klev))
       allocate(d_t_lscst(klon,klev),d_q_lscst(klon,klev))
@@ -414 +423 @@
 
 
+      ALLOCATE (zxsnow(klon),snowhgt(klon),qsnow(klon),to_ice(klon))
+      ALLOCATE (sissnow(klon),runoff(klon),albsol3_lic(klon))
+
+
+
 END SUBROUTINE phys_local_var_init
 
@@ -436 +450 @@
       deallocate(d_t_ajs,d_q_ajs)
       deallocate(d_u_ajs,d_v_ajs)
+      deallocate(d_u_ajsb,d_v_ajsb)
       deallocate(d_t_eva,d_q_eva)
       deallocate(d_t_lscst,d_q_lscst)
@@ -554 +569 @@
       DEALLOCATE(beta_prec)
       DEALLOCATE(rneb)
+      DEALLOCATE (zxsnow,snowhgt,qsnow,to_ice,sissnow,runoff,albsol3_lic)
 
 END SUBROUTINE phys_local_var_end