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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-03-23 13:39:12 -0700 (Fri, 23 Mar 2007)
New Revision: 6374

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Disable the parameter "analytical_tracer_test", and make "chemical_buoyancy" a boolean

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py	2007-03-23 20:21:00 UTC (rev 6373)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py	2007-03-23 20:39:12 UTC (rev 6374)
@@ -86,9 +86,9 @@
         regular_grid_delphi = inv.float("regular_grid_delphi", default=1.0)
 
         # Analytical Test Function
-        analytical_tracer_test = inv.int("analytical_tracer_test", default=0)
+        #analytical_tracer_test = inv.int("analytical_tracer_test", default=0)
 
-        chemical_buoyancy = inv.int("chemical_buoyancy", default=1)
+        chemical_buoyancy = inv.bool("chemical_buoyancy", default=True)
 
         # ibuoy_type=0 (absolute method, not implemented)
         # ibuoy_type=1 (ratio method)

Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-03-23 20:21:00 UTC (rev 6373)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2007-03-23 20:39:12 UTC (rev 6374)
@@ -112,8 +112,8 @@
     /* Analytical Test Function */
 
     E->trace.ianalytical_tracer_test=0;
-    input_int("analytical_tracer_test",&(E->trace.ianalytical_tracer_test),
-              "0,0,nomax",m);
+    /* input_int("analytical_tracer_test",&(E->trace.ianalytical_tracer_test),
+              "0,0,nomax",m); */
 
 
     return;

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-03-23 20:21:00 UTC (rev 6373)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-03-23 20:39:12 UTC (rev 6374)
@@ -618,9 +618,11 @@
         E->trace.deltheta[0] = tmp;
         getDoubleProperty(properties, "regular_grid_delphi", tmp, fp);
         E->trace.delphi[0] = tmp;
-        getIntProperty(properties, "analytical_tracer_test", E->trace.ianalytical_tracer_test, fp);
 
+        E->trace.ianalytical_tracer_test = 0;
+        //getIntProperty(properties, "analytical_tracer_test", E->trace.ianalytical_tracer_test, fp);
 
+
         E->composition.icompositional_rheology = 0;
         /*
         getIntProperty(properties, "compositional_rheology", E->composition.icompositional_rheology, fp);