Changeset 776 for LMDZ4/trunk/libf/phylmd/phytrac.F

Timestamp:

Jun 7, 2007, 12:01:52 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Suite du merge entre la version et la HEAD: quelques modifications
de Yann sur le
LF

File:

• LMDZ4/trunk/libf/phylmd/phytrac.F (modified) (5 diffs)

LMDZ4/trunk/libf/phylmd/phytrac.F

@@ -64 +64 @@
       USE ioipsl
       USE dimphy
+      USE mod_grid_phy_lmdz
+      USE mod_phys_lmdz_para
       USE comgeomphy
       USE iophy
@@ -211 +213 @@
 c$OMP THREADPRIVATE(trs)
 cym      SAVE trs
-      REAL :: trs_tmp(klon2)
-      REAL,SAVE,ALLOCATABLE :: trs_mpi(:)
+      REAL :: trs_tmp(klon_glo)
       
       REAL,save,allocatable :: masktr(:,:) ! Masque reservoir de sol traceur
@@ -403 +404 @@
          if (debutphy) then
            allocate( trs(klon,nbtr) )
-c$OMP MASTER
-           allocate( trs_mpi(klon_mpi) )  
-c$OMP END MASTER           
            allocate( masktr(klon,nbtr)) 
            allocate( fshtr(klon,nbtr) )
@@ -447 +445 @@
          trs(:,:) = 0.
 c$OMP MASTER         
-       if (phy_rank==0) then
+       if (is_mpi_root) then
          trs_tmp(:)=0.
          open (99,file='starttrac',status='old',
      .         err=999,form='formatted')
-         read(99,*) (trs_tmp(i),i=1,klon2)
+         read(99,*) (trs_tmp(i),i=1,klon_glo)
 999      close(99)
        endif
-       call ScatterField(trs_tmp,trs_mpi,1)
 c$OMP END MASTER
-      call ScatterField_omp(trs_mpi,trs(:,1),1)
+       call Scatter(trs_tmp,trs(:,1))
+
 c         print*, 'apres starttrac'
 
@@ -923 +921 @@
       if (lafin) then
          print*, 'c est la fin de la physique'
-         call GatherField_omp(trs(:,1),trs_mpi,1)
+         call Gather(trs(:,1),trs_tmp)
 c$OMP MASTER     
-         call GatherField(trs_mpi,trs_tmp,1)
-         if (phy_rank==0) then
+         if (is_mpi_root) then
          
            open (99,file='restarttrac',  form='formatted')
-           do i=1,klon
+           do i=1,klon_glo
                write(99,*) trs_tmp(i)
            enddo