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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-03-19 15:48:13 -0700 (Mon, 19 Mar 2007)
New Revision: 6294

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_setup.c
Log:
Moving tracer initialization code to a function

Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-03-19 22:45:38 UTC (rev 6293)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-03-19 22:48:13 UTC (rev 6294)
@@ -196,24 +196,8 @@
     make_regular_grid(E);
 
 
-    if (E->trace.ic_method==0)
-        make_tracer_array(E);
-    else if (E->trace.ic_method==1)
-        read_tracer_file(E);
-    else if (E->trace.ic_method==2)
-        restart_tracers(E);
-    else {
-        fprintf(E->trace.fpt,"Not ready for other inputs yet\n");
-        fflush(E->trace.fpt);
-        parallel_process_termination();
-    }
+    initialize_tracers(E);
 
-    /* total number of tracers  */
-
-    E->trace.ilast_tracer_count = isum_tracers(E);
-    fprintf(E->trace.fpt, "Sum of Tracers: %d\n", E->trace.ilast_tracer_count);
-
-
     /* find elements */
 
     find_tracers(E);

Modified: mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c	2007-03-19 22:45:38 UTC (rev 6293)
+++ mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c	2007-03-19 22:48:13 UTC (rev 6294)
@@ -123,28 +123,12 @@
     /* The bounding box of neiboring processors */
     get_neighboring_caps(E);
 
+    make_mesh_ijk(E);
 
-    if (E->trace.ic_method==0)
-        make_tracer_array(E);
-    else if (E->trace.ic_method==1)
-        read_tracer_file(E);
-    else if (E->trace.ic_method==2)
-        restart_tracers(E);
-    else {
-        fprintf(E->trace.fpt,"Not ready for other inputs yet\n");
-        fflush(E->trace.fpt);
-        parallel_process_termination();
-    }
 
-    /* total number of tracers  */
+    initialize_tracers(E);
 
-    E->trace.ilast_tracer_count = isum_tracers(E);
-    fprintf(E->trace.fpt, "Sum of Tracers: %d\n", E->trace.ilast_tracer_count);
 
-
-    make_mesh_ijk(E);
-
-
     /* find elements */
 
     find_tracers(E);

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-03-19 22:45:38 UTC (rev 6293)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-03-19 22:48:13 UTC (rev 6294)
@@ -1250,6 +1250,34 @@
 
 
 
+void initialize_tracers(struct All_variables *E)
+{
+    void make_tracer_array();
+    void read_tracer_file();
+    void restart_tracers();
+    int isum_tracers();
+
+    if (E->trace.ic_method==0)
+        make_tracer_array(E);
+    else if (E->trace.ic_method==1)
+        read_tracer_file(E);
+    else if (E->trace.ic_method==2)
+        restart_tracers(E);
+    else {
+        fprintf(E->trace.fpt,"Not ready for other inputs yet\n");
+        fflush(E->trace.fpt);
+        parallel_process_termination();
+    }
+
+    /* total number of tracers  */
+
+    E->trace.ilast_tracer_count = isum_tracers(E);
+    fprintf(E->trace.fpt, "Sum of Tracers: %d\n", E->trace.ilast_tracer_count);
+
+    return;
+}
+
+
 /************** MAKE TRACER ARRAY ********************************/
 /* Here, each processor will generate tracers somewhere          */
 /* in the sphere - check if its in this cap  - then check radial */