From ec20b32ec825d86c3f38c4b22bbd90b75fb334c3 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Mon, 21 Mar 2016 11:08:12 +0000 Subject: [PATCH] Bugfix: Clean up typeid check --- .../engineValveSliding/engineValveSlidingMove.C | 4 ++-- src/engine/engineTopoChangerMesh/layerAR/layerAR.C | 2 +- .../layerARGambit/layerARGambit.C | 2 +- .../engineTopoChangerMesh/pistonLayer/pistonLayer.C | 2 +- .../pistonSliding/pistonSlidingMove.C | 4 ++-- .../simpleTwoStroke/simpleTwoStrokeMove.C | 13 +++++++------ .../thoboisSliding/thoboisSlidingMove.C | 4 ++-- .../verticalValves/verticalValvesMove.C | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C b/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C index 22054edcd..d488f1edd 100644 --- a/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C +++ b/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C @@ -122,7 +122,7 @@ bool Foam::engineValveSliding::attached() const forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { result = result @@ -133,7 +133,7 @@ bool Foam::engineValveSliding::attached() const // Check thal all sliders are in sync (debug only) forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { if ( diff --git a/src/engine/engineTopoChangerMesh/layerAR/layerAR.C b/src/engine/engineTopoChangerMesh/layerAR/layerAR.C index 8aa5fb0f1..c3ea4971f 100644 --- a/src/engine/engineTopoChangerMesh/layerAR/layerAR.C +++ b/src/engine/engineTopoChangerMesh/layerAR/layerAR.C @@ -61,7 +61,7 @@ void Foam::layerAR::makeLayersLive() // Enable layering forAll (topoChanges, modI) { - if (typeid(topoChanges[modI]) == typeid(layerAdditionRemoval)) + if (isA(topoChanges[modI])) { topoChanges[modI].enable(); } diff --git a/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C b/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C index 69c616553..194473b66 100644 --- a/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C +++ b/src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C @@ -54,7 +54,7 @@ void Foam::layerARGambit::makeLayersLive() // Enable layering forAll (topoChanges, modI) { - if (typeid(topoChanges[modI]) == typeid(layerAdditionRemoval)) + if (isA(topoChanges[modI])) { topoChanges[modI].enable(); } diff --git a/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C b/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C index c5df5cf03..b9540ca45 100644 --- a/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C +++ b/src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C @@ -55,7 +55,7 @@ void Foam::pistonLayer::makeLayersLive() // Enable layering forAll (topoChanges, modI) { - if (typeid(topoChanges[modI]) == typeid(layerAdditionRemoval)) + if (isA(topoChanges[modI])) { topoChanges[modI].enable(); } diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C b/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C index 12f24b445..9b8f61336 100644 --- a/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C +++ b/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C @@ -122,7 +122,7 @@ bool Foam::pistonSliding::attached() const forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { result = result @@ -133,7 +133,7 @@ bool Foam::pistonSliding::attached() const // Check thal all sliders are in sync (debug only) forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { if ( diff --git a/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C b/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C index 8b1f13bef..1d9ea4afe 100644 --- a/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C +++ b/src/engine/engineTopoChangerMesh/simpleTwoStroke/simpleTwoStrokeMove.C @@ -33,6 +33,7 @@ License #include "mapPolyMesh.H" // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + void Foam::simpleTwoStroke::makeLayersLive() { const polyTopoChanger& morphs = topoChanger_; @@ -40,11 +41,11 @@ void Foam::simpleTwoStroke::makeLayersLive() // Enable layering forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(layerAdditionRemoval)) + if (isA(morphs[modI])) { morphs[modI].enable(); } - else if (typeid(morphs[modI]) == typeid(slidingInterface)) + else if (isA(morphs[modI])) { morphs[modI].disable(); } @@ -65,11 +66,11 @@ void Foam::simpleTwoStroke::makeSlidersLive() // Enable sliding interface forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(layerAdditionRemoval)) + if (isA(morphs[modI])) { morphs[modI].disable(); } - else if (typeid(morphs[modI]) == typeid(slidingInterface)) + else if (isA(morphs[modI])) { morphs[modI].enable(); } @@ -92,7 +93,7 @@ bool Foam::simpleTwoStroke::attached() const forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { result = result @@ -103,7 +104,7 @@ bool Foam::simpleTwoStroke::attached() const // Check thal all sliders are in sync (debug only) forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { if ( diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C b/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C index ded3deae5..0b3aa0f65 100644 --- a/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C +++ b/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C @@ -122,7 +122,7 @@ bool Foam::thoboisSliding::attached() const forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { result = result @@ -133,7 +133,7 @@ bool Foam::thoboisSliding::attached() const // Check thal all sliders are in sync (debug only) forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { if ( diff --git a/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C b/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C index 85bd01141..f9d1d0f6c 100644 --- a/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C +++ b/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C @@ -123,7 +123,7 @@ bool Foam::verticalValves::attached() const forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { result = result @@ -134,7 +134,7 @@ bool Foam::verticalValves::attached() const // Check thal all sliders are in sync (debug only) forAll (morphs, modI) { - if (typeid(morphs[modI]) == typeid(slidingInterface)) + if (isA(morphs[modI])) { if (