From 5fcfbce8dc8f62bbb2608269251c449f3c0e3b0e Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 12 Aug 2021 12:05:58 +0100 Subject: [PATCH] sampling: Reset counters on particles that are used without clouds --- src/sampling/sampledSet/lineFace/lineFace.C | 4 +++- src/sampling/sampledSet/lineUniform/lineUniform.C | 3 ++- src/sampling/sampledSet/points/points.C | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/sampling/sampledSet/lineFace/lineFace.C b/src/sampling/sampledSet/lineFace/lineFace.C index bffa5f1c1f..0923f8011c 100644 --- a/src/sampling/sampledSet/lineFace/lineFace.C +++ b/src/sampling/sampledSet/lineFace/lineFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,6 +140,8 @@ void Foam::sampledSets::lineFace::calcSamples const vector s = sign*(end - start)*(1 - dist/mag(end - start)); + sampleParticle.reset(); + if ( (!first && sampleParticle.onBoundaryFace()) diff --git a/src/sampling/sampledSet/lineUniform/lineUniform.C b/src/sampling/sampledSet/lineUniform/lineUniform.C index 0d8901aebf..6d8e23a743 100644 --- a/src/sampling/sampledSet/lineUniform/lineUniform.C +++ b/src/sampling/sampledSet/lineUniform/lineUniform.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,6 +83,7 @@ void Foam::sampledSets::lineUniform::calcSamples if (++ sampleI < nPoints_) { sampleT = scalar(sampleI)/(nPoints_ - 1); + sampleParticle.reset(); sampleParticle.track((end_ - start_)/(nPoints_ - 1), 0); } } diff --git a/src/sampling/sampledSet/points/points.C b/src/sampling/sampledSet/points/points.C index 7e1796f0c7..1f72338265 100644 --- a/src/sampling/sampledSet/points/points.C +++ b/src/sampling/sampledSet/points/points.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,6 +112,7 @@ void Foam::sampledSets::points::calcSamplesOrdered { const vector s = points_[sampleI] - points_[sampleI - 1]; sampleDist += mag(s); + sampleParticle.reset(); sampleParticle.track(s, 0); } }