From eb5223fa30918c41368a4506fc60def8b37e3f4e Mon Sep 17 00:00:00 2001
From: Dmitrij Naumov <dmitrij@naumov.de>
Date: Tue, 30 Sep 2014 21:29:58 +0000
Subject: [PATCH] Reduce indentation by reordering if clause.
---
MeshLib/MeshSurfaceExtraction.cpp | 47 ++++++++++++++++---------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index f758be29af5..2a3c5fc20fe 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -30,37 +30,38 @@ namespace MeshLib {
void MeshSurfaceExtraction::getSurfaceAreaForNodes(const MeshLib::Mesh &mesh, std::vector<double> &node_area_vec)
{
- if (mesh.getDimension() == 2)
+ if (mesh.getDimension() != 2)
{
- double total_area (0);
+ ERR ("Error in MeshSurfaceExtraction::getSurfaceAreaForNodes() - Given mesh is no surface mesh (dimension != 2).");
+ return;
+ }
- // for each node, a vector containing all the element idget every element
- const std::vector<MeshLib::Node*> &nodes = mesh.getNodes();
- const size_t nNodes ( mesh.getNNodes() );
- node_area_vec.reserve(nNodes);
- for (size_t n=0; n<nNodes; ++n)
- {
- double node_area (0);
+ double total_area (0);
- std::vector<MeshLib::Element*> conn_elems = nodes[n]->getElements();
- const size_t nConnElems (conn_elems.size());
+ // for each node, a vector containing all the element idget every element
+ const std::vector<MeshLib::Node*> &nodes = mesh.getNodes();
+ const size_t nNodes ( mesh.getNNodes() );
+ node_area_vec.reserve(nNodes);
+ for (size_t n=0; n<nNodes; ++n)
+ {
+ double node_area (0);
- for (size_t i=0; i<nConnElems; ++i)
- {
- const MeshLib::Element* elem (conn_elems[i]);
- const unsigned nElemParts = (elem->getGeomType() == MeshElemType::TRIANGLE) ? 3 : 4;
- const double area = conn_elems[i]->getContent() / nElemParts;
- node_area += area;
- total_area += area;
- }
+ std::vector<MeshLib::Element*> conn_elems = nodes[n]->getElements();
+ const size_t nConnElems (conn_elems.size());
- node_area_vec.push_back(node_area);
+ for (size_t i=0; i<nConnElems; ++i)
+ {
+ const MeshLib::Element* elem (conn_elems[i]);
+ const unsigned nElemParts = (elem->getGeomType() == MeshElemType::TRIANGLE) ? 3 : 4;
+ const double area = conn_elems[i]->getContent() / nElemParts;
+ node_area += area;
+ total_area += area;
}
- INFO ("Total surface Area: %f", total_area);
+ node_area_vec.push_back(node_area);
}
- else
- ERR ("Error in MeshSurfaceExtraction::getSurfaceAreaForNodes() - Given mesh is no surface mesh (dimension != 2).");
+
+ INFO ("Total surface Area: %f", total_area);
}
MeshLib::Mesh* MeshSurfaceExtraction::getMeshSurface(const MeshLib::Mesh &mesh, const MathLib::Vector3 &dir, double angle, bool keepOriginalNodeIds)
--
GitLab