Changeset 39266 for branches/eam_branches/ipp-20151113/Ohana/src/misc/src/magtoage.c

Timestamp:

Dec 13, 2015, 5:50:46 AM (11 years ago)

Author:

eugene

Message:

merged changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• Ohana/src/misc/src/magtoage.c (modified) (4 diffs)

branches/eam_branches/ipp-20151113/Ohana/src/misc/src/magtoage.c

@@ -2 +2 @@
 # define MMIN 1.0
 # define MMAX 120.0
-extern double drand48();
-extern double rnd_gauss();
-extern double rnd_integrate ();
-extern double gaussian ();
-
-double gaussian();
-double rnd_gauss();
-double rnd_integrate();
 
 void main (argc, argv)
@@ -29 +21 @@
   long A, B;
   
+  ohana_gaussdev_init();
+
   lAo =   0.0;
   ldA =   1.0;
@@ -118 +112 @@
       }
       else {
-        v = rnd_gauss (V, dV);
-        uv = rnd_gauss ((U-V), dUV);
+        v = ohana_gaussdev_rnd (V, dV);
+        uv = ohana_gaussdev_rnd ((U-V), dUV);
       }
       x = (uv - UV0 - 0.7*Av) / DUV;
@@ -167 +161 @@
 }
 
-double
-rnd_gauss (mean, sigma)
-double mean, sigma; 
-{
-
-  double range, x;
-
-  range = drand48();
-  x = rnd_integrate (*gaussian, range, mean, sigma);
-
-  return (x);
-
-}
-
-
-double 
-rnd_integrate (function, range, mean, sigma) 
-double (*function) ();
-double range, mean, sigma;
-{
-
-  double val, x, dx, dx1, dx2, dx3, df;
-
-  range += 0.0001;
-  val = 0;
-  dx = sigma / 10.0;
-  dx1 = dx / 3.0;
-  dx2 = 2.0*dx/3.0;
-  dx3 = dx;
-
-  for (x = mean - 7*sigma; (val < range) && (x < mean + 7*sigma); x += dx)  {
-    df = (3.0*function(x    , mean, sigma) + 
-          9.0*function(x+dx1, mean, sigma) +
-          9.0*function(x+dx2, mean, sigma) + 
-          3.0*function(x+dx3, mean, sigma)) * (dx1/8.0);
-    val += df;
-  }
-  return (x + dx / 2.0);
-}
-
-double 
-gaussian (x, mean, sigma) 
-double x, mean, sigma; 
-{
-
-  double f, X;
-
-  f = exp (-0.5 * SQ(x - mean) / SQ(sigma)) / sqrt(2 * M_PI * SQ(sigma));
-
-  return (f);
-
-}
-