Changeset 776 for LMDZ4/trunk/libf/phylmd/iophy.F90

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/iophy.F90 (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/iophy.F90

@@ -12 +12 @@
     MODULE PROCEDURE histwrite2d_phy,histwrite3d_phy
   END INTERFACE 
-  
-  REAL,private,allocatable,save,dimension(:,:) :: buffer_omp
 
 contains
 
   subroutine init_iophy(lat,lon)
-  use dimphy
+  USE dimphy
+  USE mod_phys_lmdz_para
   use ioipsl
   implicit none
@@ -38 +37 @@
     allocate(io_lon(iim))
     io_lon(:)=lon(:)
-    allocate(tmp_tab2d(iim,jjphy_nb))
-    allocate(tmp_tab3d(iim,jjphy_nb,klev))
-    allocate(ndex2d(iim*jjphy_nb))
-    allocate(ndex3d(iim*jjphy_nb*klev))
+    allocate(tmp_tab2d(iim,jj_nb))
+    allocate(tmp_tab3d(iim,jj_nb,klev))
+    allocate(ndex2d(iim*jj_nb))
+    allocate(ndex3d(iim*jj_nb*klev))
     ndex2d(:)=0
     ndex3d(:)=0
-    allocate(buffer_omp(klon_mpi,klev))
     
     ddid=(/ 1,2 /)
     dsg=(/ iim, jjm+1 /)
-    dsl=(/ iim, jjphy_nb /)
-    dpf=(/ 1,jjphy_begin /)
-    dpl=(/ iim, jjphy_end /)
-    dhs=(/ iiphy_begin-1,0 /)
-    if (phy_rank==phy_size-1) then
+    dsl=(/ iim, jj_nb /)
+    dpf=(/ 1,jj_begin /)
+    dpl=(/ iim, jj_end /)
+    dhs=(/ ii_begin-1,0 /)
+    if (mpi_rank==mpi_size-1) then
       dhe=(/0,0/)
     else
-      dhe=(/ iim-iiphy_end,0 /)  
+      dhe=(/ iim-ii_end,0 /)  
     endif
     
-    call flio_dom_set(phy_size,phy_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
+    call flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
                       'APPLE',phys_domain_id)
 
 !$OMP END MASTER
-!$OMP FLUSH(buffer_omp)
       
   end subroutine init_iophy
   
   subroutine histbeg_phy(name,itau0,zjulian,dtime,nhori,nid_day)
-  use dimphy
+  USE dimphy
+  USE mod_phys_lmdz_para
   use ioipsl
   use write_field
@@ -81 +79 @@
 
 !$OMP MASTER    
-    if (monocpu) then
-      call histbeg(name,iim,io_lon, jjphy_nb,io_lat(jjphy_begin:jjphy_end), &
-                   1,iim,1,jjphy_nb,itau0, zjulian, dtime, nhori, nid_day)
+    if (is_sequential) then
+      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
+                   1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day)
     else
