Changeset 9614

Timestamp:

Feb 5, 2015, 4:17:25 PM (10 years ago)

Author:

steve

Message:

Changed setup.py to compile fortran okada code and moved test file to tests folder

Location:

trunk/anuga_core/anuga/tsunami_source

Files:

• setup.py (modified) (1 diff)
• tests/okada_tsunami_octave_95.txt (moved) (moved from trunk/anuga_core/anuga/tsunami_source/okada_tsunami_octave_95.txt)
• tests/test_okada_tsunami.py (moved) (moved from trunk/anuga_core/anuga/tsunami_source/okada_tsunami_test.py) (2 diffs)

trunk/anuga_core/anuga/tsunami_source/setup.py

@@ -16 +16 @@
     config.add_data_dir(join('tests','data'))
 
+
+    config.add_extension('okada_tsunami_fortran',
+                         sources=['okada_tsunami_fortran.f'])
+
     
     return config

trunk/anuga_core/anuga/tsunami_source/tests/test_okada_tsunami.py

@@ -10 +10 @@
 
 import anuga
-import okada_tsunami
+import anuga.tsunami_source.okada_tsunami as okada_tsunami
 import numpy
 from anuga.utilities.system_tools import get_pathname_from_package
@@ -378 +378 @@
         ## Now read the same event from an octave code, which is completely
         ## independent of this one (i.e. they don't call okada's fortran)
-        path=get_pathname_from_package('anuga.shallow_water')
+        path=get_pathname_from_package('anuga.tsunami_source')
         octave=numpy.genfromtxt(path+sep+'okada_tsunami_octave_95.txt')
         octave_asvec=numpy.transpose(octave).reshape((1,101*101))