[cig-commits] r5898 - in mc/3D/CitcomS/branches/compressible: CitcomS/Solver lib module

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-01-25 15:41:54 -0800 (Thu, 25 Jan 2007)
New Revision: 5898

Modified:
   mc/3D/CitcomS/branches/compressible/CitcomS/Solver/Solver.py
   mc/3D/CitcomS/branches/compressible/lib/Instructions.c
   mc/3D/CitcomS/branches/compressible/lib/Material_properties.c
   mc/3D/CitcomS/branches/compressible/lib/Output_h5.c
   mc/3D/CitcomS/branches/compressible/lib/global_defs.h
   mc/3D/CitcomS/branches/compressible/module/setProperties.c
Log:
Renamed the input parameter for dissipation number to be consistent with CitcomCU


Modified: mc/3D/CitcomS/branches/compressible/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/branches/compressible/CitcomS/Solver/Solver.py	2007-01-25 23:41:15 UTC (rev 5897)
+++ mc/3D/CitcomS/branches/compressible/CitcomS/Solver/Solver.py	2007-01-25 23:41:54 UTC (rev 5898)
@@ -282,7 +282,7 @@
         datadir_old = inv.str("datadir_old", default="")
 
         rayleigh = inv.float("rayleigh", default=1e+05)
-        dissipation = inv.float("dissipation", default=0.0)
+        dissipation_number = inv.float("dissipation_number", default=0.0)
         gruneisen = inv.float("gruneisen", default=0.0)
         Q0 = inv.float("Q0", default=0.0)
 

Modified: mc/3D/CitcomS/branches/compressible/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Instructions.c	2007-01-25 23:41:15 UTC (rev 5897)
+++ mc/3D/CitcomS/branches/compressible/lib/Instructions.c	2007-01-25 23:41:54 UTC (rev 5898)
@@ -372,7 +372,7 @@
   input_int("piterations",&(E->control.p_iterations),"100,0,nomax",m);
 
   input_float("rayleigh",&(E->control.Atemp),"essential",m);
-  input_float("dissipation",&(E->control.Di),"0.0",m);
+  input_float("dissipation_number",&(E->control.disptn_number),"0.0",m);
   input_float("gruneisen",&(tmp),"0.0",m);
   if(abs(tmp) > 1e-6)
       E->control.inv_gruneisen = 1/tmp;

Modified: mc/3D/CitcomS/branches/compressible/lib/Material_properties.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Material_properties.c	2007-01-25 23:41:15 UTC (rev 5897)
+++ mc/3D/CitcomS/branches/compressible/lib/Material_properties.c	2007-01-25 23:41:54 UTC (rev 5898)
@@ -63,7 +63,7 @@
     int i;
     double r, z, tmp, T0;
 
-    tmp = E->control.Di * E->control.inv_gruneisen;
+    tmp = E->control.disptn_number * E->control.inv_gruneisen;
     T0 = E->data.surf_temp / E->data.ref_temperature;
 
     for(i=1; i<=noz; i++) {
@@ -71,7 +71,7 @@
 	z = 1 - r;
 	E->rho_ref[i] = exp(tmp*z);
 	E->thermexp_ref[i] = 1;
-	E->T_ref[i] = T0 * (exp(E->control.Di * z) - 1);
+	E->T_ref[i] = T0 * (exp(E->control.disptn_number * z) - 1);
     }
 
     for(i=1; i<=nel; i++) {

Modified: mc/3D/CitcomS/branches/compressible/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Output_h5.c	2007-01-25 23:41:15 UTC (rev 5897)
+++ mc/3D/CitcomS/branches/compressible/lib/Output_h5.c	2007-01-25 23:41:54 UTC (rev 5898)
@@ -1459,7 +1459,7 @@
     status = set_attribute_string(input, "datafile_old", E->control.old_P_file);
 
     status = set_attribute_float(input, "rayleigh", E->control.Atemp);
-    status = set_attribute_float(input, "dissipation", E->control.Di);
+    status = set_attribute_float(input, "dissipation_number", E->control.disptn_number);
     status = set_attribute_float(input, "gruneisen",
 				 ((abs(E->control.inv_gruneisen) > 1e-6)?
 				  1/E->control.inv_gruneisen :

Modified: mc/3D/CitcomS/branches/compressible/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/global_defs.h	2007-01-25 23:41:15 UTC (rev 5897)
+++ mc/3D/CitcomS/branches/compressible/lib/global_defs.h	2007-01-25 23:41:54 UTC (rev 5898)
@@ -460,7 +460,7 @@
     /* Rayleigh # */
     float Atemp;
     /* Dissipation # */
-    float Di;
+    float disptn_number;
     /* inverse of Gruneisen parameter */
     float inv_gruneisen;
 

Modified: mc/3D/CitcomS/branches/compressible/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/module/setProperties.c	2007-01-25 23:41:15 UTC (rev 5897)
+++ mc/3D/CitcomS/branches/compressible/module/setProperties.c	2007-01-25 23:41:54 UTC (rev 5898)
@@ -444,7 +444,7 @@
     getStringProperty(properties, "datafile_old", E->control.data_prefix_old, fp);
 
     getFloatProperty(properties, "rayleigh", E->control.Atemp, fp);
-    getFloatProperty(properties, "dissipation", E->control.Di, fp);
+    getFloatProperty(properties, "dissipation_number", E->control.disptn_number, fp);
     getFloatProperty(properties, "gruneisen", tmp, fp);
     if(abs(tmp) > 1e-6)
 	E->control.inv_gruneisen = 1/tmp;