Changeset 295 for codes/icosagcm/trunk/src/geometry.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/geometry.f90 (modified) (9 diffs)

codes/icosagcm/trunk/src/geometry.f90

@@ -166 +166 @@
     USE vector
     USE transfert_mod
+    USE omp_para
 
     IMPLICIT NONE
@@ -186 +187 @@
     
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -212 +213 @@
   USE vector
   USE getin_mod
+  USE omp_para
   IMPLICIT NONE
     INTEGER :: nb_it=0
@@ -226 +228 @@
     
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master) CYCLE
       d=>domain(ind)
       CALL swap_dimensions(ind)
@@ -241 +243 @@
 
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
       d=>domain(ind)
       CALL swap_dimensions(ind)
@@ -271 +273 @@
       sum=0
       DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
         CALL swap_dimensions(ind)
         CALL swap_geometry(ind)
@@ -311 +313 @@
   USE transfert_mod
   USE getin_mod
+  USE omp_para
   IMPLICIT NONE
 
@@ -330 +333 @@
  
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
       d=>domain(ind)
       CALL swap_dimensions(ind)
@@ -559 +562 @@
     CALL transfert_request(geom%centroid,req_i1)
 
-    CALL surf_triangle(d%xyz(:,ii_begin,jj_begin),d%xyz(:,ii_begin,jj_end),d%xyz(:,ii_end,jj_begin),S)
+!    CALL surf_triangle(d%xyz(:,ii_begin,jj_begin),d%xyz(:,ii_begin,jj_end),d%xyz(:,ii_end,jj_begin),S)
  
   END SUBROUTINE set_geometry