Merge remote-tracking branch 'origin/master' into develop

2020-05-15 15:32:43 +02:00 · 2020-05-15 15:32:43 +02:00 · 2b8af776b4
commit 2b8af776b4
parent 591f7dee3f dd4b8cf30d
2 changed files with 2 additions and 2 deletions
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@ -259,7 +259,7 @@ Foam::label Foam::primitiveEntry::startLineNumber() const

    if (tokens.size())
    {
-        tokens.first().lineNumber();
+        return tokens.first().lineNumber();
    }

    return -1;
--- a/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.H
@ -55,7 +55,7 @@ Usage
            (100.0 1.0)
        );

-        patch
+        refValue
        {
            type            fixedValue;
            value           uniform (15 0 0);