Changeset 4114 for dynamico_lmdz

Timestamp:

Sep 12, 2018, 4:20:27 PM (6 years ago)

Author:

ymipsl

Message:

Some fix for OpenMP

YM

Location:

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src

Files:

• distrib_icosa_lmdz.f90 (modified) (6 diffs)
• phylmd/interface_icosa_lmdz.f90 (modified) (10 diffs)

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/distrib_icosa_lmdz.f90

@@ -90 +90 @@
     INTEGER,POINTER :: index(:)
     
+!$OMP BARRIER
     pos=0
     DO ind=1,ndomain_distrib
@@ -114 +115 @@
     INTEGER :: l
     
+!$OMP BARRIER
     DO l=1,size(field_lmdz,2)  
       pos=0
@@ -141 +143 @@
     INTEGER :: l,q
 
+!$OMP BARRIER
     DO q=1,size(field_lmdz,3)  
       DO l=1,size(field_lmdz,2)  
@@ -167 +170 @@
     INTEGER,POINTER :: index(:)
     
+!$OMP BARRIER
     pos=0
     DO ind=1,ndomain_distrib
@@ -189 +193 @@
     INTEGER :: l
     
+!$OMP BARRIER
     DO l=1,size(field_lmdz,2)  
       pos=0
@@ -215 +220 @@
     INTEGER :: l,q
     
+!$OMP BARRIER
     DO q=1,size(field_lmdz,3)  
       DO l=1,size(field_lmdz,2)  

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/phylmd/interface_icosa_lmdz.f90

@@ -29 +29 @@
   INTEGER :: stop_clock
   INTEGER :: count_clock=0
-  
-!  REAL,SAVE :: day_length ! length of a day (s)
   
   INTEGER,SAVE :: nbp_phys
@@ -189 +187 @@
 
   INTEGER :: run_length  
-  REAL,SAVE :: day_length ! length of a day (s) ! SAVEd to be OpenMP shared
-  INTEGER,SAVE :: annee_ref  
-  INTEGER,SAVE :: day_ref    
+  REAL :: day_length ! length of a day (s) ! SAVEd to be OpenMP shared <--- NO!!!!
+  INTEGER :: annee_ref  
+  INTEGER :: day_ref    
   INTEGER :: day_ini    
   REAL    :: start_time 
@@ -198 +196 @@
   ! Tracer stuff (SAVEd when needed to be OpenMP shared)
   INTEGER :: nq
-  INTEGER,SAVE                  :: nqo, nbtr
-  CHARACTER(len=4),SAVE         :: type_trac
-  CHARACTER(len=20),ALLOCATABLE,SAVE :: tname(:)    ! tracer short name for restart and diagnostics
+  INTEGER                       :: nqo, nbtr
+  CHARACTER(len=4)              :: type_trac
+  CHARACTER(len=20),ALLOCATABLE :: tname(:)    ! tracer short name for restart and diagnostics
   CHARACTER(len=23),ALLOCATABLE :: ttext(:)     ! tracer long name for diagnostics
   INTEGER,ALLOCATABLE           :: niadv(:)    ! equivalent dyn / physique
@@ -235 +233 @@
   INTEGER :: iflag_phys    
 
+
     CALL init_distrib_icosa_lmdz
     
@@ -264 +263 @@
     ENDDO
 
-!$OMP BARRIER
-      
+     
     CALL transfer_icosa_to_lmdz(f_ind_cell_glo,ind_cell_glo)
     CALL deallocate_field(f_ind_cell_glo)
@@ -280 +278 @@
 
     ! Initialize tracer names, numbers, etc. for physics
-!$OMP MASTER
     !Config  Key  = type_trac
     !Config  Desc = Choix de couplage avec model de chimie INCA ou REPROBUS
@@ -290 +287 @@
      type_trac = 'lmdz'
      CALL getin('type_trac',type_trac)
-!$OMP END MASTER
-!$OMP BARRIER
 
 ! allocate some of the tracer arrays
@@ -299 +294 @@
 
 ! read "traceur.def" file to know tracer names (and figure out nqo and nbtr)
-!$OMP MASTER
-    OPEN(unit=42,file="traceur.def",form="formatted",status="old",iostat=ierr)
-    IF (ierr==0) THEN
-      READ(42,*) nq ! should be the same as nqtot
-      IF (nq /= nqtot) THEN
-        WRITE(*,*) "Error: number of tracers in tracer.def should match nqtot!"
-        WRITE(*,*) "       will just use nqtot=",nqtot," tracers"
+    IF (is_mpi_root) THEN
+  !$OMP MASTER
+      OPEN(unit=42,file="traceur.def",form="formatted",status="old",iostat=ierr)
+      IF (ierr==0) THEN
+        READ(42,*) nq ! should be the same as nqtot
+        IF (nq /= nqtot) THEN
+          WRITE(*,*) "Error: number of tracers in tracer.def should match nqtot!"
+          WRITE(*,*) "       will just use nqtot=",nqtot," tracers"
+        ENDIF
+        DO i=1,nqtot
+          READ(42,*) j,k,tname(i)
+        ENDDO
+        CLOSE(42)
       ENDIF
+      ! figure out how many water tracers are present
+      nqo=0
       DO i=1,nqtot
-        READ(42,*) j,k,tname(i)
-      ENDDO
-      CLOSE(42)
+        IF (INDEX(tname(i),"H2O")==1) THEN
+          nqo=nqo+1
+        ENDIF
+      ENDDO
+      nbtr=nqtot-nqo
+   !$OMP END MASTER
     ENDIF
-    ! figure out how many water tracers are present
-    nqo=0
+ 
+    CALL bcast(nqo)
+    CALL bcast(nbtr)
     DO i=1,nqtot
-      IF (INDEX(tname(i),"H2O")==1) THEN
-        nqo=nqo+1
-      ENDIF
-    ENDDO
-    nbtr=nqtot-nqo
-!$OMP END MASTER
-!$OMP BARRIER
-
+      CALL bcast(tname(i))
+    ENDDO
+    
     ALLOCATE(conv_flg(nbtr))
     ALLOCATE(pbl_flg(nbtr))
@@ -374 +376 @@
 
    ! Initialize physical constant
-!$OMP MASTER
     day_length=86400
     CALL getin('day_length',day_length)
@@ -387 +388 @@
     day_ref=1
     CALL getin("dayref",day_ref)
-!$OMP END MASTER
-!$OMP BARRIER
     
     physics_timestep=dt*itau_physics