X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makecontigscommand.cpp;h=72e8ea09aeeac366fc08175dd7019e404020835d;hb=60928795782d8f8648ec373d6a96b53032a77429;hp=8796ab2113f455b12c8eace90df64d4bbe2c318e;hpb=cbbf2f185fc7289910bb69421095c1de024c5225;p=mothur.git diff --git a/makecontigscommand.cpp b/makecontigscommand.cpp index 8796ab2..72e8ea0 100644 --- a/makecontigscommand.cpp +++ b/makecontigscommand.cpp @@ -704,7 +704,7 @@ int MakeContigsCommand::createProcesses(vector< vector > files, string o for(int i=0;imothurGetpid(process) + ".temp"; m->openOutputFile(tempFASTAFileNames[i][j], temp); temp.close(); } } @@ -712,14 +712,14 @@ int MakeContigsCommand::createProcesses(vector< vector > files, string o } num = driver(files[process], - outputFasta + toString(getpid()) + ".temp", - outputScrapFasta + toString(getpid()) + ".temp", - outputMisMatches + toString(getpid()) + ".temp", + outputFasta + m->mothurGetpid(process) + ".temp", + outputScrapFasta + m->mothurGetpid(process) + ".temp", + outputMisMatches + m->mothurGetpid(process) + ".temp", tempFASTAFileNames, process, group); //pass groupCounts to parent ofstream out; - string tempFile = toString(getpid()) + ".num.temp"; + string tempFile = m->mothurGetpid(process) + ".num.temp"; m->openOutputFile(tempFile, out); out << num << endl; if (createFileGroup || createOligosGroup) { @@ -1143,7 +1143,7 @@ int MakeContigsCommand::driver(vector files, string outputFasta, string num++; //report progress - if((num) % 1000 == 0){ m->mothurOut(toString(num)); m->mothurOutEndLine(); } + if((num) % 1000 == 0){ m->mothurOutJustToScreen(toString(num)); m->mothurOutEndLine(); } } //report progress @@ -1289,7 +1289,7 @@ vector< vector > MakeContigsCommand::readFastqFiles(unsigned long int& c count++; //report progress - if((count) % 10000 == 0){ m->mothurOut(toString(count)); m->mothurOutEndLine(); } + if((count) % 10000 == 0){ m->mothurOutJustToScreen(toString(count)); m->mothurOutEndLine(); } //} } }