1.12.0

[mothur.git] / aligncommand.h

diff --git a/aligncommand.h b/aligncommand.h
index f7d59b0206c989558f0e11163d1f7abddcf9a784..186ca63b15cbd09f881d29041de379dc5cf6b6b9 100644 (file)
--- a/aligncommand.h
+++ b/aligncommand.h
@@ -26,24 +26,30 @@ public:
        
 private:
        struct linePair {
-               int start;
+               unsigned long int start;
                int numSeqs;
-               linePair(int i, int j) : start(i), numSeqs(j) {}
+               linePair(unsigned long int i, int j) : start(i), numSeqs(j) {}
        };
        vector<int> processIDS;   //processid
        vector<linePair*> lines;
+       bool MPIWroteAccnos;
        
        AlignmentDB* templateDB;
        Alignment* alignment;
        
-       int driver(linePair*, string, string, string);
-       void createProcesses(string, string, string);
+       int driver(linePair*, string, string, string, string);
+       int createProcesses(string, string, string, string);
        void appendAlignFiles(string, string); 
        void appendReportFiles(string, string);
        
-       string candidateFileName, templateFileName, distanceFileName, search, align;
+       #ifdef USE_MPI
+       int driverMPI(int, int, MPI_File&, MPI_File&, MPI_File&, MPI_File&, vector<long>&);
+       #endif
+       
+       string candidateFileName, templateFileName, distanceFileName, search, align, outputDir;
        float match, misMatch, gapOpen, gapExtend, threshold;
        int processors, kmerSize;
+       vector<string> candidateFileNames;
        
        bool abort, flip;
 };