Commit dc85616d authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

additional includes

parent 58e24187
#ifndef AMDIS_MATHFUNCTIONS_H #ifndef AMDIS_MATHFUNCTIONS_H
#define AMDIS_MATHFUNCTIONS_H #define AMDIS_MATHFUNCTIONS_H
#include "Global.h"
namespace AMDiS { namespace AMDiS {
//converts signed distance to phasefield //converts signed distance to phasefield
inline double Phi1(double r, double eps) { return 0.5*(1-tanh(3*r/eps)); } inline double Phi1(double r, double eps) { return 0.5*(1-tanh(3*r/eps)); }
...@@ -17,11 +20,11 @@ namespace AMDiS { ...@@ -17,11 +20,11 @@ namespace AMDiS {
//convert Phi1 to r //convert Phi1 to r
inline double Phi1ToR(double p1, double eps) { 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 //convert Phi2 to r
inline double Phi2ToR(double p2, double eps) { 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 #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment