[cig-commits] r18940 - in short/3D/PyLith/trunk/pylith: bc faults feassemble friction materials meshio

[brad at geodynamics.org]

Author: brad
Date: 2011-09-19 14:03:16 -0700 (Mon, 19 Sep 2011)
New Revision: 18940

Modified:
   short/3D/PyLith/trunk/pylith/bc/BoundaryCondition.py
   short/3D/PyLith/trunk/pylith/bc/DirichletBC.py
   short/3D/PyLith/trunk/pylith/faults/Fault.py
   short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py
   short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py
   short/3D/PyLith/trunk/pylith/friction/FrictionModel.py
   short/3D/PyLith/trunk/pylith/materials/Material.py
   short/3D/PyLith/trunk/pylith/meshio/DataWriterVTK.py
   short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/pylith/bc/BoundaryCondition.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/BoundaryCondition.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/bc/BoundaryCondition.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -147,7 +147,7 @@
       ModuleBoundaryCondition.label(self, self.inventory.label)
       self.upDir = map(float, self.inventory.upDir)
       self.perfLogger = self.inventory.perfLogger
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring boundary condition "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/bc/DirichletBC.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/DirichletBC.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/bc/DirichletBC.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -117,7 +117,7 @@
     try:
       BoundaryCondition._configure(self)
       TimeDependentPoints._configure(self)
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring Dirichlet boundary condition "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/faults/Fault.py
===================================================================
--- short/3D/PyLith/trunk/pylith/faults/Fault.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/faults/Fault.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -233,7 +233,7 @@
       ModuleFault.id(self, self.inventory.matId)
       ModuleFault.label(self, self.inventory.faultLabel)
       self.perfLogger = self.inventory.perfLogger
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring fault "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -414,7 +414,7 @@
       
       if self.order == -1:
         self.order = self.degree+1
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring quadrature "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -165,7 +165,7 @@
       self.order = self.inventory.order
       if self.order == -1:
         self.order = self.degree
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring quadrature "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/friction/FrictionModel.py
===================================================================
--- short/3D/PyLith/trunk/pylith/friction/FrictionModel.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/friction/FrictionModel.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -128,7 +128,7 @@
         self.dbInitialState(self.inventory.dbInitialState)
 
       self.perfLogger = self.inventory.perfLogger
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring friction model "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/materials/Material.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/Material.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/materials/Material.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -191,7 +191,7 @@
 
       self.quadrature = self.inventory.quadrature
       self.perfLogger = self.inventory.perfLogger
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring material "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/meshio/DataWriterVTK.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/DataWriterVTK.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/meshio/DataWriterVTK.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -90,7 +90,7 @@
     """
     try:
       DataWriter._configure(self)
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring VTK output "
                        "(%s):\n%s" % (aliases, err.message))

Modified: short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py	2011-09-19 21:01:33 UTC (rev 18939)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py	2011-09-19 21:03:16 UTC (rev 18940)
@@ -158,7 +158,7 @@
         ModuleOutputSolnSubset.vertexFilter(self, self.inventory.vertexFilter)
       if not isinstance(self.inventory.cellFilter, NullComponent):
         ModuleOutputSolnSubset.cellFilter(self, self.inventory.cellFilter)
-    except ValueError as err:
+    except ValueError, err:
       aliases = ", ".join(self.aliases)
       raise ValueError("Error while configuring output over boundary "
                        "(%s):\n%s" % (aliases, err.message))