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

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-01-16 12:34:22 -0800 (Wed, 16 Jan 2008)
New Revision: 9079

Modified:
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/tracer_defs.h
Log:
Added timing information for tracer module. The timing is reported in *.tracer_log.* files.


Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2008-01-16 20:30:09 UTC (rev 9078)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2008-01-16 20:34:22 UTC (rev 9079)
@@ -129,6 +129,8 @@
     char output_file[200];
     void get_neighboring_caps();
     void analytical_test();
+    double CPU_time0();
+    double begin_time = CPU_time0();
 
     /* Some error control */
 
@@ -223,6 +225,9 @@
     if (E->composition.on)
         composition_setup(E);
 
+    fprintf(E->trace.fpt, "Tracer intiailization takes %f seconds.\n",
+            CPU_time0() - begin_time);
+
     return;
 }
 
@@ -286,6 +291,9 @@
     void expand_tracer_arrays();
     int icheck_that_processor_shell();
 
+    double CPU_time0();
+    double begin_time = CPU_time0();
+
     int number_of_caps=12;
     int lev=E->mesh.levmax;
     int num_ngb = E->parallel.TNUM_PASS[lev][j];
@@ -764,6 +772,7 @@
       fflush(E->trace.fpt);
     }
 
+    E->trace.lost_souls_time += CPU_time0() - begin_time;
     return;
 }
 

Modified: mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c	2008-01-16 20:30:09 UTC (rev 9078)
+++ mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c	2008-01-16 20:34:22 UTC (rev 9079)
@@ -63,6 +63,8 @@
 
     char output_file[255];
     void get_neighboring_caps();
+    double CPU_time0();
+    double begin_time = CPU_time0();
 
     /* Some error control */
 
@@ -142,6 +144,9 @@
     if (E->composition.on)
         composition_setup(E);
 
+    fprintf(E->trace.fpt, "Tracer intiailization takes %f seconds.\n",
+            CPU_time0() - begin_time);
+
     return;
 }
 
@@ -615,6 +620,8 @@
     MPI_Status status[4];
     MPI_Request request[4];
 
+    double CPU_time0();
+    double begin_time = CPU_time0();
 
     E->trace.istat_isend = E->trace.ilater[j];
 
@@ -878,6 +885,7 @@
     free(send[0]);
     free(send[1]);
 
+    E->trace.lost_souls_time += CPU_time0() - begin_time;
     return;
 }
 

Modified: mc/3D/CitcomS/trunk/lib/tracer_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/tracer_defs.h	2008-01-16 20:30:09 UTC (rev 9078)
+++ mc/3D/CitcomS/trunk/lib/tracer_defs.h	2008-01-16 20:34:22 UTC (rev 9079)
@@ -82,6 +82,13 @@
     int istat_elements_checked;
     int ilast_tracer_count;
 
+
+    /* timing information */
+    double advection_time;
+    double find_tracers_time;
+    double lost_souls_time;
+
+
     /* Mesh information */
     double xcap[13][5];
     double ycap[13][5];