[cig-commits] r6750 - in short/3D/PyLith/branches/pylith-0.8: . pylith3d/pylith3d

[leif at geodynamics.org]

Author: leif
Date: 2007-05-01 23:55:44 -0700 (Tue, 01 May 2007)
New Revision: 6750

Modified:
   short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py
   short/3D/PyLith/branches/pylith-0.8/setup.py
Log:
Updated PyLith for Pythia v0.8.1.3b5.  PetscCommandlineParser and
PetscProperty are no longer supported.  Use Pyre command line syntax. 
Use the "petsc" facility/component ("petsc.xxx=yyy") to set PETSc
options.


Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py	2007-05-02 06:48:55 UTC (rev 6749)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py	2007-05-02 06:55:44 UTC (rev 6750)
@@ -112,23 +112,11 @@
     #
 
     import pyre.inventory as pyre
-    from cig.cs.petsc import PetscProperty
 
     MacroString = pyre.str
     OutputFile = pyre.str
     InputFile = pyre.str
 
-    # declare PETSc options that are of interest to PyLith
-    ksp_monitor        = PetscProperty(default="true")
-    ksp_view           = PetscProperty(default="true")
-    ksp_rtol           = PetscProperty(default="1.0e-9")
-    log_summary        = PetscProperty(default="true")
-    partitioner        = PetscProperty(default="chaco")
-    pc_type            = PetscProperty(default="bjacobi")
-    sub_pc_type        = PetscProperty(default="ilu")
-    start_in_debugger  = PetscProperty()
-    debugger_pause     = PetscProperty()
-
     # Title
     title = pyre.str("title", default="PyLith-0.8 Simulation")
     title.meta['tip'] = "Title for this simulation"
@@ -349,10 +337,23 @@
     import PyLithLib as petsc
 
 
-    # Use PETSc-style command line parsing.
-    from cig.cs.petsc import PetscCommandlineParser as CommandlineParser
-
-
+    def _defaults(self):
+        super(PyLithApp, self)._defaults()
+        
+        # Set defaults for PETSc options.  These can be overridden in a .cfg file
+        # or from the command line using the "petsc" component.
+        self.setPetscDefaults(dict(
+            ksp_monitor        = "true",
+            ksp_view           = "true",
+            ksp_rtol           = "1.0e-9",
+            log_summary        = "true",
+            partitioner        = "chaco",
+            pc_type            = "bjacobi",
+            sub_pc_type        = "ilu",
+        ))
+        
+        return
+    
     # hack to recognize old 'pl3dscan.xxx' and 'scanner.xxx' options
     def applyConfiguration(self, context=None):
         # this mimics the standard Pyre order:  <component-name>.xxx overrides <facility-name>.xxx

Modified: short/3D/PyLith/branches/pylith-0.8/setup.py
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/setup.py	2007-05-02 06:48:55 UTC (rev 6749)
+++ short/3D/PyLith/branches/pylith-0.8/setup.py	2007-05-02 06:55:44 UTC (rev 6750)
@@ -14,7 +14,7 @@
     packages = find_packages("pylith3d"),
     
     install_requires = [
-    'pythia[mpi] >= 0.8.1.3b2, < 0.8.2a',
+    'pythia[mpi] >= 0.8.1.3b5, < 0.8.2a',
     ],
 
     author = 'Charles A. Williams, Brad Aagaard, and Matt Knepley',