diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C b/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C index 25f26cbe63..e1de8f6446 100644 --- a/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C +++ b/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C @@ -35,7 +35,7 @@ namespace Foam // A limited selection of actions const Enum actionNames ({ - { topoSetSource::NEW, "use" }, + { topoSetSource::NEW, "use" }, // Reuse NEW for "use" action name { topoSetSource::ADD, "add" }, { topoSetSource::SUBTRACT, "subtract" }, { topoSetSource::SUBSET, "subset" }, @@ -74,7 +74,7 @@ bool Foam::functionObjects::ensightWrite::updateSubset const dictionary& dict = dEntry.dict(); - auto action = actionNames.get("action", dict); + const auto action = actionNames.get("action", dict); // Handle manually if (action == topoSetSource::INVERT) @@ -95,19 +95,16 @@ bool Foam::functionObjects::ensightWrite::updateSubset { case topoSetSource::NEW: // "use" case topoSetSource::ADD: + case topoSetSource::SUBTRACT: if (topoSetSource::NEW == action) { - // NEW (use) = CLEAR + ADD (ie, only use this selection) + // "use": only use this selection (clear + ADD) + // NEW is handled like ADD in applyToSet() cellsToSelect.reset(); - action = topoSetSource::ADD; } source->applyToSet(action, cellsToSelect); break; - case topoSetSource::SUBTRACT: - source->applyToSet(action, cellsToSelect); - break; - case topoSetSource::SUBSET: { cellBitSet other(mesh, false); @@ -132,41 +129,6 @@ bool Foam::functionObjects::ensightWrite::updateSubset } -#if 0 -Foam::labelList Foam::functionObjects::ensightWrite::getSelectedPatches -( - const polyBoundaryMesh& patches -) const -{ - DynamicList