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/develop' into develop

Browse Source
This commit is contained in:
Mark Olesen
2019-01-07 19:13:18 +01:00
parent c7350f3dd7 7339d6427e
commit 620f5274d0
4 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2019 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -346,7 +346,9 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
( (
this->polyMesh::name(), // region of undecomposed mesh this->polyMesh::name(), // region of undecomposed mesh
facesInstance(), facesInstance(),
processorDb processorDb,
IOobject::NO_READ,
IOobject::AUTO_WRITE
), ),
std::move(facesInstancePoints), std::move(facesInstancePoints),
std::move(procFaces), std::move(procFaces),
@ -361,7 +363,9 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
( (
this->polyMesh::name(), // region of undecomposed mesh this->polyMesh::name(), // region of undecomposed mesh
facesInstance(), facesInstance(),
processorDb processorDb,
IOobject::NO_READ,
IOobject::AUTO_WRITE
), ),
std::move(procPoints), std::move(procPoints),
std::move(procFaces), std::move(procFaces),

3
applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2015-2019 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -166,6 +166,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
// Create dummy mesh. Only used on procs that don't have mesh. // Create dummy mesh. Only used on procs that don't have mesh.
IOobject noReadIO(io); IOobject noReadIO(io);
noReadIO.readOpt() = IOobject::NO_READ; noReadIO.readOpt() = IOobject::NO_READ;
noReadIO.writeOpt() = IOobject::AUTO_WRITE;
fvMesh dummyMesh(noReadIO, Zero, false); fvMesh dummyMesh(noReadIO, Zero, false);
// Add patches // Add patches

11
src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2018-2019 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -68,7 +68,14 @@ Foam::setToFaceZone::setToFaceZone
: :
topoSetSource(mesh), topoSetSource(mesh),
setName_(dict.get<word>("faceSet")) setName_(dict.get<word>("faceSet"))
{} {
if (dict.found("cellSet"))
{
IOWarningInFunction(dict)
<< "Ignoring entry 'cellSet' - maybe use setsToFaceZone instead ?"
<< endl;
}
}
Foam::setToFaceZone::setToFaceZone Foam::setToFaceZone::setToFaceZone

16
src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2018-2019 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -112,8 +112,18 @@ void Foam::setsToFaceZone::applyToSet
{ {
if (verbose_) if (verbose_)
{ {
Info<< " Adding all faces from faceSet " << faceSetName_ if (flip_)
<< " ..." << endl; {
Info<< " Adding all faces from faceSet " << faceSetName_
<< "; orientation pointing into cellSet "
<< cellSetName_ << " ..." << endl;
}
else
{
Info<< " Adding all faces from faceSet " << faceSetName_
<< "; orientation pointing away from cellSet "
<< cellSetName_ << " ..." << endl;
}
} }
// Load the sets // Load the sets