Changeset 1864 for LMDZ5/branches/testing/libf/dyn3dmem/write_field_loc.F90

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/write_field_loc.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/write_field_loc.F90

@@ -34 +34 @@
 
    SUBROUTINE write_field_u_gen(name,Field,ll)
-    USE parallel
+    USE parallel_lmdz
     USE write_field
     USE mod_hallo
@@ -45 +45 @@
     real, allocatable,SAVE :: New_Field(:,:,:)
     integer,dimension(0:mpi_size-1) :: jj_nb_master
-    type(Request) :: Request_write
+    type(Request),SAVE :: Request_write
+!$OMP THREADPRIVATE(Request_write)
     integer :: ll,i
     
@@ -61 +62 @@
       New_Field(:,jj_begin:jj_end,i)=reshape(Field(ij_begin:ij_end,i),(/iip1,jj_nb/))
     ENDDO
-    
+!$OMP BARRIER    
     call Register_SwapField(new_field,new_field,ip1jmp1,ll,jj_Nb_master,Request_write)
     call SendRequest(Request_write)
@@ -98 +99 @@
 
    SUBROUTINE write_field_v_gen(name,Field,ll)
-    USE parallel
+    USE parallel_lmdz
     USE write_field
     USE mod_hallo
@@ -109 +110 @@
     real, allocatable,SAVE :: New_Field(:,:,:)
     integer,dimension(0:mpi_size-1) :: jj_nb_master
-    type(Request) :: Request_write
+    type(Request),SAVE :: Request_write
+!$OMP THREADPRIVATE(Request_write)    
     integer :: ll,i,jje,ije,jjn
     
@@ -136 +138 @@
       New_Field(:,jj_begin:jje,i)=reshape(Field(ij_begin:ije,i),(/iip1,jjn/))
     ENDDO
-    
+!$OMP BARRIER    
     call Register_SwapField(new_field,new_field,ip1jm,ll,jj_Nb_master,Request_write)
     call SendRequest(Request_write)