Index: /issm/trunk-jpl/test/MITgcm/code/eeboot_minimal.F =================================================================== --- /issm/trunk-jpl/test/MITgcm/code/eeboot_minimal.F (revision 22380) +++ /issm/trunk-jpl/test/MITgcm/code/eeboot_minimal.F (revision 22381) @@ -67,17 +67,9 @@ #ifdef ALLOW_CPL_ISSM COMMON /CPL_MPI_ID/ - & mpiMyWid, local_ocean_leader, local_ice_leader - integer :: n, myid, numprocs, i, mpiMyWid, numprocsworld - integer :: mycomponent - integer :: icesize, oceansize - integer :: local_ocean_leader, local_ice_leader - integer, dimension(:), allocatable :: components - integer, dimension(:), allocatable :: icegroup, oceangroup - - integer oceancommsize,icecommsize,rankzeros(2) - integer my_local_rank,my_size,my_local_size - integer modelcomm,toissmcomm - integer dummy1(1),dummy2(1) - + & mpiMyWid + integer :: mpiMyWid, numprocsworld + integer icecommsize,rankzeros(2) + integer my_local_rank,my_local_size + integer toissmcomm #endif /* ALLOW_CPL_ISSM */ #if defined(ALLOW_NEST_PARENT) || defined(ALLOW_NEST_CHILD) @@ -192,14 +184,10 @@ #ifdef ALLOW_CPL_ISSM -cdm CALL SETDIR_OCEAN( ) call MPI_COMM_RANK(MPI_COMM_WORLD, mpiMyWid, mpiRC) call MPI_COMM_SIZE(MPI_COMM_WORLD, numprocsworld, mpiRC) - print*,'choubi 2' - c ocean comm size: 4 (normally should be recovered from list of c arguments after mpirun:) */ icecommsize=2 - oceancommsize=8 c Build array of who is rank 0 of their own group:*/ @@ -208,78 +196,24 @@ c Split world into sub-communicators for each and every model:*/ - call MPI_COMM_SPLIT(MPI_COMM_WORLD,1, MPIMYWID, modelcomm,mpiRC) - print*,'choubi 3' - - call MPI_INTERCOMM_CREATE(modelcomm,0,MPI_COMM_WORLD,rankzeros(1), - & 0,toissmcomm,mpiRC) - print*,'choubi 4a' + call MPI_COMM_SPLIT(MPI_COMM_WORLD,1,MPIMYWID, + & MPI_COMM_MODEL,mpiRC) + + print*,'Oc My global rank',mpiMyWid + print*,'Oc My world size:',numprocsworld + +cdm call MPI_INTERCOMM_CREATE(MPI_COMM_MODEL,0,MPI_COMM_WORLD, +cdm & rankzeros(1),0,toissmcomm,mpiRC) - call MPI_COMM_RANK(modelcomm, my_local_rank, mpiRC) - print*,'choubi 4b' - call MPI_COMM_SIZE(modelcomm, my_local_size, mpiRC) + call MPI_COMM_RANK(MPI_COMM_MODEL, my_local_rank, mpiRC) + call MPI_COMM_SIZE(MPI_COMM_MODEL, my_local_size, mpiRC) print*,'Oc My global rank',mpiMyWid,'MyLocal rank: ',my_local_rank - print*,'Oc My world size:',my_size,'My local size: ',my_local_size - - -cdmC allocate array components based on the number of processors -cdm allocate(components(numprocsworld)) -cdm -cdmC assign a component to the ocean code to organize processors into a group -cdm mycomponent=0 -cdm -cdmC gather components to all processors, -cdmC so each knows who is ice and who is ocean -cdm call MPI_allgather(mycomponent,1,MPI_INTEGER,components,1, -cdm & MPI_INTEGER,MPI_COMM_WORLD,mpiRC) -cdm print*,'choubi 3' -cdmC form ice and ocean groups -cdmC count the processors in each groups -cdm icesize=0 -cdm oceansize=0 -cdm do i=1,numprocsworld -cdm if(components(i).eq.0) then -cdm oceansize=oceansize+1 -cdm elseif(components(i).eq.1) then -cdm icesize=icesize+1 -cdm else -cdm write(6,*) 'error: processor', i, -cdm & 'not associated with ice or ocean' -cdm stop -cdm endif -cdm enddo -cdm -cdmC allocate group arrays -cdm allocate(icegroup(icesize)) -cdm allocate(oceangroup(oceansize)) -cdmC form the groups -cdm icesize=0 -cdm oceansize=0 -cdm do i=1,numprocsworld -cdm if(components(i).eq.0) then -cdm oceansize=oceansize+1 -cdm oceangroup(oceansize)=i-1 ! ranks are from 0 to numprocsworld-1 -cdm elseif(components(i).eq.1) then -cdm icesize=icesize+1 -cdm icegroup(icesize)=i-1 ! ranks are from 0 to numprocsworld-1 -cdm else -cdm write(6,*) 'error: processor', i, -cdm & 'not associated with ice or ocean' -cdm endif -cdm enddo -cdm -cdmC pick the lowest rank in the group as the local group leader -cdm local_ocean_leader=oceangroup(1) -cdm local_ice_leader=icegroup(1) -cdm print*,'choubi 3' -cdmC form ocean communicator -cdm call MPI_comm_split(MPI_COMM_WORLD,mycomponent,mpiMyWid, -cdm & MPI_COMM_MODEL,mpiRC) -cdm call MPI_comm_rank(MPI_COMM_MODEL,myid,mpiRC) -cdm call MPI_comm_size(MPI_COMM_MODEL,numprocs,mpiRC) - print*,'choubi 4' + print*,'Oc My world size:',numprocsworld,'My local size: ', + & my_local_size + #endif /* ALLOW_CPL_ISSM */ C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| + C-- Get my process number CALL MPI_COMM_RANK( MPI_COMM_MODEL, mpiMyId, mpiRC ) @@ -290,5 +224,5 @@ CALL PRINT_ERROR( msgBuf, myThid ) GOTO 999 - ENDIF + ENDIF myProcId = mpiMyId #ifdef USE_PDAF @@ -312,7 +246,5 @@ WRITE(fNam,'(A,A)') 'STDOUT.', myProcessStr(1:9) #endif - print*,'choubi 5' OPEN(standardMessageUnit,FILE=fNam,STATUS='unknown') - print*,'choubi 5a' #ifdef SINGLE_DISK_IO ELSE @@ -320,5 +252,4 @@ standardMessageUnit=errorMessageUnit ENDIF - print*,'choubi 6' IF( myProcId .EQ. 0 ) THEN WRITE(msgBuf,'(2A)') '** WARNING ** EEBOOT_MINIMAL: ', @@ -331,9 +262,7 @@ & SQUEEZE_RIGHT, myThid ) ENDIF - print*,'choubi 7' -#endif - print*,'choubi 8' - ENDIF - print*,'choubi 10' +#endif + ENDIF + #if defined(ALLOW_NEST_PARENT) || defined(ALLOW_NEST_CHILD) WRITE(standardMessageUnit,'(2(A,I6))') @@ -366,5 +295,5 @@ #endif /* ALLOW_USE_MPI */ ENDIF - print*,'choubi 11' + C-- Under MPI only allow same number of processes as proc grid size. C Strictly we are allowed more procs but knowing there @@ -382,5 +311,5 @@ CALL F_HPMINIT(myProcId, "mitgcmuv") #endif - print*,'choubi 12' + 999 CONTINUE RETURN