From 6c8b0ea1568984f67bf89ed2f9af3020859141ee Mon Sep 17 00:00:00 2001 From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de> Date: Fri, 5 Oct 2012 13:04:35 +0000 Subject: [PATCH] Changed constexpr in const, otherwise clang complained with an error. (reviewed by pnuske, I toke note of the protest) git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9223 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/material/components/mesitylene.hh | 2 +- dumux/material/components/xylene.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh index bfdcce69b1..29458d55a9 100644 --- a/dumux/material/components/mesitylene.hh +++ b/dumux/material/components/mesitylene.hh @@ -143,7 +143,7 @@ public: constexpr Scalar p_crit = criticalPressure(); // Chen method, eq. 7-11.4 (at boiling) - constexpr Scalar DH_v_boil = Consts::R * T_crit * Tr1 + const Scalar DH_v_boil = Consts::R * T_crit * Tr1 * (3.978 * Tr1 - 3.958 + 1.555*std::log(p_crit * 1e-5 /*Pa->bar*/ ) ) / (1.07 - Tr1); /* [J/mol] */ diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh index f1db360384..fb4ac9f41a 100644 --- a/dumux/material/components/xylene.hh +++ b/dumux/material/components/xylene.hh @@ -188,7 +188,7 @@ public: constexpr Scalar p_crit = criticalPressure(); // Chen method, eq. 7-11.4 (at boiling) - constexpr Scalar DH_v_boil = Consts::R * T_crit * Tr1 + const Scalar DH_v_boil = Consts::R * T_crit * Tr1 * (3.978 * Tr1 - 3.958 + 1.555*std::log(p_crit * 1e-5 /*Pa->bar*/ ) ) / (1.07 - Tr1); /* [J/mol] */ -- GitLab