From 17bedf58d96ef4fc2819fe37b444b0f34dcf3d2c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 13 Dec 2016 08:09:26 +0100 Subject: [PATCH] STYLE: consistent of enumerations between ensight components --- src/conversion/ensight/mesh/ensightMeshIO.C | 29 ++++++++----------- .../ensight/output/ensightOutputTemplates.C | 5 ++-- .../output/ensightSerialOutputTemplates.C | 3 +- .../ensight/part/ensightPartCells.C | 12 +++----- .../ensight/part/ensightPartFaces.C | 12 +++----- 5 files changed, 25 insertions(+), 36 deletions(-) diff --git a/src/conversion/ensight/mesh/ensightMeshIO.C b/src/conversion/ensight/mesh/ensightMeshIO.C index 406697d942..f8bc9230c2 100644 --- a/src/conversion/ensight/mesh/ensightMeshIO.C +++ b/src/conversion/ensight/mesh/ensightMeshIO.C @@ -452,24 +452,21 @@ void Foam::ensightMesh::writeCellConnectivity ensightCells::NFACED }; - for (int i=0; i < 5; ++i) + for (label typei=0; typei < ensightCells::nTypes; ++typei) { - const ensightCells::elemType& what = oldOrder[i]; + const ensightCells::elemType& what = oldOrder[typei]; writeCellConnectivity(what, ensCells, pointToGlobal, os); } + + return; } - else + + for (label typei=0; typei < ensightCells::nTypes; ++typei) { - const List enums = - ensightCells::elemEnum.enums(); + const ensightCells::elemType what = ensightCells::elemType(typei); - forAllConstIter(List, enums, iter) - { - const ensightCells::elemType what = *iter; - - writeCellConnectivity(what, ensCells, pointToGlobal, os); - } + writeCellConnectivity(what, ensCells, pointToGlobal, os); } } @@ -614,13 +611,11 @@ void Foam::ensightMesh::writeFaceConnectivity const bool raw ) const { - const List enums = ensightFaces::elemEnum.enums(); - if (raw) { - forAllConstIter(List, enums, iter) + for (label typei=0; typei < ensightFaces::nTypes; ++typei) { - const ensightFaces::elemType what = *iter; + const ensightFaces::elemType what = ensightFaces::elemType(typei); writeFaceConnectivity ( @@ -638,9 +633,9 @@ void Foam::ensightMesh::writeFaceConnectivity } else { - forAllConstIter(List, enums, iter) + for (label typei=0; typei < ensightFaces::nTypes; ++typei) { - const ensightFaces::elemType what = *iter; + const ensightFaces::elemType what = ensightFaces::elemType(typei); writeFaceConnectivity ( diff --git a/src/conversion/ensight/output/ensightOutputTemplates.C b/src/conversion/ensight/output/ensightOutputTemplates.C index 4e456fb538..65ce0098af 100644 --- a/src/conversion/ensight/output/ensightOutputTemplates.C +++ b/src/conversion/ensight/output/ensightOutputTemplates.C @@ -101,7 +101,8 @@ bool Foam::ensightOutput::writeFaceField for (label typei=0; typei < ensightFaces::nTypes; ++typei) { - const ensightFaces::elemType what = ensightFaces::elemType(typei); + const ensightFaces::elemType what = + ensightFaces::elemType(typei); writeFieldContent ( @@ -136,7 +137,7 @@ bool Foam::ensightOutput::writeFaceSubField } label start = 0; // start of sublist - for (label typei = 0; typei < ensightFaces::nTypes; ++typei) + for (label typei=0; typei < ensightFaces::nTypes; ++typei) { const ensightFaces::elemType what = ensightFaces::elemType(typei); const label size = ensFaces.faceIds(what).size(); diff --git a/src/conversion/ensight/output/ensightSerialOutputTemplates.C b/src/conversion/ensight/output/ensightSerialOutputTemplates.C index 80ed67b26a..ae15572f4c 100644 --- a/src/conversion/ensight/output/ensightSerialOutputTemplates.C +++ b/src/conversion/ensight/output/ensightSerialOutputTemplates.C @@ -84,7 +84,8 @@ bool Foam::ensightSerialOutput::writeField for (label typei=0; typei < ensightFaces::nTypes; ++typei) { - const ensightFaces::elemType what = ensightFaces::elemType(typei); + const ensightFaces::elemType what = + ensightFaces::elemType(typei); writeFieldContent ( diff --git a/src/conversion/ensight/part/ensightPartCells.C b/src/conversion/ensight/part/ensightPartCells.C index cfd5c9482f..b4fc02ad6a 100644 --- a/src/conversion/ensight/part/ensightPartCells.C +++ b/src/conversion/ensight/part/ensightPartCells.C @@ -263,12 +263,9 @@ void Foam::ensightPartCells::write } // write each element type - const List enums = - ensightCells::elemEnum.enums(); - - forAllConstIter(List, enums, iter) + for (label typei=0; typei < ensightCells::nTypes; ++typei) { - const ensightCells::elemType what = *iter; + const ensightCells::elemType what = ensightCells::elemType(typei); writeConnectivity ( @@ -308,10 +305,9 @@ void Foam::ensightPartCells::dumpInfo(Ostream& os) const os.writeEntry("name", name()); os.writeEntry("size", size()); - const List enums = ensightCells::elemEnum.enums(); - forAllConstIter(List, enums, iter) + for (label typei=0; typei < ensightCells::nTypes; ++typei) { - const ensightCells::elemType what = *iter; + const ensightCells::elemType what = ensightCells::elemType(typei); const labelUList& addr = this->cellIds(what); os.writeKeyword(ensightCells::key(what)); diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C index 5760324826..e0ed197639 100644 --- a/src/conversion/ensight/part/ensightPartFaces.C +++ b/src/conversion/ensight/part/ensightPartFaces.C @@ -226,12 +226,9 @@ void Foam::ensightPartFaces::write } // write part - const List enums = - ensightFaces::elemEnum.enums(); - - forAllConstIter(List, enums, iter) + for (label typei=0; typei < ensightFaces::nTypes; ++typei) { - const ensightFaces::elemType what = *iter; + const ensightFaces::elemType what = ensightFaces::elemType(typei); writeConnectivity ( @@ -273,10 +270,9 @@ void Foam::ensightPartFaces::dumpInfo(Ostream& os) const os.writeEntry("start", start_); os.writeEntry("size", size()); - const List enums = ensightFaces::elemEnum.enums(); - forAllConstIter(List, enums, iter) + for (label typei=0; typei < ensightFaces::nTypes; ++typei) { - const ensightFaces::elemType what = *iter; + const ensightFaces::elemType what = ensightFaces::elemType(typei); const labelUList& addr = this->faceIds(what); os.writeKeyword(ensightFaces::key(what));