From 3b3cffc758012d83306da6790783294b175483d7 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 30 Sep 2020 11:43:20 +0100 Subject: [PATCH 1/5] BUG: mapPolyMesh: incorrect addressing. Fixes #1864 Triggered when running e.g. postProcess --- src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C index 3c1c6b92ae..0bae7021c7 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -86,7 +86,7 @@ Foam::mapPolyMesh::mapPolyMesh(const polyMesh& mesh) forAll(faceZoneFaceMap_, zonei) { - pointZoneMap_[zonei] = identity(mesh.faceZones()[zonei].size()); + faceZoneFaceMap_[zonei] = identity(mesh.faceZones()[zonei].size()); } forAll(cellZoneMap_, zonei) From c1ad4295644e8b38479d00013b14e90e322974b6 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 8 Oct 2020 18:23:54 +0200 Subject: [PATCH 2/5] BUG: parallel foamToEnsight fails depending on lagrangian order (fixes #1873) - the problem arises when output fields are missing on some processors. When the information is combined, the resulting HashTables can have different insertion orders. This poses an issue when there are hash key collisions and thus different chaining. - Use sorted order. --- .../dataConversion/foamToEnsight/convertLagrangian.H | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H index 143f9f226f..101debd6a0 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H @@ -67,10 +67,10 @@ if (doLagrangian) } } - forAllConstIters(theseCloudFields, fieldIter) + // Field order may differ on individual processors, so sort by name + for (const word& fieldName : theseCloudFields.sortedToc()) { - const word& fieldName = fieldIter.key(); - const word& fieldType = fieldIter.val(); + const word& fieldType = theseCloudFields[fieldName]; IOobject fieldObject ( @@ -88,9 +88,13 @@ if (doLagrangian) // but that combination does not work. // So check the header and sync globally + const bool parRun = Pstream::parRun(); + Pstream::parRun() = false; + fieldExists = fieldObject.typeHeaderOk>(false); + Pstream::parRun() = parRun; reduce(fieldExists, orOp()); } From bea6563210721aff44548b07fa934922a3fc3e2c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 12 Oct 2020 10:34:43 +0200 Subject: [PATCH 3/5] CONFIG: ptscotch header not found on ArchLinux (fixes #1877) - on ArchLinux, everything is installed under /usr/include/scotch. The detection script uses SCOTCH_ARCH_PATH as an initial guess for ptscotch as well. However, on the second pass, it has an absolute value ("/usr") instead of a logical one ("scotch-system"). This resulted in the logic for handling scotch+ptscotch subdirs being bypassed. --- wmake/scripts/have_scotch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wmake/scripts/have_scotch b/wmake/scripts/have_scotch index ca00bba6fc..fb7182a0dd 100644 --- a/wmake/scripts/have_scotch +++ b/wmake/scripts/have_scotch @@ -90,6 +90,7 @@ search_scotch() then header=$(findFirstFile \ "$prefix/include/$localDir/$incName" \ + "$prefix/include/scotch/$incName" \ "$prefix/include/$incName" \ ) library=$(findExtLib "$libName") @@ -201,12 +202,15 @@ search_ptscotch() header=$(findFirstFile \ "$prefix/include/$FOAM_MPI/$incName" \ "$prefix/include/$localDir/$incName" \ + "$prefix/include/ptscotch/$incName" \ + "$prefix/include/scotch/$incName" \ "$prefix/include/$incName" ) library="$(findExtLib $FOAM_MPI/$libName $libName)" elif isSystem "$prefix" then header=$(findFirstFile \ + "/usr/local/include/$localDir/$incName" \ "/usr/local/include/ptscotch/$incName" \ "/usr/local/include/scotch/$incName" \ "/usr/local/include/$incName" \ From 6ecb4b69b19370c00c67f2dfa2f049307a35c685 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 12 Oct 2020 11:16:59 +0200 Subject: [PATCH 4/5] SUBMODULE: update for bugfixes, compilation (external-solver, OpenQBMM) --- modules/OpenQBMM | 2 +- modules/external-solver | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/OpenQBMM b/modules/OpenQBMM index 70d327b25e..cee0fdd438 160000 --- a/modules/OpenQBMM +++ b/modules/OpenQBMM @@ -1 +1 @@ -Subproject commit 70d327b25ed66e4a7bead8c046bda4f87225415d +Subproject commit cee0fdd438c3e90403e90abfb23ef6ead3ab171d diff --git a/modules/external-solver b/modules/external-solver index 302f251828..f3dd3aac02 160000 --- a/modules/external-solver +++ b/modules/external-solver @@ -1 +1 @@ -Subproject commit 302f2518284be5a3c796091357a67fb1ae0250cd +Subproject commit f3dd3aac02feac29ccb62fbb147c757b896ea3db From 295eef471d1f7d62714bec039939f4d68199ee01 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 12 Oct 2020 11:17:59 +0200 Subject: [PATCH 5/5] CONFIG: increment patch level --- META-INFO/api-info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/META-INFO/api-info b/META-INFO/api-info index 486ee5c72c..7f0b5c3211 100644 --- a/META-INFO/api-info +++ b/META-INFO/api-info @@ -1,2 +1,2 @@ api=2006 -patch=200924 +patch=201012