diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C index 17e8d5eb9f..93efd245a2 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C +++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C @@ -67,7 +67,7 @@ bool Foam::dimensioned::readDimensions template -bool Foam::dimensioned::initialise +void Foam::dimensioned::initialise ( Istream& is, const bool haveName, @@ -75,13 +75,19 @@ bool Foam::dimensioned::initialise ) { token nextToken(is); - is.putBack(nextToken); // Check if the original format is used in which the name is provided // and reset the name to that read - if (!haveName && nextToken.isWord()) + if (nextToken.isWord()) { - is >> name_; + if (!haveName) + { + name_ = nextToken.wordToken(); + } + } + else + { + is.putBack(nextToken); } scalar multiplier = 1; @@ -102,8 +108,6 @@ bool Foam::dimensioned::initialise } value_ *= multiplier; - - return !haveName && nextToken.isWord(); } diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H index 42ea49775a..7186e26135 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H +++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H @@ -83,8 +83,8 @@ class dimensioned const bool haveDims ); - //- Initialise from Istream. Return whether the name was read. - bool initialise(Istream& is, const bool haveName, const bool haveDims); + //- Initialise from Istream + void initialise(Istream& is, const bool haveName, const bool haveDims); public: