[cig-commits] r7885 - short/3D/PyLith/trunk/playpen/euler

[willic3 at geodynamics.org]

Author: willic3
Date: 2007-08-23 19:44:28 -0700 (Thu, 23 Aug 2007)
New Revision: 7885

Modified:
   short/3D/PyLith/trunk/playpen/euler/euler.py
Log:
Fixed some bugs, but still needs some more debugging.



Modified: short/3D/PyLith/trunk/playpen/euler/euler.py
===================================================================
--- short/3D/PyLith/trunk/playpen/euler/euler.py	2007-08-24 02:35:27 UTC (rev 7884)
+++ short/3D/PyLith/trunk/playpen/euler/euler.py	2007-08-24 02:44:28 UTC (rev 7885)
@@ -141,8 +141,8 @@
     self.eulerLon = self.inventory.eulerLon
     self.eulerRot = self.inventory.eulerRot
     self.spaceDim = self.srcCoordSys.spaceDim
-    self.dipSlip = self.srcCoordSys.dipSlip
-    self.dipCutoff = self.srcCoordSys.dipCutoff
+    self.dipSlip = self.inventory.dipSlip
+    self.dipCutoff = self.inventory.dipCutoff
 
     lat = self.eulerLat.value
     lon = self.eulerLon.value
@@ -159,7 +159,7 @@
     self.upVec = numpy.array([float(self.upDir[0]), float(self.upDir[1]),
                               float(self.upDir[2])], dtype=float)
 
-    self.dipCutoffProj = math.abs(math.sin(self.dipCutoff.value))
+    self.dipCutoffProj = abs(math.sin(self.dipCutoff.value))
     
     return
 
@@ -242,8 +242,8 @@
 
     # Need to go through this section later to fix it for a generalized coordinate
     # setup.
-    dip = numpy.dot(upDip, upVec)
-    if self.dipSlip and math.abs(dip) <= self.dipCutoffProj:
+    dip = numpy.dot(upDip, self.upVec)
+    if self.dipSlip and abs(dip) <= self.dipCutoffProj:
       # Project slip onto strike-slip direction
       strikeSlipProj = numpy.dot(velocity, alongStrike)
       vstrikeSlip = strikeSlipProj * alongStrike