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

codes/icosagcm/trunk/src/field.f90

@@ -48 +48 @@
   SUBROUTINE allocate_field(field,field_type,data_type,dim1,dim2,name)
   USE domain_mod
+  USE omp_para
   IMPLICIT NONE
     TYPE(t_field),POINTER :: field(:)
@@ -64 +65 @@
 
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master) CYCLE
 
       IF(PRESENT(name)) THEN
@@ -181 +182 @@
   SUBROUTINE deallocate_field(field)
   USE domain_mod
+  USE omp_para
   IMPLICIT NONE
     TYPE(t_field),POINTER :: field(:)
@@ -188 +190 @@
 !$OMP BARRIER
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)) CYCLE
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master) CYCLE
 
       data_type=field(ind)%data_type