r7863 - in /branches/multi_processor_merge/multi: mpi4py_processor.py uni_processor.py -- October 20, 2008 - 21:56

Author: bugman
Date: Mon Oct 20 21:56:41 2008
New Revision: 7863

URL: http://svn.gna.org/viewcvs/relax?rev=7863&view=rev
Log:
Modified the get_intro_string() methods.

Epydoc formatted docstrings have been added and the text slightly modified.


Modified:
    branches/multi_processor_merge/multi/mpi4py_processor.py
    branches/multi_processor_merge/multi/uni_processor.py

Modified: branches/multi_processor_merge/multi/mpi4py_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/mpi4py_processor.py?rev=7863&r1=7862&r2=7863&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/mpi4py_processor.py (original)
+++ branches/multi_processor_merge/multi/mpi4py_processor.py Mon Oct 20 
21:56:41 2008
@@ -130,8 +130,17 @@
 
     #TODO: MAY NEED support for widths?
     def get_intro_string(self):
+        """Return the string to append to the end of the relax introduction 
string.
+
+        @return:    The string describing this Processor fabric.
+        @rtype:     str
+        """
+
+        # Get the specific MPI version.
         version_info = MPI.Get_version()
-        return '''MPI running via mpi4py with %d slave processors & 1 
master, mpi version = %s.%s''' % (self.processor_size(), version_info[0], 
version_info[1])
+
+        # Return the string.
+        return "MPI running via mpi4py with %d slave processors & 1 master.  
Using MPI version %s.%s." % (self.processor_size(), version_info[0], 
version_info[1])
 
 
     def get_name(self):

Modified: branches/multi_processor_merge/multi/uni_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/uni_processor.py?rev=7863&r1=7862&r2=7863&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/uni_processor.py (original)
+++ branches/multi_processor_merge/multi/uni_processor.py Mon Oct 20 21:56:41 
2008
@@ -67,8 +67,14 @@
 
 
     def get_intro_string(self):
-        return '''uniprocessor'''
+        """Return the string to append to the end of the relax introduction 
string.
 
+        @return:    The string describing this Processor fabric.
+        @rtype:     str
+        """
+
+        # Return the string.
+        return "Uni-processor"
 
 
     def get_name(self):