From ef205aa8b7280e33955a86366a4a115197d367e7 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 6 Jun 2018 16:45:50 +0200
Subject: [PATCH] [quad] use capital first letter, simplify test definition
---
dumux/common/quad.hh | 64 +++++++++----------
.../1p/implicit/incompressible/CMakeLists.txt | 2 +-
.../1p/implicit/incompressible/problem.hh | 2 +-
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/dumux/common/quad.hh b/dumux/common/quad.hh
index b5ff79d19e..00118db02a 100644
--- a/dumux/common/quad.hh
+++ b/dumux/common/quad.hh
@@ -37,7 +37,7 @@ extern "C" {
namespace Dumux {
-using quad = __float128;
+using Quad = __float128;
} // namespace Dumux
@@ -46,7 +46,7 @@ using quad = __float128;
namespace Dune {
template <>
-struct IsNumber<Dumux::quad> : std::true_type {};
+struct IsNumber<Dumux::Quad> : std::true_type {};
} // namespace Dune
@@ -54,16 +54,16 @@ namespace std {
// provide the numeric limits for the quad precision type
template <>
-class numeric_limits<Dumux::quad>
+class numeric_limits<Dumux::Quad>
{
public:
static constexpr bool is_specialized = true;
- static constexpr Dumux::quad min() noexcept
+ static constexpr Dumux::Quad min() noexcept
{ return FLT128_MIN; }
- static constexpr Dumux::quad max() noexcept
+ static constexpr Dumux::Quad max() noexcept
{ return FLT128_MAX; }
- static constexpr Dumux::quad lowest() noexcept
+ static constexpr Dumux::Quad lowest() noexcept
{ return -FLT128_MAX; }
// number of bits in mantissa
@@ -76,9 +76,9 @@ public:
static constexpr bool is_integer = false;
static constexpr bool is_exact = false;
static constexpr int radix = 0;
- static constexpr Dumux::quad epsilon() noexcept
+ static constexpr Dumux::Quad epsilon() noexcept
{ return FLT128_EPSILON; }
- static constexpr Dumux::quad round_error() noexcept
+ static constexpr Dumux::Quad round_error() noexcept
{ return 0.5; }
static constexpr int min_exponent = FLT128_MIN_EXP;
@@ -91,13 +91,13 @@ public:
static constexpr bool has_signaling_NaN = true;
static constexpr float_denorm_style has_denorm = denorm_present;
static constexpr bool has_denorm_loss = false;
- static constexpr Dumux::quad infinity() noexcept
+ static constexpr Dumux::Quad infinity() noexcept
{ return __builtin_huge_valq(); };
- static constexpr Dumux::quad quiet_NaN() noexcept
+ static constexpr Dumux::Quad quiet_NaN() noexcept
{ return __builtin_nan(""); }
- static constexpr Dumux::quad signaling_NaN() noexcept
+ static constexpr Dumux::Quad signaling_NaN() noexcept
{ return __builtin_nans(""); }
- static constexpr Dumux::quad denorm_min() noexcept
+ static constexpr Dumux::Quad denorm_min() noexcept
{ return FLT128_DENORM_MIN; }
static constexpr bool is_iec559 = true;
@@ -116,12 +116,12 @@ public:
// is used for the lookup. Putting these functions into any other namespace yields compiler errors.
namespace std {
-inline ostream& operator<<(ostream& os, const Dumux::quad &val)
+inline ostream& operator<<(ostream& os, const Dumux::Quad &val)
{
return (os << double(val));
}
-inline istream& operator>>(istream& is, Dumux::quad &val)
+inline istream& operator>>(istream& is, Dumux::Quad &val)
{
double tmp;
istream &ret = (is >> tmp);
@@ -129,59 +129,59 @@ inline istream& operator>>(istream& is, Dumux::quad &val)
return ret;
}
-inline Dumux::quad abs(Dumux::quad val)
+inline Dumux::Quad abs(Dumux::Quad val)
{ return (val < 0)?-val:val; }
-inline Dumux::quad floor(Dumux::quad val)
+inline Dumux::Quad floor(Dumux::Quad val)
{ return floorq(val); }
-inline Dumux::quad ceil(Dumux::quad val)
+inline Dumux::Quad ceil(Dumux::Quad val)
{ return ceilq(val); }
-inline Dumux::quad max(Dumux::quad a, Dumux::quad b)
+inline Dumux::Quad max(Dumux::Quad a, Dumux::Quad b)
{ return (a>b)?a:b; }
-inline Dumux::quad min(Dumux::quad a, Dumux::quad b)
+inline Dumux::Quad min(Dumux::Quad a, Dumux::Quad b)
{ return (a<b)?a:b; }
-inline Dumux::quad sqrt(Dumux::quad val)
+inline Dumux::Quad sqrt(Dumux::Quad val)
{ return sqrtq(val); }
template <class ExpType>
-inline Dumux::quad pow(Dumux::quad base, ExpType exp)
+inline Dumux::Quad pow(Dumux::Quad base, ExpType exp)
{ return powq(base, exp); }
-inline Dumux::quad exp(Dumux::quad val)
+inline Dumux::Quad exp(Dumux::Quad val)
{ return expq(val); }
-inline Dumux::quad log(Dumux::quad val)
+inline Dumux::Quad log(Dumux::Quad val)
{ return logq(val); }
-inline Dumux::quad sin(Dumux::quad val)
+inline Dumux::Quad sin(Dumux::Quad val)
{ return sinq(val); }
-inline Dumux::quad cos(Dumux::quad val)
+inline Dumux::Quad cos(Dumux::Quad val)
{ return cosq(val); }
-inline Dumux::quad tan(Dumux::quad val)
+inline Dumux::Quad tan(Dumux::Quad val)
{ return tanq(val); }
-inline Dumux::quad atan(Dumux::quad val)
+inline Dumux::Quad atan(Dumux::Quad val)
{ return atanq(val); }
-inline Dumux::quad atan2(Dumux::quad a, Dumux::quad b)
+inline Dumux::Quad atan2(Dumux::Quad a, Dumux::Quad b)
{ return atan2q(a, b); }
-inline bool signbit(Dumux::quad val)
+inline bool signbit(Dumux::Quad val)
{ return signbitq(val); }
-inline bool isfinite(Dumux::quad val)
+inline bool isfinite(Dumux::Quad val)
{ return !isnanq(val) && !isinfq(val); }
-inline bool isnan(Dumux::quad val)
+inline bool isnan(Dumux::Quad val)
{ return isnanq(val); }
-inline bool isinf(Dumux::quad val)
+inline bool isinf(Dumux::Quad val)
{ return isinfq(val); }
} // namespace std
diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
index 39b6abfc0d..3fd0f23700 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
@@ -15,12 +15,12 @@ dune_add_test(NAME test_1p_incompressible_tpfa_quad
SOURCES test_1pfv.cc
CMAKE_GUARD HAVE_QUAD
COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfaQuad NUMDIFFMETHOD=DiffMethod::analytic
+ LINK_LIBRARIES ${QUADMATH_LIBRARIES}
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestcctpfaquad-00001.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_tpfa_quad test_1p.input -Problem.Name 1ptestcctpfaquad")
-target_link_libraries(test_1p_incompressible_tpfa_quad ${QUADMATH_LIBRARIES})
# using mpfa and analytical Jacobian
dune_add_test(NAME test_1p_incompressible_mpfa
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
index 32d568c270..f7d379dc55 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -77,7 +77,7 @@ SET_BOOL_PROP(OnePIncompressible, EnableFVGridGeometryCache, false);
// define a TypeTag for a quad precision test
#if HAVE_QUAD
NEW_TYPE_TAG(OnePIncompressibleTpfaQuad, INHERITS_FROM(OnePIncompressibleTpfa));
-SET_TYPE_PROP(OnePIncompressibleTpfaQuad, Scalar, quad);
+SET_TYPE_PROP(OnePIncompressibleTpfaQuad, Scalar, Quad);
#endif
} // end namespace Properties
/*!
--
GitLab