X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bellerophon.cpp;h=833cfb907d6d4bd2aed8acb3d8522932ac3b2e7d;hb=6b32d112bb60e9f7eb6d4407a4eed4c49b67bced;hp=207fa51583b0835810ffaf1e52db88e95252346b;hpb=19fcbbdba99658f5eca244803280f9ee7f9f6607;p=mothur.git diff --git a/bellerophon.cpp b/bellerophon.cpp index 207fa51..833cfb9 100644 --- a/bellerophon.cpp +++ b/bellerophon.cpp @@ -246,7 +246,7 @@ int Bellerophon::getChimeras() { numSeqsPerProcessor = iters / processors; //each process hits this only once - unsigned long int startPos = pid * numSeqsPerProcessor; + unsigned long long startPos = pid * numSeqsPerProcessor; if(pid == processors - 1){ numSeqsPerProcessor = iters - pid * numSeqsPerProcessor; } @@ -274,7 +274,7 @@ int Bellerophon::getChimeras() { MPI_Recv(&length, 1, MPI_INT, j, 2001, MPI_COMM_WORLD, &status); char* buf = new char[length]; - MPI_Recv(&buf, length, MPI_CHAR, j, 2001, MPI_COMM_WORLD, &status); + MPI_Recv(&buf[0], length, MPI_CHAR, j, 2001, MPI_COMM_WORLD, &status); string temp = buf; if (temp.length() > length) { temp = temp.substr(0, length); } @@ -293,7 +293,7 @@ int Bellerophon::getChimeras() { //played with this a bit, but it may be better to try user-defined datatypes with set string lengths?? vector MPIBestSend = getBestWindow(lines[0]); pref.clear(); - + //send your result to parent for (int i = 0; i < numSeqs; i++) { @@ -314,7 +314,7 @@ int Bellerophon::getChimeras() { #else //divide breakpoints between processors - #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) if(processors == 1){ lines.push_back(linePair(0, iters)); @@ -326,7 +326,7 @@ int Bellerophon::getChimeras() { int numSeqsPerProcessor = iters / processors; for (int i = 0; i < processors; i++) { - unsigned long int startPos = i * numSeqsPerProcessor; + unsigned long long startPos = i * numSeqsPerProcessor; if(i == processors - 1){ numSeqsPerProcessor = iters - i * numSeqsPerProcessor; } @@ -356,7 +356,7 @@ int Bellerophon::getChimeras() { int Bellerophon::createProcesses(vector mid) { try { -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) int process = 0; int exitCommand = 1; vector processIDS;