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

Timestamp:

Jul 30, 2008, 5:57:45 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Du nettoyage sur le parallelisme, inclusion de nouvelles interfaces pour OPA9
et ORCHIDEE YM
LF

File:

• LMDZ4/trunk/libf/phylmd/phys_local_var_mod.F90 (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -7 +7 @@
 ! Declaration des variables
 
-      REAL, ALLOCATABLE :: t_seri(:,:), q_seri(:,:)
-      REAL, ALLOCATABLE :: ql_seri(:,:),qs_seri(:,:)
-      REAL, ALLOCATABLE :: u_seri(:,:), v_seri(:,:)
+      REAL, SAVE, ALLOCATABLE :: t_seri(:,:), q_seri(:,:)
+      !$OMP THREADPRIVATE(t_seri, q_seri)
+      REAL, SAVE, ALLOCATABLE :: ql_seri(:,:),qs_seri(:,:)
+      !$OMP THREADPRIVATE(ql_seri,qs_seri)
+      REAL, SAVE, ALLOCATABLE :: u_seri(:,:), v_seri(:,:)
+      !$OMP THREADPRIVATE(u_seri, v_seri)
 
-      REAL, ALLOCATABLE :: tr_seri(:,:,:)
-      REAL, ALLOCATABLE :: d_t_dyn(:,:), d_q_dyn(:,:)
-      REAL, ALLOCATABLE :: d_t_con(:,:),d_q_con(:,:)
-      REAL, ALLOCATABLE :: d_u_con(:,:),d_v_con(:,:)
-      REAL, ALLOCATABLE :: d_t_wake(:,:),d_q_wake(:,:)
-      REAL, ALLOCATABLE :: d_t_lsc(:,:),d_q_lsc(:,:),d_ql_lsc(:,:)
-      REAL, ALLOCATABLE :: d_t_ajsb(:,:), d_q_ajsb(:,:)
-      REAL, ALLOCATABLE :: d_t_ajs(:,:), d_q_ajs(:,:)
-      REAL, ALLOCATABLE :: d_u_ajs(:,:), d_v_ajs(:,:)
-      REAL, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:)
+      REAL, SAVE, ALLOCATABLE :: tr_seri(:,:,:)
+      !$OMP THREADPRIVATE(tr_seri)
+      REAL, SAVE, ALLOCATABLE :: d_t_dyn(:,:), d_q_dyn(:,:)
+      !$OMP THREADPRIVATE(d_t_dyn, d_q_dyn)
+      REAL, SAVE, ALLOCATABLE :: d_t_con(:,:),d_q_con(:,:)
+      !$OMP THREADPRIVATE(d_t_con,d_q_con)
+      REAL, SAVE, ALLOCATABLE :: d_u_con(:,:),d_v_con(:,:)
+      !$OMP THREADPRIVATE(d_u_con,d_v_con)
+      REAL, SAVE, ALLOCATABLE :: d_t_wake(:,:),d_q_wake(:,:)
+      !$OMP THREADPRIVATE( d_t_wake,d_q_wake)
+      REAL, SAVE, ALLOCATABLE :: d_t_lsc(:,:),d_q_lsc(:,:),d_ql_lsc(:,:)
+      !$OMP THREADPRIVATE(d_t_lsc,d_q_lsc,d_ql_lsc)
+      REAL, SAVE, ALLOCATABLE :: d_t_ajsb(:,:), d_q_ajsb(:,:)
+      !$OMP THREADPRIVATE(d_t_ajsb, d_q_ajsb)
+      REAL, SAVE, ALLOCATABLE :: d_t_ajs(:,:), d_q_ajs(:,:)
+      !$OMP THREADPRIVATE(d_t_ajs, d_q_ajs)
+      REAL, SAVE, ALLOCATABLE :: d_u_ajs(:,:), d_v_ajs(:,:)
+      !$OMP THREADPRIVATE(d_u_ajs, d_v_ajs)
+      REAL, SAVE, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:)
+      !$OMP THREADPRIVATE(d_t_eva,d_q_eva)
 !tendances dues a oro et lif
-      REAL, ALLOCATABLE :: d_t_oli(:,:)
-      REAL, ALLOCATABLE :: d_u_oli(:,:), d_v_oli(:,:)
-      REAL, ALLOCATABLE :: d_t_vdf(:,:), d_q_vdf(:,:)
-      REAL, ALLOCATABLE :: d_u_vdf(:,:), d_v_vdf(:,:)
-      REAL, ALLOCATABLE :: d_t_oro(:,:)
-      REAL, ALLOCATABLE :: d_u_oro(:,:), d_v_oro(:,:)
-      REAL, ALLOCATABLE :: d_t_lif(:,:)
-      REAL, ALLOCATABLE :: d_u_lif(:,:), d_v_lif(:,:)
+      REAL, SAVE, ALLOCATABLE :: d_t_oli(:,:)
+      !$OMP THREADPRIVATE(d_t_oli)
+      REAL, SAVE, ALLOCATABLE :: d_u_oli(:,:), d_v_oli(:,:)
+      !$OMP THREADPRIVATE(d_u_oli, d_v_oli)
+      REAL, SAVE, ALLOCATABLE :: d_t_vdf(:,:), d_q_vdf(:,:)
+      !$OMP THREADPRIVATE( d_t_vdf, d_q_vdf)
+      REAL, SAVE, ALLOCATABLE :: d_u_vdf(:,:), d_v_vdf(:,:)
+      !$OMP THREADPRIVATE(d_u_vdf, d_v_vdf)
+      REAL, SAVE, ALLOCATABLE :: d_t_oro(:,:)
+      !$OMP THREADPRIVATE(d_t_oro)
+      REAL, SAVE, ALLOCATABLE :: d_u_oro(:,:), d_v_oro(:,:)
+      !$OMP THREADPRIVATE(d_u_oro, d_v_oro)
+      REAL, SAVE, ALLOCATABLE :: d_t_lif(:,:)
+      !$OMP THREADPRIVATE(d_t_lif)
+      REAL, SAVE, ALLOCATABLE :: d_u_lif(:,:), d_v_lif(:,:)
+      !$OMP THREADPRIVATE(d_u_lif, d_v_lif)
 ! tendance du a la conersion Ec -> E thermique
-      REAL, ALLOCATABLE :: d_t_ec(:,:)
-      REAL, ALLOCATABLE :: d_ts(:,:), d_tr(:,:,:)
+      REAL, SAVE, ALLOCATABLE :: d_t_ec(:,:)
+      !$OMP THREADPRIVATE(d_t_ec)
+      REAL, SAVE, ALLOCATABLE :: d_ts(:,:), d_tr(:,:,:)
+      !$OMP THREADPRIVATE(d_ts, d_tr)
 CONTAINS