From ba2b95b22ab8947d5583ca2c2da74557870b6861 Mon Sep 17 00:00:00 2001
From: westcott <westcott>
Date: Tue, 18 Oct 2011 18:24:23 +0000
Subject: [PATCH] 1.22.0

---
 classify.cpp        |  2 +-
 distancecommand.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classify.cpp b/classify.cpp
index eb0865c..25aa2dd 100644
--- a/classify.cpp
+++ b/classify.cpp
@@ -123,7 +123,7 @@ void Classify::generateDatabaseAndNames(string tfile, string tempFile, string me
 				//create database
 				if(method == "kmer")			{	database = new KmerDB(tempFile, kmerSize);			}
 				else if(method == "suffix")		{	database = new SuffixDB(numSeqs);								}
-				else if(method == "blast")		{	database = new BlastDB(tempFile.substr(0,tempFile.find_last_of(".")+1), gapOpen, gapExtend, match, misMatch, "");	}
+				else if(method == "blast")		{	database = new BlastDB(tempFile.substr(0,tempFile.find_last_of(".")+1), gapOpen, gapExtend, match, misMatch, "", pid);	}
 				else if(method == "distance")	{	database = new DistanceDB();	}
 				else {
 					m->mothurOut(method + " is not a valid search option. I will run the command using kmer, ksize=8."); m->mothurOutEndLine();
diff --git a/distancecommand.cpp b/distancecommand.cpp
index beea1bf..0f067ae 100644
--- a/distancecommand.cpp
+++ b/distancecommand.cpp
@@ -289,11 +289,11 @@ int DistanceCommand::execute(){
 				
 				driverMPI(start, end, outMPI, cutoff); 
 				
-				if (m->control_pressed) { outputTypes.clear(); MPI_File_close(&outMPI); delete distCalculator;  return 0; }
+				if (m->control_pressed) { outputTypes.clear(); MPI_File_close(&outMPI);   return 0; }
 			
 				//wait on chidren
 				for(int i = 1; i < processors; i++) { 
-					if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+					if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);    return 0; }
 					
 					char buf[5];
 					MPI_Recv(buf, 5, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
@@ -302,7 +302,7 @@ int DistanceCommand::execute(){
 				//do your part
 				driverMPI(start, end, outMPI, cutoff); 
 				
-				if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+				if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);   return 0; }
 			
 				char buf[5];
 				strcpy(buf, "done"); 
@@ -322,7 +322,7 @@ int DistanceCommand::execute(){
 				if (output != "square"){ driverMPI(start, end, outputFile, mySize); }
 				else { driverMPI(start, end, outputFile, mySize, output); }
 	
-				if (m->control_pressed) {  outputTypes.clear();  delete distCalculator;  return 0; }
+				if (m->control_pressed) {  outputTypes.clear();   return 0; }
 				
 				int amode=MPI_MODE_APPEND|MPI_MODE_WRONLY|MPI_MODE_CREATE; //
 				MPI_File outMPI;
@@ -341,7 +341,7 @@ int DistanceCommand::execute(){
 				for(int b = 1; b < processors; b++) { 
 					unsigned long long fileSize;
 					
-					if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+					if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);   return 0; }
 					
 					MPI_Recv(&fileSize, 1, MPI_LONG, b, tag, MPI_COMM_WORLD, &status); 
 					
@@ -371,7 +371,7 @@ int DistanceCommand::execute(){
 				if (output != "square"){ driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size); }
 				else { driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size, output); }
 				
-				if (m->control_pressed) { delete distCalculator;  return 0; }
+				if (m->control_pressed) {  return 0; }
 			
 				//tell parent you are done.
 				MPI_Send(&size, 1, MPI_LONG, 0, tag, MPI_COMM_WORLD);
-- 
2.39.2