Added NFW_Utility::NFW_M()

glenco · Jun 4, 2016 · 103b081 · 103b081
1 parent e94e7b0
commit 103b081
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/include/cosmo.h b/include/cosmo.h
@@ -390,6 +390,7 @@ class NFW_Utility {
   double NFW_V200(double M200,double R200);
   double NFW_Vmax(double cons,double M200,double R200);
   double NFW_Vr(double x,double cons,double M200,double R200);
+  double NFW_M(double x,double cons,double M200,double R200);
   double NFW_deltac(double cons);
   double NFW_Concentration(double Vmax,double M200,double R200);
   double NFW_rho(double cons,double x);

diff --git a/nfw.cpp b/nfw.cpp
@@ -49,6 +49,17 @@ double NFW_Utility::NFW_Vr(
 
 	return sqrt( (log(1+cons*x) -cons*x/(1+cons*x) ) /f/x)*NFW_V200(M200,R200);
 }
+/// Mass within a radius x in Msun
+double NFW_Utility::NFW_M(
+                           double x       /// radius , r/R_200
+                           ,double cons    /// concentration = R_200/R_s
+                           ,double M200    /// Mass
+                           ,double R200    /// Radius
+){
+  double f = log(1+cons) - cons/(1+cons);
+
+  return M200*(log(1+cons*x) -cons*x/(1+cons*x) )/f;
+}
 /// central over-density of nfw halo
 double NFW_Utility::NFW_deltac(
 		double cons    /// concentration = R_200/R_s