Ignore:
Timestamp:
Jun 30, 2009, 2:07:41 PM (15 years ago)
Author:
ole
Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/utilities/test_xml_tools.py

    r6158 r7276  
    307307        os.remove(tmp_name)
    308308
    309        
    310        
    311 #-------------------------------------------------------------
     309################################################################################
     310
    312311if __name__ == "__main__":
    313312    suite = unittest.makeSuite(Test_xml_tools, 'test')
Note: See TracChangeset for help on using the changeset viewer.