Changeset 6904 for branches/numpy/anuga

Timestamp:

Apr 25, 2009, 11:00:44 PM (16 years ago)

Author:

rwilson

Message:

Finished back-merge from Numeric trunk to numpy branch (and some code the other way).

Location:

branches/numpy/anuga

Files:

• abstract_2d_finite_volumes/domain.py (modified) (2 diffs)
• abstract_2d_finite_volumes/generic_boundary_conditions.py (modified) (1 diff)
• abstract_2d_finite_volumes/mesh_factory.py (modified) (3 diffs)
• compile_all.py (modified) (1 diff)
• load_mesh/loadASCII.py (modified) (3 diffs)
• load_mesh/test_loadASCII.py (modified) (2 diffs)
• test_all.py (modified) (1 diff)
• utilities/polygon_ext.c (modified) (4 diffs)
• utilities/system_tools.py (modified) (8 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/domain.py

@@ -1758 +1758 @@
         # We have a list with ghosts expecting updates
 
-        from Numeric import take,put
-
-
         #Update of ghost cells
         iproc = self.processor
@@ -1773 +1770 @@
             for i, q in enumerate(self.conserved_quantities):
                 Q_cv =  self.quantities[q].centroid_values
-                put(Q_cv,     Idg, take(Q_cv,     Idf))
+                num.put(Q_cv, Idg, num.take(Q_cv, Idf, axis=0))
 
  

branches/numpy/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

@@ -98 +98 @@
     # Transmissive_Momentum_Set_Stage_Boundary (cf posting by rrraman)
     def __init__(self, domain=None,
-                 f=None,
+                 f=None, # Should be removed and replaced by function below
+                 function=None,
                  default_boundary=None,
                  verbose=False):

branches/numpy/anuga/abstract_2d_finite_volumes/mesh_factory.py

@@ -259 +259 @@
     E = EIndex(n,m)
 
-    points = num.zeros( (Np,2), num.Float)
+    points = num.zeros( (Np,2), num.float)
 
     for i in range(m+1):
@@ -271 +271 @@
 
 
-    elements = num.zeros( (Nt,3), num.Int)
+    elements = num.zeros( (Nt,3), num.int)
     boundary = {}
     Idgl = []
@@ -339 +339 @@
     Idgr.extend(Idgl)
 
-    Idfl = num.array(Idfl, num.Int)
-    Idgr = num.array(Idgr, num.Int)
+    Idfl = num.array(Idfl, num.int)
+    Idgr = num.array(Idgr, num.int)
     
     full_send_dict[processor]  = [Idfl, Idfl]

branches/numpy/anuga/compile_all.py

@@ -28 +28 @@
     
 if sys.platform == 'win32':
-    raw_input('Press any key')
+    raw_input('Press the RETURN key')

branches/numpy/anuga/load_mesh/loadASCII.py

@@ -817 +817 @@
         mesh['vertex_attributes'] = None
 
-#    mesh['vertex_attribute_titles'] = []
+    mesh['vertex_attribute_titles'] = []
     try:
         titles = fid.variables['vertex_attribute_titles'][:]
@@ -829 +829 @@
         mesh['segments'] = num.array([], num.int)      #array default#
 
-#    mesh['segment_tags'] = []
+    mesh['segment_tags'] = []
     try:
         tags = fid.variables['segment_tags'][:]
@@ -844 +844 @@
         mesh['triangle_neighbors'] = num.array([], num.int)     #array default#
 
-#    mesh['triangle_tags'] = []
+    mesh['triangle_tags'] = []
     try:
         tags = fid.variables['triangle_tags'][:]

branches/numpy/anuga/load_mesh/test_loadASCII.py

@@ -398 +398 @@
         assert num.allclose(num.array(dict['segments']),
                             num.array(loaded_dict['segments']))
-
-        self.failUnlessEqual(dict['triangle_tags'], loaded_dict['triangle_tags'])
-
         for ob, ldob in map(None, dict['triangle_tags'],
                             loaded_dict['triangle_tags']):
@@ -424 +421 @@
             self.failUnless(seg == ldseg, fail_string + ' failed\n' + msg)
 
-#        dict_array = num.array(dict['vertex_attribute_titles'])
-#        loaded_dict_array = num.array(loaded_dict['vertex_attribute_titles'])
-        try:
-            assert num.allclose(dict_array, loaded_dict_array)
-        #except TypeError:      #??#
+        try:
+            assert num.allclose(num.array(dict['vertex_attribute_titles']),
+                                num.array(loaded_dict['vertex_attribute_titles']))
         except IndexError:
-            self.failUnless(num.alltrue(loaded_dict_array == dict_array),
+            self.failUnless(num.alltrue(num.array(loaded_dict['vertex_attribute_titles'])
+                            == num.array(dict['vertex_attribute_titles'])),
                             fail_string + ' failed!! Test 8')
 

branches/numpy/anuga/test_all.py

@@ -217 +217 @@
     
     if sys.platform == 'win32':
-        raw_input('Press any key')
+        raw_input('Press the RETURN key')

branches/numpy/anuga/utilities/polygon_ext.c

@@ -330 +330 @@
 
 int __separate_points_by_polygon(int M,     // Number of points
-                                int N,     // Number of polygon vertices
-                                double* points,
-                                double* polygon,
-                                long* indices,  // M-Array for storage indices
-                                int closed,
-                                int verbose) {
+                                 int N,     // Number of polygon vertices
+                                 double* points,
+                                 double* polygon,
+                                 long* indices,  // M-Array for storage indices
+                                 int closed,
+                                 int verbose) {
 
   double minpx, maxpx, minpy, maxpy, x, y, px_i, py_i, px_j, py_j, rtol=0.0, atol=0.0;
   int i, j, k, outside_index, inside_index, inside;
 
-  //Find min and max of poly used for optimisation when points
-  //are far away from polygon
-  
-  //FIXME(Ole): Pass in rtol and atol from Python
+  // Find min and max of poly used for optimisation when points
+  // are far away from polygon
+  
+  // FIXME(Ole): Pass in rtol and atol from Python
 
   minpx = polygon[0]; maxpx = minpx;
@@ -358 +358 @@
   }
 
-  //Begin main loop (for each point)
-  inside_index = 0;    //Keep track of points inside
-  outside_index = M-1; //Keep track of points outside (starting from end)   
+  // Begin main loop (for each point)
+  inside_index = 0;    // Keep track of points inside
+  outside_index = M-1; // Keep track of points outside (starting from end)   
   if (verbose){
      printf("Separating %d points\n", M);
@@ -374 +374 @@
     inside = 0;
 
-    //Optimisation
+    // Optimisation
     if ((x > maxpx) || (x < minpx) || (y > maxpy) || (y < minpy)) {
-      //Nothing
+      // Nothing
     } else {   
-      //Check polygon
+      // Check polygon
       for (i=0; i<N; i++) {
-        //printf("k,i=%d,%d\n", k, i);
         j = (i+1)%N;
 
@@ -388 +387 @@
         py_j = polygon[2*j+1];
 
-        //Check for case where point is contained in line segment
+        // Check for case where point is contained in line segment
         if (__point_on_line(x, y, px_i, py_i, px_j, py_j, rtol, atol)) {
           if (closed == 1) {

branches/numpy/anuga/utilities/system_tools.py

@@ -50 +50 @@
 
 def get_revision_number():
-    """Get the version number of the SVN
+    """Get the version number of this repository copy.
+
+    Try getting data from stored_version_info.py first, otherwise
+    try using SubWCRev.exe (Windows) or svnversion (linux), otherwise
+    try reading file .svn/entries for version information, otherwise
+    throw an exception.
+
     NOTE: This requires that the command svn is on the system PATH
     (simply aliasing svn to the binary will not work)
     """
 
-    # FIXME (Ole): Change this so that svn info is attempted first.
-    # If that fails, try to read a stored file with that same info (this would
-    # be created by e.g. the release script). Failing that, throw an exception.
-    # FIXME (Ole): Move this and store_version_info to utilities
+    def get_revision_from_svn_entries():
+        '''Get a subversion revision number from the .svn/entires file.'''
+
+        msg = '''
+No version info stored and command 'svn' is not recognised on the system PATH.
+
+If ANUGA has been installed from a distribution e.g. as obtained from SourceForge,
+the version info should be available in the automatically generated file
+'stored_version_info.py' in the anuga root directory.
+
+If run from a Subversion sandpit, ANUGA will try to obtain the version info by
+using the command 'svn info'.  In this case, make sure the command line client
+'svn' is accessible on the system path.  Simply aliasing 'svn' to the binary will
+not work.
+
+If you are using Windows, you have to install the file svn.exe which can be
+obtained from http://www.collab.net/downloads/subversion.
+
+Good luck!
+'''
+
+        try:
+            fd = open(os.path.join('.svn', 'entries'))
+        except:
+            raise Exception, msg
+
+        line = fd.readlines()[3]
+        fd.close()
+        try:
+            revision_number = int(line)
+        except:
+            msg = ".svn/entries, line 4 was '%s'?" % line.strip()
+            raise Exception, msg
+
+        return revision_number
+
+    def get_revision_from_svn_client():
+        '''Get a subversion revision number from an svn client.'''
+
+        if sys.platform[0:3] == 'win':
+            try:
+                fid = os.popen(r'C:\Program Files\TortoiseSVN\bin\SubWCRev.exe')
+            except:
+                return get_revision_from_svn_entries()
+            else:
+                version_info = fid.read()
+                if version_info == '':
+                    return get_revision_from_svn_entries()
+
+            # split revision number from data
+            for line in version_info.split('\n'):
+                if line.startswith('Updated to revision '):
+                    break
+
+            fields = line.split(' ')
+            msg = 'Keyword "Revision" was not found anywhere in text: %s' % version_info
+            assert fields[0].startswith('Updated'), msg
+
+            try:
+                revision_number = int(fields[3])
+            except:
+                msg = ("Revision number must be an integer. I got '%s' from "
+                       "'SubWCRev.exe'." % fields[3])
+                raise Exception, msg
+        else:                   # assume Linux
+            try:
+                fid = os.popen('svnversion -n . 2>/dev/null')
+            except:
+                return get_revision_from_svn_entries()
+            else:
+                version_info = fid.read()
+                if version_info == '':
+                    return get_revision_from_svn_entries()
+
+            # split revision number from data
+            if ':' in version_info:
+                (_, revision_number) =  version_info.split(':')
+            elif version_info.endswith('M'):
+                revision_number = version_info[:-1]
+            else:
+                revision_number = version_info
+
+            try:
+                revision_number = int(revision_number)
+            except:
+                msg = ("Revision number must be an integer. I got '%s' from "
+                       "'svn'." % version_info)
+                raise Exception, msg
+
+        return revision_number
+
+    # try to get revision information from stored_version_info.py
     try:
         from anuga.stored_version_info import version_info
     except:
-        msg = '''
-No version info stored and command 'svn' is not recognised on the system PATH.
-
-If ANUGA has been installed from a distribution e.g. as obtained from
-SourceForge, the version info should be available in the automatically
-generated file 'stored_version_info.py' in the anuga root directory.
-
-If run from a Subversion sandpit, ANUGA will try to obtain the version info
-by using the command 'svn info'.  In this case, make sure 'svn' is accessible
-on the system PATH.  Simply aliasing 'svn' to the binary will not work.
-
-If you are using Windows, you have to install the file svn.exe which can be
-obtained from http://www.collab.net/downloads/subversion.
-
-Good luck!
-'''
-
-        # No file available - try using Subversion
-        try:
-            # The null stuff is so this section fails quitly.
-            # This could cause the svn info command to fail due to
-            # the redirection being bad on some platforms.
-            # If that occurs then change this code.
-            if sys.platform[0:3] == 'win':
-                fid = os.popen('svn info 2> null')
-            else:
-                fid = os.popen('svn info 2>/dev/null')
-        except:
-            raise Exception(msg)
-        else:
-            version_info = fid.read()
-
-        if version_info == '':
-            raise Exception, msg
-    else:
-        pass
-        #print 'Got version from file'
-            
+        return get_revision_from_svn_client()
+
+    # split revision number from data
     for line in version_info.split('\n'):
         if line.startswith('Revision:'):
@@ -106 +165 @@
     fields = line.split(':')
     msg = 'Keyword "Revision" was not found anywhere in text: %s' % version_info
-    assert fields[0].startswith('Revision'), msg            
+    assert fields[0].startswith('Revision'), msg
 
     try:
         revision_number = int(fields[1])
     except:
-        msg = 'Revision number must be an integer. I got %s' %fields[1]
-        msg += 'Check that the command svn is on the system path' 
+        msg = ("Revision number must be an integer. I got '%s'.\n"
+               'Check that the command svn is on the system path.'
+               % fields[1])
         raise Exception, msg
 
@@ -355 +415 @@
 # @param auth Auth tuple (httpproxy, proxyuser, proxypass).
 # @param blocksize Read file in this block size.
-# @return 'auth' tuple for subsequent calls, if successful, else False.
+# @return (True, auth) if successful, else (False, auth).
 # @note If 'auth' not supplied, will prompt user.
 # @note Will try using environment variable HTTP_PROXY for proxy server.
@@ -379 +439 @@
     try:
         urllib.urlretrieve(file_url, file_name)
-        return None     # no proxy, no auth required
+        return (True, auth)     # no proxy, no auth required
     except IOError, e:
         if e[1] == 407:     # proxy error
@@ -385 +445 @@
         elif e[1][0] == 113:  # no route to host
             print 'No route to host for %s' % file_url
-            return False    # return False
+            return (False, auth)    # return False
         else:
             print 'Unknown connection error to %s' % file_url
-            return False
+            return (False, auth)
 
     # We get here if there was a proxy error, get file through the proxy
@@ -437 +497 @@
     try:
         webget = urllib2.urlopen(file_url)
-    except urllib2.HTTPError:
-        return False
+    except urllib2.HTTPError, e:
+        print 'Error received from proxy:\n%s' % str(e)
+        print 'Possibly the user/password is wrong.'
+        return (False, (httpproxy, proxyuser, proxypass))
 
     # transfer file to local filesystem
@@ -451 +513 @@
 
     # return successful auth info
-    return (httpproxy, proxyuser, proxypass)
+    return (True, (httpproxy, proxyuser, proxypass))
 
 
@@ -483 +545 @@
 
 ##
-# @brief Return a hex digest string for a given file.
+# @brief Return a hex digest (MD5) of a given file.
 # @param filename Path to the file of interest.
 # @param blocksize Size of data blocks to read.