zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: correct pow(complex, ..) functions (fixes #1638)

Browse Source 
* Use cast for std::pow(??, z).
* No cast for std::pow(z, ??) - already properly specialized.
This commit is contained in:
Mark Olesen
2020-03-19 10:58:22 +01:00
parent 5f115371d1
commit 179d9fd61d
3 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenFOAM/primitives/complex/complex.H
View File

@ -119,10 +119,10 @@ public:
//- Construct from real and imaginary parts
inline constexpr complex(const scalar r, const scalar i) noexcept;
//- Construct from std::complex
//- Implicit construct from std::complex
inline complex(const std::complex<float>& c);
//- Construct from std::complex
//- Implicit construct from std::complex
inline complex(const std::complex<double>& c);
//- Construct from Istream
@ -178,8 +178,8 @@ public:
// Member Operators
//- Conversion to std::complex
inline operator std::complex<scalar>() const
//- Implicit conversion to std::complex
operator std::complex<scalar>() const
{
return std::complex<scalar>(re, im);
}

31
src/OpenFOAM/primitives/complex/complexI.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2014 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -389,9 +389,9 @@ inline complex operator/(const scalar s, const complex& c)
namespace Foam
{
#define transFunc(func) \
inline complex func(const Foam::complex& z) \
inline complex func(const complex& c) \
{ \
return std:: func (std::complex<scalar>(z)); \
return std:: func (static_cast<std::complex<scalar>>(c)); \
}
transFunc(sqrt)
@ -414,27 +414,34 @@ transFunc(atanh)
// Special treatment for pow()
inline complex pow(const complex& x, const complex& y)
{
return std::pow(std::complex<scalar>(x), std::complex<scalar>(y));
return std::pow
(
static_cast<std::complex<scalar>>(x),
static_cast<std::complex<scalar>>(y)
);
}
// Combinations of complex and real
// Combinations of complex and integral/float
#define powFuncs(type2) \
inline complex pow(const complex& x, const type2& y) \
inline complex pow(const complex& x, const type2 y) \
{ \
return std::pow(std::complex<scalar>(x), scalar(y)); \
return std::pow(static_cast<std::complex<scalar>>(x), y); \
} \
\
inline Foam::complex pow(const type2& x, const complex& y) \
inline complex pow(const type2 x, const complex& y) \
{ \
return std::pow(scalar(x), std::complex<scalar>(y)); \
return std::pow \
( \
static_cast<std::complex<scalar>>(x), \
static_cast<std::complex<scalar>>(y) \
); \
}
powFuncs(float)
powFuncs(double)
powFuncs(int)
powFuncs(long)
powFuncs(float)
powFuncs(double)
inline complex pow3(const complex& c)