From c84150908ca263a5d6de18c6dbff34944c92351d Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 11 Sep 2022 15:04:56 +0100 Subject: [PATCH] proper fix --- Common/doc/docmain.hpp | 2 +- SU2_CFD/include/numerics_simd/CNumericsSIMD.hpp | 1 + SU2_CFD/include/numerics_simd/flow/convection/common.hpp | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Common/doc/docmain.hpp b/Common/doc/docmain.hpp index b0b35b8e48d..1e0382e6215 100644 --- a/Common/doc/docmain.hpp +++ b/Common/doc/docmain.hpp @@ -73,7 +73,7 @@ */ /*! - * \defgroup Navier_Stokes_Equations Solving the Navier-Stokes' equations + * \defgroup Navier_Stokes_Equations Solving the Navier-Stokes equations * \brief Group of classes which define the system of Navier-Stokes equations in * three formulations: direct, adjoint, and linearized. */ diff --git a/SU2_CFD/include/numerics_simd/CNumericsSIMD.hpp b/SU2_CFD/include/numerics_simd/CNumericsSIMD.hpp index f22f4a35f15..3339dada920 100644 --- a/SU2_CFD/include/numerics_simd/CNumericsSIMD.hpp +++ b/SU2_CFD/include/numerics_simd/CNumericsSIMD.hpp @@ -58,6 +58,7 @@ using SparseMatrixType = CSysMatrix; /*! * \class CNumericsSIMD + * \ingroup ConvDiscr * \brief Base class to define the interface. * \note See CNumericsEmptyDecorator. */ diff --git a/SU2_CFD/include/numerics_simd/flow/convection/common.hpp b/SU2_CFD/include/numerics_simd/flow/convection/common.hpp index 99b6455755c..8206f333855 100644 --- a/SU2_CFD/include/numerics_simd/flow/convection/common.hpp +++ b/SU2_CFD/include/numerics_simd/flow/convection/common.hpp @@ -132,8 +132,8 @@ FORCEINLINE CPair reconstructPrimitives(Int iEdge, Int iPoint, Int break; } /*--- Detect a non-physical reconstruction based on negative pressure or density. ---*/ - const Double neg_p_or_rho = max(min(V.i.pressure(), V.j.pressure()) < 0.0, - min(V.i.density(), V.j.density()) < 0.0); + const Double neg_p_or_rho = VecExpr::max(VecExpr::min(V.i.pressure(), V.j.pressure()) < 0.0, + VecExpr::min(V.i.density(), V.j.density()) < 0.0); /*--- Test the sign of the Roe-averaged speed of sound. ---*/ const Double R = sqrt(V.j.density() / V.i.density()); /*--- Delay dividing by R+1 until comparing enthalpy and velocity magnitude. ---*/ @@ -147,7 +147,7 @@ FORCEINLINE CPair reconstructPrimitives(Int iEdge, Int iPoint, Int const Double neg_sound_speed = enthalpy * (R+1) < 0.5 * v_squared; /*--- Revert to first order if the state is non-physical. ---*/ - Double bad_recon = max(neg_p_or_rho, neg_sound_speed); + Double bad_recon = VecExpr::max(neg_p_or_rho, neg_sound_speed); /*--- Handle SIMD dimensions 1 by 1. ---*/ for (size_t k = 0; k < Double::Size; ++k) { bad_recon[k] = solution.UpdateNonPhysicalEdgeCounter(iEdge[k], bad_recon[k]);