Changeset 6905


Ignore:
Timestamp:
Apr 26, 2009, 8:36:31 AM (15 years ago)
Author:
rwilson
Message:

Back-merge from main trunk and ongoing Patong Beach changes.

Location:
branches/numpy_anuga_validation
Files:
2 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • branches/numpy_anuga_validation/automated_validation_tests/flow_tests/test_inflow_using_flowline.py

    r6788 r6905  
    1818from anuga.shallow_water.shallow_water_domain import Reflective_boundary
    1919from anuga.shallow_water.shallow_water_domain import Dirichlet_boundary
    20 from anuga.shallow_water.shallow_water_domain import Transmissive_Momentum_Set_Stage_boundary
     20from anuga.shallow_water.shallow_water_domain import Transmissive_momentum_set_stage_boundary
    2121from anuga.shallow_water.shallow_water_domain import Inflow
    2222from anuga.shallow_water.data_manager import get_flow_through_cross_section
    … …  
    4646
    4747        domain = Domain(points, vertices, boundary)   
    48         domain.set_name('inflow_flowline_test')              # Output name
     48        domain.set_name('inflow_flowline_test')
    4949
    5050
    … …  
    5757            return z
    5858
    59         domain.set_quantity('elevation', topography)  # Use function for elevation
    60         domain.set_quantity('friction', mannings_n)   # Constant friction of conc surface   
     59        domain.set_quantity('elevation', topography)
     60        domain.set_quantity('friction', mannings_n)
    6161        domain.set_quantity('stage',
    62                             expression='elevation')   # Dry initial condition
     62                            expression='elevation') # Dry initial condition
    6363
    6464
    … …  
    9393        #----------------------------------------------------------------------
    9494
    95         Br = Reflective_boundary(domain)              # Solid reflective wall
    96         #Bo = Dirichlet_boundary([-(slope*length)+normal_depth, 0, 0])  # Outflow stage at normal depth
     95        Br = Reflective_boundary(domain) # Solid reflective wall
     96
     97        # Define downstream boundary based on predicted depth
    9798        def normal_depth_stage_downstream(t):
    98             return (-slope*length) + normal_depth
    99         Bt = Transmissive_Momentum_Set_Stage_boundary(domain=domain,function=normal_depth_stage_downstream)
     99            return (-slope*length) + normal_depth
     100       
     101        Bt = Transmissive_momentum_set_stage_boundary(domain=domain,
     102                                                      function=normal_depth_stage_downstream)
     103       
    100104        domain.set_boundary({'left': Br, 'right': Bt, 'top': Br, 'bottom': Br})
    101105
    … …  
    110114            if verbose :
    111115                print domain.timestepping_statistics()
     116                print domain.volumetric_balance_statistics()               
    112117
    113118

  • branches/numpy_anuga_validation/automated_validation_tests/flow_tests/test_inflow_using_flowline.stdout

    r6788 r6905  
    22Slope: 0.00333333333333 Mannings n: 0.15 Velocity: 0.56390879505 Froude: 0.135269618248
    33Time = 0.0000, steps=0 (0s)
    4 Time = 100.0000, delta t in [0.04670388, 0.07995951], steps=1512 (15s)
    5 Time = 200.0000, delta t in [0.07127650, 0.07370136], steps=1376 (20s)
    6 Time = 300.0000, delta t in [0.07195764, 0.07355355], steps=1378 (23s)
    7 Time = 400.0000, delta t in [0.07105244, 0.07239161], steps=1396 (24s)
    8 Time = 500.0000, delta t in [0.07030722, 0.07140440], steps=1414 (24s)
    9 Time = 600.0000, delta t in [0.06989589, 0.07065760], steps=1425 (25s)
    10 Time = 700.0000, delta t in [0.06967450, 0.07029477], steps=1431 (25s)
    11 Time = 800.0000, delta t in [0.06953978, 0.07006511], steps=1435 (25s)
    12 Time = 900.0000, delta t in [0.06946481, 0.06991716], steps=1437 (25s)
    13 Time = 1000.0000, delta t in [0.06941649, 0.06986708], steps=1438 (25s)
    14 90 degree flowline: ANUGA = 19.852468, Ref = 20.000000
    15 45 degree flowline: ANUGA = 19.816033, Ref = 20.000000
    16 Depth at 200m: ANUGA = 1.763466, Mannings = 1.773336
     4Time = 100.0000, delta t in [0.04670388, 0.07995951], steps=1512 (11s)
     5Time = 200.0000, delta t in [0.07127650, 0.07370342], steps=1376 (14s)
     6Time = 300.0000, delta t in [0.07195486, 0.07355360], steps=1378 (16s)
     7Time = 400.0000, delta t in [0.07104521, 0.07239835], steps=1396 (16s)
     8Time = 500.0000, delta t in [0.07030060, 0.07141862], steps=1414 (17s)
     9Time = 600.0000, delta t in [0.06991216, 0.07067471], steps=1425 (17s)
     10Time = 700.0000, delta t in [0.06967587, 0.07023568], steps=1431 (17s)
     11Time = 800.0000, delta t in [0.06953975, 0.07006602], steps=1435 (17s)
     12Time = 900.0000, delta t in [0.06946477, 0.06991716], steps=1437 (17s)
     13Time = 1000.0000, delta t in [0.06941648, 0.06986710], steps=1438 (17s)
     1490 degree flowline: ANUGA = 19.853798, Ref = 20.000000
     1545 degree flowline: ANUGA = 19.815719, Ref = 20.000000
     16Depth at 200m: ANUGA = 1.763524, Mannings = 1.773336
    1717
    1818Slope: 0.00666666666667 Mannings n: 0.15 Velocity: 0.694253162662 Froude: 0.184783744042
    1919Time = 0.0000, steps=0 (0s)
    20 Time = 100.0000, delta t in [0.05343049, 0.08872063], steps=1343 (13s)
    21 Time = 200.0000, delta t in [0.07467386, 0.07666278], steps=1325 (18s)
    22 Time = 300.0000, delta t in [0.07408417, 0.07515470], steps=1343 (22s)
    23 Time = 400.0000, delta t in [0.07382265, 0.07458443], steps=1350 (23s)
    24 Time = 500.0000, delta t in [0.07368393, 0.07432979], steps=1353 (23s)
    25 Time = 600.0000, delta t in [0.07360722, 0.07417996], steps=1355 (23s)
    26 Time = 700.0000, delta t in [0.07356671, 0.07410252], steps=1356 (23s)
    27 Time = 800.0000, delta t in [0.07354632, 0.07407251], steps=1357 (23s)
    28 Time = 900.0000, delta t in [0.07353547, 0.07405410], steps=1357 (23s)
    29 Time = 1000.0000, delta t in [0.07353034, 0.07404268], steps=1357 (23s)
    30 90 degree flowline: ANUGA = 19.962845, Ref = 20.000000
    31 45 degree flowline: ANUGA = 19.894110, Ref = 20.000000
    32 Depth at 200m: ANUGA = 1.435703, Mannings = 1.440397
     20Time = 100.0000, delta t in [0.05343049, 0.08872063], steps=1343 (10s)
     21Time = 200.0000, delta t in [0.07466640, 0.07669264], steps=1325 (14s)
     22Time = 300.0000, delta t in [0.07408680, 0.07513123], steps=1343 (16s)
     23Time = 400.0000, delta t in [0.07382196, 0.07457934], steps=1350 (17s)
     24Time = 500.0000, delta t in [0.07368435, 0.07432676], steps=1353 (17s)
     25Time = 600.0000, delta t in [0.07360707, 0.07418822], steps=1355 (17s)
     26Time = 700.0000, delta t in [0.07356677, 0.07410257], steps=1356 (17s)
     27Time = 800.0000, delta t in [0.07354588, 0.07406963], steps=1357 (17s)
     28Time = 900.0000, delta t in [0.07353536, 0.07404961], steps=1357 (17s)
     29Time = 1000.0000, delta t in [0.07353037, 0.07404735], steps=1357 (17s)
     3090 degree flowline: ANUGA = 19.941952, Ref = 20.000000
     3145 degree flowline: ANUGA = 19.894587, Ref = 20.000000
     32Depth at 200m: ANUGA = 1.435380, Mannings = 1.440397
    3333
    3434Slope: 0.0133333333333 Mannings n: 0.15 Velocity: 0.854725902658 Froude: 0.252422033155
    3535Time = 0.0000, steps=0 (0s)
    36 Time = 100.0000, delta t in [0.06106513, 0.09844171], steps=1267 (12s)
    37 Time = 200.0000, delta t in [0.07711239, 0.07797078], steps=1292 (16s)
    38 Time = 300.0000, delta t in [0.07702229, 0.07739409], steps=1297 (20s)
    39 Time = 400.0000, delta t in [0.07700414, 0.07730267], steps=1297 (22s)
    40 Time = 500.0000, delta t in [0.07700041, 0.07729391], steps=1298 (22s)
    41 Time = 600.0000, delta t in [0.07699997, 0.07729250], steps=1298 (22s)
    42 Time = 700.0000, delta t in [0.07699919, 0.07729220], steps=1298 (22s)
    43 Time = 800.0000, delta t in [0.07699915, 0.07729199], steps=1298 (22s)
    44 Time = 900.0000, delta t in [0.07699922, 0.07729228], steps=1298 (22s)
    45 Time = 1000.0000, delta t in [0.07699912, 0.07729102], steps=1298 (22s)
    46 90 degree flowline: ANUGA = 19.966722, Ref = 20.000000
    47 45 degree flowline: ANUGA = 19.904081, Ref = 20.000000
    48 Depth at 200m: ANUGA = 1.160740, Mannings = 1.169966
     36Time = 100.0000, delta t in [0.06106513, 0.09844171], steps=1267 (9s)
     37Time = 200.0000, delta t in [0.07710981, 0.07795397], steps=1292 (12s)
     38Time = 300.0000, delta t in [0.07702050, 0.07737667], steps=1297 (14s)
     39Time = 400.0000, delta t in [0.07700624, 0.07730440], steps=1297 (16s)
     40Time = 500.0000, delta t in [0.07700135, 0.07729531], steps=1298 (16s)
     41Time = 600.0000, delta t in [0.07699943, 0.07729236], steps=1298 (15s)
     42Time = 700.0000, delta t in [0.07699928, 0.07729154], steps=1298 (15s)
     43Time = 800.0000, delta t in [0.07699919, 0.07729217], steps=1298 (15s)
     44Time = 900.0000, delta t in [0.07699922, 0.07729310], steps=1298 (15s)
     45Time = 1000.0000, delta t in [0.07699910, 0.07729218], steps=1298 (15s)
     4690 degree flowline: ANUGA = 20.006814, Ref = 20.000000
     4745 degree flowline: ANUGA = 19.909959, Ref = 20.000000
     48Depth at 200m: ANUGA = 1.163983, Mannings = 1.169966
    4949
    5050Slope: 0.00333333333333 Mannings n: 0.07 Velocity: 0.890850441519 Froude: 0.268592673148
    5151Time = 0.0000, steps=0 (0s)
    52 Time = 100.0000, delta t in [0.05472541, 0.10050047], steps=1319 (14s)
    53 Time = 200.0000, delta t in [0.07832952, 0.07950825], steps=1270 (20s)
    54 Time = 300.0000, delta t in [0.07789850, 0.07837491], steps=1281 (22s)
    55 Time = 400.0000, delta t in [0.07760546, 0.07795929], steps=1286 (22s)
    56 Time = 500.0000, delta t in [0.07747375, 0.07766431], steps=1290 (22s)
    57 Time = 600.0000, delta t in [0.07742076, 0.07753688], steps=1291 (22s)
    58 Time = 700.0000, delta t in [0.07739751, 0.07748699], steps=1292 (22s)
    59 Time = 800.0000, delta t in [0.07738720, 0.07746239], steps=1292 (22s)
    60 Time = 900.0000, delta t in [0.07738258, 0.07745436], steps=1292 (22s)
    61 Time = 1000.0000, delta t in [0.07738083, 0.07745012], steps=1292 (22s)
    62 90 degree flowline: ANUGA = 19.990141, Ref = 20.000000
    63 45 degree flowline: ANUGA = 19.971668, Ref = 20.000000
    64 Depth at 200m: ANUGA = 1.119491, Mannings = 1.122523
     52Time = 100.0000, delta t in [0.05472541, 0.10050047], steps=1319 (10s)
     53Time = 200.0000, delta t in [0.07832767, 0.07949366], steps=1270 (14s)
     54Time = 300.0000, delta t in [0.07789828, 0.07837894], steps=1281 (15s)
     55Time = 400.0000, delta t in [0.07760358, 0.07796360], steps=1286 (15s)
     56Time = 500.0000, delta t in [0.07747343, 0.07766337], steps=1290 (15s)
     57Time = 600.0000, delta t in [0.07742068, 0.07754068], steps=1291 (15s)
     58Time = 700.0000, delta t in [0.07739775, 0.07748682], steps=1292 (15s)
     59Time = 800.0000, delta t in [0.07738722, 0.07746348], steps=1292 (15s)
     60Time = 900.0000, delta t in [0.07738279, 0.07745530], steps=1292 (15s)
     61Time = 1000.0000, delta t in [0.07738087, 0.07745167], steps=1292 (15s)
     6290 degree flowline: ANUGA = 19.989943, Ref = 20.000000
     6345 degree flowline: ANUGA = 19.972075, Ref = 20.000000
     64Depth at 200m: ANUGA = 1.119535, Mannings = 1.122523
    6565
    6666Slope: 0.00666666666667 Mannings n: 0.07 Velocity: 1.0967655442 Froude: 0.36690840419
    6767Time = 0.0000, steps=0 (0s)
    68 Time = 100.0000, delta t in [0.06213184, 0.11151226], steps=1258 (13s)
    69 Time = 200.0000, delta t in [0.07925606, 0.07976601], steps=1259 (19s)
    70 Time = 300.0000, delta t in [0.07917385, 0.07931469], steps=1263 (22s)
    71 Time = 400.0000, delta t in [0.07915421, 0.07923430], steps=1263 (22s)
    72 Time = 500.0000, delta t in [0.07914921, 0.07921473], steps=1264 (22s)
    73 Time = 600.0000, delta t in [0.07914788, 0.07921076], steps=1264 (22s)
    74 Time = 700.0000, delta t in [0.07914750, 0.07921009], steps=1264 (22s)
    75 Time = 800.0000, delta t in [0.07914738, 0.07920941], steps=1264 (22s)
    76 Time = 900.0000, delta t in [0.07914735, 0.07920935], steps=1264 (22s)
    77 Time = 1000.0000, delta t in [0.07914733, 0.07920948], steps=1264 (22s)
    78 90 degree flowline: ANUGA = 19.957824, Ref = 20.000000
    79 45 degree flowline: ANUGA = 19.962348, Ref = 20.000000
    80 Depth at 200m: ANUGA = 0.908330, Mannings = 0.911772
     68Time = 100.0000, delta t in [0.06213184, 0.11151226], steps=1258 (10s)
     69Time = 200.0000, delta t in [0.07925528, 0.07976601], steps=1259 (13s)
     70Time = 300.0000, delta t in [0.07917416, 0.07931069], steps=1263 (15s)
     71Time = 400.0000, delta t in [0.07915438, 0.07923348], steps=1263 (15s)
     72Time = 500.0000, delta t in [0.07914917, 0.07921518], steps=1264 (15s)
     73Time = 600.0000, delta t in [0.07914783, 0.07921045], steps=1264 (15s)
     74Time = 700.0000, delta t in [0.07914746, 0.07920966], steps=1264 (15s)
     75Time = 800.0000, delta t in [0.07914737, 0.07920952], steps=1264 (15s)
     76Time = 900.0000, delta t in [0.07914734, 0.07920939], steps=1264 (15s)
     77Time = 1000.0000, delta t in [0.07914733, 0.07920929], steps=1264 (15s)
     7890 degree flowline: ANUGA = 19.974794, Ref = 20.000000
     7945 degree flowline: ANUGA = 19.960926, Ref = 20.000000
     80Depth at 200m: ANUGA = 0.908708, Mannings = 0.911772
    8181
    8282Slope: 0.0133333333333 Mannings n: 0.07 Velocity: 1.35027677249 Froude: 0.501211650665
    8383Time = 0.0000, steps=0 (0s)
    84 Time = 100.0000, delta t in [0.07125688, 0.12373060], steps=1235 (12s)
    85 Time = 200.0000, delta t in [0.07952350, 0.07956306], steps=1258 (18s)
    86 Time = 300.0000, delta t in [0.07949782, 0.07952695], steps=1258 (21s)
    87 Time = 400.0000, delta t in [0.07949780, 0.07952483], steps=1258 (21s)
    88 Time = 500.0000, delta t in [0.07949779, 0.07952433], steps=1258 (21s)
    89 Time = 600.0000, delta t in [0.07949780, 0.07952446], steps=1258 (21s)
    90 Time = 700.0000, delta t in [0.07949780, 0.07952432], steps=1258 (21s)
    91 Time = 800.0000, delta t in [0.07949778, 0.07952434], steps=1258 (21s)
    92 Time = 900.0000, delta t in [0.07949780, 0.07952466], steps=1258 (21s)
    93 Time = 1000.0000, delta t in [0.07949780, 0.07952430], steps=1258 (21s)
    94 90 degree flowline: ANUGA = 19.975988, Ref = 20.000000
    95 45 degree flowline: ANUGA = 19.919995, Ref = 20.000000
    96 Depth at 200m: ANUGA = 0.737424, Mannings = 0.740589
     84Time = 100.0000, delta t in [0.07125688, 0.12373060], steps=1235 (10s)
     85Time = 200.0000, delta t in [0.07952332, 0.07956306], steps=1258 (13s)
     86Time = 300.0000, delta t in [0.07949784, 0.07952682], steps=1258 (16s)
     87Time = 400.0000, delta t in [0.07949778, 0.07952470], steps=1258 (16s)
     88Time = 500.0000, delta t in [0.07949767, 0.07952433], steps=1258 (16s)
     89Time = 600.0000, delta t in [0.07949779, 0.07952430], steps=1258 (16s)
     90Time = 700.0000, delta t in [0.07949779, 0.07952474], steps=1258 (16s)
     91Time = 800.0000, delta t in [0.07949780, 0.07952480], steps=1258 (16s)
     92Time = 900.0000, delta t in [0.07949778, 0.07952431], steps=1258 (16s)
     93Time = 1000.0000, delta t in [0.07949773, 0.07952455], steps=1258 (16s)
     9490 degree flowline: ANUGA = 19.975535, Ref = 20.000000
     9545 degree flowline: ANUGA = 19.920764, Ref = 20.000000
     96Depth at 200m: ANUGA = 0.737426, Mannings = 0.740589
    9797
    9898Slope: 0.00333333333333 Mannings n: 0.035 Velocity: 1.35027677249 Froude: 0.501211650665
    9999Time = 0.0000, steps=0 (0s)
    100 Time = 100.0000, delta t in [0.06406596, 0.12373060], steps=1311 (15s)
    101 Time = 200.0000, delta t in [0.07804143, 0.07809819], steps=1281 (22s)
    102 Time = 300.0000, delta t in [0.07809823, 0.07810989], steps=1281 (22s)
    103 Time = 400.0000, delta t in [0.07810992, 0.07811652], steps=1281 (22s)
    104 Time = 500.0000, delta t in [0.07806106, 0.07811752], steps=1281 (22s)
    105 Time = 600.0000, delta t in [0.07806120, 0.07810608], steps=1281 (22s)
    106 Time = 700.0000, delta t in [0.07806119, 0.07810560], steps=1281 (22s)
    107 Time = 800.0000, delta t in [0.07806119, 0.07810528], steps=1281 (22s)
    108 Time = 900.0000, delta t in [0.07806119, 0.07810526], steps=1281 (22s)
    109 Time = 1000.0000, delta t in [0.07806119, 0.07810631], steps=1281 (22s)
    110 90 degree flowline: ANUGA = 19.995665, Ref = 20.000000
    111 45 degree flowline: ANUGA = 19.981393, Ref = 20.000000
    112 Depth at 200m: ANUGA = 0.739766, Mannings = 0.740589
     100Time = 100.0000, delta t in [0.06406596, 0.12373060], steps=1311 (11s)
     101Time = 200.0000, delta t in [0.07804143, 0.07809819], steps=1281 (15s)
     102Time = 300.0000, delta t in [0.07809823, 0.07810989], steps=1281 (16s)
     103Time = 400.0000, delta t in [0.07810992, 0.07811652], steps=1281 (16s)
     104Time = 500.0000, delta t in [0.07806103, 0.07811751], steps=1281 (15s)
     105Time = 600.0000, delta t in [0.07806119, 0.07810605], steps=1281 (15s)
     106Time = 700.0000, delta t in [0.07806119, 0.07810576], steps=1281 (15s)
     107Time = 800.0000, delta t in [0.07806118, 0.07810622], steps=1281 (15s)
     108Time = 900.0000, delta t in [0.07806119, 0.07810551], steps=1281 (15s)
     109Time = 1000.0000, delta t in [0.07806119, 0.07810586], steps=1281 (15s)
     11090 degree flowline: ANUGA = 19.987676, Ref = 20.000000
     11145 degree flowline: ANUGA = 19.979713, Ref = 20.000000
     112Depth at 200m: ANUGA = 0.739503, Mannings = 0.740589
    113113
    114114Slope: 0.00666666666667 Mannings n: 0.035 Velocity: 1.66238570492 Froude: 0.684675291962
    115115Time = 0.0000, steps=0 (0s)
    116 Time = 100.0000, delta t in [0.07298360, 0.13728769], steps=1296 (15s)
    117 Time = 200.0000, delta t in [0.07648774, 0.07652320], steps=1307 (21s)
    118 Time = 300.0000, delta t in [0.07652322, 0.07652483], steps=1307 (22s)
    119 Time = 400.0000, delta t in [0.07652485, 0.07652492], steps=1307 (22s)
    120 Time = 500.0000, delta t in [0.07652492, 0.07652499], steps=1307 (22s)
    121 Time = 600.0000, delta t in [0.07652492, 0.07652500], steps=1307 (22s)
    122 Time = 700.0000, delta t in [0.07652492, 0.07652500], steps=1307 (22s)
    123 Time = 800.0000, delta t in [0.07652492, 0.07652500], steps=1307 (22s)
    124 Time = 900.0000, delta t in [0.07652492, 0.07652500], steps=1307 (22s)
    125 Time = 1000.0000, delta t in [0.07652492, 0.07652500], steps=1307 (22s)
     116Time = 100.0000, delta t in [0.07298360, 0.13728769], steps=1296 (11s)
     117Time = 200.0000, delta t in [0.07648774, 0.07652320], steps=1307 (15s)
     118Time = 300.0000, delta t in [0.07652322, 0.07652483], steps=1307 (15s)
     119Time = 400.0000, delta t in [0.07652485, 0.07652492], steps=1307 (15s)
     120Time = 500.0000, delta t in [0.07652492, 0.07652499], steps=1307 (15s)
     121Time = 600.0000, delta t in [0.07652492, 0.07652500], steps=1307 (15s)
     122Time = 700.0000, delta t in [0.07652492, 0.07652500], steps=1307 (15s)
     123Time = 800.0000, delta t in [0.07652492, 0.07652500], steps=1307 (15s)
     124Time = 900.0000, delta t in [0.07652492, 0.07652500], steps=1307 (15s)
     125Time = 1000.0000, delta t in [0.07652492, 0.07652500], steps=1307 (15s)
    12612690 degree flowline: ANUGA = 19.980911, Ref = 20.000000
    12712745 degree flowline: ANUGA = 19.965897, Ref = 20.000000
    … …  
    130130Slope: 0.0133333333333 Mannings n: 0.035 Velocity: 2.04663687344 Froude: 0.935294011626
    131131Time = 0.0000, steps=0 (0s)
    132 Time = 100.0000, delta t in [0.07303469, 0.15233023], steps=1326 (14s)
    133 Time = 200.0000, delta t in [0.07312989, 0.07313055], steps=1368 (22s)
    134 Time = 300.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    135 Time = 400.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    136 Time = 500.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    137 Time = 600.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    138 Time = 700.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    139 Time = 800.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    140 Time = 900.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
    141 Time = 1000.0000, delta t in [0.07313055, 0.07313080], steps=1368 (23s)
     132Time = 100.0000, delta t in [0.07303469, 0.15233023], steps=1326 (11s)
     133Time = 200.0000, delta t in [0.07312989, 0.07313055], steps=1368 (15s)
     134Time = 300.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     135Time = 400.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     136Time = 500.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     137Time = 600.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     138Time = 700.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     139Time = 800.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     140Time = 900.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
     141Time = 1000.0000, delta t in [0.07313055, 0.07313080], steps=1368 (16s)
    14214290 degree flowline: ANUGA = 19.969930, Ref = 20.000000
    14314345 degree flowline: ANUGA = 19.967616, Ref = 20.000000
    … …  
    146146Slope: 0.00333333333333 Mannings n: 0.012 Velocity: 2.5665804151 Froude: 1.31346733326
    147147Time = 0.0000, steps=0 (0s)
    148 Time = 100.0000, delta t in [0.07007266, 0.17058591], steps=1370 (18s)
    149 Time = 200.0000, delta t in [0.06530360, 0.07029554], steps=1472 (26s)
    150 Time = 300.0000, delta t in [0.06767159, 0.07029537], steps=1432 (25s)
    151 Time = 400.0000, delta t in [0.07029485, 0.07029537], steps=1423 (25s)
    152 Time = 500.0000, delta t in [0.07029485, 0.07029537], steps=1423 (25s)
    153 Time = 600.0000, delta t in [0.07029485, 0.07029538], steps=1423 (25s)
    154 Time = 700.0000, delta t in [0.07029485, 0.07029537], steps=1423 (25s)
    155 Time = 800.0000, delta t in [0.07029485, 0.07029537], steps=1423 (25s)
    156 Time = 900.0000, delta t in [0.07029485, 0.07029538], steps=1423 (25s)
    157 Time = 1000.0000, delta t in [0.07029485, 0.07029537], steps=1423 (25s)
     148Time = 100.0000, delta t in [0.07007266, 0.17058591], steps=1370 (13s)
     149Time = 200.0000, delta t in [0.06530360, 0.07029554], steps=1472 (18s)
     150Time = 300.0000, delta t in [0.06767159, 0.07029537], steps=1432 (17s)
     151Time = 400.0000, delta t in [0.07029485, 0.07029537], steps=1423 (17s)
     152Time = 500.0000, delta t in [0.07029485, 0.07029537], steps=1423 (17s)
     153Time = 600.0000, delta t in [0.07029485, 0.07029538], steps=1423 (17s)
     154Time = 700.0000, delta t in [0.07029485, 0.07029537], steps=1423 (17s)
     155Time = 800.0000, delta t in [0.07029485, 0.07029537], steps=1423 (17s)
     156Time = 900.0000, delta t in [0.07029485, 0.07029538], steps=1423 (17s)
     157Time = 1000.0000, delta t in [0.07029485, 0.07029537], steps=1423 (18s)
    15815890 degree flowline: ANUGA = 19.992891, Ref = 20.000000
    15915945 degree flowline: ANUGA = 20.001657, Ref = 20.000000
    … …  
    162162Slope: 0.00666666666667 Mannings n: 0.012 Velocity: 3.15983113945 Froude: 1.79424925317
    163163Time = 0.0000, steps=0 (0s)
    164 Time = 100.0000, delta t in [0.06751910, 0.18927691], steps=1410 (18s)
    165 Time = 200.0000, delta t in [0.06369027, 0.06759849], steps=1496 (26s)
    166 Time = 300.0000, delta t in [0.06753158, 0.06759767], steps=1480 (26s)
    167 Time = 400.0000, delta t in [0.06753134, 0.06759800], steps=1480 (26s)
    168 Time = 500.0000, delta t in [0.06753197, 0.06759766], steps=1480 (26s)
    169 Time = 600.0000, delta t in [0.06753148, 0.06759728], steps=1480 (26s)
    170 Time = 700.0000, delta t in [0.06753153, 0.06759775], steps=1480 (26s)
    171 Time = 800.0000, delta t in [0.06753152, 0.06759801], steps=1480 (26s)
    172 Time = 900.0000, delta t in [0.06753132, 0.06759788], steps=1480 (25s)
    173 Time = 1000.0000, delta t in [0.06753140, 0.06759801], steps=1480 (26s)
     164Time = 100.0000, delta t in [0.06751910, 0.18927691], steps=1410 (13s)
     165Time = 200.0000, delta t in [0.06369027, 0.06759849], steps=1496 (18s)
     166Time = 300.0000, delta t in [0.06753158, 0.06759767], steps=1480 (18s)
     167Time = 400.0000, delta t in [0.06753134, 0.06759800], steps=1480 (18s)
     168Time = 500.0000, delta t in [0.06753197, 0.06759766], steps=1480 (18s)
     169Time = 600.0000, delta t in [0.06753148, 0.06759728], steps=1480 (18s)
     170Time = 700.0000, delta t in [0.06753153, 0.06759775], steps=1480 (18s)
     171Time = 800.0000, delta t in [0.06753152, 0.06759801], steps=1480 (18s)
     172Time = 900.0000, delta t in [0.06753132, 0.06759788], steps=1480 (18s)
     173Time = 1000.0000, delta t in [0.06753140, 0.06759801], steps=1480 (18s)
    17417490 degree flowline: ANUGA = 19.997099, Ref = 20.000000
    17517545 degree flowline: ANUGA = 20.026867, Ref = 20.000000
    … …  
    178178Slope: 0.0133333333333 Mannings n: 0.012 Velocity: 3.89020845445 Froude: 2.45101671048
    179179Time = 0.0000, steps=0 (0s)
    180 Time = 100.0000, delta t in [0.06083936, 0.21001588], steps=1534 (19s)
    181 Time = 200.0000, delta t in [0.05060426, 0.06088284], steps=1667 (29s)
    182 Time = 300.0000, delta t in [0.06014772, 0.06083528], steps=1649 (29s)
    183 Time = 400.0000, delta t in [0.06002239, 0.06083472], steps=1649 (29s)
    184 Time = 500.0000, delta t in [0.06029467, 0.06081015], steps=1649 (29s)
    185 Time = 600.0000, delta t in [0.06019411, 0.06079852], steps=1649 (29s)
    186 Time = 700.0000, delta t in [0.06012329, 0.06076357], steps=1650 (29s)
    187 Time = 800.0000, delta t in [0.06018782, 0.06076638], steps=1650 (29s)
    188 Time = 900.0000, delta t in [0.06016674, 0.06078747], steps=1650 (29s)
    189 Time = 1000.0000, delta t in [0.06023750, 0.06077108], steps=1650 (29s)
    190 90 degree flowline: ANUGA = 20.138526, Ref = 20.000000
    191 45 degree flowline: ANUGA = 20.053061, Ref = 20.000000
    192 Depth at 200m: ANUGA = 0.258089, Mannings = 0.257056
     180Time = 100.0000, delta t in [0.06083936, 0.21001588], steps=1534 (14s)
     181Time = 200.0000, delta t in [0.05060426, 0.06088284], steps=1667 (20s)
     182Time = 300.0000, delta t in [0.06014772, 0.06083528], steps=1649 (20s)
     183Time = 400.0000, delta t in [0.06002230, 0.06083472], steps=1649 (20s)
     184Time = 500.0000, delta t in [0.06028106, 0.06081459], steps=1649 (20s)
     185Time = 600.0000, delta t in [0.06020233, 0.06079963], steps=1649 (20s)
     186Time = 700.0000, delta t in [0.06005735, 0.06079762], steps=1650 (20s)
     187Time = 800.0000, delta t in [0.06026735, 0.06076164], steps=1650 (20s)
     188Time = 900.0000, delta t in [0.06021111, 0.06076745], steps=1650 (20s)
     189Time = 1000.0000, delta t in [0.06027006, 0.06076701], steps=1650 (20s)
     19090 degree flowline: ANUGA = 20.128291, Ref = 20.000000
     19145 degree flowline: ANUGA = 20.048036, Ref = 20.000000
     192Depth at 200m: ANUGA = 0.258052, Mannings = 0.257056

  • branches/numpy_anuga_validation/automated_validation_tests/okushiri_tank_validation/validate_okushiri.py

    r5183 r6905  
    1313        for file in os.listdir('.'):
    1414            if file.endswith('.stdout') or\
    15                file.endswith('.sww') or\
    16                file.endswith('.msh'):
     15                    file.endswith('.sww') or\
     16                    file.endswith('.msh'):
    1717                os.remove(file)
    1818               
    19        
     19               
    2020    def tearDown(self):
    2121        pass
    2222
    2323    def test_that_output_is_as_expected(self):
    24 
     24        """Test that ANUGA replicates physics of the Okushiri Island
     25        wave tank experiment
     26        """
    2527       
    2628        #print
    … …  
    4143                        %s)
    4244        assert res == 0
     45
     46
     47    def test_caching_of_set_quantity(self):
     48        """Test that caching of set_quantity works
     49        """
     50       
     51        s = 'create_okushiri.py'
     52        res = os.system('python %s > create_okushiri_for_caching.stdout' %s)
     53        assert res == 0
     54
     55
     56        s = 'test_caching_of_set_quantity.py'
     57        res = os.system('python %s > test_caching_of_set_quantity.stdout' %s)
     58        assert res == 0
     59
     60       
    4361
    4462    def manual_test_that_output_is_as_expected(self):
    … …  
    6583#-------------------------------------------------------------
    6684if __name__ == "__main__":
    67     suite = unittest.makeSuite(Test_Okushiri,'test')
     85    suite = unittest.makeSuite(Test_Okushiri, 'test')
    6886    runner = unittest.TextTestRunner(verbosity=2)
    6987    runner.run(suite)

  • branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

    r6832 r6905  
    3737from anuga.interface import create_sts_boundary
    3838from anuga.interface import csv2building_polygons
    39 from anuga.lib.file_length.file_length import file_length
     39from anuga.utilities.system_tools import file_length
    4040
    4141from anuga.shallow_water.data_manager import start_screen_catcher
    … …  
    5656#-------------------------------------------------------------------------------
    5757
    58 copy_code_files(project.output_run, __file__,
    59                 os.path.join(os.path.dirname(project.__file__),
    60                              project.__name__+'.py'))
    61 start_screen_catcher(project.output_run, 0, 1)
     58copy_code_files(project.output_run,
     59                [__file__,
     60                 os.path.join(os.path.dirname(project.__file__),
     61                              project.__name__+'.py'),
     62                 os.path.join(os.path.dirname(project.__file__),
     63                              'setup_model.py')],
     64                verbose=True
     65               )
     66#start_screen_catcher(project.output_run, 0, 1)
    6267
    6368#-------------------------------------------------------------------------------
    … …  
    138143if project.use_buildings:
    139144    # Add buildings from file
    140     log.critical('Reading building polygons'    )
     145    log.critical('Reading building polygons')
    141146    building_polygons, building_heights = csv2building_polygons(project.building_polygon)
    142147    #clipping_polygons=project.building_area_polygons)
    … …  
    155160        return buildings
    156161
     162    log.critical('Creating %d building polygons' % len(building_polygons))
    157163    buildings = cache(create_polygon_function,
    158164                      building_polygons,
    … …  
    175181Br = Reflective_boundary(domain)
    176182Bs = Transmissive_stage_zero_momentum_boundary(domain)
    177 #Bs = Dirichlet_boundary([project.tide, 0, 0])
    178183Bf = Field_boundary(project.event_sts+'.sts',
    179184                    domain,

  • branches/numpy_anuga_validation/performance_tests/okushiri/run_okushiri_profile.py

    r5442 r6905  
    8383t0 = time.time()
    8484
    85 s = 'for t in domain.evolve(yieldstep = 0.05, finaltime = 2): domain.write_time()'
     85s = 'for t in domain.evolve(yieldstep = 0.05, finaltime = 22.5): domain.write_time()'
    8686
    8787import profile, pstats
    … …  
    9393
    9494S = pstats.Stats(FN)
    95 s = S.sort_stats('time').print_stats(50)
     95s = S.sort_stats('time').print_stats(20)
    9696#s = S.sort_stats('cumulative').print_stats(30)
    9797
    98 s.print_callers()
     98#s.print_callers()
    9999print s
    100100

  • branches/numpy_anuga_validation/performance_tests/okushiri/run_okushiri_profile_fitting.py

    r4578 r6905  
    6262print s
    6363
     64s.print_callers()
     65print s
     66
Note: See TracChangeset for help on using the changeset viewer.