Changeset 7223


Ignore:
Timestamp:
Jun 19, 2009, 8:33:20 AM (15 years ago)
Author:
rwilson
Message:

Merged changes from numpy branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

    r7221 r7223  
    7979        elif host.find('cyclone') == 0: # cyclone headnode
    8080            time_standard = 13.3
    81             mem_standard = 30204             
     81            mem_standard = 30204
    8282            #mem_standard = 29424
    8383
     
    9898            mem_standard = 15000 #?
    9999
     100        elif host.find('PC-32572') == 0: # Ross' Ubuntu box - nump trunk
     101            time_standard = 12.8
     102            mem_standard = 15788 #?
     103
    100104            """
    101105            test_fit_time_and_mem (__main__.Test_uq) ...  very start mem_usage() 98076
     
    114118        msg = ('Time used was %.1f s, standard is %.1f s +20%% (%.1f s)'
    115119               % (time, time_standard, int(time_standard*1.2)))
    116         assert time < time_standard*1.2
     120        assert time < time_standard*1.2, msg
    117121
    118122
Note: See TracChangeset for help on using the changeset viewer.