zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Mark Olesen
2020-10-12 12:52:17 +02:00
parent 9c7aa9727a 295eef471d
commit f83bc8c22b
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
META-INFO/api-info
View File

@ -1,2 +1,2 @@
api=2006 api=2006
patch=200924 patch=201012

6
applications/utilities/postProcessing/dataConversion/foamToEnsight/convertLagrangian.H
View File

@ -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 = theseCloudFields[fieldName];
const word& fieldType = fieldIter.val();
IOobject fieldObject IOobject fieldObject
( (

2
modules/OpenQBMM

Submodule modules/OpenQBMM updated: 70d327b25e...cee0fdd438

2
modules/external-solver

Submodule modules/external-solver updated: 302f251828...f3dd3aac02

4
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd. Copyright (C) 2019-2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -86,7 +86,7 @@ Foam::mapPolyMesh::mapPolyMesh(const polyMesh& mesh)
forAll(faceZoneFaceMap_, zonei) forAll(faceZoneFaceMap_, zonei)
{ {
pointZoneMap_[zonei] = identity(mesh.faceZones()[zonei].size()); faceZoneFaceMap_[zonei] = identity(mesh.faceZones()[zonei].size());
} }
forAll(cellZoneMap_, zonei) forAll(cellZoneMap_, zonei)

4
wmake/scripts/have_scotch
View File

@ -90,6 +90,7 @@ search_scotch()
then then
header=$(findFirstFile \ header=$(findFirstFile \
"$prefix/include/$localDir/$incName" \ "$prefix/include/$localDir/$incName" \
"$prefix/include/scotch/$incName" \
"$prefix/include/$incName" \ "$prefix/include/$incName" \
) )
library=$(findExtLib "$libName") library=$(findExtLib "$libName")
@ -201,12 +202,15 @@ search_ptscotch()
header=$(findFirstFile \ header=$(findFirstFile \
"$prefix/include/$FOAM_MPI/$incName" \ "$prefix/include/$FOAM_MPI/$incName" \
"$prefix/include/$localDir/$incName" \ "$prefix/include/$localDir/$incName" \
"$prefix/include/ptscotch/$incName" \
"$prefix/include/scotch/$incName" \
"$prefix/include/$incName" "$prefix/include/$incName"
) )
library="$(findExtLib $FOAM_MPI/$libName $libName)" library="$(findExtLib $FOAM_MPI/$libName $libName)"
elif isSystem "$prefix" elif isSystem "$prefix"
then then
header=$(findFirstFile \ header=$(findFirstFile \
"/usr/local/include/$localDir/$incName" \
"/usr/local/include/ptscotch/$incName" \ "/usr/local/include/ptscotch/$incName" \
"/usr/local/include/scotch/$incName" \ "/usr/local/include/scotch/$incName" \
"/usr/local/include/$incName" \ "/usr/local/include/$incName" \