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

applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C

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

applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    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
     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.
         IOobject noReadIO(io);
         noReadIO.readOpt() = IOobject::NO_READ;
+        noReadIO.writeOpt() = IOobject::AUTO_WRITE;
         fvMesh dummyMesh(noReadIO, Zero, false);
 
         // Add patches

src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C

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

src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C

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