From 3906e98dee72df002de85faa2174e6adef132240 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 27 Jan 2015 12:14:07 +0000 Subject: [PATCH] Formatting --- src/mesh/blockMesh/block/blockCreate.C | 16 ++++++------- src/mesh/blockMesh/blockMesh/blockMesh.H | 2 +- .../blockMesh/blockMesh/blockMeshCreate.C | 23 ++++++++++--------- src/mesh/blockMesh/blockMesh/blockMeshMerge.C | 2 +- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/mesh/blockMesh/block/blockCreate.C b/src/mesh/blockMesh/block/blockCreate.C index 2aec91b94..fa1840b02 100644 --- a/src/mesh/blockMesh/block/blockCreate.C +++ b/src/mesh/blockMesh/block/blockCreate.C @@ -270,14 +270,14 @@ void Foam::block::createCells() const { cells_[cellNo].setSize(8); - cells_[cellNo][0] = vtxLabel(i, j, k); - cells_[cellNo][1] = vtxLabel(i+1, j, k); - cells_[cellNo][2] = vtxLabel(i+1, j+1, k); - cells_[cellNo][3] = vtxLabel(i, j+1, k); - cells_[cellNo][4] = vtxLabel(i, j, k+1); - cells_[cellNo][5] = vtxLabel(i+1, j, k+1); - cells_[cellNo][6] = vtxLabel(i+1, j+1, k+1); - cells_[cellNo][7] = vtxLabel(i, j+1, k+1); + cells_[cellNo][0] = vtxLabel(i, j, k); + cells_[cellNo][1] = vtxLabel(i+1, j, k); + cells_[cellNo][2] = vtxLabel(i+1, j+1, k); + cells_[cellNo][3] = vtxLabel(i, j+1, k); + cells_[cellNo][4] = vtxLabel(i, j, k+1); + cells_[cellNo][5] = vtxLabel(i+1, j, k+1); + cells_[cellNo][6] = vtxLabel(i+1, j+1, k+1); + cells_[cellNo][7] = vtxLabel(i, j+1, k+1); cellNo++; } } diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.H b/src/mesh/blockMesh/blockMesh/blockMesh.H index fe4abfb4f..689ab3634 100644 --- a/src/mesh/blockMesh/blockMesh/blockMesh.H +++ b/src/mesh/blockMesh/blockMesh/blockMesh.H @@ -202,7 +202,7 @@ public: void clearGeom(); //- Enable/disable verbose information about the progress - static void verbose(const bool on=true); + static void verbose(const bool on = true); // Write diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C index 501870f2e..d5f6b41a8 100644 --- a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C +++ b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C @@ -54,23 +54,23 @@ void Foam::blockMesh::createPoints() const label v0 = blocks[blockI].vtxLabel(0, 0, 0); label vi1 = blocks[blockI].vtxLabel(1, 0, 0); - scalar diStart = mag(blockPoints[vi1]-blockPoints[v0]); + scalar diStart = mag(blockPoints[vi1] - blockPoints[v0]); - label vinM1 = blocks[blockI].vtxLabel(density.x()-1, 0, 0); + label vinM1 = blocks[blockI].vtxLabel(density.x() - 1, 0, 0); label vin = blocks[blockI].vtxLabel(density.x(), 0, 0); - scalar diFinal = mag(blockPoints[vin]-blockPoints[vinM1]); + scalar diFinal = mag(blockPoints[vin] - blockPoints[vinM1]); label vj1 = blocks[blockI].vtxLabel(0, 1, 0); - scalar djStart = mag(blockPoints[vj1]-blockPoints[v0]); - label vjnM1 = blocks[blockI].vtxLabel(0, density.y()-1, 0); + scalar djStart = mag(blockPoints[vj1] - blockPoints[v0]); + label vjnM1 = blocks[blockI].vtxLabel(0, density.y() - 1, 0); label vjn = blocks[blockI].vtxLabel(0, density.y(), 0); - scalar djFinal = mag(blockPoints[vjn]-blockPoints[vjnM1]); + scalar djFinal = mag(blockPoints[vjn] - blockPoints[vjnM1]); label vk1 = blocks[blockI].vtxLabel(0, 0, 1); - scalar dkStart = mag(blockPoints[vk1]-blockPoints[v0]); - label vknM1 = blocks[blockI].vtxLabel(0, 0, density.z()-1); + scalar dkStart = mag(blockPoints[vk1] - blockPoints[v0]); + label vknM1 = blocks[blockI].vtxLabel(0, 0, density.z() - 1); label vkn = blocks[blockI].vtxLabel(0, 0, density.z()); - scalar dkFinal = mag(blockPoints[vkn]-blockPoints[vknM1]); + scalar dkFinal = mag(blockPoints[vkn] - blockPoints[vknM1]); Info<< " Block " << blockI << " cell size :" << nl << " i : " << scaleFactor_*diStart << " .. " @@ -222,13 +222,13 @@ Foam::faceList Foam::blockMesh::createPatchFaces + blockOffsets_[blockI] ]; - if (quadFace[nUnique] != quadFace[nUnique-1]) + if (quadFace[nUnique] != quadFace[nUnique - 1]) { nUnique++; } } - if (quadFace[nUnique-1] == quadFace[0]) + if (quadFace[nUnique - 1] == quadFace[0]) { nUnique--; } @@ -290,4 +290,5 @@ void Foam::blockMesh::clearGeom() } } + // ************************************************************************* // diff --git a/src/mesh/blockMesh/blockMesh/blockMeshMerge.C b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C index 402b9ef18..d410dc4a1 100644 --- a/src/mesh/blockMesh/blockMesh/blockMeshMerge.C +++ b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C @@ -579,7 +579,7 @@ void Foam::blockMesh::calcMergeInfo() } nPoints_ = newPointLabel; - } + // ************************************************************************* //