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

[emheien at geodynamics.org]

Author: emheien
Date: 2013-05-24 10:42:50 -0700 (Fri, 24 May 2013)
New Revision: 22135

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:
Added reference viscosity fix from Shijie Zhong


Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2013-05-24 14:39:36 UTC (rev 22134)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2013-05-24 17:42:50 UTC (rev 22135)
@@ -768,10 +768,14 @@
 
   E->data.therm_cond = E->data.therm_diff * E->data.density * E->data.Cp;
 
-  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);
+  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);
+    }
 
   output_common_input(E);
   h5input_params(E);