Changeset 7260


Ignore:
Timestamp:
Jun 24, 2009, 2:01:52 PM (16 years ago)
Author:
ole
Message:

Merged changes to trunk in revision 7259 into Numeric branche.
Command was

~/sandpit/anuga/branches/Numeric_anuga_validation$ svn merge -r 7258:HEAD ../../anuga_validation

See also ​http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.1 for details on merging entire branches.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/Numeric_anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

    r7223 r7260  
    7171            #time_standard = 14.5
    7272            time_standard = 24.
    73             mem_standard = 30204
     73            mem_standard = 40468
    7474           
    7575        elif host.find('compute') == 0: # cyclone or tornado node
    7676            time_standard = 19.0
    77             mem_standard = 30204
     77            mem_standard = 40468
    7878
    7979        elif host.find('cyclone') == 0: # cyclone headnode
    8080            time_standard = 13.3
    81             mem_standard = 30204
     81            mem_standard = 40468
    8282            #mem_standard = 29424
    8383
    … …  
    8686           
    8787            # v 4910 is giving a mem of 15572
    88             mem_standard = 15572
     88            mem_standard = 16104
    8989           
    9090
Note: See TracChangeset for help on using the changeset viewer.