Changeset 2462 for branches/DEV_r2460_v3_3beta_NOL/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_ioclient_para.F90

Timestamp:

2010-12-07T18:56:19+01:00 (13 years ago)

Author:

acc

Message:

DEV_r2460_v3_3beta_NOL. Changes to v3.3beta to improve assignment of ocean processes to ioserver processes when discarding land-only regions. See ticket #776

File:

• branches/DEV_r2460_v3_3beta_NOL/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_ioclient_para.F90 (modified) (3 diffs)

branches/DEV_r2460_v3_3beta_NOL/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_ioclient_para.F90

@@ -17 +17 @@
 #endif
   USE mpi_mod
+  USE mod_event_parameters
   IMPLICIT NONE
     INTEGER :: NEW_COMM
@@ -26 +27 @@
     INTEGER :: nb_server_io  
     INTEGER,ALLOCATABLE :: proc_color(:) 
-    INTEGER :: i
+    INTEGER :: i, ix, jpni_reg, jpnj_reg
     INTEGER :: div,remain
     INTEGER :: group_color
     INTEGER :: Comm_client_server
     CHARACTER(LEN=6) :: oasis_server_id
+    LOGICAL :: ln_around, ln_use_allproc
     
     IF (using_oasis) THEN
@@ -51 +53 @@
 
     nb_server_io=global_size-mpi_size
-    div=mpi_size/nb_server_io
-    remain=MOD(mpi_size,nb_server_io)
-    
-    IF (mpi_rank<remain*(div+1)) THEN
-      group_color=mpi_rank/(div+1)
+!   
+! Need to be cleverer at setting group_colour when jpni*jpnj /= jpnij
+! nregproc_in holds the list of equivalent ranks in a jpni by jpnj decomposition
+! which has retained the land-only areas. If jpni*jpnj= jpnij then nregproc_in(mpi_size)
+! should equal mpi_size-1 and nregproc_in(mpi_rank+1) = mpi_rank for all mpi_rank.
+!
+    ln_use_allproc = .true.
+    ALLOCATE(nregproc_in(mpi_size))
+    INQUIRE (file='layout.dat', exist=ln_around)
+    IF (ln_around) THEN
+! use it
+     OPEN(UNIT=123,FILE='layout.dat')
+     READ(123,'(48X,2i8,/)',ERR=606,END=606) jpni_reg, jpnj_reg
+     do ix = 1,mpi_size
+      READ(123,'(45X,I5)',ERR=606,END=606) nregproc_in(ix)
+     end do
+     ln_use_allproc = .false.
+ 606 CLOSE(123)
+    ENDIF
+    IF ( ln_use_allproc ) THEN
+!
+! Either layout.dat does not exist or the reading of nregproc_in has failed.
+! Default to regular decomposition with no omitted land-only regions.
+!
+     do ix = 1,mpi_size
+      nregproc_in(ix) = ix - 1
+     end do
+!
+! jpni_reg and jpnj_reg are not known; just have to make sure jpni_reg*jpnj_reg=mpi_size
+!
+     jpni_reg=mpi_size
+     jpnj_reg=1
+    ENDIF
+
+    div=(jpni_reg*jpnj_reg)/nb_server_io
+    remain=MOD(jpni_reg*jpnj_reg,nb_server_io)
+ 
+!
+! Note need to add 1 to mpi_rank when indexing nregproc_in since nregproc_in is 
+! indexed 1 to mpi_size but mpi_rank ranges from 0 to mpi_size-1
+!
+    IF (nregproc_in(mpi_rank+1)<remain*(div+1)) THEN
+      group_color=nregproc_in(mpi_rank+1)/(div+1)
     ELSE
-      group_color=(nb_server_io-1)-(mpi_size-1-mpi_rank)/div
+      group_color=(nb_server_io-1)-(jpni_reg*jpnj_reg - 1 -nregproc_in(mpi_rank+1))/div
     ENDIF