Changeset 5865 for CONFIG_DEVT

Timestamp:

06/24/21 14:33:06 (3 years ago)

Author:

ymipsl

Message:

Adapt ORCHIDEE sources for ensemble management.
YM

Location:

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/ORCHIDEE

Files:

• src_parallel/mod_orchidee_ensemble.F90 (added)
• src_parallel/mod_orchidee_para.F90 (modified) (3 diffs)
• src_parallel/xios_orchidee.f90 (modified) (3 diffs)
• src_sechiba/intersurf.f90 (modified) (3 diffs)

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/ORCHIDEE/src_parallel/mod_orchidee_para.F90

@@ -128 +128 @@
   !! \n
   !_ ============================================================================================================================== 
-  SUBROUTINE Init_orchidee_data_para(nbp,kindex,arg_offset,arg_omp_size,arg_omp_rank,COMM)
-
+  SUBROUTINE Init_orchidee_data_para(nbp,kindex,arg_offset,arg_omp_size,arg_omp_rank, COMM_ENSEMBLE)
+    USE mod_orchidee_ensemble
     IMPLICIT NONE
     INTEGER,INTENT(IN)     :: nbp
@@ -136 +136 @@
     INTEGER,INTENT(IN)     :: arg_omp_size
     INTEGER,INTENT(IN)     :: arg_omp_rank
-    INTEGER,INTENT(IN)     :: COMM
+    INTEGER,INTENT(IN)     :: COMM_ENSEMBLE
     
     INTEGER,SAVE              :: arg_nbp_mpi
@@ -144 +144 @@
     INTEGER                   :: mpi_rank
     INTEGER                   :: ierr
-        
+    INTEGER,SAVE              :: COMM
+       
+    
+    IF (arg_omp_rank==0) CALL init_orchidee_ensemble(COMM_ENSEMBLE,COMM)
+    CALL barrier2_omp()
+
 #ifdef CPP_PARA
     CALL MPI_COMM_SIZE(COMM,mpi_size,ierr)

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/ORCHIDEE/src_parallel/xios_orchidee.f90

@@ -130 +130 @@
     USE grid, ONLY : grid_type, unstructured, regular_lonlat, regular_xy, nvertex, &
                      longitude, latitude, bounds_lon, bounds_lat, ind_cell_glo
+    USE mod_orchidee_ensemble, ONLY : ensemble_management, whole_ensemble_size, whole_ensemble_rank, COMM_ORCHIDEE_ENSEMBLE
     IMPLICIT NONE
     !
@@ -271 +272 @@
        !! 2. Context initialization
        !
-       CALL xios_context_initialize("orchidee",MPI_COMM_ORCH)
+       CALL xios_context_initialize("orchidee",COMM_ORCHIDEE_ENSEMBLE)
        CALL xios_get_handle("orchidee",ctx_hdl_orchidee)
        CALL xios_set_current_context(ctx_hdl_orchidee)
@@ -352 +353 @@
        !! 4. Axis definition
        !
+       if (ensemble_management) CALL xios_set_axis_attr("ensemble",n_glo=whole_ensemble_size,begin=whole_ensemble_rank, n=1) 
+ 
        CALL xios_set_axis_attr("nvm",n_glo=nvm ,VALUE=(/(REAL(i,r_std),i=1,nvm)/))
        CALL xios_set_axis_attr("nlut",n_glo=nlut ,VALUE=(/(REAL(i,r_std),i=1,nlut)/))

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/ORCHIDEE/src_sechiba/intersurf.f90

@@ -719 +719 @@
 !_ ==============================================================================================================================
 
-  SUBROUTINE init_intersurf(nbp_l_lon,nbp_l_lat,kjpindex,kindex,orch_offset,orch_omp_size,orch_omp_rank,COMM, grid)
+  SUBROUTINE init_intersurf(nbp_l_lon,nbp_l_lat,kjpindex,kindex,orch_offset,orch_omp_size,orch_omp_rank, COMM_ENSEMBLE, grid)
 
     USE mod_orchidee_para
@@ -730 +730 @@
     INTEGER,INTENT(IN)  :: kindex(:)
     INTEGER,INTENT(IN)  :: orch_offset
-    INTEGER,INTENT(IN)  :: COMM
     INTEGER,INTENT(IN)  :: orch_omp_size
     INTEGER,INTENT(IN)  :: orch_omp_rank
+    INTEGER,INTENT(IN)  :: COMM_ENSEMBLE
     INTEGER(i_std), INTENT(in), OPTIONAL :: grid          !! grid type : regular_lonlat or unstructured (dynamico)
 
     INTEGER,DIMENSION(kjpindex)  :: kindex_offset
+    INTEGER :: ensemble_comm_size, ensemble_comm_rank,ierr
 
     IF (printlev >= 1) WRITE(*,*) 'Start ORCHIDEE'
 
     IF (orch_omp_rank==0) THEN
+      CALL MPI_COMM_SIZE(COMM_ENSEMBLE,ensemble_comm_size,ierr)
+      CALL MPI_COMM_RANK(COMM_ENSEMBLE,ensemble_comm_rank,ierr)
+      PRINT*,ensemble_comm_size,ensemble_comm_rank
+
       CALL Init_timer
       CALL start_timer(timer_mpi)
@@ -745 +750 @@
     ENDIF
     CALL barrier2_omp()    
-    CALL init_orchidee_data_para(kjpindex,kindex,orch_offset,orch_omp_size,orch_omp_rank,COMM)
+    CALL init_orchidee_data_para(kjpindex,kindex,orch_offset,orch_omp_size,orch_omp_rank, COMM_ENSEMBLE)
     CALL Set_stdout_file('out_orchidee')