Changeset 3878


Ignore:
Timestamp:
Oct 27, 2006, 5:34:53 PM (16 years ago)
Author:
ole
Message:

Okushiri mesh using new mesh interface

Location:
anuga_validation/okushiri_2005
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • anuga_validation/okushiri_2005/create_okushiri.py

    r3861 r3878  
    130130    island_4 = [xleft + 2*(xright-xleft)/3+0.4, ybottom + (ytop-ybottom)/3-0.3]
    131131    island_5 = [xleft + 2*(xright-xleft)/3+1.2, ybottom+0.2]
    132     island_6 = [xl-.01, yb]  #OK
    133     island_7 = [xl-.01, yt]  #OK     
     132    island_6 = [xl-.01, yb]  # Keep right edge just off the gulleys
     133    island_7 = [xl-.01, yt]
     134
     135   
    134136
    135137    island = [island_0, island_1, island_2,
     
    138140
    139141
    140    
     142    #Midway points just inside boundary and associated rectangular region
     143    point_mtop0 = [xleft + (xright-xleft)/3+1, ytop-0.02]
     144    point_mbottom0 = [xleft + (xright-xleft)/3+1, ybottom+0.02]
     145    point_se0 = [xright-0.02, ybottom+0.02]
     146    point_ne0 = [xright-0.02, ytop-0.02]   
    141147
     148    mid = [point_mtop0, point_ne0, point_se0, point_mbottom0]
     149
     150
     151    # Bounding polygon and interior regions
    142152    bounding_polygon = [point_se,
    143153                        point_ne,
     
    148158   
    149159
    150     interior_regions = [[gulleys, 0.00002*base_resolution],
    151                         [island, 0.00007*base_resolution]]
    152    
    153 
     160    interior_regions = [[mid, 0.0005],
     161                        [gulleys, 0.00002*base_resolution],
     162                        [island, 0.00007*base_resolution]]
    154163
    155164   
    156165
    157166    print 'start create mesh from regions'
    158 
    159167    meshname = project.mesh_filename + '.msh'
    160168    m = create_mesh_from_regions(bounding_polygon,
  • anuga_validation/okushiri_2005/extract_timeseries.py

    r3861 r3878  
    4545
    4646# old limiters
    47 expected_covariances = {'Boundary': 5.288601162783020386e-05,
    48                         'ch5': 1.167001054284431472e-04,
    49                         'ch7': 1.121474766904651861e-04,
    50                         'ch9': 1.249244820847215335e-04}
     47#expected_covariances = {'Boundary': 5.288601162783020386e-05,
     48#                        'ch5': 1.167001054284431472e-04,
     49#                        'ch7': 1.121474766904651861e-04,
     50#                        'ch9': 1.249244820847215335e-04}
     51#
     52#expected_differences = {'Boundary': 8.361144081847830638e-04,
     53#                        'ch5': 3.423673831653336816e-03,
     54#                        'ch7': 2.799962153549145211e-03,
     55#                        'ch9': 3.198560464876740433e-03}
    5156
    52 expected_differences = {'Boundary': 8.361144081847830638e-04,
    53                         'ch5': 3.423673831653336816e-03,
    54                         'ch7': 2.799962153549145211e-03,
    55                         'ch9': 3.198560464876740433e-03}
     57
     58expected_covariances = {'Boundary': 5.288392008865989237e-05,
     59                        'ch5': 1.166748190444680592e-04,
     60                        'ch7': 1.121816242516757850e-04,
     61                        'ch9': 1.249543278366777640e-04}
     62
     63expected_differences = {'Boundary':  8.373150808730501615e-04,
     64                        'ch5': 3.425914311580337875e-03,
     65                        'ch7': 2.802327594773105189e-03,
     66                        'ch9': 3.198733498646373370e-03}
    5667
    5768
     
    94105# Read and interpolate model output
    95106#--------------------------------------------------
     107
     108import sys
     109if len(sys.argv) > 1:
     110    sww_filename = sys.argv[1]
     111else:   
     112    sww_filename = project.output_filename
     113   
    96114#f = file_function('okushiri_new_limiters.sww',   #The best so far
    97115#f = file_function('okushiri_as2005_with_mxspd=0.1.sww',
    98 f = file_function(project.output_filename,
     116f = file_function(sww_filename,
    99117                  quantities='stage',
    100118                  interpolation_points=gauge_locations,
  • anuga_validation/okushiri_2005/project.py

    r3861 r3878  
    1818#output_filename = 'okushiri_new_limiters.sww'
    1919#output_filename = 'okushiri_nl_coarse10_mesh.sww'
    20 output_filename = 'okushiri_nl_coarse100_mesh.sww'
     20#output_filename = 'okushiri_nl_coarse100_mesh.sww'
     21output_filename = 'okushiri_new_mesh1.sww'
    2122
    2223
    2324
    24 
  • anuga_validation/okushiri_2005/run_okushiri.py

    r3859 r3878  
    5353domain.set_name(project.output_filename)  # Name of output sww file
    5454domain.set_default_order(2)               # Apply second order scheme
    55 #domain.set_all_limiters(0.9)              # Maximal second order scheme (old lim)
     55domain.set_all_limiters(0.9)              # Max second order scheme (old lim)
    5656domain.set_minimum_storable_height(0.001) # Don't store w < 0.001m
    5757domain.set_maximum_allowed_speed(0.1)     # Allow a little runoff (0.1 is OK)
Note: See TracChangeset for help on using the changeset viewer.