X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimerauchimecommand.cpp;h=61a91f4116b171395981f453f6c39e65bd2d2b52;hb=60928795782d8f8648ec373d6a96b53032a77429;hp=3a9f42b22e0715ccf1f68313439342269da81bf8;hpb=37b23ba7d98eca13d02cde8d3b1ad08ac92fefb9;p=mothur.git

diff --git a/chimerauchimecommand.cpp b/chimerauchimecommand.cpp
index 3a9f42b..61a91f4 100644
--- a/chimerauchimecommand.cpp
+++ b/chimerauchimecommand.cpp
@@ -1639,11 +1639,11 @@ int ChimeraUchimeCommand::createProcesses(string outputFileName, string filename
 				processIDS.push_back(pid);  //create map from line number to pid so you can append files in correct order later
 				process++;
 			}else if (pid == 0){
-				num = driver(outputFileName + toString(getpid()) + ".temp", files[process], accnos + toString(getpid()) + ".temp", alns + toString(getpid()) + ".temp", numChimeras);
+				num = driver(outputFileName + toString(m->mothurGetpid(process)) + ".temp", files[process], accnos + toString(m->mothurGetpid(process)) + ".temp", alns + toString(m->mothurGetpid(process)) + ".temp", numChimeras);
 				
 				//pass numSeqs to parent
 				ofstream out;
-				string tempFile = outputFileName + toString(getpid()) + ".num.temp";
+				string tempFile = outputFileName + toString(m->mothurGetpid(process)) + ".num.temp";
 				m->openOutputFile(tempFile, out);
 				out << num << endl;
 				out << numChimeras << endl;
@@ -1803,14 +1803,16 @@ int ChimeraUchimeCommand::createProcessesGroups(string outputFName, string filen
 		
 		//divide the groups between the processors
 		vector<linePair> lines;
-		int numGroupsPerProcessor = groups.size() / processors;
-		for (int i = 0; i < processors; i++) {
-			int startIndex =  i * numGroupsPerProcessor;
-			int endIndex = (i+1) * numGroupsPerProcessor;
-			if(i == (processors - 1)){	endIndex = groups.size(); 	}
-			lines.push_back(linePair(startIndex, endIndex));
-		}
-		
+        int remainingPairs = groups.size();
+        int startIndex = 0;
+        for (int remainingProcessors = processors; remainingProcessors > 0; remainingProcessors--) {
+            int numPairs = remainingPairs; //case for last processor
+            if (remainingProcessors != 1) { numPairs = ceil(remainingPairs / remainingProcessors); }
+            lines.push_back(linePair(startIndex, (startIndex+numPairs))); //startIndex, endIndex
+            startIndex = startIndex + numPairs;
+            remainingPairs = remainingPairs - numPairs;
+        }
+
 #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)		
 				
 		//loop through and create all the processes you want
@@ -1821,11 +1823,11 @@ int ChimeraUchimeCommand::createProcessesGroups(string outputFName, string filen
 				processIDS.push_back(pid);  //create map from line number to pid so you can append files in correct order later
 				process++;
 			}else if (pid == 0){
-				num = driverGroups(outputFName + toString(getpid()) + ".temp", filename + toString(getpid()) + ".temp", accnos + toString(getpid()) + ".temp", alns + toString(getpid()) + ".temp", accnos + ".byCount." + toString(getpid()) + ".temp", lines[process].start, lines[process].end, groups);
+				num = driverGroups(outputFName + toString(m->mothurGetpid(process)) + ".temp", filename + toString(m->mothurGetpid(process)) + ".temp", accnos + toString(m->mothurGetpid(process)) + ".temp", alns + toString(m->mothurGetpid(process)) + ".temp", accnos + ".byCount." + toString(m->mothurGetpid(process)) + ".temp", lines[process].start, lines[process].end, groups);
 				
 				//pass numSeqs to parent
 				ofstream out;
-				string tempFile = outputFName + toString(getpid()) + ".num.temp";
+				string tempFile = outputFName + toString(m->mothurGetpid(process)) + ".num.temp";
 				m->openOutputFile(tempFile, out);
 				out << num << endl;
 				out.close();