[cig-commits] r7955 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-09-12 12:23:56 -0700 (Wed, 12 Sep 2007)
New Revision: 7955

Modified:
   mc/3D/CitcomS/trunk/lib/Composition_related.c
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Tracer_setup.c
Log:
Using drand48() instead of rand() to improve the quality of random tracers. Added some debugging output if the tracer count is low. 

Modified: mc/3D/CitcomS/trunk/lib/Composition_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-09-12 19:22:05 UTC (rev 7954)
+++ mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-09-12 19:23:56 UTC (rev 7955)
@@ -283,6 +283,7 @@
             /* use previous composition. */
             if (numtracers == 0) {
                 iempty++;
+                fprintf(E->trace.fpt, "No tracer in element %d!\n", e);
                 continue;
             }
 

Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-09-12 19:22:05 UTC (rev 7954)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-09-12 19:23:56 UTC (rev 7955)
@@ -2656,7 +2656,6 @@
     if (E->trace.istat1%100==0)
         {
             fprintf(E->trace.fpt,"Checked all elements %d times already this turn\n",E->trace.istat1);
-            fprintf(stderr,"Checked all elements %d times already this turn\n",E->trace.istat1);
             fflush(E->trace.fpt);
         }
     if (iel>0)

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-09-12 19:22:05 UTC (rev 7954)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-09-12 19:23:56 UTC (rev 7955)
@@ -670,6 +670,8 @@
 
     E->trace.ilast_tracer_count = isum_tracers(E);
     fprintf(E->trace.fpt, "Sum of Tracers: %d\n", E->trace.ilast_tracer_count);
+    if(E->parallel.me==0)
+        fprintf(stderr, "Sum of Tracers: %d\n", E->trace.ilast_tracer_count);
 
 
     /* find elements */
@@ -777,10 +779,15 @@
             exit(10);
         }
 
-
+#if 1
+        random1=drand48();
+        random2=drand48();
+        random3=drand48();
+#else
         random1=(1.0*rand())/(1.0*RAND_MAX);
         random2=(1.0*rand())/(1.0*RAND_MAX);
         random3=(1.0*rand())/(1.0*RAND_MAX);
+#endif
 
         x=xmin+random1*(xmax-xmin);
         y=ymin+random2*(ymax-ymin);