Changeset 5492 for CONFIG_DEVT

Timestamp:

11/02/20 11:40:17 (3 years ago)

Author:

ymipsl

Message:

ensemble interface for orchidee.

YM

File:

• CONFIG_DEVT/LMDZOR_V6.2_work_ENSEMBLES/modeles/LMDZ/libf/phylmd/surf_land_orchidee_mod.F90 (modified) (8 diffs)

CONFIG_DEVT/LMDZOR_V6.2_work_ENSEMBLES/modeles/LMDZ/libf/phylmd/surf_land_orchidee_mod.F90

@@ -212 +212 @@
     INTEGER, SAVE                             :: orch_comm
     !$OMP THREADPRIVATE(orch_comm)
+    INTEGER, SAVE                             :: orch_comm_ensemble
+    !$OMP THREADPRIVATE(orch_comm_ensemble)
 
     REAL, ALLOCATABLE, DIMENSION(:), SAVE     :: coastalflow
@@ -501 +503 @@
     IF (debut) THEN
        CALL Init_orchidee_index(knon,knindex,offset,ktindex)
-       CALL Get_orchidee_communicator(orch_comm,orch_mpi_size,orch_mpi_rank, orch_omp_size,orch_omp_rank)
+       CALL Get_orchidee_communicator(orch_comm_ensemble, orch_comm,orch_mpi_size,orch_mpi_rank, orch_omp_size,orch_omp_rank)
 
        IF (grid_type==unstructured) THEN
@@ -550 +552 @@
        IF (knon > 0) THEN
 #ifdef CPP_VEGET
-         CALL Init_intersurf(nbp_lon,nbp_lat,knon,ktindex,offset,orch_omp_size,orch_omp_rank,orch_comm,grid=grid_type)
+         CALL Init_intersurf(nbp_lon,nbp_lat,knon,ktindex,offset,orch_omp_size,orch_omp_rank, orch_comm_ensemble, grid=grid_type)
 #endif
        ENDIF
@@ -691 +693 @@
 ! 
 
-  SUBROUTINE Get_orchidee_communicator(orch_comm, orch_mpi_size, orch_mpi_rank, orch_omp_size,orch_omp_rank)
+  SUBROUTINE Get_orchidee_communicator(orch_comm_ensemble, orch_comm, orch_mpi_size, orch_mpi_rank, orch_omp_size,orch_omp_rank)
   USE  mod_surf_para
       
@@ -698 +700 @@
 #endif    
 
+    INTEGER,INTENT(OUT) :: orch_comm_ensemble
     INTEGER,INTENT(OUT) :: orch_comm
     INTEGER,INTENT(OUT) :: orch_mpi_size
@@ -705 +708 @@
     INTEGER             :: color
     INTEGER             :: i,ierr
+    INTEGER             :: ensemble_com_rank
+    INTEGER             :: ensemble_com_size
 !
 ! End definition
@@ -717 +722 @@
       ENDIF
     
-#ifdef CPP_MPI    
+#ifdef CPP_MPI   
+      CALL MPI_COMM_RANK(COMM_LMDZ_PHY_ENSEMBLE,ensemble_com_rank,ierr)
+      CALL MPI_COMM_SIZE(COMM_LMDZ_PHY_ENSEMBLE,ensemble_com_size,ierr)
+      PRINT*,"Get_orchidee_communicator before split ",ensemble_com_size, ensemble_com_rank
+      CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY_ENSEMBLE,color,ensemble_com_rank,orch_comm_ensemble,ierr)
+      CALL MPI_COMM_RANK(orch_comm_ensemble,ensemble_com_rank,ierr)
+      CALL MPI_COMM_SIZE(orch_comm_ensemble,ensemble_com_size,ierr)
+      PRINT*,"Get_orchidee_communicator after split ",ensemble_com_size, ensemble_com_rank
       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
       CALL MPI_COMM_SIZE(orch_comm,orch_mpi_size,ierr)
@@ -724 +736 @@
     
     ENDIF
+    CALL bcast_omp(orch_comm_ensemble)
     CALL bcast_omp(orch_comm)