Changeset 9573


Ignore:
Timestamp:
Feb 1, 2015, 2:17:11 PM (10 years ago)
Author:
steve
Message:

Getting anuga.test() ti work (one error)

Location:
trunk/anuga_core/source/anuga
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/source/anuga/coordinate_transforms/tests/test_geo_reference.py

    r9562 r9573  
    605605        abs_points = geo.get_absolute(points)
    606606        # check we haven't changed 'points' itself
    607         self.failIf(num.alltrue(abs_points == points))
     607        self.assertFalse(num.alltrue(abs_points == points))
    608608        new_points = abs_points.copy()
    609609        new_points[:,0] -= x0
    … …  
    615615        abs_points = geo.get_absolute(points)
    616616        # check we haven't changed 'points' itself
    617         self.failIf(num.alltrue(abs_points == points))
     617        self.assertFalse(num.alltrue(abs_points == points))
    618618        new_points = abs_points.copy()
    619619        new_points[:,0] -= x0

  • trunk/anuga_core/source/anuga/load_mesh/tests/test_loadASCII.py

    r9562 r9573  
    519519            self.fail('imaginary file did not raise error!')
    520520
    521     def throws_error_2_screen_test_import_mesh_bad(self):
     521    def throws_error_2_screen_import_mesh_bad(self):
    522522        fileName = tempfile.mktemp('.msh')
    523523        file = open(fileName, 'w')

  • trunk/anuga_core/source/anuga/setup.py

    r9558 r9573  
    3333    config.add_subpackage('utilities')
    3434    config.add_subpackage('validation_utilities')
    35     config.add_subpackage('visualiser')
     35
    3636     
    3737    config.make_config_py()

  • trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

    r9381 r9573  
    14061406    def get_water_volume(self):
    14071407   
    1408         from anuga import myid, numprocs, send, receive, barrier
     1408        from anuga import numprocs
    14091409
    14101410        #print self.evolved_called
    … …  
    14281428            Height = Stage-Elev
    14291429            volume = Height.get_integral()
     1430
     1431        if numprocs ==1:
     1432            self.volume_history.append(volume)
     1433            return volume
     1434
     1435        # isolated parallel code
     1436        from anuga import myid, send, receive, barrier
    14301437           
    14311438        if myid == 0:
    … …  
    14541461        """
    14551462   
    1456         from anuga import myid, numprocs, send, receive, barrier
     1463        from anuga import numprocs
    14571464
    14581465        if not self.compute_fluxes_method=='DE':
    … …  
    14621469           
    14631470        flux_integral = self.boundary_flux_integral.boundary_flux_integral
    1464            
     1471
     1472        if numprocs == 1:
     1473            return flux_integral
     1474
     1475        # isolate parallel code
     1476        from anuga import myid, send, receive, barrier
     1477       
    14651478        if myid == 0:
    14661479            for i in range(1,numprocs):
    … …  
    14881501        """
    14891502   
    1490         from anuga import myid, numprocs, send, receive, barrier
     1503        from anuga import numprocs
    14911504
    14921505        flux_integral = self.fractional_step_volume_integral
    1493            
     1506
     1507        if numprocs == 1:
     1508            return flux_integral
     1509
     1510        # isolate parallel code
     1511        from anuga import myid, send, receive, barrier
     1512               
    14941513        if myid == 0:
    14951514            for i in range(1,numprocs):

  • trunk/anuga_core/source/anuga/utilities/tests/test_numerical_tools.py

    r9562 r9573  
    129129        self.assertRaises(Exception, ensure_numeric(num.array(('abc',))))
    130130
    131     def NO_test_ensure_numeric_char(self):
     131    def NO_ensure_numeric_char(self):
    132132        '''numpy can't handle this'''
    133133

  • trunk/anuga_core/source/anuga/utilities/tests/test_plot_utils.py

    r9437 r9573  
    9999        return
    100100
    101     def basic_tests(self):
     101    def basic_checks(self):
    102102        """
    103103            Check that dimensions are as required, and that
    … …  
    138138        self.everything_equal(p3, 4, p2, 4)
    139139
    140     def velExtrap_timeSlices_test(self, ve):
     140    def velExtrap_timeSlices_check(self, ve):
    141141        """
    142142
    … …  
    251251                print flowAlg
    252252            self.create_domain(InitialOceanStage=1., InitialLandStage=0., flowAlg=flowAlg, verbose=verbose)
    253             self.basic_tests()
     253            self.basic_checks()
    254254
    255255        os.remove('test_plot_utils.sww')
    … …  
    265265            self.create_domain(InitialOceanStage=1., InitialLandStage=0., flowAlg=flowAlg, verbose=verbose)
    266266            # Test time-slices with velocity_extrapolation=True
    267             self.velExtrap_timeSlices_test(ve=True)
    268             self.velExtrap_timeSlices_test(ve=False)
     267            self.velExtrap_timeSlices_check(ve=True)
     268            self.velExtrap_timeSlices_check(ve=False)
    269269           
    270270        os.remove('test_plot_utils.sww')

  • trunk/anuga_core/source/anuga/utilities/tests/test_system_tools.py

    r9566 r9573  
    144144
    145145    # helper routine to test clean_line()
    146     def clean_line_test(self, instr, delim, expected):
     146    def clean_line_helper(self, instr, delim, expected):
    147147        result = clean_line(instr, delim)
    148148        self.assertTrue(result == expected,
    … …  
    151151
    152152    def test_clean_line_01(self):
    153         self.clean_line_test('abc, ,,xyz,123', ',', ['abc', '', 'xyz', '123'])
     153        self.clean_line_helper('abc, ,,xyz,123', ',', ['abc', '', 'xyz', '123'])
    154154
    155155    def test_clean_line_02(self):
    156         self.clean_line_test(' abc , ,, xyz  , 123  ', ',',
     156        self.clean_line_helper(' abc , ,, xyz  , 123  ', ',',
    157157                             ['abc', '', 'xyz', '123'])
    158158
    159159    def test_clean_line_03(self):
    160         self.clean_line_test('1||||2', '|', ['1', '2'])
     160        self.clean_line_helper('1||||2', '|', ['1', '2'])
    161161
    162162    def test_clean_line_04(self):
    163         self.clean_line_test('abc, ,,xyz,123, ', ',',
     163        self.clean_line_helper('abc, ,,xyz,123, ', ',',
    164164                             ['abc', '', 'xyz', '123'])
    165165
    166166    def test_clean_line_05(self):
    167         self.clean_line_test('abc, ,,xyz,123, ,    ', ',',
     167        self.clean_line_helper('abc, ,,xyz,123, ,    ', ',',
    168168                             ['abc', '', 'xyz', '123', ''])
    169169
    170170    def test_clean_line_06(self):
    171         self.clean_line_test(',,abc, ,,xyz,123, ,    ', ',',
     171        self.clean_line_helper(',,abc, ,,xyz,123, ,    ', ',',
    172172                             ['abc', '', 'xyz', '123', ''])
    173173
    174174    def test_clean_line_07(self):
    175         self.clean_line_test('|1||||2', '|', ['1', '2'])
     175        self.clean_line_helper('|1||||2', '|', ['1', '2'])
    176176
    177177    def test_clean_line_08(self):
    178         self.clean_line_test(' ,a,, , ,b,c , ,, , ', ',',
     178        self.clean_line_helper(' ,a,, , ,b,c , ,, , ', ',',
    179179                             ['a', '', '', 'b', 'c', '', ''])
    180180
    181181    def test_clean_line_09(self):
    182         self.clean_line_test('a:b:c', ':', ['a', 'b', 'c'])
     182        self.clean_line_helper('a:b:c', ':', ['a', 'b', 'c'])
    183183
    184184    def test_clean_line_10(self):
    185         self.clean_line_test('a:b:c:', ':', ['a', 'b', 'c'])
     185        self.clean_line_helper('a:b:c:', ':', ['a', 'b', 'c'])
    186186
    187187################################################################################
    … …  
    466466
    467467        x = get_revision_number()
    468         assert int(x)
     468        x = x.split('.')
     469
     470        assert int(x[0])
     471        assert int(x[1])
     472        assert int(x[2])
    469473
    470474################################################################################
Note: See TracChangeset for help on using the changeset viewer.