Changeset 581

Timestamp:

Nov 17, 2004, 3:42:00 PM (20 years ago)

Author:

chris

Message:

 

File:

• inundation/ga/storm_surge/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py (modified) (1 diff)

inundation/ga/storm_surge/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py

@@ -67 +67 @@
 import time
 t0 = time.time()
+<<<<<<< .mine
+for t in domain.evolve(max_timestep = 0.1, yieldstep = 1.0, finaltime = 50):
+=======
 for t in domain.evolve(yieldstep = 0.1, finaltime = 5):
+>>>>>>> .r445
     domain.write_time()