From 8dc37158fe05cb1cbbb99a464ab3aac23aa04532 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 22 Nov 2012 09:49:07 +0000
Subject: [PATCH] Fixed DuMuX for use with Clang. (reviewed by pnuske)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9624 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/material/components/mesitylene.hh | 2 +-
dumux/material/components/xylene.hh | 2 +-
test/boxmodels/2p2c/injectionspatialparams.hh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index c956509c5f..a0ded2783d 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -124,7 +124,7 @@ public:
// fit over a certain temperature range. This suggests choosing an interval of integration being in the actual fit range.
// I.e. choosing T=273.15K as reference point for liquid enthalpy.
- constexpr Scalar sqrt1over3 = std::sqrt(1./3.);
+ const Scalar sqrt1over3 = std::sqrt(1./3.);
const Scalar TEval1 = 0.5*(temperature-273.15)* sqrt1over3 + 0.5*(273.15+temperature) ; // evaluation points according to Gauss-Legendre integration
const Scalar TEval2 = 0.5*(temperature-273.15)* (-1)* sqrt1over3 + 0.5*(273.15+temperature) ; // evaluation points according to Gauss-Legendre integration
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index 05ffd93d51..9d644727ad 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -167,7 +167,7 @@ public:
// fit over a certain temperature range. This suggests choosing an interval of integration being in the actual fit range.
// I.e. choosing T=273.15K as reference point for liquid enthalpy.
- constexpr Scalar sqrt1over3 = std::sqrt(1./3.);
+ const Scalar sqrt1over3 = std::sqrt(1./3.);
const Scalar TEval1 = 0.5*(temperature-273.15)* sqrt1over3 + 0.5*(273.15+temperature) ; // evaluation points according to Gauss-Legendre integration
const Scalar TEval2 = 0.5*(temperature-273.15)* (-1)* sqrt1over3 + 0.5*(273.15+temperature) ; // evaluation points according to Gauss-Legendre integration
diff --git a/test/boxmodels/2p2c/injectionspatialparams.hh b/test/boxmodels/2p2c/injectionspatialparams.hh
index dbab1803dd..82e602b146 100644
--- a/test/boxmodels/2p2c/injectionspatialparams.hh
+++ b/test/boxmodels/2p2c/injectionspatialparams.hh
@@ -31,7 +31,7 @@
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-//#include <dumux/boxmodels/2p2c/2p2cmodel.hh>
+#include <dumux/boxmodels/2p2c/2p2cproperties.hh>
namespace Dumux
{
--
GitLab