Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/phytrac.F90

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phytrac.F90 (modified) (8 diffs)

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

@@ -45 +45 @@
   USE tracreprobus_mod
   USE control_mod
+  USE indice_sol_mod
 
   IMPLICIT NONE
@@ -50 +51 @@
   INCLUDE "YOMCST.h"
   INCLUDE "dimensions.h"
-  INCLUDE "indicesol.h"
   INCLUDE "clesphys.h"
   INCLUDE "temps.h"
@@ -203 +203 @@
   INTEGER                   :: itau_w      ! pas de temps ecriture = nstep + itau_phy
   LOGICAL,PARAMETER         :: ok_sync=.TRUE.
-  CHARACTER(len=20)         :: chtratimestep 
-
+  CHARACTER(len=20),save    :: chtratimestep,chtratimestep_omp
+!$OMP THREADPRIVATE(chtratimestep)
 !
 ! Nature du traceur
@@ -264 +264 @@
   CHARACTER(len=8),DIMENSION(nbtr) :: solsym
 !RomP >>>
-  INTEGER,SAVE  :: iflag_lscav
-  LOGICAL,SAVE  :: convscav
+  INTEGER,SAVE  :: iflag_lscav_omp,iflag_lscav
+  LOGICAL,SAVE  :: convscav_omp,convscav
 !$OMP THREADPRIVATE(iflag_lscav,convscav)
 !RomP <<<
@@ -309 +309 @@
   IF (debutphy) THEN
 !!jyg
-   chtratimestep='DefFreq'
-   CALL getin('tra_time_step',chtratimestep)
+!$OMP MASTER
+   chtratimestep_omp='DefFreq'
+   CALL getin('tra_time_step',chtratimestep_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+   chtratimestep=chtratimestep_omp
    IF (chtratimestep .NE. 'DefFreq') THEN
      call convers_timesteps(chtratimestep,pdtphys,ecrit_tra)
@@ -321 +325 @@
 !Config Help = 
 !
-  convscav=.false.
-  call getin('convscav', convscav)
+!$OMP MASTER
+  convscav_omp=.false.
+  call getin('convscav', convscav_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+  convscav=convscav_omp
   print*,'phytrac passage dans routine conv avec lessivage', convscav
 !
@@ -331 +339 @@
 !Config Help = 
 !
-  iflag_lscav=1
-  call getin('iflag_lscav', iflag_lscav)
+!$OMP MASTER
+  iflag_lscav_omp=1
+  call getin('iflag_lscav', iflag_lscav_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+  iflag_lscav=iflag_lscav_omp
 !
   SELECT CASE(iflag_lscav)
@@ -371 +383 @@
      INCLUDE "ini_histrac.h"
 #endif
-  END IF
+  END IF ! of IF (debutphy)
 !############################################ END INITIALIZATION #######