From dc85616de26e8ac2574db8497d010a3e6f408ee2 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Tue, 25 May 2010 16:12:52 +0000
Subject: [PATCH] additional includes
---
AMDiS/src/MathFunctions.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/AMDiS/src/MathFunctions.h b/AMDiS/src/MathFunctions.h
index e126becd..0b440198 100644
--- a/AMDiS/src/MathFunctions.h
+++ b/AMDiS/src/MathFunctions.h
@@ -1,5 +1,8 @@
#ifndef AMDIS_MATHFUNCTIONS_H
#define AMDIS_MATHFUNCTIONS_H
+
+#include "Global.h"
+
namespace AMDiS {
//converts signed distance to phasefield
inline double Phi1(double r, double eps) { return 0.5*(1-tanh(3*r/eps)); }
@@ -17,11 +20,11 @@ namespace AMDiS {
//convert Phi1 to r
inline double Phi1ToR(double p1, double eps) {
- return eps/3.0 * atanh( std::max(-1+1.e-14, std::min(1-1.e-14, 1-2*p1)) );
+ return eps/3.0 * atanh( max(-1+1.e-14, min(1-1.e-14, 1-2*p1)) );
}
//convert Phi2 to r
inline double Phi2ToR(double p2, double eps) {
- return eps/3.0 * atanh( std::max(-1+1.e-14, std::min(1-1.e-14, 1+2*p2)) );
+ return eps/3.0 * atanh( max(-1+1.e-14, min(1-1.e-14, 1+2*p2)) );
}
}
#endif
--
GitLab