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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-03-12 16:27:29 -0700 (Mon, 12 Mar 2007)
New Revision: 6235

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
   mc/3D/CitcomS/trunk/lib/Composition_related.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Commented out code about compositional_rheology, which is not implemented

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py	2007-03-12 23:11:49 UTC (rev 6234)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py	2007-03-12 23:27:29 UTC (rev 6235)
@@ -113,10 +113,10 @@
 
 
         # compositional_rheology=1 (not implemented in this version, TODO:remove)
-        compositional_rheology = inv.bool("compositional_rheology",
-                                          default=False)
-        compositional_prefactor = inv.float("compositional_prefactor",
-                                            default=1.0)
+        #compositional_rheology = inv.bool("compositional_rheology",
+        #                                  default=False)
+        #compositional_prefactor = inv.float("compositional_prefactor",
+        #                                    default=1.0)
 
 
 

Modified: mc/3D/CitcomS/trunk/lib/Composition_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-03-12 23:11:49 UTC (rev 6234)
+++ mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-03-12 23:27:29 UTC (rev 6235)
@@ -72,7 +72,7 @@
 
     /* icompositional_rheology=0 (off) */
     /* icompositional_rheology=1 (on) */
-
+    /*
     input_int("compositional_rheology",
               &(E->composition.icompositional_rheology),"1,0,nomax",m);
 
@@ -81,6 +81,7 @@
                      &(E->composition.compositional_rheology_prefactor),
                      "1.0",m);
     }
+    */
 
     return;
 }
@@ -130,7 +131,7 @@
         fprintf(E->trace.fpt,"Resetting initial composition\n");
 
 
-
+    /*
     if (E->composition.icompositional_rheology==0) {
         fprintf(E->trace.fpt,"Compositional Rheology - OFF\n");
     }
@@ -139,8 +140,8 @@
         fprintf(E->trace.fpt,"Compositional Prefactor: %f\n",
                 E->composition.compositional_rheology_prefactor);
     }
+    */
 
-
     fflush(E->trace.fpt);
     fflush(stderr);
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-03-12 23:11:49 UTC (rev 6234)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-03-12 23:27:29 UTC (rev 6235)
@@ -627,12 +627,13 @@
             getIntProperty(properties, "reset_initial_composition", E->composition.ireset_initial_composition, fp);
         }
 
+        /*
         getIntProperty(properties, "compositional_rheology", E->composition.icompositional_rheology, fp);
 
         if (E->composition.icompositional_rheology==1) {
             getDoubleProperty(properties, "compositional_prefactor", E->composition.compositional_rheology_prefactor, fp);
         }
-
+        */
     }
     PUTS(("\n"));