[cig-commits] r22805 - mc/3D/CitcomS/trunk/lib

[becker at geodynamics.org]

Author: becker
Date: 2013-09-20 07:58:59 -0700 (Fri, 20 Sep 2013)
New Revision: 22805

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:


Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2013-09-19 23:00:37 UTC (rev 22804)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2013-09-20 14:58:59 UTC (rev 22805)
@@ -768,14 +768,10 @@
 
   E->data.therm_cond = E->data.therm_diff * E->data.density * E->data.Cp;
 
-  input_float("reftemperature",&(E->data.ref_temperature),"2700.0",m);
- 
-  if (E->control.stokes!=1) {
-     E->data.ref_viscosity = E->data.ref_temperature *
-         E->data.density * E->data.grav_acc * E->data.therm_exp *
-      E->data.radius_km * E->data.radius_km * E->data.radius_km * 1e9
-     /(E->control.Atemp * E->data.therm_diff);
-    }
+  E->data.ref_temperature = E->control.Atemp * E->data.therm_diff
+    * E->data.ref_viscosity
+    / (E->data.density * E->data.grav_acc * E->data.therm_exp)
+    / (E->data.radius_km * E->data.radius_km * E->data.radius_km * 1e9);
 
   output_common_input(E);
   h5input_params(E);