added mpi code to cluster.split command

[mothur.git] / globaldata.cpp

diff --git a/globaldata.cpp b/globaldata.cpp
index c2871694e2feaa9219ed5d31575e57a84a3022dc..69dccb5226638a3af2a2bb9936b774f6dc90169e 100644 (file)
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -47,6 +47,7 @@ void GlobalData::setFormat(string Format)             {       format = Format;                }
 
 /******************************************************/
 GlobalData::GlobalData() {
+       m = MothurOut::getInstance();
        //option definitions should go here...
        clear();
        gListVector = NULL;             
@@ -79,6 +80,7 @@ void GlobalData::clear() {
 //     fastafile               =   ""; //do we need this?
        treefile                =       "";
        sharedfile              =       "";
+       format = "";
 }
 
 
@@ -123,9 +125,10 @@ void GlobalData::newRead() {
                        labels.clear(); Groups.clear();
                        allLines = 1;
                        runParse = true;
+                       names.clear();
        }
        catch(exception& e) {
-               errorOut(e, "GlobalData", "newRead");
+               m->errorOut(e, "GlobalData", "newRead");
                exit(1);
        }
 }
@@ -151,7 +154,7 @@ GlobalData::~GlobalData() {
                if (nameMap != NULL) { delete nameMap; nameMap = NULL; }
        }
        catch(exception& e) {
-               errorOut(e, "GlobalData", "~GlobalData");
+               m->errorOut(e, "GlobalData", "~GlobalData");
                exit(1);
        }
 }