Index: unk/anuga_core/source/anuga/operators/test/all_tests.py
===================================================================
--- /trunk/anuga_core/source/anuga/operators/test/all_tests.py	(revision 9458)
+++ 	(revision )
@@ -1,83 +1,0 @@
-"""Regression testing framework
-This module will search for scripts in the same directory named
-test_*.py.  Each such script should be a test suite that tests a
-module through PyUnit. This script will aggregate all
-found test suites into one big test suite and run them all at once.
-"""
-
-# Author: Mark Pilgrim
-# Modified by Ole Nielsen
-
-import unittest
-import os
-
-
-#List files that should be excluded from the testing process.
-#E.g. if they are known to fail and under development
-exclude = [] 
-
-
-def get_test_files(path):
-
-    import sys
-
-    files = os.listdir(path)
-
-    #Check sub directories
-    test_files = []
-    for file in files:
-        if os.path.isdir(file):
-            sys.path.append(file)
-            #print 'Recursing into', file
-            test_files += get_test_files(path + os.sep + file)
-        elif file[:5] == 'test_' and file[-2:] == 'py':
-            #print 'Appending', file
-            test_files.append(file)
-        else:
-            pass
-    return test_files
-
-
-
-def regressionTest():
-    import sys, os, re, unittest
-    path = os.path.split(sys.argv[0])[0] or os.getcwd()
-
-
-    files = get_test_files(path)
-
-
-
-    #test = re.compile('^test_[\w]*.py$', re.IGNORECASE)
-    #files = filter(test.search, files)
-
-
-    try:
-        files.remove(__file__)  #Remove self from list (Ver 2.3. or later)
-    except:
-        files.remove('test_all.py')
-
-    print 'Testing:'
-    for file in files:
-        print '  ' + file
-
-    if globals().has_key('exclude'):
-        for file in exclude:
-            files.remove(file)
-            print 'WARNING: File '+ file + ' excluded from testing'
-
-
-    filenameToModuleName = lambda f: os.path.splitext(f)[0]
-    #print "files",files 
-    moduleNames = map(filenameToModuleName, files)
-    #print "moduleNames",moduleNames
-    modules = map(__import__, moduleNames)
-    load = unittest.defaultTestLoader.loadTestsFromModule
-    return unittest.TestSuite(map(load, modules))
-
-################################################################################
-
-if __name__ == '__main__':   
-    suite = regressionTest()
-    runner = unittest.TextTestRunner() #verbosity=2)
-    runner.run(suite)
Index: /trunk/anuga_core/source/anuga/structures/test/data/inlet_operator_test1.lic
===================================================================
--- /trunk/anuga_core/source/anuga/structures/test/data/inlet_operator_test1.lic	(revision 9459)
+++ /trunk/anuga_core/source/anuga/structures/test/data/inlet_operator_test1.lic	(revision 9459)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
+  <metadata>
+    <author>Stephen Roberts</author>
+  </metadata>
+  <datafile>
+    <filename>inlet_operator_test1.tms</filename>
+    <checksum>2626649089</checksum>
+    <publishable>Yes</publishable>
+    <accountable>Stephen Roberts</accountable>
+    <source>Australian National University</source>
+    <IP_owner>Australian National University</IP_owner>
+    <IP_info>A very simple time series I made up to test inlet_operator
+    </IP_info>
+  </datafile>
+
+</ga_license_file>
Index: /trunk/anuga_core/source/anuga/structures/test/data/inlet_operator_test2.lic
===================================================================
--- /trunk/anuga_core/source/anuga/structures/test/data/inlet_operator_test2.lic	(revision 9459)
+++ /trunk/anuga_core/source/anuga/structures/test/data/inlet_operator_test2.lic	(revision 9459)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
+  <metadata>
+    <author>Stephen Roberts</author>
+  </metadata>
+  <datafile>
+    <filename>inlet_operator_test2.tms</filename>
+    <checksum>4136545855</checksum>
+    <publishable>Yes</publishable>
+    <accountable>Stephen Roberts</accountable>
+    <source>Australian National University</source>
+    <IP_owner>Australian National University</IP_owner>
+    <IP_info>A very simple time series I made up to test inlet_operator
+    </IP_info>
+  </datafile>
+
+</ga_license_file>
Index: unk/anuga_core/source/anuga/structures/test/test_all.py
===================================================================
--- /trunk/anuga_core/source/anuga/structures/test/test_all.py	(revision 9458)
+++ 	(revision )
@@ -1,83 +1,0 @@
-"""Regression testing framework
-This module will search for scripts in the same directory named
-test_*.py.  Each such script should be a test suite that tests a
-module through PyUnit. This script will aggregate all
-found test suites into one big test suite and run them all at once.
-"""
-
-# Author: Mark Pilgrim
-# Modified by Ole Nielsen
-
-import unittest
-import os
-
-
-#List files that should be excluded from the testing process.
-#E.g. if they are known to fail and under development
-exclude = [] 
-
-
-def get_test_files(path):
-
-    import sys
-
-    files = os.listdir(path)
-
-    #Check sub directories
-    test_files = []
-    for file in files:
-        if os.path.isdir(file):
-            sys.path.append(file)
-            #print 'Recursing into', file
-            test_files += get_test_files(path + os.sep + file)
-        elif file[:5] == 'test_' and file[-2:] == 'py':
-            #print 'Appending', file
-            test_files.append(file)
-        else:
-            pass
-    return test_files
-
-
-
-def regressionTest():
-    import sys, os, re, unittest
-    path = os.path.split(sys.argv[0])[0] or os.getcwd()
-
-
-    files = get_test_files(path)
-
-
-
-    #test = re.compile('^test_[\w]*.py$', re.IGNORECASE)
-    #files = filter(test.search, files)
-
-
-    try:
-        files.remove(__file__)  #Remove self from list (Ver 2.3. or later)
-    except:
-        files.remove('test_all.py')
-
-    print 'Testing:'
-    for file in files:
-        print '  ' + file
-
-    if globals().has_key('exclude'):
-        for file in exclude:
-            files.remove(file)
-            print 'WARNING: File '+ file + ' excluded from testing'
-
-
-    filenameToModuleName = lambda f: os.path.splitext(f)[0]
-    #print "files",files 
-    moduleNames = map(filenameToModuleName, files)
-    #print "moduleNames",moduleNames
-    modules = map(__import__, moduleNames)
-    load = unittest.defaultTestLoader.loadTestsFromModule
-    return unittest.TestSuite(map(load, modules))
-
-################################################################################
-
-if __name__ == '__main__':   
-    suite = regressionTest()
-    runner = unittest.TextTestRunner() #verbosity=2)
-    runner.run(suite)
Index: /trunk/anuga_core/source/anuga/structures/test/test_inlet_operator.py
===================================================================
--- /trunk/anuga_core/source/anuga/structures/test/test_inlet_operator.py	(revision 9458)
+++ /trunk/anuga_core/source/anuga/structures/test/test_inlet_operator.py	(revision 9459)
@@ -15,4 +15,7 @@
 
 from anuga.structures.inlet_operator import Inlet_operator
