[cig-commits] r16140 - short/3D/PyLith/trunk/playpen/powerlaw

[brad at geodynamics.org]

Author: brad
Date: 2010-01-17 15:13:23 -0800 (Sun, 17 Jan 2010)
New Revision: 16140

Modified:
   short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_gendb.py
   short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_params.spatialdb
Log:
Fixed power-law coefficient.

Modified: short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_gendb.py
===================================================================
--- short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_gendb.py	2010-01-17 01:19:24 UTC (rev 16139)
+++ short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_gendb.py	2010-01-17 23:13:23 UTC (rev 16140)
@@ -122,13 +122,14 @@
     self._info.log("Querying for parameters at output points.")
     n = self._queryDB(self.dbExponent, "power-law-exponent", points, coordsys)
     Q = self._queryDB(self.dbActivationE, "activation-energy", points, coordsys)
-    #Ae = self._queryDB(self.dbAe, "power-law-coefficient", points, coordsys)
-    Ae = self._queryDB(self.dbAe, "flow-constant", points, coordsys)
+    logAe = self._queryDB(self.dbAe, "log-flow-constant", points, coordsys)
+    scaleAe = self._queryDB(self.dbAe, "flow-constant-scale", points, coordsys)
     T = self._queryDB(self.dbTemperature, "temperature", points, coordsys)
 
     # Compute power-law parameters
     self._info.log("Computing parameters at output points.")
     from pyre.handbook.constants.fundamental import R
+    Ae = 10**(logAe - scaleAe * n)
     At = 3**(0.5*(n+1))/2.0 * Ae * numpy.exp(-Q/(R.value*T))
     
     if self.refSelection == "stress":

Modified: short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_params.spatialdb
===================================================================
--- short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_params.spatialdb	2010-01-17 01:19:24 UTC (rev 16139)
+++ short/3D/PyLith/trunk/playpen/powerlaw/powerlaw_params.spatialdb	2010-01-17 23:13:23 UTC (rev 16140)
@@ -13,7 +13,7 @@
 #SPATIAL.ascii 1
 SimpleDB {
   num-values = 4 // number of material property values
-  value-names =  flow-constant activation-energy power-law-exponent flow-constant-multiplier // names of the material property values
+  value-names =  log-flow-constant activation-energy power-law-exponent flow-constant-scale // names of the material property values
   value-units =  None kJ/mol None None // units
   num-locs = 4 // number of locations
   data-dim = 1