Changeset 854 for LMDZ4/trunk/libf/phytherm

Timestamp:

Oct 23, 2007, 2:03:16 PM (17 years ago)

Author:

lsce

Message:

AC + JG + YM + ACo : - Corrected bugs found on 16 and 24 CPUs on ccrt scalar machine platine

• Added use of lmdz communicator in inca model

File:

• LMDZ4/trunk/libf/phytherm/surf_land_orchidee_mod.F90 (modified) (2 diffs)

LMDZ4/trunk/libf/phytherm/surf_land_orchidee_mod.F90

@@ -485 +485 @@
     INTEGER                               :: MyLastPoint
     INTEGER                               :: LastPoint
-    INTEGER                               :: mpi_rank
-    INTEGER                               :: mpi_size
-    INTEGER                               :: ierr   
+    INTEGER                               :: mpi_rank_orch
+    INTEGER                               :: mpi_size_orch
+    INTEGER                               :: ierr 
 !
 ! End definition
@@ -496 +496 @@
     IF (is_parallel) THEN
 #ifdef CPP_PARA    
-       CALL MPI_COMM_SIZE(orch_comm,mpi_size,ierr)
-       CALL MPI_COMM_RANK(orch_comm,mpi_rank,ierr)
+       CALL MPI_COMM_SIZE(orch_comm,mpi_size_orch,ierr)
+       CALL MPI_COMM_RANK(orch_comm,mpi_rank_orch,ierr)
 #endif
     ELSE
-       mpi_rank=0
-       mpi_size=1
-    ENDIF
-    
+       mpi_rank_orch=0
+       mpi_size_orch=1
+    ENDIF
+
     IF (is_parallel) THEN
-       IF (.NOT. is_north_pole) THEN
+       IF (mpi_rank_orch /= 0) THEN
 #ifdef CPP_PARA
-          CALL MPI_RECV(LastPoint,1,MPI_INTEGER,mpi_rank-1,1234,orch_comm,status,ierr)
-#endif
-       ENDIF
-       
-       IF (.NOT. is_south_pole) THEN
+          CALL MPI_RECV(LastPoint,1,MPI_INTEGER,mpi_rank_orch-1,1234,orch_comm,status,ierr)
+#endif
+       ENDIF
+       
+       IF (mpi_rank_orch /= mpi_size_orch-1) THEN
 #ifdef CPP_PARA
-          CALL MPI_SEND(MyLastPoint,1,MPI_INTEGER,mpi_rank+1,1234,orch_comm,ierr)  
-#endif
-       ENDIF
-    ENDIF
-    
-    IF (is_north_pole) THEN 
+          CALL MPI_SEND(MyLastPoint,1,MPI_INTEGER,mpi_rank_orch+1,1234,orch_comm,ierr)  
+#endif
+       ENDIF
+    ENDIF
+    
+    IF (mpi_rank_orch == 0) THEN 
        offset=0
     ELSE