Changeset 709

Timestamp:

07/20/18 11:12:21 (6 years ago)

Author:

ymipsl

Message:

OpenMP fix when creating intial state from files by interpolation (etat0_database).

Missing synchronisation when using openMP parallelisation on vertical levels.

YM

File:

• codes/icosagcm/trunk/src/initial/etat0_database.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/initial/etat0_database.f90

@@ -57 +57 @@
     CALL writeField("relief_out",f_phis,once=.TRUE.)
 
-    DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
-      f_phis(ind)%rval2d(:)=f_phis(ind)%rval2d(:)*g      
-    ENDDO
-
+    IF (is_omp_level_master) THEN
+      DO ind=1,ndomain
+        IF (.NOT. assigned_domain(ind)) CYCLE
+        f_phis(ind)%rval2d(:)=f_phis(ind)%rval2d(:)*g      
+      ENDDO
+    ENDIF
+!$OMP BARRIER    
 
     IF (is_omp_master) CALL xios_get_axis_attr("lev_ecdyn",n_glo=nb_level)
@@ -98 +100 @@
 ! make correction to ps due to relief at higher resolution
 ! difference with LMDZ : tsol is taken from ECDYN.NC and not from ECPHY
-    DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
-      f_ps(ind)%rval2d(:)=f_ps(ind)%rval2d(:)*(1.+(f_z(ind)%rval2d(:)-f_phis(ind)%rval2d(:))/287.0/f_ts(ind)%rval2d(:))
-    ENDDO
+    IF (is_omp_level_master) THEN
+      DO ind=1,ndomain
+        IF (.NOT. assigned_domain(ind)) CYCLE
+        f_ps(ind)%rval2d(:)=f_ps(ind)%rval2d(:)*(1.+(f_z(ind)%rval2d(:)-f_phis(ind)%rval2d(:))/287.0/f_ts(ind)%rval2d(:))
+      ENDDO
+    ENDIF
+!$OMP BARRIER    
     CALL transfert_request(f_ps,req_i0) 
     CALL writeField("ps_out",f_ps)
@@ -135 +140 @@
     ENDDO
 
+    CALL writeField("tempdb_out",f_temp_reg)
+    CALL writeField("temp_out",f_temp)
 
     CALL deallocate_field(f_ts)