Changeset 266 for codes/icosagcm/trunk/src/field.f90

Timestamp:

08/05/14 15:56:49 (10 years ago)

Author:

ymipsl

Message:

Synchronize trunk and Saturn branch.
Merge modification from Saturn branch to trunk

YM

File:

• codes/icosagcm/trunk/src/field.f90 (modified) (5 diffs)

codes/icosagcm/trunk/src/field.f90

@@ -116 +116 @@
   END SUBROUTINE allocate_field
 
-  SUBROUTINE allocate_field_glo(field,field_type,data_type,dim1,dim2)
+  SUBROUTINE allocate_field_glo(field,field_type,data_type,dim1,dim2,name)
   USE domain_mod
   IMPLICIT NONE
@@ -123 +123 @@
     INTEGER,INTENT(IN) :: data_type
     INTEGER,OPTIONAL :: dim1,dim2
+    CHARACTER(*), OPTIONAL :: name
     INTEGER :: ind
     INTEGER :: ii_size,jj_size
@@ -141 +142 @@
       ENDIF
     
+      IF(PRESENT(name)) THEN
+         field(ind)%name = name
+      ELSE
+         field(ind)%name = '(undefined)'
+      END IF
     
       field(ind)%data_type=data_type
@@ -180 +186 @@
     INTEGER :: ind
 
+!$OMP BARRIER
     DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
 
       data_type=field(ind)%data_type
@@ -199 +207 @@
       
    ENDDO
+!$OMP BARRIER
+!$OMP MASTER
    DEALLOCATE(field)
+!$OMP END MASTER
+!$OMP BARRIER
        
   END SUBROUTINE deallocate_field