Changeset 7223

Timestamp:

Jun 19, 2009, 8:33:20 AM (15 years ago)

Author:

rwilson

Message:

Merged changes from numpy branch.

File:

• anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py (modified) (3 diffs)

anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

@@ -79 +79 @@
         elif host.find('cyclone') == 0: # cyclone headnode
             time_standard = 13.3
-            mem_standard = 30204             
+            mem_standard = 30204
             #mem_standard = 29424
 
@@ -98 +98 @@
             mem_standard = 15000 #?
 
+        elif host.find('PC-32572') == 0: # Ross' Ubuntu box - nump trunk
+            time_standard = 12.8
+            mem_standard = 15788 #?
+
             """
             test_fit_time_and_mem (__main__.Test_uq) ...  very start mem_usage() 98076
@@ -114 +118 @@
         msg = ('Time used was %.1f s, standard is %.1f s +20%% (%.1f s)'
                % (time, time_standard, int(time_standard*1.2)))
-        assert time < time_standard*1.2
+        assert time < time_standard*1.2, msg