changes for 1.12.2

[mothur.git] / distancecommand.cpp

diff --git a/distancecommand.cpp b/distancecommand.cpp
index da5d0f157390cb1a70c666ac86a9ecae1221f095..05ed87cb960c5c61fff158384723ff9d3b2a1e3a 100644 (file)
--- a/distancecommand.cpp
+++ b/distancecommand.cpp
@@ -32,7 +32,7 @@ DistanceCommand::DistanceCommand(string option) {
                        OptionParser parser(option);
                        map<string, string> parameters = parser.getParameters();
                        
-                       ValidParameters validParameter;
+                       ValidParameters validParameter("dist.seqs");
                        map<string, string>::iterator it2;
                
                        //check to make sure all parameters are valid for command
@@ -300,6 +300,7 @@ int DistanceCommand::execute(){
                                MPI_Send(&size, 1, MPI_LONG, 0, tag, MPI_COMM_WORLD);
                        }
                }
+               MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case
 #else          
                                
        #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
@@ -342,6 +343,14 @@ int DistanceCommand::execute(){
                
                if (output == "square") {  convertMatrix(outputFile); }
                
+               ifstream fileHandle;
+               fileHandle.open(outputFile.c_str());
+               if(fileHandle) {
+                       gobble(fileHandle);
+                       if (fileHandle.eof()) { m->mothurOut(outputFile + " is blank. This can result if there are no distances below your cutoff.");  m->mothurOutEndLine(); }
+               }
+
+               
                #ifdef USE_MPI
                        }
                #endif