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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-03 11:59:06 -0700 (Fri, 03 Aug 2007)
New Revision: 7772

Modified:
   mc/3D/CitcomS/branches/compressible/lib/Instructions.c
   mc/3D/CitcomS/branches/compressible/module/setProperties.c
Log:
Fixed a bug. fabs() returns a float, but abs() returns an int.

Modified: mc/3D/CitcomS/branches/compressible/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Instructions.c	2007-08-02 22:44:47 UTC (rev 7771)
+++ mc/3D/CitcomS/branches/compressible/lib/Instructions.c	2007-08-03 18:59:06 UTC (rev 7772)
@@ -407,8 +407,10 @@
   input_float("rayleigh",&(E->control.Atemp),"essential",m);
   input_float("dissipation_number",&(E->control.disptn_number),"0.0",m);
   input_float("gruneisen",&(tmp),"0.0",m);
-  if(abs(tmp) > 1e-6)
+  if(fabs(tmp) > 1e-6)
       E->control.inv_gruneisen = 1/tmp;
+  else
+      E->control.inv_gruneisen = 0;
 
   /* data section */
   input_float("Q0",&(E->control.Q0),"0.0",m);

Modified: mc/3D/CitcomS/branches/compressible/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/module/setProperties.c	2007-08-02 22:44:47 UTC (rev 7771)
+++ mc/3D/CitcomS/branches/compressible/module/setProperties.c	2007-08-03 18:59:06 UTC (rev 7772)
@@ -451,8 +451,10 @@
     getFloatProperty(properties, "rayleigh", E->control.Atemp, 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;
+    if(fabs(tmp) > 1e-6)
+	E->control.inv_gruneisen = 1.0/tmp;
+    else
+        E->control.inv_gruneisen = 0;
 
     getFloatProperty(properties, "Q0", E->control.Q0, fp);