[cig-commits] r19064 - short/3D/PyLith/trunk/playpen/postproc
willic3 at geodynamics.org
willic3 at geodynamics.org
Thu Oct 13 15:32:52 PDT 2011
Author: willic3
Date: 2011-10-13 15:32:51 -0700 (Thu, 13 Oct 2011)
New Revision: 19064
Modified:
short/3D/PyLith/trunk/playpen/postproc/princaxes.py
Log:
Removed scaling of principal axes by eigenvalues, as this can be done in
additional postprocessing, if desired.
Modified: short/3D/PyLith/trunk/playpen/postproc/princaxes.py
===================================================================
--- short/3D/PyLith/trunk/playpen/postproc/princaxes.py 2011-10-13 16:17:32 UTC (rev 19063)
+++ short/3D/PyLith/trunk/playpen/postproc/princaxes.py 2011-10-13 22:32:51 UTC (rev 19064)
@@ -185,8 +185,7 @@
def _compPrincAxes(self, tensor):
"""
- Function to compute 3D principal axes, sort them, and multiply by
- corresponding eigenvalue.
+ Function to compute 3D principal axes and sort them.
"""
tensorMat = numpy.array([(tensor[0], tensor[3], tensor[5]),
(tensor[3], tensor[1], tensor[4]),
@@ -196,11 +195,11 @@
idx = eigenValue.argsort()
eigenValuesOrdered = eigenValue[idx]
princAxesOrdered = princAxes[:,idx]
- tensorOrdered = numpy.empty_like(princAxesOrdered)
- tensorOrdered[0,:] = eigenValuesOrdered[0] * princAxesOrdered[0,:]
- tensorOrdered[1,:] = eigenValuesOrdered[1] * princAxesOrdered[1,:]
- tensorOrdered[2,:] = eigenValuesOrdered[2] * princAxesOrdered[2,:]
- return tensorOrdered, eigenValuesOrdered
+ # tensorOrdered = numpy.empty_like(princAxesOrdered)
+ # tensorOrdered[0,:] = eigenValuesOrdered[0] * princAxesOrdered[0,:]
+ # tensorOrdered[1,:] = eigenValuesOrdered[1] * princAxesOrdered[1,:]
+ # tensorOrdered[2,:] = eigenValuesOrdered[2] * princAxesOrdered[2,:]
+ return princAxesOrdered, eigenValuesOrdered
def _writeVtkFile(self):
More information about the CIG-COMMITS
mailing list