From 0750ff309b2336a92fe92e7d0572343cc7466a1f Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 31 Oct 2013 13:58:34 +0000 Subject: [PATCH] ENH: List: Output of zero or single element non-contiguous lists --- src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C | 4 ++-- src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C | 4 ++-- src/OpenFOAM/containers/Lists/UList/UListIO.C | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C index 477d724e6b..42ac74b405 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -198,7 +198,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const FixedList& L) // Write end delimiter os << token::END_BLOCK; } - else if (Size < 11 && contiguous()) + else if (Size <= 1 ||(Size < 11 && contiguous())) { // Write start delimiter os << token::BEGIN_LIST; diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C index ec7efc1f1f..c79fd18150 100644 --- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C +++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ Foam::Ostream& Foam::operator<< // Write end delimiter os << token::END_BLOCK; } - else if (L.size() < 11 && contiguous()) + else if(L.size() <= 1 || (L.size() < 11 && contiguous())) { // Write size and start delimiter os << L.size() << token::BEGIN_LIST; diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C index a8bd6bf1c3..38874ca849 100644 --- a/src/OpenFOAM/containers/Lists/UList/UListIO.C +++ b/src/OpenFOAM/containers/Lists/UList/UListIO.C @@ -92,7 +92,7 @@ Foam::Ostream& Foam::operator<<(Foam::Ostream& os, const Foam::UList& L) // Write end delimiter os << token::END_BLOCK; } - else if (L.size() == 1 || (L.size() < 11 && contiguous())) + else if (L.size() <= 1 || (L.size() < 11 && contiguous())) { // Write size and start delimiter os << L.size() << token::BEGIN_LIST;