Changeset 295 for codes/icosagcm/trunk/src/transfert_mpi.f90

Timestamp:

10/31/14 14:52:01 (10 years ago)

Author:

ymipsl

Message:

Merging OpenMP parallisme mode : by subdomain and on vertical level.
This feature is actually experimental but may be retro-compatible with the last method based only on subdomain

YM

File:

• codes/icosagcm/trunk/src/transfert_mpi.f90 (modified) (9 diffs)

codes/icosagcm/trunk/src/transfert_mpi.f90

@@ -1119 +1119 @@
 
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
           
           rval2d=>field(ind)%rval2d
@@ -1152 +1152 @@
         
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
           rval2d=>field(ind)%rval2d
           req=>message%request(ind)        
@@ -1192 +1192 @@
       
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
 
           dim3=size(field(ind)%rval3d,2)
@@ -1226 +1226 @@
          
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
           dim3=size(field(ind)%rval3d,2)
           rval3d=>field(ind)%rval3d
@@ -1263 +1263 @@
     
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master ) CYCLE
 
           dim3=size(field(ind)%rval4d,2)
@@ -1302 +1302 @@
         
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
           
           dim3=size(field(ind)%rval4d,2)
@@ -1421 +1421 @@
         
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
           
           rval2d=>field(ind)%rval2d
@@ -1452 +1452 @@
         
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
 
           rval3d=>field(ind)%rval3d
@@ -1485 +1485 @@
                 
         DO ind=1,ndomain
-          IF (.NOT. assigned_domain(ind)) CYCLE
+          IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
 
           rval4d=>field(ind)%rval4d