[cig-commits] r5355 - in mc/3D/CitcomS/trunk: . CitcomS bin

[leif at geodynamics.org]

Author: leif
Date: 2006-11-27 19:01:37 -0800 (Mon, 27 Nov 2006)
New Revision: 5355

Modified:
   mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
   mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py
   mc/3D/CitcomS/trunk/bin/citcoms.in
   mc/3D/CitcomS/trunk/setup.py
Log:
Changes related to Pythia v0.8.1.0b7, which CitcomS now requires:
'journal' is no longer a part of an application's inventory,
and pyre.applications.start() is now responsible for calling run().


Modified: mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py	2006-11-28 02:57:07 UTC (rev 5354)
+++ mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py	2006-11-28 03:01:37 UTC (rev 5355)
@@ -111,7 +111,6 @@
 #        self._info.line("    full name: %r" % self.inventory.fullname)
 
         self._info.line("  facilities:")
-        self._info.line("    journal: %r" % self.inventory.journal.name)
         self._info.line("    launcher: %r" % self.inventory.launcher.name)
 
         self._info.line("    solver1: %r" % self.inventory.solver1.name)
@@ -162,14 +161,6 @@
 
 
 
-# main
-if __name__ == "__main__":
-
-    app = CoupledApp("CitcomS")
-    app.run()
-
-
-
 # version
 __id__ = "$Id$"
 

Modified: mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py	2006-11-28 02:57:07 UTC (rev 5354)
+++ mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py	2006-11-28 03:01:37 UTC (rev 5355)
@@ -81,7 +81,6 @@
         #self._info.line("    full name: %r" % self.inventory.fullname)
 
         self._info.line("  facilities:")
-        self._info.line("    journal: %r" % self.inventory.journal.name)
         self._info.line("    launcher: %r" % self.inventory.launcher.name)
 
         self._info.line("    solver: %r" % self.solver.name)
@@ -103,15 +102,6 @@
 
 
 
-# main
-if __name__ == "__main__":
-
-    app = SimpleApp("CitcomS")
-    app.run()
-
-
-
-
 # version
 __id__ = "$Id$"
 

Modified: mc/3D/CitcomS/trunk/bin/citcoms.in
===================================================================
--- mc/3D/CitcomS/trunk/bin/citcoms.in	2006-11-28 02:57:07 UTC (rev 5354)
+++ mc/3D/CitcomS/trunk/bin/citcoms.in	2006-11-28 03:01:37 UTC (rev 5355)
@@ -40,7 +40,7 @@
         site.addsitedir(directory)
 
 from CitcomS.SimpleApp import SimpleApp
-app = SimpleApp()
-app.run()
+from pyre.applications import start
+start(applicationClass=SimpleApp)
 
 #  end of file 

Modified: mc/3D/CitcomS/trunk/setup.py
===================================================================
--- mc/3D/CitcomS/trunk/setup.py	2006-11-28 02:57:07 UTC (rev 5354)
+++ mc/3D/CitcomS/trunk/setup.py	2006-11-28 03:01:37 UTC (rev 5355)
@@ -13,7 +13,7 @@
     packages = find_packages(),
     
     install_requires = [
-    'pythia[mpi] >= 0.8.1.0b4, < 0.8.2a',
+    'pythia[mpi] >= 0.8.1.0b7, < 0.8.2a',
     ],
 
     author = 'Louis Moresi, et al.',