r10202 - /branches/multi_processor_merge/relax -- January 13, 2010 - 16:05

Author: bugman
Date: Wed Jan 13 16:05:04 2010
New Revision: 10202

URL: http://svn.gna.org/viewcvs/relax?rev=10202&view=rev
Log:
Broke some nasty recursion.

The processor instance was being placed into the relax instance and then 
relax calling the processor
instance method get_intro_string() to get a message about the processor.  Now 
the top level code is
calling the method and placing the string into the relax instance.


Modified:
    branches/multi_processor_merge/relax

Modified: branches/multi_processor_merge/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/relax?rev=10202&r1=10201&r2=10202&view=diff
==============================================================================
--- branches/multi_processor_merge/relax (original)
+++ branches/multi_processor_merge/relax Wed Jan 13 16:05:04 2010
@@ -369,7 +369,7 @@
 
         # Multi processor string component.
         if not self.mode == 'prompt' or not self.multiprocessor_type == 
'uni':
-            intro_string  = intro_string  + '\nProcessor model:  %s\n' % 
self.processor.get_intro_string()
+            intro_string  = intro_string  + '\nProcessor model:  %s\n' % 
self.processor_intro_string
 
         # Return the string.
         return intro_string
@@ -440,12 +440,15 @@
 
     # Set up the multi-processor elements.
     callbacks = Application_callback(master=relax_instance)
-    relax_instance.processor = 
Processor.load_multiprocessor(relax_instance.multiprocessor_type, callbacks, 
processor_size=relax_instance.n_processors)
+    processor = 
Processor.load_multiprocessor(relax_instance.multiprocessor_type, callbacks, 
processor_size=relax_instance.n_processors)
+
+    # Store the processor intro string.
+    relax_instance.processor_intro_string = processor.get_intro_string()
 
     # Normal relax operation.
     if not profile_flag:
         # Execute relax in multi-processor mode (this includes the 
uni-processor for normal operation).
-        relax_instance.processor.run()
+        processor.run()
 
     # relax in profiling mode.
     else:
@@ -461,4 +464,4 @@
 
         # Run relax in profiling mode.
         profile.Profile.print_stats = print_stats
-        profile.run('relax_instance.processor.run()')
+        profile.run('processor.run()')