Changeset 704 for LMDZ4/branches/V3_test/libf/phylmd/readsulfate.F

Timestamp:

Aug 17, 2006, 5:41:51 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Inclusion des modifs de Y. Meurdesoif pour la version V3
LF

File:

• LMDZ4/branches/V3_test/libf/phylmd/readsulfate.F (modified) (10 diffs)

LMDZ4/branches/V3_test/libf/phylmd/readsulfate.F

@@ -2 +2 @@
 ! $Header$
 !
-      SUBROUTINE readsulfate (r_day, first, sulfate)
-      
+      SUBROUTINE readsulfate (r_day, first, sulfate_p)
+      USE dimphy, klon=>klon2,klon2=>klon
       IMPLICIT none
       
@@ -34 +34 @@
 #include "chem.h"      
 #include "dimensions.h"      
-#include "dimphy.h"      
+cym#include "dimphy.h"      
 #include "temps.h"      
 c 
@@ -45 +45 @@
 c Output:      
 c -------     
+      REAL*8  sulfate_p(klon_omp,klev)
       REAL*8  sulfate (klon, klev)  ! Mass of sulfate (monthly mean data, 
                                   !  from file) [ug SO4/m3]
+      REAL*8,SAVE,ALLOCATABLE :: sulfate_mpi(:,:) 
 c      
 c Local Variables:
@@ -62 +64 @@
       REAL*8 so4_2(iim, jjm+1, klev, 12)   ! The sulfate distributions
       
-      REAL*8 so4(klon, klev, 12)  ! SO4 in right dimension
-      SAVE so4
-      REAL*8 so4_out(klon, klev)
-      SAVE so4_out
+cym      REAL*8 so4(klon, klev, 12)  ! SO4 in right dimension
+cym      SAVE so4
+cym      REAL*8 so4_out(klon, klev)
+cym      SAVE so4_out
+
+      REAL*8,allocatable,save :: so4(:, :, :)  ! SO4 in right dimension
+      REAL*8,allocatable,save :: so4_out(:, :)
+c$OMP THREADPRIVATE(so4,so4_out)
       
       LOGICAL lnewday 
       LOGICAL lonlyone
       PARAMETER (lonlyone=.FALSE.)
-
+      logical,save :: first2=.true.
+c$OMP THREADPRIVATE(first2)
+
+c$OMP MASTER
+      if (first2) then
+     
+        allocate( so4(klon, klev, 12) )
+        allocate( so4_out(klon, klev))
+        allocate(sulfate_mpi(klon_mpi,klev))  
+        first2=.false.
+        
+      endif
+
+      if (phy_rank==0) then
+            
       iday = INT(r_day) 
       
@@ -265 +285 @@
 
       ENDIF ! Did I have to do anything (was it a new day?)
-      
+
+      endif   ! phy_rank==0
+      
+      call ScatterField(sulfate,sulfate_mpi,klev)
+c$OMP END MASTER
+      call ScatterField_omp(sulfate_mpi,sulfate_p,klev)            
+
       RETURN
       END
@@ -277 +303 @@
 c-----------------------------------------------------------------------------
       
-      SUBROUTINE readsulfate_preind (r_day, first, pi_sulfate)
-      
+      SUBROUTINE readsulfate_preind (r_day, first, pi_sulfate_p)
+      USE dimphy, klon=>klon2,klon2=>klon
       IMPLICIT none
       
@@ -305 +331 @@
 #include "chem.h"      
 #include "dimensions.h"      
-#include "dimphy.h"      
+cym#include "dimphy.h"      
 #include "temps.h"      
 c 
@@ -316 +342 @@
 c Output:      
 c -------     
+      REAL*8  pi_sulfate_p (klon_omp, klev)  
+                                 
       REAL*8  pi_sulfate (klon, klev)  ! Number conc. sulfate (monthly mean data, 
-                                  !  from file)
+                                  !  from fil
+      REAL*8,SAVE,ALLOCATABLE :: pi_sulfate_mpi(:,:)                      
 c      
 c Local Variables:
@@ -327 +356 @@
       INTEGER im, day1, day2, im2, ismaller
       REAL*8 pi_so4_1(iim, jjm+1, klev, 12)
-      
-      REAL*8 pi_so4(klon, klev, 12)  ! SO4 in right dimension
-      SAVE pi_so4
-      REAL*8 pi_so4_out(klon, klev)
-      SAVE pi_so4_out
+
+cym      REAL*8 pi_so4(klon, klev, 12)  ! SO4 in right dimension
+cym      SAVE pi_so4
+cym      REAL*8 pi_so4_out(klon, klev)
+cym      SAVE pi_so4_out
+
+      REAL*8,allocatable,save :: pi_so4(:, :, :)  ! SO4 in right dimension
+      REAL*8,allocatable,save :: pi_so4_out(:, :)
+c$OMP THREADPRIVATE(pi_so4,pi_so4_out)            
       
       CHARACTER*4 cyear
       LOGICAL lnewday
-
+      logical,save :: first2=.true.
+c$OMP THREADPRIVATE(first2)
+
+c$OMP MASTER
+      if (first2) then
+     
+        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
+    
       
 
@@ -479 +526 @@
 
       ENDIF ! Was this the beginning of a new day?
+
+      endif   ! phy_rank==0
+      
+      call ScatterField(pi_sulfate,pi_sulfate_mpi,klev)
+c$OMP END MASTER
+      call ScatterField_omp(pi_sulfate_mpi,pi_sulfate_p,klev)            
+
       RETURN
       END