[cig-commits] r4553 - in short/3D/PyLith/trunk: modulesrc/meshio pylith/materials pylith/meshio

[knepley at geodynamics.org]

Author: knepley
Date: 2006-09-15 09:03:37 -0700 (Fri, 15 Sep 2006)
New Revision: 4553

Modified:
   short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
   short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py
   short/3D/PyLith/trunk/pylith/materials/Homogeneous.py
   short/3D/PyLith/trunk/pylith/meshio/MeshIOAscii.py
Log:
Corrections to get pylithic running


Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2006-09-15 03:54:39 UTC (rev 4552)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2006-09-15 16:03:37 UTC (rev 4553)
@@ -23,7 +23,7 @@
 	meshio.c meshio_embed.cpp meshio_embed.h
 
 meshiomodule_la_LIBADD = \
-	$(top_builddir)/libsrc/meshio/libpylithmeshio.la
+	$(top_builddir)/libsrc/meshio/libpylithmeshio.la $(PETSC_LIB)
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py	2006-09-15 03:54:39 UTC (rev 4552)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py	2006-09-15 16:03:37 UTC (rev 4553)
@@ -87,8 +87,8 @@
   def _configure(self):
     """Set members using inventory."""
     self.useDB = self.inventory.useDB
-    self.muLame = self.inventory.muLame
-    self.lambdaLame = self.inventory.lambdaLame
+    self.muLame = self.inventory.density*self.inventory.vs*self.inventory.vs
+    self.lambdaLame = self.inventory.density*self.inventory.vp*self.inventory.vp - 2.0*self.muLame
     self.density = self.inventory.density
     return
 

Modified: short/3D/PyLith/trunk/pylith/materials/Homogeneous.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/Homogeneous.py	2006-09-15 03:54:39 UTC (rev 4552)
+++ short/3D/PyLith/trunk/pylith/materials/Homogeneous.py	2006-09-15 16:03:37 UTC (rev 4553)
@@ -35,8 +35,8 @@
 
     import pyre.inventory
 
-    from ElasticIsotropic import ElasticIsotropic
-    material = pyre.inventory.facility("material", factory=ElasticIsotropic)
+    from ElasticIsotropic3D import ElasticIsotropic3D
+    material = pyre.inventory.facility("material", factory=ElasticIsotropic3D)
     material.meta['tip'] = "Material in problem."
 
 

Modified: short/3D/PyLith/trunk/pylith/meshio/MeshIOAscii.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/MeshIOAscii.py	2006-09-15 03:54:39 UTC (rev 4552)
+++ short/3D/PyLith/trunk/pylith/meshio/MeshIOAscii.py	2006-09-15 16:03:37 UTC (rev 4553)
@@ -26,7 +26,7 @@
 
   # INVENTORY //////////////////////////////////////////////////////////
 
-  class Inventory(Component.Inventory):
+  class Inventory(MeshIO.Inventory):
     """Python object for managing MeshIOAscii facilities and properties."""
 
     ## @class Inventory
@@ -50,7 +50,7 @@
     """Constructor."""
     MeshIO.__init__(self, name)
     import pylith.meshio.meshio as bindings
-    self.cppHandler = bindings.MeshIOAscii()
+    self.cppHandle = bindings.MeshIOAscii()
     return
 
 
@@ -58,8 +58,9 @@
 
   def _configure(self):
     """Set members based using inventory."""
-    MeshIO.configure(self)
+    MeshIO._configure(self)
     self.filename = self.inventory.filename
+    self.cppHandle.filename = self.filename
     return