Changeset 6007


Ignore:
Timestamp:
Nov 27, 2008, 11:34:01 AM (14 years ago)
Author:
ole
Message:

Verified validate_all.py on Windows and Linux64 with more superfluous parameters removed

Location:
anuga_validation
Files:
3 edited

Legend:

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

    r5986 r6007  
    6262        #print "time", time
    6363        #print "mem", mem
     64
     65        #Defaults
     66        time_standard = 50.
     67        mem_standard = 50000.
     68       
    6469        if host.find('tornado') == 0:
    6570            # Tornado headnode
    6671            #time_standard = 14.5
    67             time_standard = 24
    68             mem_standard = 302404
     72            time_standard = 24.
     73            mem_standard = 302404.
    6974           
    7075        elif host.find('compute-1') == 0: # cyclone or tornado node
    7176            time_standard = 19.0
    72             mem_standard = 30204
     77            mem_standard = 30204.
    7378
    7479        elif host.find('cyclone') == 0: # cyclone headnode
    7580            time_standard = 13.3
    76             mem_standard = 29424
     81            mem_standard = 29424.
    7782
    7883        elif host.find('nautilus') == 0:
     
    8085           
    8186            # v 4910 is giving a mem of 15572
    82             mem_standard = 15572
     87            mem_standard = 15572.
    8388           
    8489
    8590        elif host.find('bogong') == 0:
    8691            time_standard = 14.2
    87             mem_standard = 30000 # Updated by Ole 20080507
     92            mem_standard = 30000. # Updated by Ole 20080507
    8893
    8994
    9095        elif host.find('pc-31569') == 0: # DSG's PC
    9196            time_standard = 31.6
    92             mem_standard = 15000 #?
     97            mem_standard = 15000. #?
    9398
    9499            """
     
    108113        assert time<time_standard*1.2
    109114
     115
     116
     117        if sys.platform == 'win32':
     118            # Memory usage does not work on windows
     119            return
    110120       
    111121        # Before change: https://datamining.anu.edu.au/anuga/changeset/5855
     
    114124        mem_standard *= 1.25
    115125
    116         msg = 'Memory used was %d, mem_standard is %d' %(mem, mem_standard)
     126        msg = 'Memory used was %f, mem_standard is %f' %(float(mem), mem_standard)
    117127        #print msg
    118128        assert mem<mem_standard*1.2, msg           
  • anuga_validation/automated_validation_tests/okushiri_tank_validation/run_okushiri.py

    r6005 r6007  
    5555    domain.set_name(project.output_filename)  # Name of output sww file
    5656    domain.set_default_order(2)               # Apply second order scheme
    57     #domain.set_all_limiters(0.9)              # Max second order scheme
    58                                               # (old lim)
    5957    domain.set_minimum_storable_height(0.001) # Don't store w < 0.001m
    6058    domain.set_quantities_to_be_monitored('stage')
    61 
    62     domain.use_centroid_velocities = True
    6359
    6460    #-------------------------
  • anuga_validation/okushiri_2005/run_okushiri.py

    r6005 r6007  
    5454domain.set_name(project.output_filename)  # Name of output sww file
    5555domain.set_default_order(2)               # Apply second order scheme
    56 #domain.set_all_limiters(0.9)              # Max second order scheme (old lim)
    5756domain.set_minimum_storable_height(0.001) # Don't store h < 0.001m
    58 domain.tight_slope_limiters = True
    5957
    6058#Timings on AMD64-242 (beta_h=0)
Note: See TracChangeset for help on using the changeset viewer.