- Timestamp:
- Nov 18, 2011, 7:55:23 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_work/development/2010-projects/anuga_1d/sww/sww_domain.py
r8225 r8251 90 90 self.quantities_to_be_stored = ['stage','xmomentum'] 91 91 92 92 self.__doc__ = 'sww_domain' 93 93 94 94 self.set_spatial_order(2) … … 166 166 167 167 168 169 170 168 def distribute_to_vertices_and_edges(self): 171 169 #Call correct module function 172 170 #(either from this module or C-extension) 173 171 distribute_to_vertices_and_edges(self) 172 174 173 175 174 def evolve(self, yieldstep = None, finaltime = None, duration = None, … … 223 222 224 223 import sys 224 import numpy as np 225 225 from anuga_1d.config import epsilon, h0 226 226 … … 240 240 h_C = Height.centroid_values 241 241 u_C = Velocity.centroid_values 242 243 w_V = domain.quantities['stage'].vertex_values 244 z_V = domain.quantities['elevation'].vertex_values 245 h_V = domain.quantities['height'].vertex_values 246 u_V = domain.quantities['velocity'].vertex_values 247 uh_V = domain.quantities['xmomentum'].vertex_values 248 249 250 # print 'w_C', np.any(np.isnan(w_C)) 251 # print 'uh_C', np.any(np.isnan(uh_C)) 252 # print 'z_C', np.any(np.isnan(z_C)) 253 # print 'h_C', np.any(np.isnan(h_C)) 254 # print 'u_C', np.any(np.isnan(u_C)) 255 # 256 # print 'w_V', np.any(np.isnan(w_V)) 257 # print 'uh_V', np.any(np.isnan(uh_V)) 258 # print 'z_V', np.any(np.isnan(z_V)) 259 # print 'h_V', np.any(np.isnan(h_V)) 260 # print 'u_V', np.any(np.isnan(u_V)) 242 261 243 262 #Calculate height (and fix negatives)better be non-negative! … … 245 264 h_C[:] = w_C - z_C 246 265 247 #h0 = 1.0e-12248 u_C[:] = uh_C/(h_C + h0/(h_C + 1.0e-16))266 u_C[:] = numpy.where(h_C <= 1.0e-14, 0.0, uh_C/h_C) 267 249 268 250 269 #print 'domain.order', domain.order … … 263 282 264 283 265 stage_V = domain.quantities['stage'].vertex_values 266 bed_V = domain.quantities['elevation'].vertex_values 267 h_V = domain.quantities['height'].vertex_values 268 u_V = domain.quantities['velocity'].vertex_values 269 xmom_V = domain.quantities['xmomentum'].vertex_values 270 271 h_V[:,:] = stage_V - bed_V 272 284 # print 'w_C', np.any(np.isnan(w_C)) 285 # print 'uh_C', np.any(np.isnan(uh_C)) 286 # print 'z_C', np.any(np.isnan(z_C)) 287 # print 'h_C', np.any(np.isnan(h_C)) 288 # print 'u_C', np.any(np.isnan(u_C)) 289 290 291 292 h_V[:,:] = w_V - z_V 273 293 274 294 #print 'any' ,numpy.any( h_V[:,0] < 0.0) … … 306 326 # 307 327 # 308 stage_V[:,:] = bed_V + h_V328 w_V[:,:] = z_V + h_V 309 329 #bed_V[:,:] = stage_V - h_V 310 xmom_V[:,:] = u_V * h_V 330 uh_V[:,:] = u_V * h_V 331 332 333 # print 'w_V', np.any(np.isnan(w_V)) 334 # print 'uh_V', np.any(np.isnan(uh_V)) 335 # print 'z_V', np.any(np.isnan(z_V)) 336 # print 'h_V', np.any(np.isnan(h_V)) 337 # print 'u_V', np.any(np.isnan(u_V)) 311 338 312 339 return
Note: See TracChangeset
for help on using the changeset viewer.