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

Using OPM_THROW to log messages, fixed Copyright headers

Browse Source
This commit is contained in:
Pål Grønås Drange 2016-06-20 17:20:33 +02:00
parent 4323b2f4fa
commit 06cd6c85f3
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/core/wells/InjectionSpecification.cpp
View File

@ -1,5 +1,6 @@
/*
Copyright 2016 The Open Porous Media project.
Copyright 2012 Sintef.
Copyright 2016 Statoil.
This file is part of the Open Porous Media project (OPM).
@ -18,6 +19,8 @@
#include <stdexcept>
#include "config.h"
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/wells/InjectionSpecification.hpp>
namespace Opm
@ -51,7 +54,7 @@ namespace Opm
case ControlMode::GRUP: return "GRUP";
case ControlMode::FLD : return "FLD" ;
}
throw new std::domain_error("Unknown control mode");
OPM_THROW(std::domain_error, "Unknown control mode " << mode << " encountered in injection specification");
}
@ -63,7 +66,7 @@ namespace Opm
case InjectorType::OIL : return "OIL" ;
case InjectorType::GAS : return "GAS" ;
}
throw new std::domain_error("Unknown injector type");
OPM_THROW(std::domain_error, "Unknown injector type " << type << " encountered in injection specification");
}
@ -74,6 +77,6 @@ namespace Opm
case GuideRateType::RAT : return "RAT" ;
case GuideRateType::NONE_GRT: return "NONE_GRT";
}
throw new std::domain_error("Unknown guide rate type");
OPM_THROW(std::domain_error, "Unknown guide rate type " << type << " encountered in injection specification");
}
} // namespace Opm

11
opm/core/wells/ProductionSpecification.cpp
View File

@ -1,5 +1,6 @@
/*
Copyright 2016 The Open Porous Media project.
Copyright 2012 Sintef.
Copyright 2016 Statoil.
This file is part of the Open Porous Media project (OPM).
@ -18,6 +19,8 @@
#include <stdexcept>
#include "config.h"
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/wells/ProductionSpecification.hpp>
namespace Opm
@ -56,7 +59,7 @@ namespace Opm
case ControlMode::GRUP: return "GRUP";
case ControlMode::FLD : return "FLD" ;
}
throw new std::domain_error("Unknown control mode");
OPM_THROW(std::domain_error, "Unknown control mode " << mode << " encountered in production specification");
}
@ -68,7 +71,7 @@ namespace Opm
case Procedure::RATE : return "RATE" ;
case Procedure::WELL : return "WELL" ;
}
throw new std::domain_error("Unknown procedure");
OPM_THROW(std::domain_error, "Unknown procedure " << type << " encountered in production specification");
}
@ -81,7 +84,7 @@ namespace Opm
case GuideRateType::WATER : return "WATER" ;
case GuideRateType::NONE_GRT: return "NONE_GRT";
}
throw new std::domain_error("Unknown guide rate type");
OPM_THROW(std::domain_error, "Unknown guide rate type " << type << " encountered in production specification");
}