OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow to prevent ParameterGroup from printing to std::cout.

Browse Source 
This commit adds a verbose flag to the constructor of
ParameterGroup to allow for deactivating any
output to std:cout. This is handy for parallel runs where we only
want to print statistics on one process.
This commit is contained in:
Markus Blatt
2015-05-08 11:09:49 +02:00
committed by Arne Morten Kvarving
parent 0cee419b89
commit 6cd2560cd6
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/core/utility/parameters/Parameter.hpp
View File

@@ -90,7 +90,8 @@ namespace Opm {
template<>
struct ParameterMapItemTrait<int> {
static int convert(const ParameterMapItem& item,
std::string& conversion_error)
std::string& conversion_error,
const bool)
{
conversion_error = correct_parameter_tag(item);
if (conversion_error != "") {
@@ -125,7 +126,8 @@ namespace Opm {
template<>
struct ParameterMapItemTrait<double> {
static double convert(const ParameterMapItem& item,
std::string& conversion_error)
std::string& conversion_error,
const bool)
{
conversion_error = correct_parameter_tag(item);
if (conversion_error != "") {
@@ -160,7 +162,8 @@ namespace Opm {
template<>
struct ParameterMapItemTrait<bool> {
static bool convert(const ParameterMapItem& item,
std::string& conversion_error)
std::string& conversion_error,
const bool)
{
conversion_error = correct_parameter_tag(item);
if (conversion_error != "") {
@@ -194,7 +197,8 @@ namespace Opm {
template<>
struct ParameterMapItemTrait<std::string> {
static std::string convert(const ParameterMapItem& item,
std::string& conversion_error)
std::string& conversion_error,
const bool)
{
conversion_error = correct_parameter_tag(item);
if (conversion_error != "") {

10
opm/core/utility/parameters/ParameterGroup.cpp
View File

@@ -87,8 +87,9 @@ namespace Opm {
}
ParameterGroup::ParameterGroup(const std::string& patharg,
const ParameterGroup* parent)
: path_(patharg), parent_(parent), output_is_enabled_(true)
const ParameterGroup* parent,
const bool enable_output)
: path_(patharg), parent_(parent), output_is_enabled_(enable_output)
{
}
@@ -100,7 +101,7 @@ namespace Opm {
void ParameterGroup::readXML(const std::string& xml_filename)
{
fill_xml(*this, xml_filename);
fill_xml(*this, xml_filename, output_is_enabled_);
}
namespace {
@@ -218,7 +219,8 @@ namespace Opm {
map_[name_path.first] = data;
} else {
std::shared_ptr<ParameterMapItem> data(new ParameterGroup(this->path() + ID_delimiter_path + name_path.first,
this));
this,
output_is_enabled_));
ParameterGroup& child = dynamic_cast<ParameterGroup&>(*data);
child.insertParameter(name_path.second, value);
map_[name_path.first] = data;

7
opm/core/utility/parameters/ParameterGroup.hpp
View File

@@ -116,7 +116,8 @@ namespace Opm {
struct RequirementFailedException : public std::exception {};
ParameterGroup();
ParameterGroup(const std::string& path, const ParameterGroup* parent);
ParameterGroup(const std::string& path, const ParameterGroup* parent,
const bool enable_output);
// From ParameterMapItem
virtual ~ParameterGroup();
@@ -137,8 +138,10 @@ namespace Opm {
/// pass arguments that cannot be handled by the ParameterGroup,
/// or an empty argument list. If false, such arguments are stored
/// and can be retrieved later with unhandledArguments().
/// \param enable_output Whether to enable output or not.
template <typename StringArray>
ParameterGroup(int argc, StringArray argv, const bool verify_syntax = true);
ParameterGroup(int argc, StringArray argv, const bool verify_syntax = true,
const bool enabled_output=true);
/// \brief This method checks if there is something with name
/// \p name in the parameter gropup.

13
opm/core/utility/parameters/ParameterGroup_impl.hpp
View File

@@ -53,14 +53,15 @@ namespace Opm {
struct ParameterMapItemTrait<ParameterGroup> {
static ParameterGroup
convert(const ParameterMapItem& item,
std::string& conversion_error)
std::string& conversion_error,
bool enable_output)
{
std::string tag = item.getTag();
if (tag != ID_xmltag__param_grp) {
conversion_error = "The XML tag was '" + tag +
"' but should be '" +
ID_xmltag__param_grp + "'.\n";
return ParameterGroup("", 0);
return ParameterGroup("", 0, enable_output);
}
conversion_error = "";
const ParameterGroup& pg = dynamic_cast<const ParameterGroup&>(item);
@@ -105,8 +106,9 @@ namespace Opm {
}
template <typename StringArray>
ParameterGroup::ParameterGroup(int argc, StringArray argv, bool verify_syntax)
: path_(ID_path_root), parent_(0), output_is_enabled_(true)
ParameterGroup::ParameterGroup(int argc, StringArray argv, bool verify_syntax,
const bool enable_output)
: path_(ID_path_root), parent_(0), output_is_enabled_(enable_output)
{
if (verify_syntax && (argc < 2)) {
std::cerr << "Usage: " << argv[0] << " "
@@ -296,7 +298,8 @@ namespace Opm {
const std::string& name = named_data.first;
const data_type data = named_data.second;
std::string conversion_error;
T value = ParameterMapItemTrait<T>::convert(*data, conversion_error);
T value = ParameterMapItemTrait<T>::convert(*data, conversion_error,
output_is_enabled_);
if (conversion_error != "") {
std::cerr << "ERROR: Failed to convert the element named '"
<< name