Changeset 776 for LMDZ4/trunk/libf/phylmd/readsulfate.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/readsulfate.F (modified) (7 diffs)

LMDZ4/trunk/libf/phylmd/readsulfate.F

@@ -3 +3 @@
 !
       SUBROUTINE readsulfate (r_day, first, sulfate_p)
-      USE dimphy, klon=>klon2,klon2=>klon
+      USE dimphy, ONLY : klev
+      USE mod_grid_phy_lmdz, klon=>klon_glo
+      USE mod_phys_lmdz_para
       IMPLICIT none
       
@@ -84 +86 @@
         allocate( so4(klon, klev, 12) )
         allocate( so4_out(klon, klev))
-        allocate(sulfate_mpi(klon_mpi,klev))  
         first2=.false.
         
       endif
 
-      if (phy_rank==0) then
+      if (is_mpi_root) then
             
       iday = INT(r_day) 
@@ -288 +289 @@
       endif   ! phy_rank==0
       
-      call ScatterField(real(sulfate),real(sulfate_mpi),klev)
 c$OMP END MASTER
-      call ScatterField_omp(real(sulfate_mpi),real(sulfate_p)
-     . ,klev)            
+      call Scatter(real(sulfate),real(sulfate_p))            
 
       RETURN
@@ -305 +304 @@
       
       SUBROUTINE readsulfate_preind (r_day, first, pi_sulfate_p)
-      USE dimphy, klon=>klon2,klon2=>klon
+      USE dimphy, ONLY : klev
+      USE mod_grid_phy_lmdz, klon=>klon_glo
+      USE mod_phys_lmdz_para
       IMPLICIT none
       
@@ -347 +348 @@
       REAL*8  pi_sulfate (klon, klev)  ! Number conc. sulfate (monthly mean data, 
                                   !  from fil
-      REAL*8,SAVE,ALLOCATABLE :: pi_sulfate_mpi(:,:)                      
 c      
 c Local Variables:
@@ -377 +377 @@
         allocate( pi_so4(klon, klev, 12) )
         allocate( pi_so4_out(klon, klev))
-        allocate(pi_sulfate_mpi (klon_mpi, klev))  
         first2=.false.
         
       endif
 
-      if (phy_rank==0) then
+      if (is_mpi_root) then
     
       
@@ -528 +527 @@
       ENDIF ! Was this the beginning of a new day?
 
-      endif   ! phy_rank==0
-      
-      call ScatterField(real(pi_sulfate),real(pi_sulfate_mpi),klev)
+      endif   ! is_mpi_root==0
+      
 c$OMP END MASTER
-      call ScatterField_omp(real(pi_sulfate_mpi),real(pi_sulfate_p)
-     .,klev)            
+      call Scatter(real(pi_sulfate),real(pi_sulfate_p))            
 
       RETURN