-      call histbeg(name,iim,io_lon, jjphy_nb,io_lat(jjphy_begin:jjphy_end), &
-                   1,iim,1,jjphy_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
+      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
+                   1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
     endif
 !$OMP END MASTER
@@ -93 +91 @@
   
   subroutine histwrite2d_phy(nid,name,itau,field)
-  use dimphy
-  use ioipsl
+  USE dimphy
+  USE mod_phys_lmdz_para
+  USE ioipsl
   implicit none
   include 'dimensions90.h'
@@ -102 +101 @@
     integer, intent(in) :: itau
     real,dimension(klon),intent(in) :: field
-
-    CALL GatherField_omp(field,buffer_omp,1)    
+    
+    REAL,dimension(klon_mpi) :: buffer_omp
+    
+    CALL Gather_omp(field,buffer_omp)    
 !$OMP MASTER
-    CALL phy2dyn(buffer_omp,tmp_tab2d,1)
-    CALL histwrite(nid,name,itau,tmp_tab2d,iim*jjphy_nb,ndex2d)
+    CALL grid1Dto2D_mpi(buffer_omp,tmp_tab2d)
+    CALL histwrite(nid,name,itau,tmp_tab2d,iim*jj_nb,ndex2d)
 !$OMP END MASTER    
   end subroutine histwrite2d_phy
   
   subroutine histwrite3d_phy(nid,name,itau,field)
-  use dimphy
+  USE dimphy
+  USE mod_phys_lmdz_para
+
   use ioipsl
   implicit none
@@ -120 +123 @@
     integer, intent(in) :: itau
     real,dimension(klon,klev),intent(in) :: field
+
+    REAL,dimension(klon_mpi,klev) :: buffer_omp
     
-    CALL GatherField_omp(field,buffer_omp,klev)
+    CALL Gather_omp(field,buffer_omp)
 !$OMP MASTER
-    CALL phy2dyn(buffer_omp,tmp_tab3d,klev)
-    CALL histwrite(nid,name,itau,tmp_tab3d,iim*jjphy_nb*klev,ndex3d)
+    CALL grid1Dto2D_mpi(buffer_omp,tmp_tab3d)
+    CALL histwrite(nid,name,itau,tmp_tab3d,iim*jj_nb*klev,ndex3d)
 !$OMP END MASTER    
   end subroutine histwrite3d_phy
   
   
-  subroutine phy2dyn(field_phy,field_dyn,nlev)
-  use dimphy
-  implicit none
-  include 'dimensions90.h'
-  
-    real,dimension(klon_mpi,nlev),intent(in) :: field_phy
-    real,dimension(iim,jjphy_nb,nlev),intent(out) :: field_dyn
-    integer,intent(in) :: nlev
-    
-    integer :: next
-    integer :: j,l
-    
-      do l=1,nlev
-                
-        if (jjphy_begin==jjphy_end) then
-          field_dyn(:,1,l)=0.
-          field_dyn(iiphy_begin:iiphy_end,1,l)=field_phy(1:klon_mpi,l)
-        else
-        
-         if (jjphy_begin==1) then
-            field_dyn(:,1,l)=field_phy(1,l)
-            next=2
-         else
-           field_dyn(:,1,l)=0.
-           next=iim-iiphy_begin+2
-           field_dyn(iiphy_begin:iim,1,l)=field_phy(1:next-1,l)   
-         endif
-        
-          do j=2,jjphy_nb-1
-            field_dyn(:,j,l)=field_phy(next:next+iim-1,l)
-            next=next+iim
-          enddo
-          
-          if (jjphy_end==jjm+1) then
-             field_dyn(:,jjphy_nb,l)=field_phy(klon_mpi,l)
-          else
-           field_dyn(:,jjphy_nb,l)=0.
-           field_dyn(1:iiphy_end,jjphy_nb,l)=field_phy(next:next+iiphy_end-1,l)   
-          endif
-          
-        endif
-     
-     enddo
-         
-    end subroutine phy2dyn          
+!  subroutine phy2dyn(field_phy,field_dyn,nlev)
+!  USE dimphy_old
+!  implicit none
+!  include 'dimensions90.h'
+!  
+!    real,dimension(klon_mpi,nlev),intent(in) :: field_phy
+!    real,dimension(iim,jjphy_nb,nlev),intent(out) :: field_dyn
+!    integer,intent(in) :: nlev
+!    
+!    integer :: next
+!    integer :: j,l
+!    
+!      do l=1,nlev
+!               
+!       if (jjphy_begin==jjphy_end) then
+!         field_dyn(:,1,l)=0.
+!         field_dyn(iiphy_begin:iiphy_end,1,l)=field_phy(1:klon_mpi,l)
+!       else
+!       
+!        if (jjphy_begin==1) then
+!           field_dyn(:,1,l)=field_phy(1,l)
+!           next=2
+!        else
+!          field_dyn(:,1,l)=0.
+!          next=iim-iiphy_begin+2
+!          field_dyn(iiphy_begin:iim,1,l)=field_phy(1:next-1,l)   
+!        endif
+!       
+!         do j=2,jjphy_nb-1
+!           field_dyn(:,j,l)=field_phy(next:next+iim-1,l)
+!           next=next+iim
+!         enddo
+!         
+!         if (jjphy_end==jjm+1) then
+!             field_dyn(:,jjphy_nb,l)=field_phy(klon_mpi,l)
+!         else
+!          field_dyn(:,jjphy_nb,l)=0.
+!          field_dyn(1:iiphy_end,jjphy_nb,l)=field_phy(next:next+iiphy_end-1,l)   
+!         endif
+!         
+!       endif
+!     
+!     enddo
+!        
+!    end subroutine phy2dyn