X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimeraslayercommand.cpp;h=c41e026497191d8218f90ef8ddb5754aa92cfee0;hb=4d7ffb38e091e9e7425d94e112551a3f90cacb0f;hp=58aecf58ccd10354c5aca094d20827c44fc00ff9;hpb=6f4b9401f7deb8aaf0d87659298308f4138cc3b0;p=mothur.git

diff --git a/chimeraslayercommand.cpp b/chimeraslayercommand.cpp
index 58aecf5..c41e026 100644
--- a/chimeraslayercommand.cpp
+++ b/chimeraslayercommand.cpp
@@ -261,13 +261,16 @@ int ChimeraSlayerCommand::execute(){
 				MPIPos = setFilePosFasta(fastafile, numSeqs); //fills MPIPos, returns numSeqs
 				
 				//send file positions to all processes
-				MPI_Bcast(&numSeqs, 1, MPI_INT, 0, MPI_COMM_WORLD);  //send numSeqs
-				MPI_Bcast(&MPIPos[0], (numSeqs+1), MPI_LONG, 0, MPI_COMM_WORLD); //send file pos	
+				for(int i = 1; i < processors; i++) { 
+					MPI_Send(&numSeqs, 1, MPI_INT, i, tag, MPI_COMM_WORLD);
+					MPI_Send(&MPIPos[0], (numSeqs+1), MPI_LONG, i, tag, MPI_COMM_WORLD);
+				}
 				
 				//figure out how many sequences you have to align
 				numSeqsPerProcessor = numSeqs / processors;
-				if(pid == (processors - 1)){	numSeqsPerProcessor = numSeqs - pid * numSeqsPerProcessor; 	}
 				int startIndex =  pid * numSeqsPerProcessor;
+				if(pid == (processors - 1)){	numSeqsPerProcessor = numSeqs - pid * numSeqsPerProcessor; 	}
+				
 			
 				//align your part
 				driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPI, outMPIAccnos, MPIPos);
@@ -280,14 +283,15 @@ int ChimeraSlayerCommand::execute(){
 					if (tempResult != 0) { MPIWroteAccnos = true; }
 				}
 			}else{ //you are a child process
-				MPI_Bcast(&numSeqs, 1, MPI_INT, 0, MPI_COMM_WORLD); //get numSeqs
+				MPI_Recv(&numSeqs, 1, MPI_INT, 0, tag, MPI_COMM_WORLD, &status);
 				MPIPos.resize(numSeqs+1);
-				MPI_Bcast(&MPIPos[0], (numSeqs+1), MPI_LONG, 0, MPI_COMM_WORLD); //get file positions
+				MPI_Recv(&MPIPos[0], (numSeqs+1), MPI_LONG, 0, tag, MPI_COMM_WORLD, &status);
 				
 				//figure out how many sequences you have to align
 				numSeqsPerProcessor = numSeqs / processors;
-				if(pid == (processors - 1)){	numSeqsPerProcessor = numSeqs - pid * numSeqsPerProcessor; 	}
 				int startIndex =  pid * numSeqsPerProcessor;
+				if(pid == (processors - 1)){	numSeqsPerProcessor = numSeqs - pid * numSeqsPerProcessor; 	}
+				
 				
 				//align your part
 				driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPI, outMPIAccnos, MPIPos);
@@ -301,6 +305,7 @@ int ChimeraSlayerCommand::execute(){
 			MPI_File_close(&inMPI);
 			MPI_File_close(&outMPI);
 			MPI_File_close(&outMPIAccnos);
+			MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case
 			
 			//delete accnos file if blank
 			if (pid == 0) {