Changeset 469 for codes/icosagcm/trunk

Timestamp:

09/05/16 12:07:12 (8 years ago)

Author:

ymipsl

Message:

Repairing openMP --> domain_update

YM

File:

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

codes/icosagcm/trunk/src/geometry.f90

@@ -367 +367 @@
     INTEGER :: ind,i,j,k,n
     TYPE(t_domain),POINTER :: d
-    TYPE(t_field),POINTER :: xyz_glo(:), xyz_loc(:), vertex_glo(:), vertex_loc(:)
+    TYPE(t_field),POINTER,SAVE :: xyz_glo(:), xyz_loc(:), vertex_glo(:), vertex_loc(:)
     REAL(rstd), POINTER :: xyz(:,:), vertex(:,:)
     
@@ -382 +382 @@
        vertex(:,:) = xyz_v(:,:)
     END DO
-    
+
+!$OMP BARRIER    
+!$OMP MASTER
     CALL allocate_field_glo(xyz_glo, field_t, type_real, 3)
     CALL allocate_field_glo(vertex_glo, field_z, type_real, 3)
+
     CALL gather_field(xyz_loc, xyz_glo)
+    CALL gather_field(vertex_loc, vertex_glo)
+
     CALL bcast_field(xyz_glo)
-    CALL gather_field(vertex_loc, vertex_glo)
     CALL bcast_field(vertex_glo)
-    CALL deallocate_field(vertex_loc)
-    CALL deallocate_field(xyz_loc)
 
     DO ind=1,ndomain_glo
@@ -409 +411 @@
     CALL deallocate_field_glo(vertex_glo)
     CALL deallocate_field_glo(xyz_glo)
+!$OMP END MASTER
+!$OMP BARRIER
+    CALL deallocate_field(vertex_loc)
+    CALL deallocate_field(xyz_loc)
 
   END SUBROUTINE update_domain