Changeset 8599

Timestamp:

Nov 6, 2012, 9:45:46 PM (12 years ago)

Author:

steve

Message:

Updating changes in windows

Location:

trunk

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py (modified) (2 diffs)
• anuga_core/source/anuga/operators/run_set_stage.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/documentation/report.tex (modified) (1 diff)
• anuga_work/development/2010-projects/anuga_1d/compile_all.py (modified) (1 diff)
• anuga_work/development/2010-projects/anuga_1d/sww/1dprofile_dispersion.py (modified) (4 diffs)
• anuga_work/development/2010-projects/anuga_1d/sww/sww_domain.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -985 +985 @@
         fid = open(filename + '.txt', 'w')
         start = time.mktime(time.strptime('2000', '%Y'))
+        
+        #print 'start ',start
+        
         dt = 60  #One minute intervals
         t = 0.0
@@ -1007 +1010 @@
         vertices = [[0,1,2]]
         domain = Domain(points, vertices)
-
+        #print domain.starttime, start
+                
         # Check that domain.starttime is updated if non-existing
         F = file_function(filename + '.tms',
                           domain,
                           quantities = ['Attribute0', 'Attribute1', 'Attribute2'])  
+                          
+                          
+        #print domain.starttime, start
         assert num.allclose(domain.starttime, start)
 

trunk/anuga_core/source/anuga/operators/run_set_stage.py

@@ -29 +29 @@
 domain = anuga.rectangular_cross_domain(int(L/dx), int(W/dy), L, W, (-L/2.0, -W/2.0))
 
+
+print domain.starttime
 
 output_file = 'set_stage'

trunk/anuga_core/source/anuga_parallel/documentation/report.tex

@@ -22 +22 @@
 %\usepackage{url} %Already defined in manual
 \usepackage{graphicx}
+%\usepackage{epstopdf}
 
 %\input{definitions}

trunk/anuga_work/development/2010-projects/anuga_1d/compile_all.py

@@ -33 +33 @@
 execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
-os.chdir('..')
-os.chdir('sqpipe')
-execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
+#os.chdir('..')
+#os.chdir('sqpipe')
+#execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 
 

trunk/anuga_work/development/2010-projects/anuga_1d/sww/1dprofile_dispersion.py

@@ -106 +106 @@
 
 # Set final time and yield time for simulation
-finaltime = 1.0
-yieldstep = 1.0
+finaltime = 2000.0
+yieldstep = 100.0
 
+#import pdb; pdb.set_trace()
 #===================================================================
 # Time loop
@@ -122 +123 @@
 
 import pylab
-pylab.ion()
+pylab.ioff()
 
 x = domain.get_vertices().flatten()
@@ -163 +164 @@
 
 uplot = pylab.plot(x, u, 'k')
-pylab.draw()
 
 #plot2.set_ylim(width_lim)
@@ -172 +172 @@
 #pylab.savefig('figure4.pdf')
 pylab.show()
+
+
     
-    
+#raw_input('Press any key:')
 

trunk/anuga_work/development/2010-projects/anuga_1d/sww/sww_domain.py

@@ -161 +161 @@
         #self.flux_timestep = comp_flux_ext(timestep,self,stage,xmom,bed)
 
-        from anuga_1d.sww.sww_vel_comp_flux_ext import compute_fluxes_vel_ext as comp_flux_ext
+        from anuga_1d.sww.sww_well_comp_flux_ext import compute_fluxes_vel_ext as comp_flux_ext
         self.flux_timestep = comp_flux_ext(timestep,self,stage,xmom,bed,height,velocity)