- Timestamp:
- Nov 6, 2008, 12:17:15 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py
r5892 r5897 8 8 """ 9 9 10 ##from numpy.oldnumeric import allclose, argmax, zeros, Float 11 import numpy 12 10 from Numeric import allclose, argmax, zeros, Float 13 11 from anuga.config import epsilon 14 12 from anuga.config import beta_euler, beta_rk2 … … 107 105 108 106 if verbose: print 'Initialising Domain' 107 from Numeric import zeros, Float, Int, ones 109 108 from quantity import Quantity 110 109 … … 156 155 for key in self.full_send_dict: 157 156 buffer_shape = self.full_send_dict[key][0].shape[0] 158 self.full_send_dict[key].append( numpy.zeros( (buffer_shape,self.nsys), numpy.float))157 self.full_send_dict[key].append(zeros( (buffer_shape,self.nsys) ,Float)) 159 158 160 159 161 160 for key in self.ghost_recv_dict: 162 161 buffer_shape = self.ghost_recv_dict[key][0].shape[0] 163 self.ghost_recv_dict[key].append( numpy.zeros( (buffer_shape,self.nsys), numpy.float))162 self.ghost_recv_dict[key].append(zeros( (buffer_shape,self.nsys) ,Float)) 164 163 165 164 … … 169 168 N = len(self) #number_of_elements 170 169 self.number_of_elements = N 171 self.tri_full_flag = numpy.ones(N, numpy.int)170 self.tri_full_flag = ones(N, Int) 172 171 for i in self.ghost_recv_dict.keys(): 173 172 for id in self.ghost_recv_dict[i][0]: … … 176 175 # Test the assumption that all full triangles are store before 177 176 # the ghost triangles. 178 if not numpy.allclose(self.tri_full_flag[:self.number_of_full_nodes],1):177 if not allclose(self.tri_full_flag[:self.number_of_full_nodes],1): 179 178 print 'WARNING: Not all full triangles are store before ghost triangles' 180 179 … … 231 230 # calculation 232 231 N = len(self) # Number_of_triangles 233 self.already_computed_flux = numpy.zeros((N, 3), numpy.int)232 self.already_computed_flux = zeros((N, 3), Int) 234 233 235 234 # Storage for maximal speeds computed for each triangle by 236 235 # compute_fluxes 237 236 # This is used for diagnostics only (reset at every yieldstep) 238 self.max_speed = numpy.zeros(N, numpy.float)237 self.max_speed = zeros(N, Float) 239 238 240 239 if mesh_filename is not None: … … 267 266 """ 268 267 268 from Numeric import zeros, Float 269 269 270 if not (vertex is None or edge is None): 270 271 msg = 'Values for both vertex and edge was specified.' … … 272 273 raise msg 273 274 274 q = numpy.zeros( len(self.conserved_quantities), numpy.float)275 q = zeros( len(self.conserved_quantities), Float) 275 276 276 277 for i, name in enumerate(self.conserved_quantities): … … 768 769 # Find index of largest computed flux speed 769 770 if triangle_id is None: 770 k = self.k = numpy.argmax(self.max_speed)771 k = self.k = argmax(self.max_speed) 771 772 else: 772 773 errmsg = 'Triangle_id %d does not exist in mesh: %s' %(triangle_id, … … 1085 1086 1086 1087 """ 1087 print '.evolve: 0'1088 1088 1089 1089 from anuga.config import min_timestep, max_timestep, epsilon … … 1096 1096 %self.get_boundary_tags() 1097 1097 assert hasattr(self, 'boundary_objects'), msg 1098 print '.evolve: 1'1099 1098 1100 1099 … … 1105 1104 1106 1105 self._order_ = self.default_order 1107 print '.evolve: 2'1108 1106 1109 1107 … … 1129 1127 self.number_of_first_order_steps = 0 1130 1128 1131 print '.evolve: 3' 1129 1132 1130 # Update ghosts 1133 1131 self.update_ghosts() 1134 1132 1135 print '.evolve: 4'1136 1133 # Initial update of vertex and edge values 1137 1134 self.distribute_to_vertices_and_edges() 1138 1135 1139 print '.evolve: 5'1140 1136 # Update extrema if necessary (for reporting) 1141 1137 self.update_extrema() 1142 1138 1143 print '.evolve: 6'1144 1139 # Initial update boundary values 1145 1140 self.update_boundary() 1146 1141 1147 print '.evolve: 7'1148 1142 # Or maybe restore from latest checkpoint 1149 1143 if self.checkpoint is True: 1150 1144 self.goto_latest_checkpoint() 1151 print '.evolve: 8'1152 1145 1153 1146 if skip_initial_step is False: … … 1209 1202 self.number_of_steps = 0 1210 1203 self.number_of_first_order_steps = 0 1211 self.max_speed = numpy.zeros(N, numpy.float)1204 self.max_speed = zeros(N, Float) 1212 1205 1213 1206 def evolve_one_euler_step(self, yieldstep, finaltime): … … 1575 1568 """ 1576 1569 1570 from Numeric import ones, sum, equal, Float 1571 1577 1572 N = len(self) # Number_of_triangles 1578 1573 d = len(self.conserved_quantities)
Note: See TracChangeset
for help on using the changeset viewer.