+
+import warnings
+warnings.simplefilter("ignore")
 
 class Test_inlet_operator(unittest.TestCase):
@@ -215,6 +218,6 @@
         
         path = get_pathname_from_package('anuga.structures')
-        filename1 = os.path.join(path, 'data', 'inlet_operator_test1.tms')
-        filename2 = os.path.join(path, 'data', 'inlet_operator_test2.tms')
+        filename1 = os.path.join(path, 'test', 'data', 'inlet_operator_test1.tms')
+        filename2 = os.path.join(path, 'test', 'data', 'inlet_operator_test2.tms')
 
         line1 = [[95.0, 10.0], [105.0, 10.0]]
@@ -275,6 +278,6 @@
 
         path = get_pathname_from_package('anuga.structures')
-        filename1 = os.path.join(path, 'data', 'inlet_operator_test1.tms')
-        filename2 = os.path.join(path, 'data', 'inlet_operator_test2.tms')
+        filename1 = os.path.join(path, 'test', 'data', 'inlet_operator_test1.tms')
+        filename2 = os.path.join(path, 'test', 'data', 'inlet_operator_test2.tms')
 
         line1 = [[95.0, 10.0], [105.0, 10.0]]
Index: /trunk/anuga_core/source/anuga/utilities/test/data/complex_polygon.csv
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/complex_polygon.csv	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/complex_polygon.csv	(revision 9459)
@@ -0,0 +1,4 @@
+0.0, 0.0
+1.0, 0.0
+0.0, 1.0
+1.0, 1.0
Index: /trunk/anuga_core/source/anuga/utilities/test/data/complex_polygon.lic
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/complex_polygon.lic	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/complex_polygon.lic	(revision 9459)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
+  <metadata>
+    <author>Stephen Roberts</author>
+  </metadata>
+  <datafile>
+    <filename>complex_polygon.csv</filename>
+    <checksum>2282859544</checksum>
+    <publishable>Yes</publishable>
+    <accountable>Stephen Roberts</accountable>
+    <source>Australian National University</source>
+    <IP_owner>Australian National University</IP_owner>
+    <IP_info>A very simple polygon that I made up to test read_polygon
+    </IP_info>
+  </datafile>
+
+</ga_license_file>
Index: /trunk/anuga_core/source/anuga/utilities/test/data/crc_test_file.lic
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/crc_test_file.lic	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/crc_test_file.lic	(revision 9459)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
+  <metadata>
+    <author>Ole Nielsen</author>
+  </metadata>
+  
+  <datafile>
+    <filename>crc_test_file.png</filename>
+    <checksum>1203293305</checksum>
+    <publishable>Yes</publishable>
+    <accountable>Ole Nielsen</accountable>
+    <source>Generated by ANUGA development team</source>
+    <IP_owner>Geoscience Australia</IP_owner>
+    <IP_info>For use with the ANUGA test suite</IP_info>    
+  </datafile>
+
+</ga_license_file>
Index: /trunk/anuga_core/source/anuga/utilities/test/data/mainland_only.csv
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/mainland_only.csv	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/mainland_only.csv	(revision 9459)
@@ -0,0 +1,669 @@
+447050.12,7699852.43
+447203.12,7699910.99
+447515.37,7699565.56
+447500.56,7699975.01
+447108.86,7700098.85
+447245.43,7700352.72
+447801.34,7700638.9
+447949.64,7700807.59
+448148.85,7701005.2
+448039.38,7701067.95
+448286.4,7701286.75
+448629.74,7701668.52
+448762.26,7701896.92
+449068.7,7702094.86
+449313.85,7702257.18
+449641.69,7702267.03
+449952.99,7702236.97
+449882.5,7702139.37
+449798.8,7701938.79
+452234.95,7702449.48
+452124.96,7702695.97
+451914.75,7703042.89
+452051.64,7703220.36
+452386.22,7703428.27
+452179.04,7703806.19
+451828.57,7703692.3
+451688.35,7703584.54
+451368.2,7703428.67
+451042.06,7704256.67
+450803.07,7704462.93
+450575.06,7704828.59
+450604.43,7705106.47
+450815.46,7705208.91
+451316.98,7705298.92
+451924.85,7705328.34
+452377.34,7705454.69
+452659.43,7705466.55
+452848.14,7705365.26
+452598.38,7705335.79
+452490.83,7705084.25
+452680.37,7705057.12
+452703.65,7705290.71
+452900.35,7705311.18
+452862.19,7705555.66
+453186.99,7705555.46
+453331.15,7705379.89
+453292.48,7705058.83
+453405.43,7704871
+453371.02,7705267.12
+453352.47,7705572.53
+453576.98,7705700.42
+453512.98,7705881.75
+453999.96,7705969.42
+454264.09,7706077.49
+454810.53,7706125.45
+455114.38,7706177.18
+455381.52,7706336.15
+455759.28,7706395.81
+456215.41,7706342.78
+456311.51,7706221.29
+455985.98,7706096.48
+455421.51,7706175.79
+455269.09,7705942.96
+454732.9,7705957.02
+454474.93,7705876.64
+454479.42,7705757.12
+454596.74,7705874.76
+454991.43,7705829.34
+455206.33,7705662.8
+455432.49,7705568.22
+461705.68,7709721.75
+462681.38,7710184.34
+462779.65,7710482.26
+463056.17,7710698.69
+463259.76,7710932.65
+463528.99,7711157.9
+463682.76,7711319.81
+463855.98,7711643.35
+464151.16,7711912.91
+464409.06,7712090.53
+464809.62,7712276.2
+465149.56,7712571.29
+465630.89,7712780.13
+466036.98,7712984.97
+465181.11,7714371.34
+465019.61,7714356.02
+464885.09,7714537.37
+465100.95,7714590.61
+465286.72,7714741.84
+465400.42,7714998.25
+464671.38,7716117.31
+464895.42,7716082.28
+465151.15,7716065.23
+465071.02,7715748.04
+465729.29,7714908.91
+465823.92,7714709.27
+465747.66,7714469.42
+466120.38,7713001.57
+466492.26,7712966.9
+466775.42,7713029.44
+467032.41,7713160.54
+467297.21,7713226.65
+467806.49,7713073.39
+468037.27,7713256.55
+468066.76,7713635.1
+467004.69,7715274.42
+466818.95,7715250.69
+466375.43,7715300.02
+466146.19,7715440.81
+465843.06,7716010.12
+466175.67,7716412.94
+466380.06,7716525.75
+466664.07,7716668.08
+467020.09,7716789.41
+467282.73,7716724.63
+467774.06,7717026.17
+468295.45,7717050.01
+468362.22,7716975.3
+468244.58,7716713.01
+468071.32,7716493.65
+467926.66,7716288.59
+467583.92,7716116.52
+467400.5,7715878.47
+467202.45,7715688.59
+467041.39,7715491.29
+468154.43,7713974.54
+468276.86,7714372.52
+468591.62,7714186.26
+468835.89,7714365.51
+469013.06,7715004.76
+468874.87,7715189.81
+469164.56,7715321.56
+469285.13,7715460.11
+469504.94,7715848.35
+469560.1,7716051.6
+469951.56,7716164.07
+470227.74,7716395.76
+470528.1,7716527.21
+470693.18,7716678.53
+470859.73,7716867.32
+471026.02,7717124.03
+471016.59,7717834.9
+471362.52,7717548.85
+471789.32,7717768.92
+471870.1,7717601.48
+472434.42,7717618.64
+472665.9,7717689.06
+472837.39,7717601.04
+473196.1,7717649.21
+473626.49,7717874.47
+473885.97,7718038.99
+474263.06,7718206.44
+474412.08,7718182.32
+474594.42,7718163.78
+474821.66,7718076.69
+475121.5,7718214.37
+475223.28,7718425.9
+475476.17,7718609.98
+475121.86,7718674.76
+474863.49,7718669.94
+474601.45,7718732.39
+473978.67,7718674.37
+474141.31,7718951.68
+474107.38,7719388.11
+473700.91,7719275.75
+473475.67,7719397.13
+473577.71,7719845.01
+473778.59,7720147.5
+473928.91,7720412.26
+474205.34,7720536.95
+474422.69,7720797.46
+474548.52,7720960.33
+474800.58,7721026.01
+474830.52,7721375.62
+474772.31,7721647.26
+475022.71,7721981.52
+475300.53,7721874.47
+475528.45,7722142.38
+475400.26,7722237.85
+475440.43,7722402.57
+475611.94,7722703.84
+475758.77,7722771.56
+475923.14,7722963.25
+475963.47,7723190.18
+476126.77,7723405.11
+476561.29,7723438.92
+476647.47,7723664.81
+476775.47,7723798.89
+476958.72,7723924.2
+477132.66,7723991.94
+477046.49,7723752.78
+477196.96,7723451.97
+477503.07,7723367.27
+477741.72,7723655.22
+478119.66,7723925.75
+478338.32,7724075.43
+478491.21,7724321.31
+478614.89,7724588.18
+478873.09,7724792.13
+478967.77,7724929.48
+478810.3,7725265.26
+478437.82,7725321.69
+478121.91,7725057.17
+477764.17,7724844.81
+477366.53,7724669.51
+477104.29,7724622.48
+476853.35,7724759.61
+476985.32,7725046.42
+477169.53,7725240.34
+477265.32,7725314.61
+477342,7725645.62
+477511.75,7725747.66
+477593.88,7725903.81
+477763.23,7726311.3
+477976.75,7726433.31
+478180.74,7726661.56
+478521.65,7726608.87
+478807.2,7726638.01
+479155.09,7726837.64
+479410.23,7727022.77
+479800.89,7727206.95
+479984.05,7727451.75
+480179.78,7727650.07
+480152.36,7727920.07
+480333.56,7728078.54
+480538.71,7728255.85
+480755.14,7728599.17
+480572.33,7728933.18
+480407.84,7728739.31
+480054.46,7728734.48
+479883.66,7728605.9
+479628.22,7728639.9
+479756.26,7728787.24
+479776.71,7729119.27
+479893.22,7729333
+480016.67,7729840.01
+480201.13,7729894.45
+480494.01,7729945.7
+480587.74,7730033.23
+480912.99,7730050.21
+481211.99,7730229.82
+481360.89,7730395.99
+481623.78,7730245.77
+481877.03,7730327.94
+482131.4,7730334.85
+482721.42,7730383.05
+482917.32,7730487.27
+483234.15,7730587.19
+483714.75,7730604.26
+484237.99,7730732.03
+484715.5,7730715.87
+485030.44,7730622.08
+485249.35,7730649.94
+485361.82,7730789.48
+485637.12,7730725.53
+485929.13,7730614
+486157.8,7730180.38
+486052.64,7730019.82
+485936.13,7729717.6
+485760.24,7729371.06
+485480.05,7729096.37
+485211.26,7728916.85
+484889.32,7728718.47
+484742.79,7728208.16
+484440.62,7728072.87
+484150,7727843.52
+484024.06,7727650.84
+483914.73,7727524.57
+483773.15,7727334.08
+483613.94,7727063.9
+483487,7726835.8
+483399.58,7726697.38
+483241.32,7726515.73
+483092.44,7726347.36
+482943.58,7726164.61
+482826.02,7725952
+482614.59,7725809.03
+482456.33,7725650.6
+482294.08,7725326.18
+482167.12,7725139.01
+482031.78,7724997.21
+481847.51,7724813.31
+481712.21,7724649.37
+481591.49,7724484.34
+481186.39,7724206.12
+481229.58,7723796.69
+481193.37,7723560.93
+480898.49,7723521.86
+480783.99,7723405.53
+480839.48,7723178.72
+480957.32,7723102.5
+481343.76,7723261.18
+481600.04,7723336.72
+481642.12,7722972.67
+481566.51,7722547.61
+481451.22,7722202.2
+481318.16,7721920.96
+481200.79,7721575.54
+481065.37,7721543.29
+480733.58,7721923.62
+480486.54,7721985.31
+480283.48,7721877.72
+480066.14,7721504.51
+480425.77,7721375.45
+480668.67,7721284.98
+480511.77,7720897.46
+480467.44,7720494.57
+480348.97,7720228.83
+480222.1,7720022.84
+480080.51,7719925.28
+479901.49,7719763.49
+479845.63,7719432.52
+479558.35,7719205.3
+479385.52,7719105.49
+479097.04,7719015.49
+478999.02,7719088.41
+478940.22,7718622.42
+479090.64,7718299.45
+479405.53,7718086.25
+479394.48,7717752.01
+479271.87,7717500.36
+478929.77,7717071.38
+478677.85,7716843.63
+478681.19,7716670.99
+478660.92,7716227.18
+478577.12,7715776.65
+478534.78,7715488.85
+478411.74,7714975.39
+477779.33,7714903.53
+478255.43,7714831.11
+478127.84,7714613.18
+482021.51,7710263.79
+482078.8,7710247.25
+482097.65,7710150.99
+482397.64,7710057.24
+482748.73,7709883.85
+483144.57,7709735.96
+483657.07,7709536.16
+484235.11,7709388.41
+484958.98,7709166.63
+485367.27,7709027.55
+485997.39,7708814.5
+486504.64,7708590.26
+486867.02,7708530.79
+487410.52,7708536.74
+487845.62,7708696.42
+488159.01,7708717.68
+488498.39,7708806.45
+488826.51,7708593.09
+489486.75,7708402.06
+489727.16,7708574.85
+489921.77,7708735.44
+490481.83,7708910.63
+490738.95,7709031.4
+491001.3,7709094.63
+491153.23,7709264.04
+491428.03,7709420.23
+491761.8,7709583.21
+492259,7709324.35
+492348.73,7708931.52
+492198.95,7708589.48
+492367.79,7708240.95
+492352.28,7708004.1
+492060.95,7707607.77
+491963.22,7707307.8
+491831.15,7707005.61
+491643.86,7706784.18
+491434.68,7706641.31
+491561.69,7706639.16
+491723.07,7706617.1
+491871.81,7706880.57
+492014.32,7707134.08
+492107.88,7707428.5
+492351.32,7707827.03
+492435.55,7708063.91
+492361.53,7708268.61
+492502.07,7708314.05
+492709.47,7707836.05
+492733.38,7707909.1
+492605.15,7708285.32
+492341.64,7708499.9
+492313.37,7708838.54
+492607.99,7708940.49
+493093.24,7708835.56
+493619.05,7708841.31
+493903.31,7708822.6
+494206.32,7708769.59
+494489.62,7708486.37
+495021.72,7708327.18
+494951.91,7708488.74
+494486.47,7708570.48
+494280.24,7708778.47
+493923.06,7708903.4
+493607.56,7708920.99
+493010.96,7708888.65
+492592.32,7709037.87
+492345.37,7709439.49
+492759.97,7709873.27
+493027.09,7710137.01
+493224.85,7710334.09
+493573.67,7710401.74
+493678.9,7710229.13
+493662.19,7710379.64
+493737.09,7710550.09
+494043.22,7710604.44
+494171.26,7710726.22
+494496.11,7710867.99
+495012.61,7710879.22
+495220.75,7711316.43
+495531.13,7711123.95
+495533.3,7710790.83
+495538.48,7710913.68
+495604,7711209.19
+494874.69,7712371
+495228.7,7712621.23
+495431.74,7712788.39
+495611.83,7713075.08
+496055.54,7712910.29
+496465.85,7713002.24
+503095.45,7716705.38
+503302.75,7716750.71
+503516.31,7716807.11
+503735.08,7716873.47
+503845.48,7716735.11
+503749.6,7716545.89
+503623.52,7716372.16
+503500.56,7716186.27
+503356.78,7716012.54
+503215.08,7715844.35
+503114.01,7715646.27
+503228.59,7715630.76
+503407.76,7715709.3
+503617.12,7715649.5
+503830.64,7715577.52
+504010.82,7715472.34
+504064.94,7715268.7
+504082.6,7715058.42
+504052.34,7714845.95
+504082.5,7714668.87
+504200.25,7714863.61
+504334.66,7715058.36
+504484.68,7715187.81
+504661.77,7715228.71
+504739.94,7715430.1
+504829.57,7715619.32
+504968.15,7715780.86
+505159.79,7715691.16
+505346.27,7715769.68
+505466.12,7715967.74
+505576.59,7716146.99
+505774.5,7716134.76
+505957.8,7716042.84
+506104.74,7716209.9
+506002.71,7716374.83
+505981.95,7716585.11
+506029.94,7716792.04
+506162.29,7716958
+506336.3,7717071.92
+506504.07,7717196.92
+506596.86,7717407.16
+506755.25,7717529.94
+506887.62,7717689.25
+507053.31,7717820.88
+507259.61,7717902.69
+507466.94,7717934.69
+507682.61,7717983.29
+507896.17,7717988.73
+508108.7,7717995.27
+508328.52,7718007.34
+508534.82,7718061.47
+508714.06,7718175.36
+508884.97,7718283.73
+508921.55,7718496.2
+508988.33,7718700.9
+509188.38,7718742.85
+509303.08,7718928.71
+509501.07,7719003.86
+509665.76,7719135.46
+509758.58,7719318.01
+509836.84,7719519.39
+509914.96,7719492.78
+509848.17,7719285.87
+509902.26,7719138.65
+510062.64,7719030.1
+510253.27,7718979.08
+510451.16,7718892.64
+510586.57,7718850.5
+510535.41,7718657.97
+510526.94,7718445.49
+510475.75,7718217.55
+510472.5,7718001.74
+510412.99,7717797.04
+510415.99,7717590.09
+510503.38,7717398.58
+510559.52,7717205.98
+510637.53,7717023.32
+510667.65,7716870.59
+510823.83,7716750.97
+510925.83,7716609.24
+510761.31,7716729.97
+510571.79,7716830.8
+510527.11,7717025.61
+510497.03,7717230.36
+510391.93,7717419.67
+510328.51,7717632.2
+510328.64,7717848
+510196.31,7717818.2
+510098.36,7717761.81
+510034.71,7717593.63
+510074.18,7717386.66
+510169.9,7717188.51
+510308.35,7717020.21
+510283.26,7716867.5
+510493.62,7716774.41
+510670.64,7716645.92
+510833.05,7716504.17
+511009.02,7716396.7
+511069.35,7716246.15
+511057.83,7716156.52
+511255.8,7716237.18
+511462.03,7716203.84
+511663.02,7716135.09
+511871.33,7716096.22
+512068.26,7716174.65
+512240.23,7716312.87
+512449.64,7716360.31
+512605.88,7716335.85
+512494.28,7716153.32
+512497.29,7715991.74
+512702.46,7715944
+512830.65,7716036.87
+512639.05,7716123.33
+512773.49,7716207.34
+512980.84,7716276.91
+513169.47,7716390.75
+513359.06,7716399.46
+513328.69,7716194.75
+513520.41,7716261
+513703.83,7716365.98
+513734.19,7716561.85
+513736.44,7716762.16
+513838.68,7716956.85
+513947.2,7717173.68
+513997.38,7717394.97
+513988.18,7717611.89
+514153.92,7717734.6
+514267.63,7717920.43
+514427.17,7718102.9
+514591.91,7718253.27
+514630.63,7718460.19
+514501.58,7718622.98
+514495.51,7718832.15
+514345.61,7718982.79
+514337.43,7719170.93
+514522.92,7719219.47
+514663.69,7719354.37
+514750.34,7719559.03
+514940.07,7719678.39
+515135,7719792.2
+515309.1,7719909.36
+515473.85,7720047.55
+515386.47,7720203.67
+515560.58,7720335.21
+515618.08,7720545.42
+515791.14,7720650.4
+515992.32,7720743.17
+516166.45,7720869.18
+516340.61,7721031.69
+516487.7,7721208.62
+516707.77,7721389.25
+517077.24,7721564.24
+517248.64,7721707.83
+517357.62,7721981.01
+530000,7687033.4
+424913.9,7687033.4
+425539.85,7691615.14
+426064.25,7691355.15
+425733.81,7690808.03
+426223.44,7691109.04
+426478.84,7690748.24
+426237.33,7691262.95
+426898.56,7691103.16
+426763.28,7690643.24
+430997.89,7693894.23
+431118.95,7694305.35
+431475.13,7694725.19
+431766.48,7695225.54
+431865.94,7695585.65
+432081.73,7695482.49
+432396.55,7695334.35
+432846.36,7695250.94
+433541.79,7695147.47
+434240.3,7695315.14
+434966.54,7695580.29
+435463.96,7695829.03
+435906.1,7696116.28
+436504.87,7696263.55
+437013.04,7696708.18
+437127.53,7696975.35
+437096.1,7697310.58
+437536.17,7697333.26
+437597.07,7696907.38
+437581.53,7696609.6
+437947.81,7696605.43
+438684.5,7696605.93
+439450.95,7696717.19
+439768.6,7696638.65
+440266.52,7696774.35
+440588.59,7696913.84
+441233.62,7696939.37
+441358.55,7696624.38
+441630.15,7696916.41
+442005.73,7696632.17
+442414.48,7696076.88
+442625.19,7695919.33
+442912.54,7695561.72
+443129.46,7695109.8
+443067.51,7695274.5
+443462.24,7695459.56
+443963.71,7695467.89
+444377.94,7695425
+443687.61,7695582.06
+443092.76,7695498.15
+442737.53,7695929.68
+442457.73,7696206.52
+442142.49,7696799.76
+442035.61,7697315.14
+442691.11,7697331.79
+443097.91,7697346.46
+443641,7697369.33
+444128.52,7697207.16
+444357.11,7696682.21
+444580.43,7696801.38
+444804.64,7696647.17
+445230.69,7696500.27
+445492.86,7696832.05
+445662.25,7696895.68
+446005.36,7696979.8
+446066.35,7697101.74
+445721.36,7696960.07
+445502.67,7697012.48
+445154.54,7696560.89
+444834.24,7696822.14
+444570.77,7696887.68
+444329.82,7696752.95
+444255.55,7697182.13
+444235.37,7697617.02
+444496.65,7698215.54
+444854.79,7698165.82
+445136.1,7698375.92
+445423.52,7698630.3
+445834.52,7698965.88
+446025.31,7698859.14
+446352.51,7698721.85
+446614.47,7698809.01
+446690.61,7698755.02
+446789.41,7698445.45
+446634.98,7698250.17
+446888.82,7698273.11
+446657.79,7698275.7
+446855.91,7698476.65
+446749.05,7698702.09
+446619.25,7698940.73
+446426.15,7698798.45
+446116.63,7698938.01
+446205.05,7699273.65
+446365.07,7699674.81
+446667.64,7699758.78
+447025.41,7699831.85
Index: /trunk/anuga_core/source/anuga/utilities/test/data/mainland_only.lic
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/mainland_only.lic	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/mainland_only.lic	(revision 9459)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
+  <metadata>
+    <author>Ole Nielsen</author>
+  </metadata>
+  <datafile>
+    <filename>mainland_only.csv</filename>
+    <checksum>556538090</checksum>
+    <publishable>Yes</publishable>
+    <accountable>Ole Nielsen</accountable>
+    <source>Geoscience Australia</source>
+    <IP_owner>Geoscience Australia</IP_owner>
+    <IP_info>This is a polygon comprising easting and northing locations 
+    roughly tracing parts of the coastline at Dampier WA as well as a small 
+    arbitrary area inland.
+    
+    The data was obtained by subsampling the digitized coastline by a factor
+    of 10 making it a very rough approximation. 
+    It is used with a unit test in test_polygon.py as an example of
+    a convoluted polygon to test the functionality 
+    in ANUGA to specifically set the onshore initial condition in a 
+    tsunami scenario. 
+    
+    The original coastline was derived from Maritime Boundaries which 
+    is a public dataset but some of it was modified using a digitised 
+    coastline from a Landgate supplied image.
+    
+    However, after decimation, this dataset is obscured and does not provide
+    a usable coastline. As such it does not infringe on Landgate's IP.
+    </IP_info>
+  </datafile>
+
+</ga_license_file>
Index: /trunk/anuga_core/source/anuga/utilities/test/data/non_complex_polygon.csv
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/non_complex_polygon.csv	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/non_complex_polygon.csv	(revision 9459)
@@ -0,0 +1,5 @@
+508596.64631910616, 1608992.935823899
+508596.6463191061, 1608964.3290053799
+508596.6463191061, 1608938.9518384717
+508596.6463191061, 1608923.6196273684
+507000.0000000000, 1508000.0000000000
Index: /trunk/anuga_core/source/anuga/utilities/test/data/non_complex_polygon.lic
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/data/non_complex_polygon.lic	(revision 9459)
+++ /trunk/anuga_core/source/anuga/utilities/test/data/non_complex_polygon.lic	(revision 9459)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
+  <metadata>
+    <author>Stephen Roberts</author>
+  </metadata>
+  <datafile>
+    <filename>non_complex_polygon.csv</filename>
+    <checksum>3643740350</checksum>
+    <publishable>Yes</publishable>
+    <accountable>Stephen Roberts</accountable>
+    <source>Australian National University</source>
+    <IP_owner>Australian National University</IP_owner>
+    <IP_info>A very simple nonconvex polygon that I made up to test read_polygon
+    </IP_info>
+  </datafile>
+
+</ga_license_file>
Index: unk/anuga_core/source/anuga/utilities/test/test_all.py
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/test_all.py	(revision 9458)
+++ 	(revision )
@@ -1,102 +1,0 @@
-"""Regression testing framework
-This module will search for scripts in the same directory named
-test_*.py.  Each such script should be a test suite that tests a
-module through PyUnit. This script will aggregate all
-found test suites into one big test suite and run them all at once.
-"""
-
-# Author: Mark Pilgrim
-# Modified by Ole Nielsen
-
-import unittest
-import os
-
-
-#List files that should be excluded from the testing process.
-#E.g. if they are known to fail and under development
-#exclude = ['test_interpolate_sww.py'] 
-
-
-def get_test_files(path):
-
-    import sys
-
-    files = os.listdir(path)
-
-    #Check sub directories
-    test_files = []
-    for file in files:
-        if os.path.isdir(file):
-            sys.path.append(file)
-            #print 'Recursing into', file
-            test_files += get_test_files(path + os.sep + file)
-        elif file[:5] == 'test_' and file[-2:] == 'py':
-            #print 'Appending', file
-            test_files.append(file)
-        else:
-            pass
-    return test_files
-
-
-
-def regressionTest():
-    import sys, os, re, unittest
-    path = os.path.split(sys.argv[0])[0] or os.getcwd()
-
-
-    files = get_test_files(path)
-
-
-
-    #test = re.compile('^test_[\w]*.py$', re.IGNORECASE)
-    #files = filter(test.search, files)
-
-
-    try:
-        files.remove(__file__)  #Remove self from list (Ver 2.3. or later)
-    except:
-        files.remove('test_all.py')
-
-    print 'Testing:'
-    for file in files:
-        print '  ' + file
-
-    if globals().has_key('exclude'):
-        for file in exclude:
-            files.remove(file)
-            print 'WARNING: File '+ file + ' excluded from testing'
-
-
-    filenameToModuleName = lambda f: os.path.splitext(f)[0]
-    #print "files",files 
-    moduleNames = map(filenameToModuleName, files)
-    #print "moduleNames",moduleNames
-    modules = map(__import__, moduleNames)
-    load = unittest.defaultTestLoader.loadTestsFromModule
-    return unittest.TestSuite(map(load, modules))
-
-if __name__ == '__main__':
-
-    from os import sep
-
-    #Attempt to compile all extensions
-    #execfile('..' + sep + 'utilities' + sep + 'compile.py')
-
-    #FIXME: Temporary measure
-    #os.chdir('..' + sep + 'utilities')
-    #execfile('compile.py')
-    #os.chdir('..' + sep + 'pyvolution')    
-    
-    #FIXME: Temporary measure
-    #os.chdir('..' + sep + 'triangle')
-    #execfile('compile.py')
-    #os.chdir('..' + sep + 'pyvolution')   
-    
-    #os.system('python compile.py') 
-
-    #print regressionTest()
-    #unittest.main(defaultTest='regressionTest')
-    
-    suite = regressionTest()
-    runner = unittest.TextTestRunner() #(verbosity=2)
-    runner.run(suite)
Index: /trunk/anuga_core/source/anuga/utilities/test/test_system_tools.py
===================================================================
--- /trunk/anuga_core/source/anuga/utilities/test/test_system_tools.py	(revision 9458)
+++ /trunk/anuga_core/source/anuga/utilities/test/test_system_tools.py	(revision 9459)
@@ -17,5 +17,5 @@
 # I'm trying to keep this file general, so it works for EQRM and ANUGA
 # EQRM also uses this file, but has a different directory structure
-from system_tools import *
+from anuga.utilities.system_tools import *
 
 class Test_system_tools(unittest.TestCase):
@@ -123,11 +123,11 @@
         """
 
-        # Get path where this test is run
-        # I'm trying to keep this file general, so it works for EQRM and ANUGA
-        path, tail = split(__file__)
-        if path == '':
-            path = '.' + sep
-
-        filename = path + sep + '..' + sep + 'data' + sep + 'crc_test_file.png'
+
+            
+        path = get_pathname_from_package('anuga.utilities')        
+                
+        filename = os.path.join(path, 'test', 'data', 'crc_test_file.png') 
+
+
 
         ref_crc = 1203293305 # Computed on Windows box
