X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clustersplitcommand.cpp;h=92f0e486898f80b2c6f85bb984a5b7662bc18340;hb=75cff1a83a64cd46e9dd603e02597a2bb6a76119;hp=6d3c86ff1fa2efb62d46618f372706fd117c002a;hpb=3504e4e2feeb05aabb0c79aa42cb696522030924;p=mothur.git diff --git a/clustersplitcommand.cpp b/clustersplitcommand.cpp index 6d3c86f..92f0e48 100644 --- a/clustersplitcommand.cpp +++ b/clustersplitcommand.cpp @@ -439,6 +439,8 @@ int ClusterSplitCommand::execute(){ vector< map > distName = split->getDistanceFiles(); //returns map of distance files -> namefile sorted by distance file size delete split; + if (m->debug) { m->mothurOut("[DEBUG]: distName.size() = " + toString(distName.size()) + ".\n"); } + //output a merged distance file if (splitmethod == "fasta") { createMergedDistanceFile(distName); } @@ -447,11 +449,9 @@ int ClusterSplitCommand::execute(){ m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to split the distance file."); m->mothurOutEndLine(); estart = time(NULL); - + if (!runCluster) { -#ifdef USE_MPI - } -#endif + m->mothurOutEndLine(); m->mothurOut("Output File Names: "); m->mothurOutEndLine(); for (int i = 0; i < distName.size(); i++) { m->mothurOut(distName[i].begin()->first); m->mothurOutEndLine(); m->mothurOut(distName[i].begin()->second); m->mothurOutEndLine(); } @@ -459,7 +459,7 @@ int ClusterSplitCommand::execute(){ return 0; } - + //****************** break up files between processes and cluster each file set ******************************// #ifdef USE_MPI ////you are process 0 from above//// @@ -947,7 +947,7 @@ vector ClusterSplitCommand::createProcesses(vector< map if ((processToAssign-1) == 1) { m->mothurOut(distName[i].begin()->first + "\n"); } } - //not lets reverse the order of ever other process, so we balance big files running with little ones + //now lets reverse the order of ever other process, so we balance big files running with little ones for (int i = 0; i < processors; i++) { //cout << i << endl; int remainder = ((i+1) % processors);