modified calculators to use doubles, added numotu and fontsize parameters to heatmap...

[mothur.git] / classifyseqscommand.cpp

diff --git a/classifyseqscommand.cpp b/classifyseqscommand.cpp
index 6c42418c2ae788939206a41ee650d1d3866ca4c3..128fd01fd9f8b042ba736b97fbf89cdf86626fc8 100644 (file)
--- a/classifyseqscommand.cpp
+++ b/classifyseqscommand.cpp
@@ -98,14 +98,6 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
                                        
                                        int ableToOpen;
                                        
-                                       #ifdef USE_MPI  
-                                               int pid;
-                                               MPI_Comm_size(MPI_COMM_WORLD, &processors); //set processors to the number of mpi processes running
-                                               MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
-                               
-                                               if (pid == 0) {
-                                       #endif
-                                       
                                        ifstream in;
                                        ableToOpen = openInputFile(fastaFileNames[i], in, "noerror");
                                
@@ -120,17 +112,6 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
                                        }
                                        in.close();
                                        
-                                       #ifdef USE_MPI  
-                                                       for (int j = 1; j < processors; j++) {
-                                                               MPI_Send(&ableToOpen, 1, MPI_INT, j, 2001, MPI_COMM_WORLD); 
-                                                       }
-                                               }else{
-                                                       MPI_Status status;
-                                                       MPI_Recv(&ableToOpen, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
-                                               }
-                                               
-                                       #endif
-                                       
                                        if (ableToOpen == 1) { 
                                                m->mothurOut("Unable to open " + fastaFileNames[i] + ". It will be disregarded."); m->mothurOutEndLine(); 
                                                //erase from file list
@@ -169,14 +150,6 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
                                        }
                                        int ableToOpen;
                                        
-                                       #ifdef USE_MPI  
-                                               int pid;
-                                               MPI_Comm_size(MPI_COMM_WORLD, &processors); //set processors to the number of mpi processes running
-                                               MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
-                               
-                                               if (pid == 0) {
-                                       #endif
-
                                        ifstream in;
                                        ableToOpen = openInputFile(namefileNames[i], in, "noerror");
                                
@@ -191,17 +164,6 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
                                        }
                                        in.close();
                                        
-                                       #ifdef USE_MPI  
-                                                       for (int j = 1; j < processors; j++) {
-                                                               MPI_Send(&ableToOpen, 1, MPI_INT, j, 2001, MPI_COMM_WORLD); 
-                                                       }
-                                               }else{
-                                                       MPI_Status status;
-                                                       MPI_Recv(&ableToOpen, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
-                                               }
-                                               
-                                       #endif
-                                       
                                        if (ableToOpen == 1) { 
                                                m->mothurOut("Unable to open " + namefileNames[i] + ". It will be disregarded."); m->mothurOutEndLine();  abort = true;
                                                //erase from file list
@@ -230,14 +192,6 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
                                        }
                                        int ableToOpen;
                                        
-                                       #ifdef USE_MPI  
-                                               int pid;
-                                               MPI_Comm_size(MPI_COMM_WORLD, &processors); //set processors to the number of mpi processes running
-                                               MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
-                               
-                                               if (pid == 0) {
-                                       #endif
-
                                        ifstream in;
                                        ableToOpen = openInputFile(groupfileNames[i], in, "noerror");
                                
@@ -252,17 +206,6 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
                                        }
                                        in.close();
                                        
-                                       #ifdef USE_MPI  
-                                                       for (int j = 1; j < processors; j++) {
-                                                               MPI_Send(&ableToOpen, 1, MPI_INT, j, 2001, MPI_COMM_WORLD); 
-                                                       }
-                                               }else{
-                                                       MPI_Status status;
-                                                       MPI_Recv(&ableToOpen, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
-                                               }
-                                               
-                                       #endif
-                                       
                                        if (ableToOpen == 1) { 
                                                m->mothurOut("Unable to open " + groupfileNames[i] + ". It will be disregarded."); m->mothurOutEndLine(); groupfileNames[i] = "";
                                                //erase from file list