Ignore:
Timestamp:
Sep 5, 2008, 9:16:45 PM (15 years ago)
Author:
steve
Message:

Updated timestepping

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/development/anuga_1d/shallow_water_domain_new.py

    r5737 r5741  
    165165        distribute_to_vertices_and_edges(self)
    166166       
    167     def evolve(self, yieldstep = None, finaltime = None,
     167    def evolve(self, yieldstep = None,
     168               finaltime = None,
     169               duration = None,
    168170               skip_initial_step = False):
    169171        """Specialisation of basic evolve method from parent class
     
    172174        self.distribute_to_vertices_and_edges()
    173175       
    174         for t in Generic_Domain.evolve(self, yieldstep, finaltime,
     176        for t in Generic_Domain.evolve(self, yieldstep, finaltime, duration,
    175177                                       skip_initial_step):
    176178            #Pass control on to outer loop for more specific actions
     
    439441       
    440442
    441     domain.timestep = timestep
     443    domain.flux_timestep = timestep
    442444    #print domain.quantities['stage'].centroid_values
    443445
     
    468470        from comp_flux_ext import compute_fluxes_ext
    469471       
    470         domain.timestep = compute_fluxes_ext(timestep,
     472        domain.flux_timestep = compute_fluxes_ext(timestep,
    471473                                  epsilon,
    472474                                  g,
     
    501503        from comp_flux_ext import compute_fluxes_ext_short
    502504
    503         domain.timestep = compute_fluxes_ext_short(timestep,domain,stage,xmom,bed)
     505        domain.flux_timestep = compute_fluxes_ext_short(timestep,domain,stage,xmom,bed)
    504506
    505507
     
    526528        max_speed_array = domain.max_speed_array
    527529               
    528         from comp_flux_ext_wellbalanced import compute_fluxes_ext_wellbalanced                  #from comp_flux_ext import compute_fluxes_ext
     530        from comp_flux_ext_wellbalanced import compute_fluxes_ext_wellbalanced  #from comp_flux_ext import compute_fluxes_ext
    529531       
    530         domain.timestep = compute_fluxes_ext_wellbalanced(timestep,
     532        domain.flux_timestep = compute_fluxes_ext_wellbalanced(timestep,
    531533                                  epsilon,
    532534                                  g,
Note: See TracChangeset for help on using the changeset viewer.