Changeset 718 for LMDZ4/branches/V3_test/libf

Timestamp:

Oct 6, 2006, 12:26:45 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Corrections bugs divers YM
LF

Location:

LMDZ4/branches/V3_test/libf

Files:

• dyn3dpar/mod_hallo.F90 (modified) (3 diffs)
• phylmd/ini_histISCCP.h (modified) (1 diff)
• phylmd/interface_surf.F90 (modified) (4 diffs)
• phylmd/mod_phys_mpi.F90 (modified) (1 diff)

LMDZ4/branches/V3_test/libf/dyn3dpar/mod_hallo.F90

@@ -430 +430 @@
       type(request_SR),pointer :: Req
       type(Hallo),pointer :: PtrHallo
-      integer, dimension(4) :: TabRequest
-      integer, dimension(MPI_STATUS_SIZE,4) :: TabStatus
+      integer, dimension(2*mpi_size) :: TabRequest
+      integer, dimension(MPI_STATUS_SIZE,2*mpi_size) :: TabStatus
       integer :: NbRequest
       integer :: i,rank,pos,ij,l,ierr
@@ -512 +512 @@
       type(request_SR),pointer :: Req
       type(Hallo),pointer :: PtrHallo
-      integer, dimension(4) :: TabRequest
-      integer, dimension(MPI_STATUS_SIZE,4) :: TabStatus
+      integer, dimension(mpi_size) :: TabRequest
+      integer, dimension(MPI_STATUS_SIZE,mpi_size) :: TabStatus
       integer :: NbRequest
       integer :: i,rank,pos,ij,l,ierr
@@ -553 +553 @@
       type(request_SR),pointer :: Req
       type(Hallo),pointer :: PtrHallo
-      integer, dimension(4) :: TabRequest
-      integer, dimension(MPI_STATUS_SIZE,4) :: TabStatus
+      integer, dimension(mpi_size) :: TabRequest
+      integer, dimension(MPI_STATUS_SIZE,mpi_size) :: TabStatus
       integer :: NbRequest
       integer :: i,rank,pos,ij,l,ierr

LMDZ4/branches/V3_test/libf/phylmd/ini_histISCCP.h

@@ -70 +70 @@
           jmin_ins=1
           jmax_ins=jjmp1
-          do i=1,iim-1
-             if(zx_lon(i,1).lt.lonmin_ins) imin_ins=i
-             if(zx_lon(i,1).le.lonmax_ins) imax_ins=i+1
-          enddo
-          do j=1,jjmp1
-             if(zx_lat(1,j).ge.latmin_ins) jmax_ins=j
-             if(zx_lat(1,j).gt.latmax_ins) jmin_ins=j
-          enddo
+cym          do i=1,iim-1
+cym             if(zx_lon(i,1).lt.lonmin_ins) imin_ins=i
+cym             if(zx_lon(i,1).le.lonmax_ins) imax_ins=i+1
+cym          enddo
+cym          do j=1,jjmp1
+cym             if(zx_lat(1,j).ge.latmin_ins) jmax_ins=j
+cym             if(zx_lat(1,j).gt.latmax_ins) jmin_ins=j
+cym          enddo
 c
           print*,'On stoke le fichier histISCCP instantanne sur ',

LMDZ4/branches/V3_test/libf/phylmd/interface_surf.F90

@@ -917 +917 @@
 
     if (.not. allocated(run_off_lic)) then
-      allocate(run_off_lic(knon), stat = error)
+      allocate(run_off_lic(klon), stat = error)
       if (error /= 0) then
         abort_message='Pb allocation run_off_lic'
@@ -1034 +1034 @@
 
   USE intersurf
-  USE parallel, only : pole_nord,pole_sud
   USE dimphy, klon_x=>klon
   IMPLICIT NONE
@@ -1474 +1473 @@
   SUBROUTINE Get_orchidee_communicator(knon,orch_comm)
   USE dimphy, only : phy_rank
+#ifdef CPP_PARA
   USE parallel, only : COMM_LMDZ
+#endif
   IMPLICIT NONE
 #ifdef CPP_PARA
@@ -1499 +1500 @@
     
   SUBROUTINE Init_neighbours(iim,jjm,knon,neighbours,ktindex,pctsrf)
+#ifdef CPP_PARA
   USE parallel,only : COMM_LMDZ
+#endif  
   USE dimphy
   IMPLICIT NONE

LMDZ4/branches/V3_test/libf/phylmd/mod_phys_mpi.F90

@@ -233 +233 @@
       if (monocpu) then
         Fieldr(:,:)=Fields(:,:)
-#ifdef CPP_PARA      
       else
+#ifdef CPP_PARA
         call MPI_Gatherv(Fields,klon_mpi*ll,MPI_REAL8,Field_tmp,sendcounts,  &
                          displs,MPI_REAL8,0,COMM_LMDZ,ierr)
-#endif
-      endif
-      
-     Pos=1     
-     do rank=0,phy_size-1
-       klon_b=klon_para_begin(rank)
-       klon_e=klon_para_end(rank)
-       Nb=klon_para_nb(rank)
-       do l=1,ll
-         Fieldr(klon_b:klon_e,l)=Field_tmp(Pos:Pos+Nb-1)
-         Pos=Pos+Nb
-       enddo
-     enddo
+        Pos=1     
+        do rank=0,phy_size-1
+          klon_b=klon_para_begin(rank)
+          klon_e=klon_para_end(rank)
+          Nb=klon_para_nb(rank)
+          do l=1,ll
+           Fieldr(klon_b:klon_e,l)=Field_tmp(Pos:Pos+Nb-1)
+           Pos=Pos+Nb
+          enddo
+        enddo
+#endif
+     endif
       
    end subroutine GatherField