Changeset 1117 for LMDZ4/branches

Timestamp:

Mar 11, 2009, 1:47:42 PM (16 years ago)

Author:

yann meurdesoif

Message:

Correction pour bon fonctionnement en OpenMP suite à la mise à jour des modifications sur le nombre de traceur spécifié dynamiquement
YM

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Files:

• etat0_netcdf.F (modified) (3 diffs)
• infotrac.F90 (modified) (1 diff)
• vlspltgen_p.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/etat0_netcdf.F

@@ -40 +40 @@
       REAL :: vvent(iip1, jjm, llm)
       REAL :: t3d(iip1, jjp1, llm), tpot(iip1, jjp1, llm)
-      REAL :: q3d(iip1, jjp1, llm,nqtot), qsat(iip1, jjp1, llm)
+      REAL :: qsat(iip1, jjp1, llm)
+      REAL,ALLOCATABLE :: q3d(:, :, :,:)
       REAL :: tsol(klon), qsol(klon), sn(klon)
       REAL :: tsolsrf(klon,nbsrf), qsolsrf(klon,nbsrf),snsrf(klon,nbsrf) 
@@ -170 +171 @@
       !
       CALL inifilr()
+C init pour traceurs
+      call infotrac_init
+      ALLOCATE(q3d(iip1, jjp1, llm,nqtot))
 !      CALL phys_state_var_init()
       !
@@ -625 +629 @@
       phis(iip1,:) = phis(1,:)
 
-C init pour traceurs
-      call infotrac_init
 C Ecriture
       CALL inidissip( lstardis, nitergdiv, nitergrot, niterh   ,

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/infotrac.F90

@@ -3 +3 @@
 ! nqtot : total number of tracers and higher order of moment, water vapor and liquid included
   INTEGER, SAVE :: nqtot
-!$OMP THREADPRIVATE(nqtot)   
+!!$OMP THREADPRIVATE(nqtot)   
 
 ! nbtr : number of tracers not including higher order of moment or water vapor or liquid
 !        number of tracers used in the physics
   INTEGER, SAVE :: nbtr
-!$OMP THREADPRIVATE(nbtr)   
+!!$OMP THREADPRIVATE(nbtr)   
 
 ! Name variables
   CHARACTER(len=20), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
   CHARACTER(len=23), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
-!$OMP THREADPRIVATE(tname,ttext)   
+!!$OMP THREADPRIVATE(tname,ttext)   
 
 ! iadv  : index of trasport schema for each tracer
   INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: iadv
-!$OMP THREADPRIVATE(iadv)   
+!!$OMP THREADPRIVATE(iadv)   
 
 ! niadv : vector keeping the coorspondance between all tracers(nqtot) treated in the 
 !         dynamic part of the code and the tracers (nbtr+2) used in the physics part of the code. 
   INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: niadv ! equivalent dyn / physique
-!$OMP THREADPRIVATE(niadv)   
+!!$OMP THREADPRIVATE(niadv)   
 
 ! Variables for INCA
   INTEGER, ALLOCATABLE, DIMENSION(:), SAVE  :: conv_flg
   INTEGER, ALLOCATABLE, DIMENSION(:), SAVE  :: pbl_flg
-!$OMP THREADPRIVATE(conv_flg, pbl_flg)   
+!!$OMP THREADPRIVATE(conv_flg, pbl_flg)   
 
 CONTAINS

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/vlspltgen_p.F

@@ -69 +69 @@
       INTEGER ijb,ije,iq
       LOGICAL, SAVE :: firstcall=.TRUE.
-
+!$OMP THREADPRIVATE(firstcall)
       type(request) :: MyRequest1
       type(request) :: MyRequest2
@@ -88 +88 @@
 
 c Allocate variables depending on dynamic variable nqtot
+
          IF (firstcall) THEN
             firstcall=.FALSE.
+!$OMP MASTER
             ALLOCATE(zm(ip1jmp1,llm,nqtot))
             ALLOCATE(zq(ip1jmp1,llm,nqtot))
+!$OMP END MASTER
+!$OMP BARRIER
          END IF
-
 c-- Calcul de Qsat en chaque point
 c-- approximation: au milieu des couches play(l)=(p(l)+p(l+1))/2