From bbf345256fad8038a8cfc5d63dade2ef56fd763b Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 14 Dec 2015 18:00:30 +0000 Subject: [PATCH 1/4] BUG: searchableCone: inside/outside test using wrong sign for gradient --- .../searchableSurface/searchableCone.C | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/src/meshTools/searchableSurface/searchableCone.C b/src/meshTools/searchableSurface/searchableCone.C index b4c212a92b..2ed0c2abf0 100644 --- a/src/meshTools/searchableSurface/searchableCone.C +++ b/src/meshTools/searchableSurface/searchableCone.C @@ -1075,21 +1075,6 @@ void Foam::searchableCone::getVolumeType volType.setSize(points.size()); volType = volumeType::INSIDE; - scalar magDir = magDir_; - - bool swap = false; - bool swapInner = false; - - if (radius1_ > radius2_) - { - swap = true; - } - - if (innerRadius1_ > innerRadius2_) - { - swapInner = true; - } - forAll(points, pointI) { const point& pt = points[pointI]; @@ -1100,15 +1085,7 @@ void Foam::searchableCone::getVolumeType scalar parallel = v & unitDir_; scalar comp = parallel; scalar compInner = parallel; - if (swap) - { - comp = -(magDir-parallel); - } - if (swapInner) - { - compInner = -(magDir-parallel); - } scalar radius_sec = radius1_+comp*(radius2_-radius1_)/magDir_; From 316dc48e37dd1d674bb5ddc49be4a868013321ce Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 15 Dec 2015 14:52:56 +0000 Subject: [PATCH 2/4] STYLE: probes: indentation --- src/sampling/probes/probes.C | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C index 862d487063..078d79673a 100644 --- a/src/sampling/probes/probes.C +++ b/src/sampling/probes/probes.C @@ -132,8 +132,7 @@ void Foam::probes::findElements(const fvMesh& mesh) << " seems to be on multiple domains:" << " cell " << elementList_[probeI] << " on my domain " << Pstream::myProcNo() - << " and cell " << cellI << " on some other domain." - << endl + << " and cell " << cellI << " on some other domain." << endl << "This might happen if the probe location is on" << " a processor patch. Change the location slightly" << " to prevent this." << endl; @@ -146,8 +145,7 @@ void Foam::probes::findElements(const fvMesh& mesh) << " seems to be on multiple domains:" << " cell " << faceList_[probeI] << " on my domain " << Pstream::myProcNo() - << " and face " << faceI << " on some other domain." - << endl + << " and face " << faceI << " on some other domain." << endl << "This might happen if the probe location is on" << " a processor patch. Change the location slightly" << " to prevent this." << endl; From d77f54ab4e947882f9ff1ce809028641b63bf801 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 15 Dec 2015 14:53:16 +0000 Subject: [PATCH 3/4] BUG: ParticleCollector: handle particle not intersecting triangle --- .../ParticleCollector/ParticleCollector.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C index 42d4c7a33d..745fe0b31c 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -379,9 +379,9 @@ void Foam::ParticleCollector::collectParcelConcentricCircles scalar(nSector_)*theta/constant::mathematical::twoPi ); } - } - hitFaceIDs_.append(secI); + hitFaceIDs_.append(secI); + } } From 5949dcac106c521b83498dcebe187a41f4dd57dc Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 15 Dec 2015 15:26:16 +0000 Subject: [PATCH 4/4] BUG: hotBoxes: shell script syntax error --- .../reactingParcelFilmFoam/hotBoxes/patchifyObstacles | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles index bfe0562df1..e184c4dbb5 100755 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles @@ -3,7 +3,7 @@ # ========= | # # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # # \\ / O peration | Version: dev # -# \\ / A nd | Web: www.OpenFOAM.com # +# \\ / A nd | Web: www.OpenFOAM.org # # \\/ M anipulation | # #-----------------------------------------------------------------------------# cd ${0%/*} || exit 1 # Run from this directory @@ -71,7 +71,7 @@ for xi in $(seq 1 1 $nx); do echo "processing cube $n" pad="" - if [ $n -lt 10]; then + if [ $n -lt 10 ]; then pad="0" fi