Commit c1fa35f0 authored by Douglas Serson's avatar Douglas Serson
Browse files

Move verbose output from modules to FC

parent 773d05d2
......@@ -77,15 +77,6 @@ InputDat::~InputDat()
*/
void InputDat::Process(po::variables_map &vm)
{
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "Processing input dat file" << endl;
}
}
string line, word, tag;
std::ifstream datFile;
stringstream s;
......
......@@ -64,6 +64,11 @@ public:
return "InputDat";
}
virtual std::string GetModuleDescription()
{
return "Processing input dat file";
}
private:
void ReadTecplotFEBlockZone(std::ifstream &datFile,
string &line,
......
......@@ -66,6 +66,11 @@ public:
return "InputFld";
}
virtual std::string GetModuleDescription()
{
return "Processing input fld file";
}
private:
};
}
......
......@@ -105,14 +105,6 @@ InputNek5000::~InputNek5000()
*/
void InputNek5000::Process(po::variables_map &vm)
{
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "Processing Nek5000 field file" << endl;
}
}
string fldending = "fld5000";
ifstream file(m_f->m_inputfiles[fldending][0].c_str(), ios::binary);
......
......@@ -66,6 +66,11 @@ public:
return "InputNek5000";
}
virtual std::string GetModuleDescription()
{
return "Processing Nek5000 field file";
}
private:
};
}
......
......@@ -77,14 +77,6 @@ InputPts::~InputPts()
*/
void InputPts::Process(po::variables_map &vm)
{
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "Processing input pts file" << endl;
}
}
string inFile = (m_f->m_inputfiles["pts"][0]).c_str();
if (m_f->m_session)
......
......@@ -66,6 +66,11 @@ public:
return "InputPts";
}
virtual std::string GetModuleDescription()
{
return "Processing input pts file";
}
private:
};
}
......
......@@ -92,15 +92,6 @@ void InputXml::Process(po::variables_map &vm)
return;
}
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "Processing input xml file" << endl;
timerpart.Start();
}
}
string xml_ending = "xml";
string xml_gz_ending = "xml.gz";
......
......@@ -66,6 +66,11 @@ public:
return "InputXml";
}
virtual std::string GetModuleDescription()
{
return "Processing input xml file";
}
private:
};
}
......
......@@ -144,6 +144,11 @@ public:
virtual std::string GetModuleName() = 0;
virtual std::string GetModuleDescription()
{
return " ";
}
FIELD_UTILS_EXPORT void RegisterConfig(string key, string value);
FIELD_UTILS_EXPORT void PrintConfig();
FIELD_UTILS_EXPORT void SetDefaults();
......
......@@ -57,13 +57,6 @@ OutputFileBase::~OutputFileBase()
void OutputFileBase::Process(po::variables_map &vm)
{
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << GetModuleName() <<": Writing file..." << endl;
}
}
if(m_f->m_fieldPts != LibUtilities::NullPtsField)
{
OutputFromPts(vm);
......
......@@ -67,6 +67,12 @@ public:
{
return "OutputFileBase";
}
virtual std::string GetModuleDescription()
{
return "Writing file";
}
};
}
}
......
......@@ -82,7 +82,7 @@ void OutputFld::Process(po::variables_map &vm)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "OutputFld: Writing boundary file(s): ";
cout << "\t OutputFld: Writing boundary file(s): ";
for (int i = 0; i < m_f->m_bndRegionsToWrite.size(); ++i)
{
cout << m_f->m_bndRegionsToWrite[i];
......@@ -232,14 +232,6 @@ void OutputFld::Process(po::variables_map &vm)
}
else
{
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "OutputFld: Writing file..." << endl;
}
}
fs::path writefile(filename);
int writefld = 1;
if (fs::exists(writefile) && (vm.count("forceoutput") == 0))
......
......@@ -65,6 +65,12 @@ public:
{
return "OutputFld";
}
virtual std::string GetModuleDescription()
{
return "Writing file";
}
};
}
}
......
......@@ -67,11 +67,6 @@ void OutputInfo::Process(po::variables_map &vm)
string filename = m_config["outfile"].as<string>();
int i;
if (m_f->m_verbose)
{
cout << "OutputInfo: Writing Info file..." << endl;
}
// partition mesh
ASSERTL0(vm.count("nprocs") > 0,
"--nprocs nust be specified with info output");
......
......@@ -64,6 +64,12 @@ public:
{
return "OutputInfo";
}
virtual std::string GetModuleDescription()
{
return "Writing Info file";
}
};
}
}
......
......@@ -62,14 +62,6 @@ void OutputPts::OutputFromPts(po::variables_map &vm)
// Extract the output filename and extension
string filename = m_config["outfile"].as<string>();
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "OutputPts: Writing file..." << endl;
}
}
fs::path writefile(filename);
int writepts = 1;
if (fs::exists(writefile) && (vm.count("forceoutput") == 0))
......@@ -110,14 +102,6 @@ void OutputPts::OutputFromExp(po::variables_map &vm)
// Extract the output filename and extension
string filename = m_config["outfile"].as<string>();
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "OutputPts: Writing file..." << endl;
}
}
fs::path writefile(filename);
int writepts = 1;
if (fs::exists(writefile) && (vm.count("forceoutput") == 0))
......
......@@ -62,13 +62,7 @@ OutputStdOut::~OutputStdOut()
void OutputStdOut::Process(po::variables_map &vm)
{
// Extract the output filename and extension
string filename = m_config["outfile"].as<string>();
if (m_f->m_verbose)
{
cout << "OutputStdOut: Output written to StdOut" << endl;
}
}
}
}
......@@ -64,6 +64,12 @@ public:
{
return "OutputStdOut";
}
virtual std::string GetModuleDescription()
{
return "Output written to StdOut";
}
};
}
}
......
......@@ -152,15 +152,6 @@ void OutputTecplot::Process(po::variables_map &vm)
return;
}
if (m_f->m_verbose)
{
if (m_f->m_comm->TreatAsRankZero())
{
cout << "OutputTecplot: Writing file..." << endl;
}
}
// Extract the output filename and extension
string filename = m_config["outfile"].as<string>();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment