Changeset 9234

Timestamp:

Jul 2, 2014, 5:44:15 PM (11 years ago)

Author:

steve

Message:

updating version.py

Location:

trunk/anuga_core/source/anuga

Files:

• get_version.py (modified) (1 diff)
• structures/riverwall.py (modified) (4 diffs)
• utilities/system_tools.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/get_version.py

@@ -16 +16 @@
 
 """
+
+
 
 template = 'version.txt'

trunk/anuga_core/source/anuga/structures/riverwall.py

@@ -461 +461 @@
         # Pretty printing of riverwall information in parallel
         if(verbose): 
-            barrier()
+            if domain.parallel : barrier()
             for i in range(numprocs):
                 if(myid==i):
@@ -471 +471 @@
                     if(not connectedness[1]):
                         raise Exception, msg
-                barrier()
+                if domain.parallel : barrier()
         return 
     
@@ -704 +704 @@
 
         # Files must be created before writing out
-        barrier()    
-
         domain=self.domain
+        
+        #if domain.parallel: barrier()    
+
         # Now dump the required info to the files
         for i in range(numprocs):
@@ -728 +729 @@
                 pass
 
-            barrier() 
+            #if domain.parallel : barrier() 
 
         return

trunk/anuga_core/source/anuga/utilities/system_tools.py

@@ -167 +167 @@
             if line.startswith('Revision:'):
                 break
-        
         fields = line.split(':')
         msg = 'Keyword "Revision" was not found anywhere in text: %s' % version_info
@@ -211 +210 @@
     except:
         try:
-            from anuga.stored_version_info import version_inf
+            from anuga.stored_version_info import version_info
             return process_version_info(version_info)
         except:
@@ -263 +262 @@
     # to somewhere else.
     
-    import config
+    import anuga.config as config
     import subprocess