a few modifications for 1.9

[mothur.git] / classify.cpp

diff --git a/classify.cpp b/classify.cpp
index f09cbf5da8a59b9446e91542c7b48a5a1fd22bc3..c3e52abc5bcd9347853945346ee12cf641a268e3 100644 (file)
--- a/classify.cpp
+++ b/classify.cpp
@@ -32,11 +32,14 @@ Classify::Classify(string tfile, string tempFile, string method, int kmerSize, f
                        MPI_File inMPI;\r
                        MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are\r
 \r
-                       char* inFileName = new char[tempFile.length()];\r
-                       memcpy(inFileName, tempFile.c_str(), tempFile.length());\r
-       \r
+                       //char* inFileName = new char[tempFile.length()];\r
+                       //memcpy(inFileName, tempFile.c_str(), tempFile.length());\r
+                       \r
+                       char inFileName[1024];\r
+                       strcpy(inFileName, tempFile.c_str());\r
+\r
                        MPI_File_open(MPI_COMM_WORLD, inFileName, MPI_MODE_RDONLY, MPI_INFO_NULL, &inMPI);  //comm, filename, mode, info, filepointer\r
-                       delete inFileName;\r
+                       //delete inFileName;\r
 \r
                        if (pid == 0) { //only one process needs to scan file\r
                                positions = setFilePosFasta(tempFile, numSeqs); //fills MPIPos, returns numSeqs\r
@@ -171,11 +174,14 @@ void Classify::readTaxonomy(string file) {
                MPI_File inMPI;\r
                MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are\r
 \r
-               char* inFileName = new char[file.length()];\r
-               memcpy(inFileName, file.c_str(), file.length());\r
+               //char* inFileName = new char[file.length()];\r
+               //memcpy(inFileName, file.c_str(), file.length());\r
                \r
+               char inFileName[1024];\r
+               strcpy(inFileName, file.c_str());\r
+\r
                MPI_File_open(MPI_COMM_WORLD, inFileName, MPI_MODE_RDONLY, MPI_INFO_NULL, &inMPI);  //comm, filename, mode, info, filepointer\r
-               delete inFileName;\r
+               //delete inFileName;\r
 \r
                if (pid == 0) {\r
                        positions = setFilePosEachLine(file, num);\r