Changeset 7825 for anuga_work/development/anuga_1d/quantity.py

Timestamp:

Jun 11, 2010, 7:46:04 PM (14 years ago)

Author:

steve

Message:

anuga_1d works with numeric on 64bit machine

File:

• anuga_work/development/anuga_1d/quantity.py (modified) (3 diffs)

anuga_work/development/anuga_1d/quantity.py

@@ -237 +237 @@
     def set_values_from_constant(self,numeric):
 
-        self.vertex_values[:]   = numeric
-        self.centroid_values[:] = numeric
+        self.vertex_values[:,:]   = numeric
+        self.centroid_values[:,] = numeric
 
 
     def set_values_from_array(self,numeric):
 
-        self.vertex_values[:]   = numeric
+        self.vertex_values[:,:]   = numeric
         self.interpolate()
 
@@ -249 +249 @@
     def set_values_from_quantity(self,quantity):
 
-        self.vertex_values[:]   = quantity.vertex_values
-        self.centroid_values[:] = quantity.centroid_values
+        self.vertex_values[:,:]   = quantity.vertex_values
+        self.centroid_values[:,] = quantity.centroid_values
 
     def set_values_from_function(self,function):
 
-        self.vertex_values[:]   = map(function, self.domain.vertices)
-        self.centroid_values[:] = map(function, self.domain.centroids)
+        self.vertex_values[:,:]   = map(function, self.domain.vertices)
+        self.centroid_values[:,] = map(function, self.domain.centroids)
 
 
@@ -1097 +1097 @@
         #backup_centroid_values(self)
 
-        self.centroid_backup_values[:] = (self.centroid_values).astype('f')
+        self.centroid_backup_values[:,] = (self.centroid_values).astype('f')
 
     def saxpy_centroid_values(self,a,b):
         # Call correct module function
         # (either from this module or C-extension)
-        self.centroid_values[:] = (a*self.centroid_values + b*self.centroid_backup_values).astype('f')
+        self.centroid_values[:,] = (a*self.centroid_values + b*self.centroid_backup_values).astype('f')