Changeset 5728


Ignore:
Timestamp:
Sep 4, 2008, 7:12:44 AM (16 years ago)
Author:
steve
Message:
 
Location:
anuga_work/development/anuga_1d
Files:
1 added
2 edited

Legend:

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

    r5727 r5728  
    11import os
    22from math import sqrt, sin, cos, pi, exp
    3 from shallow_water_domain import *
     3from shallow_water_domain_new import *
    44from Numeric import zeros, Float
    55#from analytic_dam_sudi import AnalyticDam
     
    138138        #pass
    139139   
    140         from pylab import plot,title,xlabel,ylabel,legend,savefig,show,hold,subplot,ion
     140        from pylab import clf,plot,title,xlabel,ylabel,legend,savefig,show,hold,subplot,ion
    141141        #print 'Test1'
    142         hold(False)
     142        #hold(False)
     143        clf()
    143144        #print 'test 2'
    144145        plot1 = subplot(211)
     
    150151        xlabel('Position')
    151152        ylabel('Stage')
    152         legend( ('Bed Elevation', 'Numerical Solution'),
    153            'upper right', shadow=False)
     153        #legend( ('Bed Elevation', 'Numerical Solution'),
     154        #   'upper right', shadow=False)
     155
     156       
    154157        #legend(('Analytical Solution', 'Numerical Solution'),
    155158        #   'lower right', shadow=False)
     
    157160        plot(X,MomentumQ)
    158161        #plot2.set_ylim([-5,35])
    159         legend( ('Numerical Solution', 'for momentum'),
    160            'upper right', shadow=False)
     162        #legend( ('Numerical Solution', 'for momentum'),
     163        #   'upper right', shadow=False)
    161164   
    162165        xlabel('Position')
     
    168171        #savefig(file)
    169172        show()
    170 
     173       
    171174print 'That took %.2f seconds'%(time.time()-t0)
  • anuga_work/development/anuga_1d/test_shallow_water.py

    r5727 r5728  
    55
    66
    7 from shallow_water_domain import *
    8 from shallow_water_domain import flux_function as domain_flux_function
    9 
    10 from Numeric import allclose, array, ones, Float
     7from shallow_water_domain_new import *
     8from shallow_water_domain_new import flux_function as domain_flux_function
     9
     10from Numeric import allclose, array, ones, Float, maximum
    1111
    1212
     
    1515        self.points = [0.0, 1.0, 2.0, 3.0]
    1616        self.vertex_values = [[1.0,2.0],[4.0,5.0],[-1.0,2.0]]
     17        self.points2 = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0]
    1718       
    1819    def tearDown(self):
     
    123124        """
    124125               
    125         def slope_one(x):
    126             return x
     126        def slope_square(x):
     127            return maximum(4.0-(x-5.0)*(x-5.0), 0.0)
    127128                       
    128         domain = Domain(self.points)
    129         domain.set_quantity('stage',4.0)
    130         domain.set_quantity('elevation',slope_one)
     129        domain = Domain(self.points2)
     130        domain.set_quantity('stage',10.0)
     131        domain.set_quantity('elevation',slope_square)
    131132        domain.set_boundary({'exterior' : Reflective_boundary(domain)})
    132133
    133         yieldstep=0.01
    134         finaltime=0.01
     134        yieldstep=10.0
     135        finaltime=10.0
    135136
    136137        for t in domain.evolve(yieldstep=yieldstep, finaltime=finaltime):
     
    146147        print domain.quantities['xmomentum'].centroid_values   
    147148
    148         assert allclose( array([-34.3, -24.5, -14.7], Float), domain.quantities['xmomentum'].explicit_update )
     149        #assert allclose( array([-34.3, -24.5, -14.7], Float), domain.quantities['xmomentum'].explicit_update )
    149150
    150151
Note: See TracChangeset for help on using the changeset viewer.