Changeset 634 for LMDZ4/branches/LMDZ4_par_0/libf/phylmd/readsulfate.F

Timestamp:

May 4, 2005, 5:11:29 PM (19 years ago)

Author:

Laurent Fairhead

Message:

Modifications faites à la physique pour la rendre parallele YM
Une branche de travail LMDZ4_par_0 a été créée provisoirement afin de tester
les modifs pleinement avant leurs inclusions dans le tronc principal
LF

File:

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

LMDZ4/branches/LMDZ4_par_0/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 
 c Input:
 c ------
-      REAL*8  r_day                   ! Day of integration
+      REAL  r_day                   ! Day of integration
       LOGICAL first                 ! First timestep 
                                     ! (and therefore initialization necessary)
@@ -45 +45 @@
 c Output:      
 c -------     
-      REAL*8  sulfate (klon, klev)  ! Mass of sulfate (monthly mean data, 
-                                  !  from file) [ug SO4/m3]
-c      
+c$$$      REAL*8  sulfate_p(klon2,klev)
+c$$$      REAL*8  sulfate (klon, klev)  ! Mass of sulfate (monthly mean data, 
+c$$$                                  !  from file) [ug SO4/m3]
+      REAL  sulfate_p(klon2,klev)
+      REAL  sulfate (klon, klev)  ! Mass of sulfate (monthly mean data, 
+                                  !  from file) [ug SO4/m3]c      
 c Local Variables:
 c ----------------      
@@ -62 +65 @@
       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(:, :)
       
       LOGICAL lnewday 
       LOGICAL lonlyone
       PARAMETER (lonlyone=.FALSE.)
-
+      logical,save :: first2=.true.
+
+      if (first2) then
+     
+        allocate( so4(klon, klev, 12) )
+        allocate( so4_out(klon, klev))
+          
+        first2=.false.
+        
+      endif
+
+      if (phy_rank==0) then
+            
       iday = INT(r_day) 
       
@@ -249 +267 @@
 
       ENDIF ! Did I have to do anything (was it a new day?)
-      
+
+      endif   ! phy_rank==0
+      
+      call ScatterField(sulfate,sulfate_p,klev)
+            
       RETURN
       END
@@ -261 +283 @@
 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
       
@@ -289 +311 @@
 #include "chem.h"      
 #include "dimensions.h"      
-#include "dimphy.h"      
+cym#include "dimphy.h"      
 #include "temps.h"      
 c 
 c Input:
 c ------
-      REAL*8  r_day                   ! Day of integration
+      REAL r_day                   ! Day of integration
       LOGICAL first                 ! First timestep 
                                     ! (and therefore initialization necessary)
@@ -300 +322 @@
 c Output:      
 c -------     
-      REAL*8  pi_sulfate (klon, klev)  ! Number conc. sulfate (monthly mean data, 
-                                  !  from file)
+      REAL pi_sulfate_p (klon2, klev)  
+      REAL pi_sulfate (klon, klev)  ! Number conc. sulfate 
+                                       ! (monthly mean data, 
 c      
 c Local Variables:
@@ -311 +334 @@
       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(:, :)
+            
       
       CHARACTER*4 cyear
       LOGICAL lnewday
-
+      logical,save :: first2=.true.
+
+      if (first2) then
+     
+        allocate( pi_so4(klon, klev, 12) )
+        allocate( pi_so4_out(klon, klev))
+          
+        first2=.false.
+        
+      endif
+
+      if (phy_rank==0) then
+    
       
 
@@ -463 +502 @@
 
       ENDIF ! Was this the beginning of a new day?
+
+      endif   ! phy_rank==0
+      
+      call ScatterField(pi_sulfate,pi_sulfate_p,klev)
+
+
       RETURN
       END