[cig-commits] r20613 - in cs/spatialdata/trunk: spatialdata/units tests/pytests/units

[brad at geodynamics.org]

Author: brad
Date: 2012-08-21 09:24:21 -0700 (Tue, 21 Aug 2012)
New Revision: 20613

Modified:
   cs/spatialdata/trunk/spatialdata/units/NondimElasticQuasistatic.py
   cs/spatialdata/trunk/tests/pytests/units/TestNondimElasticQuasistatic.py
Log:
Added implicit density scale to NondimElasticQuasistatic.

Modified: cs/spatialdata/trunk/spatialdata/units/NondimElasticQuasistatic.py
===================================================================
--- cs/spatialdata/trunk/spatialdata/units/NondimElasticQuasistatic.py	2012-08-20 23:39:43 UTC (rev 20612)
+++ cs/spatialdata/trunk/spatialdata/units/NondimElasticQuasistatic.py	2012-08-21 16:24:21 UTC (rev 20613)
@@ -93,6 +93,10 @@
     self.setPressureScale(self.inventory.shearModulus)
     self.setTimeScale(self.inventory.relaxationTime)
 
+    # Compute implicit density scale.
+    vs = self.inventory.lengthScale / self.inventory.relaxationTime
+    self.setDensityScale(self.inventory.shearModulus / vs**2)
+
     return
 
 

Modified: cs/spatialdata/trunk/tests/pytests/units/TestNondimElasticQuasistatic.py
===================================================================
--- cs/spatialdata/trunk/tests/pytests/units/TestNondimElasticQuasistatic.py	2012-08-20 23:39:43 UTC (rev 20612)
+++ cs/spatialdata/trunk/tests/pytests/units/TestNondimElasticQuasistatic.py	2012-08-21 16:24:21 UTC (rev 20613)
@@ -32,8 +32,11 @@
     self.assertEqual(1.0e+3*meter, dim.lengthScale())
     self.assertEqual(3.0e+10*pascal, dim.pressureScale())
     self.assertEqual(1.0*year, dim.timeScale())
-    self.assertEqual(1.0*kilogram/meter**3, dim.densityScale())
 
+    vs = (1.0e+3*meter) / (1.0*year)
+    rho = (3.0e+10*pascal) / (vs**2)
+    self.assertEqual(rho, dim.densityScale())
+
     return