X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=filterseqscommand.cpp;h=8b68988884acb408d0e72c5c3fa407a7b9f241b6;hp=f6ca47988809f623b940f2ae04703d276ad90fa8;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=deba0af0ccdcb6005ed5b2b82649b137c63fbdf7

diff --git a/filterseqscommand.cpp b/filterseqscommand.cpp
index f6ca479..8b68988 100644
--- a/filterseqscommand.cpp
+++ b/filterseqscommand.cpp
@@ -558,7 +558,7 @@ int FilterSeqsCommand::driverMPIRun(int start, int num, MPI_File& inMPI, MPI_Fil
 
 			}
 			
-			if((i+1) % 100 == 0){	cout << (i+1) << endl;	 m->mothurOutJustToLog(toString(i+1) + "\n");	}
+			if((i+1) % 100 == 0){	cout << (i+1) << endl;		}
 		}
 		
 		if(outputString != ""){ //output to file 
@@ -572,7 +572,7 @@ int FilterSeqsCommand::driverMPIRun(int start, int num, MPI_File& inMPI, MPI_Fil
 			delete buf;
 		}
 		
-		if((num) % 100 != 0){	cout << (num) << endl;	 m->mothurOutJustToLog(toString(num) + "\n");	}
+		if((num) % 100 != 0){	cout << (num) << endl;	 	}
 			
 		return 0;
 	}
@@ -623,10 +623,10 @@ int FilterSeqsCommand::driverRunFilter(string F, string outputFilename, string i
 			#endif
 			
 			//report progress
-			if((count) % 100 == 0){	m->mothurOut(toString(count)); m->mothurOutEndLine();		}
+			if((count) % 100 == 0){	m->mothurOutJustToScreen(toString(count)+"\n"); 	}
 		}
 		//report progress
-		if((count) % 100 != 0){	m->mothurOut(toString(count)); m->mothurOutEndLine();		}
+		if((count) % 100 != 0){	m->mothurOutJustToScreen(toString(count)+"\n"); 		}
 		
 		
 		out.close();
@@ -729,6 +729,9 @@ int FilterSeqsCommand::createProcessesRunFilter(string F, string filename, strin
 		//Close all thread handles and free memory allocations.
 		for(int i=0; i < pDataArray.size(); i++){
 			num += pDataArray[i]->count;
+            if (pDataArray[i]->count != pDataArray[i]->end) {
+                m->mothurOut("[ERROR]: process " + toString(i) + " only processed " + toString(pDataArray[i]->count) + " of " + toString(pDataArray[i]->end) + " sequences assigned to it, quitting. \n"); m->control_pressed = true; 
+            }
             CloseHandle(hThreadArray[i]);
 			delete pDataArray[i];
 		}
@@ -1003,10 +1006,10 @@ int FilterSeqsCommand::driverCreateFilter(Filters& F, string filename, linePair*
 			#endif
 			
 			//report progress
-			if((count) % 100 == 0){	m->mothurOut(toString(count)); m->mothurOutEndLine();		}
+			if((count) % 100 == 0){	m->mothurOutJustToScreen(toString(count)+"\n"); 		}
 		}
 		//report progress
-		if((count) % 100 != 0){	m->mothurOut(toString(count)); m->mothurOutEndLine();		}
+		if((count) % 100 != 0){	m->mothurOutJustToScreen(toString(count)+"\n"); 	}
 		in.close();
 		
 		return count;
@@ -1049,11 +1052,11 @@ int FilterSeqsCommand::MPICreateFilter(int start, int num, Filters& F, MPI_File&
 			cout.flush();
 						
 			//report progress
-			if((i+1) % 100 == 0){	cout << (i+1) << endl;	 m->mothurOutJustToLog(toString(i+1) + "\n");	}
+			if((i+1) % 100 == 0){	cout << (i+1) << endl;		}
 		}
 		
 		//report progress
-		if((num) % 100 != 0){	cout << num << endl; m->mothurOutJustToLog(toString(num) + "\n"); 	}
+		if((num) % 100 != 0){	cout << num << endl; 	}
 		
 		return 0;
 	}
@@ -1176,6 +1179,9 @@ int FilterSeqsCommand::createProcessesCreateFilter(Filters& F, string filename)
 		//Close all thread handles and free memory allocations.
 		for(int i=0; i < pDataArray.size(); i++){
 			num += pDataArray[i]->count;
+            if (pDataArray[i]->count != pDataArray[i]->end) {
+                m->mothurOut("[ERROR]: process " + toString(i) + " only processed " + toString(pDataArray[i]->count) + " of " + toString(pDataArray[i]->end) + " sequences assigned to it, quitting. \n"); m->control_pressed = true; 
+            }
             F.mergeFilter(pDataArray[i]->F.getFilter());
             
 			for (int k = 0; k < alignmentLength; k++) {	 F.a[k] += pDataArray[i]->F.a[k];       }