mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-11-22 09:16:27 -06:00
Merge pull request #775 from akva2/trim_istream
propertysystem: avoid pulling in istream
This commit is contained in:
commit
08e7625ecc
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <iostream>
|
#include <ostream>
|
||||||
|
|
||||||
namespace Opm {
|
namespace Opm {
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
@ -245,7 +245,7 @@ constexpr auto getPropValue() { return Properties::Detail::GetPropImpl<TypeTag,
|
|||||||
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
void printValues(std::ostream& os = std::cout)
|
void printValues(std::ostream& os)
|
||||||
{
|
{
|
||||||
os <<
|
os <<
|
||||||
"The eWoms property system was compiled with the macro\n"
|
"The eWoms property system was compiled with the macro\n"
|
||||||
|
@ -383,7 +383,7 @@ static inline int start(int argc, char **argv, bool registerParams=true)
|
|||||||
int printProps = EWOMS_GET_PARAM(TypeTag, int, PrintProperties);
|
int printProps = EWOMS_GET_PARAM(TypeTag, int, PrintProperties);
|
||||||
if (printProps && myRank == 0) {
|
if (printProps && myRank == 0) {
|
||||||
if (printProps == 1 || !isatty(fileno(stdout)))
|
if (printProps == 1 || !isatty(fileno(stdout)))
|
||||||
Properties::printValues<TypeTag>();
|
Properties::printValues<TypeTag>(std::cout);
|
||||||
}
|
}
|
||||||
|
|
||||||
// instantiate and run the concrete problem. make sure to
|
// instantiate and run the concrete problem. make sure to
|
||||||
|
Loading…
Reference in New Issue
Block a user