added a few evenness calculators and fixed a couple of bugs in filter.seqs and pre...

[mothur.git] / chimerabellerophoncommand.cpp

diff --git a/chimerabellerophoncommand.cpp b/chimerabellerophoncommand.cpp
index fd768a753c1798d7f26012f0c8d3f065db7c6252..6d0961689d425b1ffd8ba75a86653453e3e72011 100644 (file)
--- a/chimerabellerophoncommand.cpp
+++ b/chimerabellerophoncommand.cpp
@@ -27,7 +27,7 @@ ChimeraBellerophonCommand::ChimeraBellerophonCommand(string option)  {
                        OptionParser parser(option);
                        map<string,string> parameters = parser.getParameters();
                        
-                       ValidParameters validParameter;
+                       ValidParameters validParameter("chimera.bellerophon");
                        map<string,string>::iterator it;
                        
                        //check to make sure all parameters are valid for command
@@ -54,14 +54,6 @@ ChimeraBellerophonCommand::ChimeraBellerophonCommand(string option)  {
        
                                        int ableToOpen;
                                        ifstream in;
-                                       
-                                       #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
 
                                        ableToOpen = openInputFile(fastaFileNames[i], in, "noerror");
                                
@@ -75,17 +67,6 @@ ChimeraBellerophonCommand::ChimeraBellerophonCommand(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();