diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index b0a08e6007..953b526f14 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C @@ -41,10 +41,7 @@ Foam::externalCoupledMixedFvPatchField::patchKey = "# Patch: "; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -Foam::fileName Foam::externalCoupledMixedFvPatchField::baseDir -( - const word& patchName -) const +Foam::fileName Foam::externalCoupledMixedFvPatchField::baseDir() const { word regionName(this->dimensionedInternalField().mesh().name()); if (regionName == polyMesh::defaultRegion) @@ -55,21 +52,7 @@ Foam::fileName Foam::externalCoupledMixedFvPatchField::baseDir fileName result(commsDir_/regionName); result.clean(); - if (collate_) - { - return result; - } - else - { - if (patchName == word::null) - { - return fileName(result/this->patch().name()); - } - else - { - return fileName(result/patchName); - } - } + return result; } @@ -97,75 +80,49 @@ void Foam::externalCoupledMixedFvPatchField::setMaster offsets_[i] = 0; } - if (collate_) + // set the master patch + forAll(patchIDs, i) { - // set the master patch - forAll(patchIDs, i) + label patchI = patchIDs[i]; + + patchType& pf = refCast(bf[patchI]); + + offsets_[patchI][Pstream::myProcNo()] = pf.size(); + + if (i == 0) { - label patchI = patchIDs[i]; - - patchType& pf = refCast(bf[patchI]); - - offsets_[patchI][Pstream::myProcNo()] = pf.size(); - - if (i == 0) - { - pf.master() = true; - } - else - { - pf.master() = false; - } + pf.master() = true; } - - // set the patch offsets - int tag = Pstream::msgType() + 1; - forAll(offsets_, i) + else { - Pstream::gatherList(offsets_[i], tag); - Pstream::scatterList(offsets_[i], tag); - } - - label patchOffset = 0; - forAll(offsets_, patchI) - { - label sumOffset = 0; - List