Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/phys_output_var_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_var_mod.F90 (modified) (2 diffs)

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

@@ -59 +59 @@
   LOGICAL, SAVE :: vars_defined = .FALSE. ! ug PAS THREADPRIVATE ET C'EST NORMAL
 
+  REAL, allocatable:: zustr_gwd_hines(:), zvstr_gwd_hines(:) ! (klon)
+  REAL, allocatable:: zustr_gwd_front(:), zvstr_gwd_front(:) ! (klon)
   REAL, allocatable:: zustr_gwd_rando(:), zvstr_gwd_rando(:) ! (klon)
+  !$OMP THREADPRIVATE(zustr_gwd_hines, zvstr_gwd_hines)
+  !$OMP THREADPRIVATE(zustr_gwd_front, zvstr_gwd_front)
   !$OMP THREADPRIVATE(zustr_gwd_rando, zvstr_gwd_rando)
 
@@ -86 +90 @@
     allocate (bils_ec(klon),bils_ech(klon),bils_tke(klon),bils_diss(klon),bils_kinetic(klon),bils_enthalp(klon),bils_latent(klon))
 
+    IF (ok_hines) allocate(zustr_gwd_hines(klon), zvstr_gwd_hines(klon))
+    IF (.not.ok_hines.and.ok_gwd_rando) &
+                  allocate(zustr_gwd_front(klon), zvstr_gwd_front(klon))
     IF (ok_gwd_rando) allocate(zustr_gwd_rando(klon), zvstr_gwd_rando(klon))