From 8395d69cdb43fb0c0a3d7bf7627c744776aa8baf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 11 May 2020 16:21:00 +0200 Subject: [PATCH 1/3] BUG: Pair sort on construct did the opposite (fixes #1701) --- src/OpenFOAM/primitives/Pair/PairI.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/primitives/Pair/PairI.H b/src/OpenFOAM/primitives/Pair/PairI.H index e228caf09c..7b72921b42 100644 --- a/src/OpenFOAM/primitives/Pair/PairI.H +++ b/src/OpenFOAM/primitives/Pair/PairI.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -89,7 +89,7 @@ inline Foam::Pair::Pair(const FixedList& list) template inline Foam::Pair::Pair(const T& f, const T& s, const bool doSort) { - if (doSort && f < s) + if (doSort && s < f) { first() = s; second() = f; From 90e21679b31c65aedc45460356617480130da841 Mon Sep 17 00:00:00 2001 From: Andrew Heather <> Date: Tue, 12 May 2020 15:27:26 +0100 Subject: [PATCH 2/3] DOC: Corrected header documentation --- .../derived/scaledFixedValue/scaledFixedValueFvPatchField.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.H index 9c5ea24e80..caaa5a8e74 100644 --- 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); From dd4b8cf30db8b7defc6f139de5e311ccb49d3418 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 14 May 2020 17:18:00 +0200 Subject: [PATCH 3/3] BUG: incorrect startLineNumber for primitiveEntry (fixes #1706) --- src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C index c7402d1322..95eab69745 100644 --- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C +++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C @@ -151,7 +151,7 @@ Foam::label Foam::primitiveEntry::startLineNumber() const if (tokens.size()) { - tokens.first().lineNumber(); + return tokens.first().lineNumber(); } return -1;