Ignore:
Timestamp:
Oct 4, 2016, 4:13:00 PM (9 years ago)
Author:
steve
Message:

Commit svn after a lot of git updates

Location:
trunk/anuga_core/anuga/file_conversion/tests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/anuga/file_conversion/tests/test_2pts.py

    r9733 r9737  
    155155
    156156
    157     def test_sww2pts_centroids(self):
     157    def test_sww2pts_centroids_1_5(self):
    158158        """Test that sww information can be converted correctly to pts data at specified coordinates
    159159        - in this case, the centroids.
    … …  
    170170        # Create shallow water domain
    171171        domain = Domain(*rectangular(2, 2))
     172        domain.set_flow_algorithm('1_5')
    172173
    173174        B = Transmissive_boundary(domain)
    174175        domain.set_boundary( {'left': B, 'right': B, 'top': B, 'bottom': B})
    175176
    176         domain.set_name('datatest')
     177        domain.set_name('datatest_1_5')
    177178
    178179        ptsfile = domain.get_name() + '_elevation.pts'
    … …  
    228229                data_points = points,
    229230                NODATA_value = NODATA_value)
    230         #ref_point_values = [-0.5, -0.5, -1, -1, -1, -1, -1.5, -1.5]   #At centroids
    231 
    232         ref_point_values = [-0.72222223, -0.72222223, -1.00000002, -1.00000002,
    233                             -1.00000002, -1.00000002, -1.27777779, -1.27777779]
     231       
     232        ref_point_values = [-0.5, -0.5, -1, -1, -1, -1, -1.5, -1.5]   #At centroids
     233
     234
    234235        point_values = Geospatial_data(ptsfile).get_attributes()
    235236        #print 'P', point_values
    … …  
    244245
    245246
     247
     248    def test_sww2pts_centroids_de0(self):
     249        """Test that sww information can be converted correctly to pts data at specified coordinates
     250        - in this case, the centroids.
     251        """
     252
     253        import time, os
     254        from anuga.file.netcdf import NetCDFFile
     255        # Used for points that lie outside mesh
     256        NODATA_value = 1758323
     257
     258        # Setup
     259        from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular
     260
     261        # Create shallow water domain
     262        domain = Domain(*rectangular(2, 2))
     263
     264        B = Transmissive_boundary(domain)
     265        domain.set_boundary( {'left': B, 'right': B, 'top': B, 'bottom': B})
     266
     267        domain.set_name('datatest_de0')
     268
     269        ptsfile = domain.get_name() + '_elevation.pts'
     270        swwfile = domain.get_name() + '.sww'
     271
     272        domain.set_datadir('.')
     273        domain.format = 'sww'
     274        domain.set_quantity('elevation', lambda x,y: -x-y)
     275
     276        domain.geo_reference = Geo_reference(56,308500,6189000)
     277
     278        sww = SWW_file(domain)
     279        sww.store_connectivity()
     280        sww.store_timestep()
     281
     282        #self.domain.tight_slope_limiters = 1
     283        domain.evolve_to_end(finaltime = 0.01)
     284        sww.store_timestep()
     285
     286        # Check contents in NetCDF
     287        fid = NetCDFFile(sww.filename, netcdf_mode_r)
     288
     289        # Get the variables
     290        x = fid.variables['x'][:]
     291        y = fid.variables['y'][:]
     292        elevation = fid.variables['elevation'][:]
     293        time = fid.variables['time'][:]
     294        stage = fid.variables['stage'][:]
     295
     296        volumes = fid.variables['volumes'][:]
     297
     298
     299        # Invoke interpolation for vertex points       
     300        points = num.concatenate( (x[:,num.newaxis],y[:,num.newaxis]), axis=1 )
     301        points = num.ascontiguousarray(points)
     302        sww2pts(domain.get_name() + '.sww',
     303                quantity = 'elevation',
     304                data_points = points,
     305                NODATA_value = NODATA_value)
     306        ref_point_values = elevation
     307        point_values = Geospatial_data(ptsfile).get_attributes()
     308        #print 'P', point_values
     309        #print 'Ref', ref_point_values       
     310        assert num.allclose(point_values, ref_point_values)       
     311
     312
     313
     314        # Invoke interpolation for centroids
     315        points = domain.get_centroid_coordinates()
     316        #print points
     317        sww2pts(domain.get_name() + '.sww',
     318                quantity = 'elevation',
     319                data_points = points,
     320                NODATA_value = NODATA_value)
     321        #ref_point_values = [-0.5, -0.5, -1, -1, -1, -1, -1.5, -1.5]   #At centroids
     322
     323        ref_point_values = [-0.77777777, -0.77777777, -0.99999998, -0.99999998,
     324                             -0.99999998, -0.99999998, -1.22222221, -1.22222221]
     325        point_values = Geospatial_data(ptsfile).get_attributes()
     326        #print 'P', point_values
     327        #print 'Ref', ref_point_values       
     328        assert num.allclose(point_values, ref_point_values)       
     329
     330        fid.close()
     331
     332        #Cleanup
     333        os.remove(sww.filename)
     334        os.remove(ptsfile)
     335
    246336#-------------------------------------------------------------
    247337
    248338if __name__ == "__main__":
    249     suite = unittest.makeSuite(Test_2Pts, 'test_sww')
     339    suite = unittest.makeSuite(Test_2Pts, 'test_')
    250340    runner = unittest.TextTestRunner() #verbosity=2)
    251341    runner.run(suite)   

  • trunk/anuga_core/anuga/file_conversion/tests/test_csv2sts.py

    r9476 r9737  
    1616from anuga.file_conversion.csv2sts import csv2sts
    1717
    18 # some test file we want to generate
     18# some test files we want to generate
    1919testfile_csv = 'small___.csv'
    2020sts_out = 'sts_out.sts'

  • trunk/anuga_core/anuga/file_conversion/tests/test_sww2dem.py

    r9734 r9737  
    320320        # Create shallow water domain
    321321        domain = Domain(points, vertices, boundary)
    322         domain.default_order = 2
     322        domain.set_flow_algorithm('DE0')
    323323
    324324        domain.set_name('datatest_de0')
    … …  
    435435        # Check grid values (FIXME: Use same strategy for other sww2dem tests)
    436436
    437         V = [-1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.333e+02, -1.367e+02, -1.400e+02, -1.433e+02, -1.467e+02, -1.500e+02,
    438              - 9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.300e+02, -1.333e+02, -1.367e+02, -1.400e+02, -1.467e+02,
    439              - 8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.233e+02, -1.267e+02, -1.300e+02, -1.367e+02, -1.433e+02,
    440              - 8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.167e+02, -1.200e+02, -1.267e+02, -1.333e+02, -1.400e+02,
    441              - 7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.100e+02, -1.167e+02, -1.233e+02, -1.300e+02, -1.367e+02,
    442              - 6.667e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.333e+02,
    443              - 6.333e+01, -7.000e+01, -7.667e+01, -8.333e+01, -9.000e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02,
    444              - 6.000e+01, -6.667e+01, -7.333e+01, -8.000e+01, -8.333e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02,
    445              - 5.667e+01, -6.333e+01, -7.000e+01, -7.333e+01, -7.667e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02,
    446              - 5.333e+01, -6.000e+01, -6.333e+01, -6.667e+01, -7.000e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02,
    447              - 5.000e+01, -5.333e+01, -5.667e+01, -6.000e+01, -6.333e+01, -6.667e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02 ]   
     437       
     438#         V = [-1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.333e+02, -1.367e+02, -1.400e+02, -1.433e+02, -1.467e+02, -1.500e+02,
     439#              - 9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.300e+02, -1.333e+02, -1.367e+02, -1.400e+02, -1.467e+02,
     440#              - 8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.233e+02, -1.267e+02, -1.300e+02, -1.367e+02, -1.433e+02,
     441#              - 8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.167e+02, -1.200e+02, -1.267e+02, -1.333e+02, -1.400e+02,
     442#              - 7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.100e+02, -1.167e+02, -1.233e+02, -1.300e+02, -1.367e+02,
     443#              - 6.667e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.333e+02,
     444#              - 6.333e+01, -7.000e+01, -7.667e+01, -8.333e+01, -9.000e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.267e+02,
     445#              - 6.000e+01, -6.667e+01, -7.333e+01, -8.000e+01, -8.333e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02, -1.200e+02,
     446#              - 5.667e+01, -6.333e+01, -7.000e+01, -7.333e+01, -7.667e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02, -1.133e+02,
     447#              - 5.333e+01, -6.000e+01, -6.333e+01, -6.667e+01, -7.000e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02, -1.067e+02,
     448#              - 5.000e+01, -5.333e+01, -5.667e+01, -6.000e+01, -6.333e+01, -6.667e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.333e+01, -1.000e+02 ]   
     449       
     450       
     451        V = [-1.000e+02, -1.033e+02, -1.067e+02, -1.100e+02, -1.133e+02, -1.167e+02, -1.233e+02, -1.300e+02, -1.367e+02, -1.433e+02, -1.500e+02,
     452             -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02, -1.100e+02, -1.133e+02, -1.200e+02, -1.267e+02, -1.333e+02, -1.400e+02, -1.433e+02,
     453             -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02, -1.100e+02, -1.167e+02, -1.233e+02, -1.300e+02, -1.333e+02, -1.367e+02,
     454             -9.000e+01, -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02, -1.133e+02, -1.200e+02, -1.233e+02, -1.267e+02, -1.300e+02,
     455             -8.667e+01, -9.000e+01, -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.100e+02, -1.133e+02, -1.167e+02, -1.200e+02, -1.233e+02,
     456             -8.333e+01, -8.667e+01, -9.000e+01, -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02, -1.100e+02, -1.133e+02, -1.167e+02,
     457             -7.667e+01, -8.000e+01, -8.333e+01, -8.667e+01, -9.000e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02, -1.100e+02, -1.133e+02,
     458             -7.000e+01, -7.333e+01, -7.667e+01, -8.000e+01, -8.667e+01, -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02, -1.100e+02,
     459             -6.333e+01, -6.667e+01, -7.000e+01, -7.667e+01, -8.333e+01, -9.000e+01, -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02, -1.067e+02,
     460             -5.667e+01, -6.000e+01, -6.667e+01, -7.333e+01, -8.000e+01, -8.667e+01, -9.000e+01, -9.333e+01, -9.667e+01, -1.000e+02, -1.033e+02,
     461             -5.000e+01, -5.667e+01, -6.333e+01, -7.000e+01, -7.667e+01, -8.333e+01, -8.667e+01, -9.000e+01, -9.333e+01, -9.667e+01, -1.000e+02]
    448462       
    449463        for i, line in enumerate(lines[6:]):
    … …  
    22532267    #     os.remove(LOG_FILENAME)
    22542268        log.logging.disable(log.logging.CRITICAL)
    2255    
    2256         os.remove(LOG_FILENAME)
     2269
     2270        try:   
     2271            os.remove(LOG_FILENAME)
     2272        except:
     2273            pass
    22572274       
    22582275       
Note: See TracChangeset for help on using the changeset viewer.