[cig-commits] r9268 - in mc/3D/CitcomS/trunk: CitcomS/Components lib module

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-02-08 15:50:30 -0800 (Fri, 08 Feb 2008)
New Revision: 9268

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Tracer_setup.c
   mc/3D/CitcomS/trunk/lib/tracer_defs.h
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Added new parameter: itracer_interpolate_fields

When it is 0 (default), nothing is done.
Otherwise, the convection fields are interpolated onto the location of tracers.


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py	2008-02-08 18:56:03 UTC (rev 9267)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py	2008-02-08 23:50:30 UTC (rev 9268)
@@ -92,6 +92,9 @@
         # Warning level
         itracer_warnings = inv.bool("itracer_warnings", default=True)
 
+        # Interpolate convection fields onto the location of tracers
+        itracer_interpolate_fields = inv.int("itracer_interpolate_fields",
+                                              default=0)
         # Enriched internal heat production
         tracer_enriched = inv.bool("tracer_enriched", default=False)
         Q0_enriched = inv.float("Q0_enriched", default=0.0)

Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2008-02-08 18:56:03 UTC (rev 9267)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2008-02-08 23:50:30 UTC (rev 9268)
@@ -169,6 +169,8 @@
     E->trace.number_of_extra_quantities = 0;
     if (E->trace.nflavors > 0)
         E->trace.number_of_extra_quantities += 1;
+    else if (E->trace.itracer_interpolate_fields)
+        E->trace.number_of_extra_quantities += 2;
 
 
     E->trace.number_of_tracer_quantities =

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2008-02-08 18:56:03 UTC (rev 9267)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2008-02-08 23:50:30 UTC (rev 9268)
@@ -173,6 +173,10 @@
         input_boolean("itracer_warnings",&(E->trace.itracer_warnings),"on",m);
 
 
+        /* Interpolate convection fields onto the location of tracers */
+        input_int("itracer_interpolate_fields",&(E->trace.itracer_interpolate_fields),"0",m);
+
+
         if(E->parallel.nprocxy == 12)
             full_tracer_input(E);
 

Modified: mc/3D/CitcomS/trunk/lib/tracer_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/tracer_defs.h	2008-02-08 18:56:03 UTC (rev 9267)
+++ mc/3D/CitcomS/trunk/lib/tracer_defs.h	2008-02-08 23:50:30 UTC (rev 9268)
@@ -43,6 +43,7 @@
     int ic_method;
     int itperel;
     int itracer_interpolation_scheme;
+    int itracer_interpolate_fields;
 
     double box_cushion;
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2008-02-08 18:56:03 UTC (rev 9267)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2008-02-08 23:50:30 UTC (rev 9268)
@@ -662,6 +662,7 @@
     }
 
     getIntProperty(properties, "itracer_warnings", E->trace.itracer_warnings, fp);
+    getIntProperty(properties, "itracer_interpolate_fields", E->trace.itracer_interpolate_fields, fp);
 
     getIntProperty(properties, "chemical_buoyancy",
                    E->composition.ichemical_buoyancy, fp);