From 9e02f8871a2d7913528d250036a1feea5c1e3e42 Mon Sep 17 00:00:00 2001 From: Josh Kelly Date: Thu, 20 Apr 2023 10:12:47 +0100 Subject: [PATCH] SU2_OMP_PARALLEL formatting in CTurboOutput --- .clang-format | 2 +- SU2_CFD/src/output/CTurboOutput.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index cb363900eb6..211546de046 100644 --- a/.clang-format +++ b/.clang-format @@ -2,4 +2,4 @@ BasedOnStyle: Google PointerAlignment: Left DerivePointerAlignment: false ColumnLimit: 120 -SortIncludes: Never +SortIncludes: false diff --git a/SU2_CFD/src/output/CTurboOutput.cpp b/SU2_CFD/src/output/CTurboOutput.cpp index fde9360eeb9..b9d85685b64 100644 --- a/SU2_CFD/src/output/CTurboOutput.cpp +++ b/SU2_CFD/src/output/CTurboOutput.cpp @@ -26,6 +26,7 @@ */ #include "../../include/output/CTurboOutput.hpp" +#include "Common/include/parallelization/omp_structure.hpp" CTurbomachineryPrimitiveState::CTurbomachineryPrimitiveState() { Density = Pressure = TangVelocity = 0.0; } CTurbomachineryPrimitiveState::CTurbomachineryPrimitiveState(vector TurboPrimitive, unsigned short nDim, @@ -176,7 +177,7 @@ CTurboOutput::CTurboOutput(const CConfig& config, const CGeometry& geometry, CFl // TODO: I have a feeling this should not be in such a for loop, to be discussed with Salvo (Nitish) SU2_OMP_PARALLEL { - const int thread = omp_get_thread_num(); + // const int thread = omp_get_thread_num(); /* Switch between the Turbomachinery Performance Kind */ // TODO: This needs to be fixed @@ -202,6 +203,7 @@ CTurboOutput::CTurboOutput(const CConfig& config, const CGeometry& geometry, CFl break; } } + END_SU2_OMP_PARALLEL } BladesPerformances.push_back(bladeSpanPerformances); }