X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimeracheckcommand.cpp;fp=chimeracheckcommand.cpp;h=3a530fde0ab5b31c71cbe19437984bb8a75578c1;hb=ae57e166b2ed7b475ec3f466106bd76fabadd063;hp=2b88eb5736bfd37364461facb043b0db76aa3cfc;hpb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;p=mothur.git diff --git a/chimeracheckcommand.cpp b/chimeracheckcommand.cpp index 2b88eb5..3a530fd 100644 --- a/chimeracheckcommand.cpp +++ b/chimeracheckcommand.cpp @@ -349,7 +349,7 @@ int ChimeraCheckCommand::execute(){ int pid, numSeqsPerProcessor; int tag = 2001; - vector MPIPos; + vector MPIPos; MPI_Status status; MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are @@ -424,7 +424,7 @@ int ChimeraCheckCommand::execute(){ MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case #else - vector positions = m->divideFile(fastaFileNames[i], processors); + vector positions = m->divideFile(fastaFileNames[i], processors); for (int s = 0; s < (positions.size()-1); s++) { lines.push_back(new linePair(positions[s], positions[(s+1)])); @@ -520,7 +520,7 @@ int ChimeraCheckCommand::driver(linePair* filePos, string outputFName, string fi delete candidateSeq; #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) - unsigned long int pos = inFASTA.tellg(); + unsigned long long pos = inFASTA.tellg(); if ((pos == -1) || (pos >= filePos->end)) { break; } #else if (inFASTA.eof()) { break; } @@ -544,7 +544,7 @@ int ChimeraCheckCommand::driver(linePair* filePos, string outputFName, string fi } //********************************************************************************************************************** #ifdef USE_MPI -int ChimeraCheckCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_File& outMPI, vector& MPIPos){ +int ChimeraCheckCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_File& outMPI, vector& MPIPos){ try { MPI_File outAccMPI; MPI_Status status;