From 34b1f1185b248fd7c9feb6fdcd385eadd195d87d Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Fri, 12 Apr 2019 01:44:17 +0200
Subject: [PATCH] Reindent the code after name change
---
src/mesh/GmshReader.cpp | 3 ++-
src/mesh/MeshNodeBoundary.hpp | 6 +++---
src/mesh/Synchronizer.hpp | 7 +++----
src/scheme/AcousticSolver.hpp | 15 ++++++---------
src/scheme/FiniteVolumesEulerUnknowns.hpp | 10 ++++------
src/utils/BuildInfo.cpp | 4 ++--
src/utils/PugsAssert.hpp | 7 +++----
7 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/src/mesh/GmshReader.cpp b/src/mesh/GmshReader.cpp
index 563048abc..3dcbb21df 100644
--- a/src/mesh/GmshReader.cpp
+++ b/src/mesh/GmshReader.cpp
@@ -727,7 +727,8 @@ GmshReader::__readElements2_2()
// throw ErrorHandler(__FILE__,__LINE__,
// "reading file '"+m_filename
// +"': unknown element type
- // '"+std::to_string(elementType)+"'", ErrorHandler::normal);
+ // '"+std::to_string(elementType)+"'",
+ // ErrorHandler::normal);
// }
// int elementTypeNumber = 0;
diff --git a/src/mesh/MeshNodeBoundary.hpp b/src/mesh/MeshNodeBoundary.hpp
index 2e5a41610..9cc040a4a 100644
--- a/src/mesh/MeshNodeBoundary.hpp
+++ b/src/mesh/MeshNodeBoundary.hpp
@@ -96,9 +96,9 @@ class MeshFlatNodeBoundary : public MeshNodeBoundary<Dimension>
template <typename MeshType>
PUGS_INLINE void _checkBoundaryIsFlat(const TinyVector<2, double>& normal,
- const TinyVector<2, double>& xmin,
- const TinyVector<2, double>& xmax,
- const MeshType& mesh) const;
+ const TinyVector<2, double>& xmin,
+ const TinyVector<2, double>& xmax,
+ const MeshType& mesh) const;
template <typename MeshType>
PUGS_INLINE Rd _getOutgoingNormal(const MeshType& mesh);
diff --git a/src/mesh/Synchronizer.hpp b/src/mesh/Synchronizer.hpp
index 469f0a299..ed378365d 100644
--- a/src/mesh/Synchronizer.hpp
+++ b/src/mesh/Synchronizer.hpp
@@ -179,10 +179,9 @@ class Synchronizer
for (size_t i_rank = 0; i_rank < parallel::size(); ++i_rank) {
const auto& requested_item_info_from_rank = requested_item_info[i_rank];
const auto& requested_data = requested_data_list[i_rank];
- parallel_for(
- requested_item_info_from_rank.size(), PUGS_LAMBDA(size_t i) {
- item_value[requested_item_info_from_rank[i]] = requested_data[i];
- });
+ parallel_for(requested_item_info_from_rank.size(), PUGS_LAMBDA(size_t i) {
+ item_value[requested_item_info_from_rank[i]] = requested_data[i];
+ });
}
}
diff --git a/src/scheme/AcousticSolver.hpp b/src/scheme/AcousticSolver.hpp
index d2bf0bf93..caf300bd8 100644
--- a/src/scheme/AcousticSolver.hpp
+++ b/src/scheme/AcousticSolver.hpp
@@ -167,9 +167,8 @@ class AcousticSolver
{
inverse(Ar, m_inv_Ar);
const NodeValue<const Rdd> invAr = m_inv_Ar;
- parallel_for(m_mesh.numberOfNodes(), PUGS_LAMBDA(const NodeId& r) {
- m_ur[r] = invAr[r] * br[r];
- });
+ parallel_for(m_mesh.numberOfNodes(),
+ PUGS_LAMBDA(const NodeId& r) { m_ur[r] = invAr[r] * br[r]; });
return m_ur;
}
@@ -196,9 +195,8 @@ class AcousticSolver
void
inverse(const NodeValue<const Rdd>& A, NodeValue<Rdd>& inv_A) const
{
- parallel_for(m_mesh.numberOfNodes(), PUGS_LAMBDA(const NodeId& r) {
- inv_A[r] = ::inverse(A[r]);
- });
+ parallel_for(m_mesh.numberOfNodes(),
+ PUGS_LAMBDA(const NodeId& r) { inv_A[r] = ::inverse(A[r]); });
}
PUGS_INLINE
@@ -319,9 +317,8 @@ class AcousticSolver
});
NodeValue<Rd> mutable_xr = m_mesh.mutableXr();
- parallel_for(m_mesh.numberOfNodes(), PUGS_LAMBDA(const NodeId& r) {
- mutable_xr[r] += dt * ur[r];
- });
+ parallel_for(m_mesh.numberOfNodes(),
+ PUGS_LAMBDA(const NodeId& r) { mutable_xr[r] += dt * ur[r]; });
m_mesh_data.updateAllData();
const CellValue<const double> mj = unknowns.mj();
diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp
index 9008516d7..52d4ca15a 100644
--- a/src/scheme/FiniteVolumesEulerUnknowns.hpp
+++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp
@@ -173,13 +173,11 @@ class FiniteVolumesEulerUnknowns
});
const CellValue<const double>& Vj = m_mesh_data.Vj();
- parallel_for(m_mesh.numberOfCells(), PUGS_LAMBDA(const CellId& j) {
- m_mj[j] = m_rhoj[j] * Vj[j];
- });
+ parallel_for(m_mesh.numberOfCells(),
+ PUGS_LAMBDA(const CellId& j) { m_mj[j] = m_rhoj[j] * Vj[j]; });
- parallel_for(m_mesh.numberOfCells(), PUGS_LAMBDA(const CellId& j) {
- m_inv_mj[j] = 1. / m_mj[j];
- });
+ parallel_for(m_mesh.numberOfCells(),
+ PUGS_LAMBDA(const CellId& j) { m_inv_mj[j] = 1. / m_mj[j]; });
}
FiniteVolumesEulerUnknowns(const MeshDataType& mesh_data)
diff --git a/src/utils/BuildInfo.cpp b/src/utils/BuildInfo.cpp
index 1c6136bbf..636ef9efb 100644
--- a/src/utils/BuildInfo.cpp
+++ b/src/utils/BuildInfo.cpp
@@ -18,8 +18,8 @@ std::string
BuildInfo::compiler()
{
std::stringstream compiler_info;
- compiler_info << PUGS_BUILD_COMPILER << " ("
- << PUGS_BUILD_COMPILER_VERSION << ")" << std::ends;
+ compiler_info << PUGS_BUILD_COMPILER << " (" << PUGS_BUILD_COMPILER_VERSION
+ << ")" << std::ends;
return compiler_info.str();
}
diff --git a/src/utils/PugsAssert.hpp b/src/utils/PugsAssert.hpp
index 88b748f49..b0f260382 100644
--- a/src/utils/PugsAssert.hpp
+++ b/src/utils/PugsAssert.hpp
@@ -62,8 +62,7 @@ class AssertError
};
PRAGMA_DIAGNOSTIC_IGNORED_WATTRIBUTES
-inline bool __attribute__((analyzer_noreturn))
-_pugs_assert(const bool& assert)
+inline bool __attribute__((analyzer_noreturn)) _pugs_assert(const bool& assert)
{
return assert;
}
@@ -73,7 +72,7 @@ PRAGMA_DIAGNOSTIC_POP
// Useless test is there to check syntax even in optimized mode. Costs nothing.
#define Assert(assertion, ...) \
- if (not _pugs_assert(assertion)) { \
+ if (not _pugs_assert(assertion)) { \
using vargs_t = decltype(std::make_tuple(__VA_ARGS__)); \
static_assert(std::tuple_size_v<vargs_t> <= 1, "too many arguments"); \
}
@@ -81,7 +80,7 @@ PRAGMA_DIAGNOSTIC_POP
#else // NDEBUG
#define Assert(assertion, ...) \
- if (not _pugs_assert(assertion)) { \
+ if (not _pugs_assert(assertion)) { \
using vargs_t = decltype(std::make_tuple(__VA_ARGS__)); \
static_assert(std::tuple_size_v<vargs_t> <= 1, "too many arguments"); \
if constexpr (std::tuple_size_v<vargs_t> == 0) { \
--
GitLab