Changeset 1084 for LMDZ4

Timestamp:

Jan 29, 2009, 11:37:41 AM (16 years ago)

Author:

jghattas

Message:

Bug-fix pour OpenMP.
Anne Cozic

Location:

LMDZ4/trunk/libf

Files:

• dyn3dpar/dynredem_p.F (modified) (2 diffs)
• dyn3dpar/gcm.F (modified) (1 diff)
• phylmd/climb_hq_mod.F90 (modified) (1 diff)

LMDZ4/trunk/libf/dyn3dpar/dynredem_p.F

@@ -551 +551 @@
       DATA nb / 0 /
 
+      logical exist_file
+
       call Gather_Field(ucov,ip1jmp1,llm,0)
       call Gather_Field(vcov,ip1jm,llm,0)
@@ -645 +647 @@
       IF (config_inca /= 'none') THEN
 ! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc
-         ierr_file = NF_OPEN ("start_trac.nc", NF_NOWRITE,nid_trac)
-         IF (ierr_file .NE.NF_NOERR) THEN
-            write(6,*)' Pb d''ouverture du fichier start_trac.nc'
-            write(6,*)' ierr = ', ierr_file 
-         ENDIF
+         inquire(FILE="start_trac.nc", EXIST=exist_file) 
+         print *, "EXIST", exist_file
+         if (exist_file) then 
+            ierr_file = NF_OPEN ("start_trac.nc", NF_NOWRITE,nid_trac)
+            IF (ierr_file .NE.NF_NOERR) THEN
+               write(6,*)' Pb d''ouverture du fichier start_trac.nc'
+               write(6,*)' ierr = ', ierr_file 
+            ENDIF
+         else
+            ierr_file = 2
+         endif
       END IF
 

LMDZ4/trunk/libf/dyn3dpar/gcm.F

@@ -13 +13 @@
       USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
       USE mod_grid_phy_lmdz
+      USE mod_phys_lmdz_omp_data, ONLY: klon_omp
       USE dimphy
       USE mod_interface_dyn_phys

LMDZ4/trunk/libf/phylmd/climb_hq_mod.F90

@@ -57 +57 @@
 !****************************************************************************************
     LOGICAL, SAVE                            :: first=.TRUE.
+    !$OMP THREADPRIVATE(first)
     REAL, DIMENSION(klon,klev)               :: local_H
     REAL, DIMENSION(klon)                    :: psref