diff --git a/doc/images/wiki/fr_cond-initiales.png b/doc/images/wiki/fr_cond-initiales.png
new file mode 100644
index 0000000000000000000000000000000000000000..0147f8d92867d4b3ff50f2339212c6b414a8f071
Binary files /dev/null and b/doc/images/wiki/fr_cond-initiales.png differ
diff --git a/doc/images/wiki/fr_cond-limites.png b/doc/images/wiki/fr_cond-limites.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1be3151264bf0fa0b5417db7bd66430600b0d2
Binary files /dev/null and b/doc/images/wiki/fr_cond-limites.png differ
diff --git a/doc/images/wiki/fr_edit-cond-limites.png b/doc/images/wiki/fr_edit-cond-limites.png
new file mode 100644
index 0000000000000000000000000000000000000000..5583bc5144919bac6c535648747983a25406bc60
Binary files /dev/null and b/doc/images/wiki/fr_edit-cond-limites.png differ
diff --git a/doc/images/wiki/fr_edit_geometrie.png b/doc/images/wiki/fr_edit_geometrie.png
new file mode 100644
index 0000000000000000000000000000000000000000..b02bb693e6557fcb6593554fcfcef7cd6d1f7984
Binary files /dev/null and b/doc/images/wiki/fr_edit_geometrie.png differ
diff --git a/doc/images/wiki/fr_geometrie.png b/doc/images/wiki/fr_geometrie.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ebbef4dc23ea0b576213665086e497fd2cacaea
Binary files /dev/null and b/doc/images/wiki/fr_geometrie.png differ
diff --git a/doc/images/wiki/fr_meshing_geometrie.png b/doc/images/wiki/fr_meshing_geometrie.png
new file mode 100644
index 0000000000000000000000000000000000000000..600a3ab79dd46af15db6a907baeafbfdf96fb4e1
Binary files /dev/null and b/doc/images/wiki/fr_meshing_geometrie.png differ
diff --git a/doc/images/wiki/fr_nouvelle-etude.png b/doc/images/wiki/fr_nouvelle-etude.png
new file mode 100644
index 0000000000000000000000000000000000000000..83c419e38c9f022dc78d2274689a19f6f0d3eefb
Binary files /dev/null and b/doc/images/wiki/fr_nouvelle-etude.png differ
diff --git a/doc/images/wiki/fr_reseau.png b/doc/images/wiki/fr_reseau.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d5cd84307d8ade4825157b1d836da478eca56dd
Binary files /dev/null and b/doc/images/wiki/fr_reseau.png differ
diff --git a/doc/users/Tuto1/data/Bief_1.M b/doc/users/Tuto1/data/Bief_1.M
deleted file mode 100644
index 19e85d6e15cf4523bc3dc7c6836b6170ab4bef09..0000000000000000000000000000000000000000
--- a/doc/users/Tuto1/data/Bief_1.M
+++ /dev/null
@@ -1,4488 +0,0 @@
-# SECMA V 6.10 ENTREE: Bief_1.ST SORTIE: Bief_1.M
-# Z: INTERPOL LINEAIRE
-# D MOY SUR MAX DE BORD 1 -BORD 2 50.00
- 1 1 0 37 31090.0000
- 31090.0000 0.0000 23.7300
- 31090.0000 0.2083 23.4425
- 31090.0000 0.4167 23.1550
- 31090.0000 0.6250 22.8675
- 31090.0000 0.8333 22.5800
- 31090.0000 1.0417 22.2925
- 31090.0000 1.2500 22.0050
- 31090.0000 1.4583 21.7175
- 31090.0000 1.6667 21.4300
- 31090.0000 1.8750 21.1425
- 31090.0000 2.0833 20.8550
- 31090.0000 2.2917 20.5675
- 31090.0000 2.5000 20.2800 rg
- 31090.0000 2.5000 19.4302
- 31090.0000 3.2095 19.2900
- 31090.0000 4.0593 19.2900
- 31090.0000 4.9085 19.3142
- 31090.0000 5.7573 19.3546
- 31090.0000 6.6061 19.3951
- 31090.0000 7.4549 19.4355
- 31090.0000 8.3037 19.4759
- 31090.0000 9.1525 19.5163
- 31090.0000 10.0013 19.5567
- 31090.0000 10.7000 19.7402
- 31090.0000 10.7000 20.5900 rd
- 31090.0000 11.3124 20.7705
- 31090.0000 11.9249 20.9510
- 31090.0000 12.5373 21.1315
- 31090.0000 13.1497 21.3120
- 31090.0000 13.7621 21.4925
- 31090.0000 14.3746 21.6730
- 31090.0000 14.9254 21.9872
- 31090.0000 15.4603 22.3357
- 31090.0000 15.9952 22.6843
- 31090.0000 16.5301 23.0329
- 31090.0000 17.0651 23.3814
- 31090.0000 17.6000 23.7300
- 999.9990 999.9990 0.0000
- 2 1 1 37 31127.5000
- 31127.5000 0.0000 23.2850
- 31127.5000 0.2083 23.0283
- 31127.5000 0.4167 22.7717
- 31127.5000 0.6250 22.5150
- 31127.5000 0.8333 22.2583
- 31127.5000 1.0417 22.0017
- 31127.5000 1.2500 21.7450
- 31127.5000 1.4583 21.4883
- 31127.5000 1.6667 21.2317
- 31127.5000 1.8750 20.9750
- 31127.5000 2.0833 20.7183
- 31127.5000 2.2917 20.4617
- 31127.5000 2.5000 20.2050 rg
- 31127.5000 2.5000 19.3590
- 31127.5000 3.2470 19.2600
- 31127.5000 4.0930 19.2600
- 31127.5000 4.9384 19.2856
- 31127.5000 5.7835 19.3259
- 31127.5000 6.6285 19.3661
- 31127.5000 7.4736 19.4064
- 31127.5000 8.3187 19.4466
- 31127.5000 9.1637 19.4868
- 31127.5000 10.0088 19.5271
- 31127.5000 10.7000 19.7140
- 31127.5000 10.7000 20.5600 rd
- 31127.5000 11.3058 20.7464
- 31127.5000 11.9115 20.9329
- 31127.5000 12.5173 21.1193
- 31127.5000 13.1231 21.3057
- 31127.5000 13.7289 21.4921
- 31127.5000 14.3346 21.6786
- 31127.5000 14.8928 21.9703
- 31127.5000 15.4342 22.2992
- 31127.5000 15.9757 22.6282
- 31127.5000 16.5171 22.9571
- 31127.5000 17.0586 23.2861
- 31127.5000 17.6000 23.6150
- 999.9990 999.9990 0.0000
- 3 2 0 37 31165.0000
- 31165.0000 0.0000 22.8400
- 31165.0000 0.2083 22.6142
- 31165.0000 0.4167 22.3883
- 31165.0000 0.6250 22.1625
- 31165.0000 0.8333 21.9367
- 31165.0000 1.0417 21.7108
- 31165.0000 1.2500 21.4850
- 31165.0000 1.4583 21.2592
- 31165.0000 1.6667 21.0333
- 31165.0000 1.8750 20.8075
- 31165.0000 2.0833 20.5817
- 31165.0000 2.2917 20.3558
- 31165.0000 2.5000 20.1300 rg
- 31165.0000 2.5000 19.2877
- 31165.0000 3.2845 19.2300
- 31165.0000 4.1268 19.2300
- 31165.0000 4.9684 19.2571
- 31165.0000 5.8097 19.2971
- 31165.0000 6.6510 19.3372
- 31165.0000 7.4923 19.3773
- 31165.0000 8.3336 19.4173
- 31165.0000 9.1749 19.4574
- 31165.0000 10.0163 19.4974
- 31165.0000 10.7000 19.6877
- 31165.0000 10.7000 20.5300 rd
- 31165.0000 11.2991 20.7223
- 31165.0000 11.8982 20.9147
- 31165.0000 12.4974 21.1070
- 31165.0000 13.0965 21.2994
- 31165.0000 13.6956 21.4917
- 31165.0000 14.2947 21.6841
- 31165.0000 14.8602 21.9533
- 31165.0000 15.4082 22.2627
- 31165.0000 15.9561 22.5720
- 31165.0000 16.5041 22.8813
- 31165.0000 17.0520 23.1907
- 31165.0000 17.6000 23.5000
- 999.9990 999.9990 0.0000
- 4 2 1 37 31217.0000
- 31217.0000 -0.2000 22.8320
- 31217.0000 0.0117 22.6108
- 31217.0000 0.2235 22.3895
- 31217.0000 0.4352 22.1683
- 31217.0000 0.6470 21.9470
- 31217.0000 0.8587 21.7257
- 31217.0000 1.0703 21.5043
- 31217.0000 1.2819 21.2829
- 31217.0000 1.4935 21.0615
- 31217.0000 1.7051 20.8402
- 31217.0000 1.9168 20.6188
- 31217.0000 2.1284 20.3974
- 31217.0000 2.3400 20.1760 rg
- 31217.0000 2.4741 19.3798
- 31217.0000 3.1540 19.1900
- 31217.0000 4.0093 19.1900
- 31217.0000 4.8641 19.2121
- 31217.0000 5.7185 19.2528
- 31217.0000 6.5728 19.2935
- 31217.0000 7.4272 19.3342
- 31217.0000 8.2815 19.3748
- 31217.0000 9.1358 19.4155
- 31217.0000 9.9902 19.4562
- 31217.0000 10.7000 19.6347
- 31217.0000 10.7000 20.4900 rd
- 31217.0000 11.2956 20.6925
- 31217.0000 11.8912 20.8951
- 31217.0000 12.4867 21.0976
- 31217.0000 13.0823 21.3001
- 31217.0000 13.6779 21.5027
- 31217.0000 14.2735 21.7052
- 31217.0000 14.8408 21.9722
- 31217.0000 15.3927 22.2745
- 31217.0000 15.9445 22.5769
- 31217.0000 16.4963 22.8793
- 31217.0000 17.0482 23.1816
- 31217.0000 17.6000 23.4840
- 999.9990 999.9990 0.0000
- 5 2 2 37 31269.0000
- 31269.0000 -0.4000 22.8240
- 31269.0000 -0.1848 22.6074
- 31269.0000 0.0303 22.3907
- 31269.0000 0.2455 22.1741
- 31269.0000 0.4607 21.9574
- 31269.0000 0.6757 21.7406
- 31269.0000 0.8906 21.5236
- 31269.0000 1.1055 21.3067
- 31269.0000 1.3204 21.0898
- 31269.0000 1.5353 20.8728
- 31269.0000 1.7502 20.6559
- 31269.0000 1.9651 20.4389
- 31269.0000 2.1800 20.2220 rg
- 31269.0000 2.4481 19.4720
- 31269.0000 3.0235 19.1500
- 31269.0000 3.8919 19.1500
- 31269.0000 4.7598 19.1671
- 31269.0000 5.6272 19.2084
- 31269.0000 6.4946 19.2497
- 31269.0000 7.3620 19.2910
- 31269.0000 8.2294 19.3324
- 31269.0000 9.0967 19.3737
- 31269.0000 9.9641 19.4150
- 31269.0000 10.7000 19.5816
- 31269.0000 10.7000 20.4500 rd
- 31269.0000 11.2920 20.6627
- 31269.0000 11.8841 20.8754
- 31269.0000 12.4761 21.0882
- 31269.0000 13.0681 21.3009
- 31269.0000 13.6602 21.5136
- 31269.0000 14.2522 21.7263
- 31269.0000 14.8215 21.9910
- 31269.0000 15.3772 22.2864
- 31269.0000 15.9329 22.5818
- 31269.0000 16.4886 22.8772
- 31269.0000 17.0443 23.1726
- 31269.0000 17.6000 23.4680
- 999.9990 999.9990 0.0000
- 6 2 3 37 31321.0000
- 31321.0000 -0.6000 22.8160
- 31321.0000 -0.3814 22.6039
- 31321.0000 -0.1628 22.3919
- 31321.0000 0.0557 22.1798
- 31321.0000 0.2743 21.9678
- 31321.0000 0.4927 21.7555
- 31321.0000 0.7109 21.5430
- 31321.0000 0.9291 21.3305
- 31321.0000 1.1473 21.1180
- 31321.0000 1.3654 20.9055
- 31321.0000 1.5836 20.6930
- 31321.0000 1.8018 20.4805
- 31321.0000 2.0200 20.2680 rg
- 31321.0000 2.4222 19.5641
- 31321.0000 2.8930 19.1100
- 31321.0000 3.7744 19.1100
- 31321.0000 4.6556 19.1222
- 31321.0000 5.5360 19.1641
- 31321.0000 6.4164 19.2060
- 31321.0000 7.2968 19.2479
- 31321.0000 8.1772 19.2899
- 31321.0000 9.0576 19.3318
- 31321.0000 9.9380 19.3737
- 31321.0000 10.7000 19.5286
- 31321.0000 10.7000 20.4100 rd
- 31321.0000 11.2885 20.6329
- 31321.0000 11.8770 20.8558
- 31321.0000 12.4655 21.0787
- 31321.0000 13.0540 21.3016
- 31321.0000 13.6425 21.5245
- 31321.0000 14.2310 21.7474
- 31321.0000 14.8021 22.0098
- 31321.0000 15.3617 22.2982
- 31321.0000 15.9213 22.5867
- 31321.0000 16.4808 22.8751
- 31321.0000 17.0404 23.1636
- 31321.0000 17.6000 23.4520
- 999.9990 999.9990 0.0000
- 7 2 4 37 31373.0000
- 31373.0000 -0.8000 22.8080
- 31373.0000 -0.5780 22.6005
- 31373.0000 -0.3560 22.3931
- 31373.0000 -0.1340 22.1856
- 31373.0000 0.0880 21.9781
- 31373.0000 0.3097 21.7703
- 31373.0000 0.5312 21.5623
- 31373.0000 0.7526 21.3542
- 31373.0000 0.9741 21.1462
- 31373.0000 1.1956 20.9381
- 31373.0000 1.4171 20.7301
- 31373.0000 1.6385 20.5220
- 31373.0000 1.8600 20.3140 rg
- 31373.0000 2.3963 19.6562
- 31373.0000 2.7625 19.0700
- 31373.0000 3.6570 19.0700
- 31373.0000 4.5513 19.0772
- 31373.0000 5.4447 19.1197
- 31373.0000 6.3382 19.1623
- 31373.0000 7.2316 19.2048
- 31373.0000 8.1251 19.2474
- 31373.0000 9.0185 19.2899
- 31373.0000 9.9120 19.3325
- 31373.0000 10.7000 19.4755
- 31373.0000 10.7000 20.3700 rd
- 31373.0000 11.2850 20.6031
- 31373.0000 11.8699 20.8362
- 31373.0000 12.4549 21.0693
- 31373.0000 13.0398 21.3024
- 31373.0000 13.6248 21.5354
- 31373.0000 14.2097 21.7685
- 31373.0000 14.7827 22.0286
- 31373.0000 15.3462 22.3101
- 31373.0000 15.9096 22.5916
- 31373.0000 16.4731 22.8730
- 31373.0000 17.0365 23.1545
- 31373.0000 17.6000 23.4360
- 999.9990 999.9990 0.0000
- 8 3 0 37 31425.0000
- 31425.0000 -1.0000 22.8000
- 31425.0000 -0.7746 22.5971
- 31425.0000 -0.5492 22.3943
- 31425.0000 -0.3238 22.1914
- 31425.0000 -0.0983 21.9885
- 31425.0000 0.1267 21.7852
- 31425.0000 0.3515 21.5816
- 31425.0000 0.5762 21.3780
- 31425.0000 0.8010 21.1744
- 31425.0000 1.0257 20.9708
- 31425.0000 1.2505 20.7672
- 31425.0000 1.4752 20.5636
- 31425.0000 1.7000 20.3600 rg
- 31425.0000 2.3704 19.7483
- 31425.0000 2.6320 19.0300
- 31425.0000 3.5395 19.0300
- 31425.0000 4.4470 19.0322
- 31425.0000 5.3535 19.0754
- 31425.0000 6.2600 19.1186
- 31425.0000 7.1664 19.1617
- 31425.0000 8.0729 19.2049
- 31425.0000 8.9794 19.2481
- 31425.0000 9.8859 19.2912
- 31425.0000 10.7000 19.4225
- 31425.0000 10.7000 20.3300 rd
- 31425.0000 11.2814 20.5733
- 31425.0000 11.8628 20.8165
- 31425.0000 12.4442 21.0598
- 31425.0000 13.0256 21.3031
- 31425.0000 13.6071 21.5464
- 31425.0000 14.1885 21.7896
- 31425.0000 14.7633 22.0474
- 31425.0000 15.3307 22.3219
- 31425.0000 15.8980 22.5965
- 31425.0000 16.4653 22.8710
- 31425.0000 17.0327 23.1455
- 31425.0000 17.6000 23.4200
- 999.9990 999.9990 0.0000
- 9 3 1 37 31480.0000
- 31480.0000 -1.0000 22.7833
- 31480.0000 -0.7656 22.5892
- 31480.0000 -0.5311 22.3950
- 31480.0000 -0.2967 22.2009
- 31480.0000 -0.0629 22.0060
- 31480.0000 0.1564 21.7946
- 31480.0000 0.3755 21.5830
- 31480.0000 0.5946 21.3714
- 31480.0000 0.8137 21.1598
- 31480.0000 1.0328 20.9482
- 31480.0000 1.2518 20.7366
- 31480.0000 1.4709 20.5249
- 31480.0000 1.6900 20.3133 rg
- 31480.0000 2.3400 19.6829
- 31480.0000 2.6435 18.9867
- 31480.0000 3.5499 18.9867
- 31480.0000 4.4562 18.9893
- 31480.0000 5.3615 19.0325
- 31480.0000 6.2668 19.0756
- 31480.0000 7.1722 19.1187
- 31480.0000 8.0775 19.1618
- 31480.0000 8.9829 19.2049
- 31480.0000 9.8882 19.2480
- 31480.0000 10.7000 19.3803
- 31480.0000 10.7000 20.2867 rd
- 31480.0000 11.2767 20.5394
- 31480.0000 11.8534 20.7922
- 31480.0000 12.4301 21.0449
- 31480.0000 13.0069 21.2977
- 31480.0000 13.5836 21.5504
- 31480.0000 14.1603 21.8032
- 31480.0000 14.7344 22.0616
- 31480.0000 15.3075 22.3220
- 31480.0000 15.8806 22.5823
- 31480.0000 16.4538 22.8427
- 31480.0000 17.0269 23.1030
- 31480.0000 17.6000 23.3633
- 999.9990 999.9990 0.0000
- 10 3 2 37 31535.0000
- 31535.0000 -1.0000 22.7667
- 31535.0000 -0.7565 22.5812
- 31535.0000 -0.5131 22.3958
- 31535.0000 -0.2696 22.2103
- 31535.0000 -0.0274 22.0236
- 31535.0000 0.1861 21.8040
- 31535.0000 0.3995 21.5844
- 31535.0000 0.6130 21.3648
- 31535.0000 0.8264 21.1452
- 31535.0000 1.0398 20.9255
- 31535.0000 1.2532 20.7059
- 31535.0000 1.4666 20.4863
- 31535.0000 1.6800 20.2667 rg
- 31535.0000 2.3096 19.6175
- 31535.0000 2.6550 18.9433
- 31535.0000 3.5602 18.9433
- 31535.0000 4.4653 18.9464
- 31535.0000 5.3695 18.9895
- 31535.0000 6.2737 19.0326
- 31535.0000 7.1779 19.0756
- 31535.0000 8.0821 19.1187
- 31535.0000 8.9863 19.1617
- 31535.0000 9.8905 19.2048
- 31535.0000 10.7000 19.3381
- 31535.0000 10.7000 20.2433 rd
- 31535.0000 11.2720 20.5056
- 31535.0000 11.8440 20.7678
- 31535.0000 12.4161 21.0300
- 31535.0000 12.9881 21.2923
- 31535.0000 13.5601 21.5545
- 31535.0000 14.1321 21.8168
- 31535.0000 14.7055 22.0758
- 31535.0000 15.2844 22.3220
- 31535.0000 15.8633 22.5682
- 31535.0000 16.4422 22.8143
- 31535.0000 17.0211 23.0605
- 31535.0000 17.6000 23.3067
- 999.9990 999.9990 0.0000
- 11 4 0 37 31590.0000
- 31590.0000 -1.0000 22.7500
- 31590.0000 -0.7475 22.5733
- 31590.0000 -0.4951 22.3965
- 31590.0000 -0.2426 22.2198
- 31590.0000 0.0081 22.0411
- 31590.0000 0.2159 21.8135
- 31590.0000 0.4236 21.5858
- 31590.0000 0.6313 21.3582
- 31590.0000 0.8391 21.1305
- 31590.0000 1.0468 20.9029
- 31590.0000 1.2545 20.6753
- 31590.0000 1.4623 20.4476
- 31590.0000 1.6700 20.2200 rg
- 31590.0000 2.2792 19.5520
- 31590.0000 2.6665 18.9000
- 31590.0000 3.5705 18.9000
- 31590.0000 4.4745 18.9035
- 31590.0000 5.3776 18.9466
- 31590.0000 6.2806 18.9896
- 31590.0000 7.1836 19.0326
- 31590.0000 8.0867 19.0756
- 31590.0000 8.9897 19.1186
- 31590.0000 9.8928 19.1616
- 31590.0000 10.7000 19.2959
- 31590.0000 10.7000 20.2000 rd
- 31590.0000 11.2673 20.4717
- 31590.0000 11.8347 20.7434
- 31590.0000 12.4020 21.0152
- 31590.0000 12.9693 21.2869
- 31590.0000 13.5366 21.5586
- 31590.0000 14.1040 21.8303
- 31590.0000 14.6765 22.0900
- 31590.0000 15.2612 22.3220
- 31590.0000 15.8459 22.5540
- 31590.0000 16.4306 22.7860
- 31590.0000 17.0153 23.0180
- 31590.0000 17.6000 23.2500
- 999.9990 999.9990 0.0000
- 12 4 1 37 31637.5000
- 31637.5000 -1.0000 22.7375
- 31637.5000 -0.7451 22.5623
- 31637.5000 -0.4902 22.3872
- 31637.5000 -0.2352 22.2120
- 31637.5000 0.0152 22.0319
- 31637.5000 0.2199 21.8001
- 31637.5000 0.4246 21.5683
- 31637.5000 0.6292 21.3365
- 31637.5000 0.8339 21.1047
- 31637.5000 1.0385 20.8729
- 31637.5000 1.2432 20.6411
- 31637.5000 1.4478 20.4093
- 31637.5000 1.6525 20.1775 rg
- 31637.5000 2.2515 19.5013
- 31637.5000 2.6712 18.8625
- 31637.5000 3.5748 18.8625
- 31637.5000 4.4783 18.8662
- 31637.5000 5.3809 18.9092
- 31637.5000 6.2834 18.9522
- 31637.5000 7.1860 18.9952
- 31637.5000 8.0886 19.0381
- 31637.5000 8.9912 19.0811
- 31637.5000 9.8937 19.1241
- 31637.5000 10.7000 19.2589
- 31637.5000 10.7000 20.1625 rd
- 31637.5000 11.2634 20.4421
- 31637.5000 11.8268 20.7218
- 31637.5000 12.3902 21.0014
- 31637.5000 12.9535 21.2810
- 31637.5000 13.5169 21.5607
- 31637.5000 14.0803 21.8403
- 31637.5000 14.6492 22.1072
- 31637.5000 15.2393 22.3232
- 31637.5000 15.8295 22.5393
- 31637.5000 16.4197 22.7554
- 31637.5000 17.0098 22.9714
- 31637.5000 17.6000 23.1875
- 999.9990 999.9990 0.0000
- 13 4 2 37 31685.0000
- 31685.0000 -1.0000 22.7250
- 31685.0000 -0.7426 22.5514
- 31685.0000 -0.4852 22.3778
- 31685.0000 -0.2279 22.2042
- 31685.0000 0.0224 22.0227
- 31685.0000 0.2240 21.7867
- 31685.0000 0.4255 21.5507
- 31685.0000 0.6271 21.3148
- 31685.0000 0.8287 21.0788
- 31685.0000 1.0303 20.8429
- 31685.0000 1.2318 20.6069
- 31685.0000 1.4334 20.3710
- 31685.0000 1.6350 20.1350 rg
- 31685.0000 2.2237 19.4506
- 31685.0000 2.6759 18.8250
- 31685.0000 3.5790 18.8250
- 31685.0000 4.4821 18.8289
- 31685.0000 5.3842 18.8719
- 31685.0000 6.2863 18.9148
- 31685.0000 7.1884 18.9578
- 31685.0000 8.0905 19.0007
- 31685.0000 8.9926 19.0437
- 31685.0000 9.8947 19.0867
- 31685.0000 10.7000 19.2219
- 31685.0000 10.7000 20.1250 rd
- 31685.0000 11.2594 20.4125
- 31685.0000 11.8189 20.7001
- 31685.0000 12.3783 20.9876
- 31685.0000 12.9378 21.2752
- 31685.0000 13.4972 21.5627
- 31685.0000 14.0567 21.8502
- 31685.0000 14.6218 22.1243
- 31685.0000 15.2174 22.3245
- 31685.0000 15.8131 22.5246
- 31685.0000 16.4087 22.7247
- 31685.0000 17.0044 22.9249
- 31685.0000 17.6000 23.1250
- 999.9990 999.9990 0.0000
- 14 4 3 37 31732.5000
- 31732.5000 -1.0000 22.7125
- 31732.5000 -0.7402 22.5405
- 31732.5000 -0.4803 22.3684
- 31732.5000 -0.2205 22.1964
- 31732.5000 0.0295 22.0134
- 31732.5000 0.2280 21.7733
- 31732.5000 0.4265 21.5332
- 31732.5000 0.6250 21.2931
- 31732.5000 0.8235 21.0530
- 31732.5000 1.0220 20.8129
- 31732.5000 1.2205 20.5727
- 31732.5000 1.4190 20.3326
- 31732.5000 1.6175 20.0925 rg
- 31732.5000 2.1960 19.3999
- 31732.5000 2.6806 18.7875
- 31732.5000 3.5833 18.7875
- 31732.5000 4.4858 18.7916
- 31732.5000 5.3875 18.8345
- 31732.5000 6.2891 18.8775
- 31732.5000 7.1907 18.9204
- 31732.5000 8.0923 18.9633
- 31732.5000 8.9940 19.0063
- 31732.5000 9.8956 19.0492
- 31732.5000 10.7000 19.1848
- 31732.5000 10.7000 20.0875 rd
- 31732.5000 11.2555 20.3830
- 31732.5000 11.8110 20.6784
- 31732.5000 12.3665 20.9739
- 31732.5000 12.9220 21.2693
- 31732.5000 13.4775 21.5648
- 31732.5000 14.0331 21.8602
- 31732.5000 14.5944 22.1415
- 31732.5000 15.1956 22.3257
- 31732.5000 15.7967 22.5099
- 31732.5000 16.3978 22.6941
- 31732.5000 16.9989 22.8783
- 31732.5000 17.6000 23.0625
- 999.9990 999.9990 0.0000
- 15 5 0 37 31780.0000
- 31780.0000 -1.0000 22.7000
- 31780.0000 -0.7377 22.5295
- 31780.0000 -0.4754 22.3590
- 31780.0000 -0.2131 22.1885
- 31780.0000 0.0366 22.0042
- 31780.0000 0.2320 21.7599
- 31780.0000 0.4275 21.5157
- 31780.0000 0.6229 21.2714
- 31780.0000 0.8183 21.0271
- 31780.0000 1.0137 20.7828
- 31780.0000 1.2092 20.5386
- 31780.0000 1.4046 20.2943
- 31780.0000 1.6000 20.0500 rg
- 31780.0000 2.1682 19.3492
- 31780.0000 2.6853 18.7500
- 31780.0000 3.5875 18.7500
- 31780.0000 4.4896 18.7543
- 31780.0000 5.3908 18.7972
- 31780.0000 6.2919 18.8401
- 31780.0000 7.1931 18.8830
- 31780.0000 8.0942 18.9259
- 31780.0000 8.9954 18.9688
- 31780.0000 9.8966 19.0117
- 31780.0000 10.7000 19.1478
- 31780.0000 10.7000 20.0500 rd
- 31780.0000 11.2516 20.3534
- 31780.0000 11.8031 20.6567
- 31780.0000 12.3547 20.9601
- 31780.0000 12.9063 21.2635
- 31780.0000 13.4579 21.5668
- 31780.0000 14.0094 21.8702
- 31780.0000 14.5671 22.1586
- 31780.0000 15.1737 22.3269
- 31780.0000 15.7802 22.4952
- 31780.0000 16.3868 22.6634
- 31780.0000 16.9934 22.8317
- 31780.0000 17.6000 23.0000
- 999.9990 999.9990 0.0000
- 16 5 1 37 31827.0000
- 31827.0000 -0.5000 22.8450
- 31827.0000 -0.3527 22.5904
- 31827.0000 -0.1094 22.3705
- 31827.0000 0.1339 22.1507
- 31827.0000 0.3710 21.9239
- 31827.0000 0.5808 21.6672
- 31827.0000 0.7907 21.4104
- 31827.0000 1.0006 21.1537
- 31827.0000 1.2105 20.8970
- 31827.0000 1.4204 20.6402
- 31827.0000 1.6302 20.3835
- 31827.0000 1.8401 20.1267
- 31827.0000 2.0500 19.8700 rg
- 31827.0000 2.3341 19.0943
- 31827.0000 2.9433 18.7200
- 31827.0000 3.8197 18.7200
- 31827.0000 4.6957 18.7341
- 31827.0000 5.5711 18.7758
- 31827.0000 6.4465 18.8175
- 31827.0000 7.3219 18.8591
- 31827.0000 8.1973 18.9008
- 31827.0000 9.0727 18.9425
- 31827.0000 9.9481 18.9842
- 31827.0000 10.7000 19.1436
- 31827.0000 10.7000 20.0200 rd
- 31827.0000 11.2496 20.3302
- 31827.0000 11.7991 20.6404
- 31827.0000 12.3487 20.9506
- 31827.0000 12.8983 21.2607
- 31827.0000 13.4478 21.5709
- 31827.0000 13.9974 21.8811
- 31827.0000 14.5520 22.1791
- 31827.0000 15.1616 22.3422
- 31827.0000 15.7712 22.5054
- 31827.0000 16.3808 22.6686
- 31827.0000 16.9904 22.8318
- 31827.0000 17.6000 22.9950
- 999.9990 999.9990 0.0000
- 17 6 0 37 31874.0000
- 31874.0000 0.0000 22.9900
- 31874.0000 0.0323 22.6513
- 31874.0000 0.2566 22.3821
- 31874.0000 0.4810 22.1128
- 31874.0000 0.7053 21.8436
- 31874.0000 0.9296 21.5744
- 31874.0000 1.1540 21.3052
- 31874.0000 1.3783 21.0360
- 31874.0000 1.6026 20.7668
- 31874.0000 1.8270 20.4976
- 31874.0000 2.0513 20.2284
- 31874.0000 2.2757 19.9592
- 31874.0000 2.5000 19.6900 rg
- 31874.0000 2.5000 18.8394
- 31874.0000 3.2012 18.6900
- 31874.0000 4.0518 18.6900
- 31874.0000 4.9018 18.7139
- 31874.0000 5.7514 18.7544
- 31874.0000 6.6011 18.7948
- 31874.0000 7.4507 18.8353
- 31874.0000 8.3003 18.8757
- 31874.0000 9.1500 18.9162
- 31874.0000 9.9996 18.9566
- 31874.0000 10.7000 19.1394
- 31874.0000 10.7000 19.9900 rd
- 31874.0000 11.2476 20.3070
- 31874.0000 11.7951 20.6240
- 31874.0000 12.3427 20.9410
- 31874.0000 12.8902 21.2580
- 31874.0000 13.4378 21.5750
- 31874.0000 13.9854 21.8920
- 31874.0000 14.5368 22.1995
- 31874.0000 15.1495 22.3576
- 31874.0000 15.7621 22.5157
- 31874.0000 16.3747 22.6738
- 31874.0000 16.9874 22.8319
- 31874.0000 17.6000 22.9900
- 999.9990 999.9990 0.0000
- 18 7 0 37 31875.0000 PontRD101m
- 31875.0000 0.5400 21.8900
- 31875.0000 0.7033 21.7067
- 31875.0000 0.8667 21.5233
- 31875.0000 1.0300 21.3400
- 31875.0000 1.1933 21.1567
- 31875.0000 1.3567 20.9733
- 31875.0000 1.5200 20.7900
- 31875.0000 1.6833 20.6067
- 31875.0000 1.8467 20.4233
- 31875.0000 2.0100 20.2400
- 31875.0000 2.1733 20.0567
- 31875.0000 2.3367 19.8733
- 31875.0000 2.5000 19.6900 rg
- 31875.0000 2.5000 18.8394
- 31875.0000 3.2012 18.6900
- 31875.0000 4.0518 18.6900
- 31875.0000 4.9018 18.7139
- 31875.0000 5.7514 18.7544
- 31875.0000 6.6011 18.7948
- 31875.0000 7.4507 18.8353
- 31875.0000 8.3003 18.8757
- 31875.0000 9.1500 18.9162
- 31875.0000 9.9996 18.9566
- 31875.0000 10.7000 19.1394
- 31875.0000 10.7000 19.9900 rd
- 31875.0000 10.9658 20.1483
- 31875.0000 11.2317 20.3067
- 31875.0000 11.4975 20.4650
- 31875.0000 11.7633 20.6233
- 31875.0000 12.0292 20.7817
- 31875.0000 12.2950 20.9400
- 31875.0000 12.5608 21.0983
- 31875.0000 12.8267 21.2567
- 31875.0000 13.0925 21.4150
- 31875.0000 13.3583 21.5733
- 31875.0000 13.6242 21.7317
- 31875.0000 13.8900 21.8900
- 999.9990 999.9990 0.0000
- 19 8 0 37 31885.0000 PontRD101v
- 31885.0000 0.5400 21.8900
- 31885.0000 0.7033 21.7067
- 31885.0000 0.8667 21.5233
- 31885.0000 1.0300 21.3400
- 31885.0000 1.1933 21.1567
- 31885.0000 1.3567 20.9733
- 31885.0000 1.5200 20.7900
- 31885.0000 1.6833 20.6067
- 31885.0000 1.8467 20.4233
- 31885.0000 2.0100 20.2400
- 31885.0000 2.1733 20.0567
- 31885.0000 2.3367 19.8733
- 31885.0000 2.5000 19.6900 rg
- 31885.0000 2.5000 18.8394
- 31885.0000 3.2012 18.6900
- 31885.0000 4.0518 18.6900
- 31885.0000 4.9018 18.7139
- 31885.0000 5.7514 18.7544
- 31885.0000 6.6011 18.7948
- 31885.0000 7.4507 18.8353
- 31885.0000 8.3003 18.8757
- 31885.0000 9.1500 18.9162
- 31885.0000 9.9996 18.9566
- 31885.0000 10.7000 19.1394
- 31885.0000 10.7000 19.9900 rd
- 31885.0000 10.9658 20.1483
- 31885.0000 11.2317 20.3067
- 31885.0000 11.4975 20.4650
- 31885.0000 11.7633 20.6233
- 31885.0000 12.0292 20.7817
- 31885.0000 12.2950 20.9400
- 31885.0000 12.5608 21.0983
- 31885.0000 12.8267 21.2567
- 31885.0000 13.0925 21.4150
- 31885.0000 13.3583 21.5733
- 31885.0000 13.6242 21.7317
- 31885.0000 13.8900 21.8900
- 999.9990 999.9990 0.0000
- 20 9 0 37 31886.0000
- 31886.0000 0.0000 22.9900
- 31886.0000 0.0323 22.6513
- 31886.0000 0.2566 22.3821
- 31886.0000 0.4810 22.1128
- 31886.0000 0.7053 21.8436
- 31886.0000 0.9296 21.5744
- 31886.0000 1.1540 21.3052
- 31886.0000 1.3783 21.0360
- 31886.0000 1.6026 20.7668
- 31886.0000 1.8270 20.4976
- 31886.0000 2.0513 20.2284
- 31886.0000 2.2757 19.9592
- 31886.0000 2.5000 19.6900 rg
- 31886.0000 2.5000 18.8394
- 31886.0000 3.2012 18.6900
- 31886.0000 4.0518 18.6900
- 31886.0000 4.9018 18.7139
- 31886.0000 5.7514 18.7544
- 31886.0000 6.6011 18.7948
- 31886.0000 7.4507 18.8353
- 31886.0000 8.3003 18.8757
- 31886.0000 9.1500 18.9162
- 31886.0000 9.9996 18.9566
- 31886.0000 10.7000 19.1394
- 31886.0000 10.7000 19.9900 rd
- 31886.0000 11.2476 20.3070
- 31886.0000 11.7951 20.6240
- 31886.0000 12.3427 20.9410
- 31886.0000 12.8902 21.2580
- 31886.0000 13.4378 21.5750
- 31886.0000 13.9854 21.8920
- 31886.0000 14.5368 22.1995
- 31886.0000 15.1495 22.3576
- 31886.0000 15.7621 22.5157
- 31886.0000 16.3747 22.6738
- 31886.0000 16.9874 22.8319
- 31886.0000 17.6000 22.9900
- 999.9990 999.9990 0.0000
- 21 9 1 37 31929.0000
- 31929.0000 0.0000 22.8733
- 31929.0000 0.0625 22.5615
- 31929.0000 0.2613 22.3017
- 31929.0000 0.4743 22.0512
- 31929.0000 0.6874 21.8008
- 31929.0000 0.9004 21.5504
- 31929.0000 1.1134 21.2999
- 31929.0000 1.3265 21.0495
- 31929.0000 1.5319 20.7934
- 31929.0000 1.7323 20.5333
- 31929.0000 1.9326 20.2733
- 31929.0000 2.1330 20.0133
- 31929.0000 2.3333 19.7533 rg
- 31929.0000 2.5277 18.9491
- 31929.0000 3.1948 18.6533
- 31929.0000 4.0685 18.6533
- 31929.0000 4.9418 18.6693
- 31929.0000 5.8144 18.7070
- 31929.0000 6.6866 18.7564
- 31929.0000 7.5588 18.8058
- 31929.0000 8.4310 18.8552
- 31929.0000 9.3032 18.9046
- 31929.0000 10.1715 18.9800
- 31929.0000 10.9375 19.1697
- 31929.0000 10.9667 20.0200 rd
- 31929.0000 11.5057 20.3270
- 31929.0000 12.0447 20.6341
- 31929.0000 12.5838 20.9411
- 31929.0000 13.1228 21.2481
- 31929.0000 13.6618 21.5552
- 31929.0000 14.2009 21.8622
- 31929.0000 14.7447 22.1566
- 31929.0000 15.3486 22.2972
- 31929.0000 15.9525 22.4378
- 31929.0000 16.5563 22.5784
- 31929.0000 17.1602 22.7189
- 31929.0000 17.7333 22.9300
- 999.9990 999.9990 0.0000
- 22 9 2 37 31972.0000
- 31972.0000 0.0000 22.7567
- 31972.0000 0.0926 22.4718
- 31972.0000 0.2660 22.2213
- 31972.0000 0.4677 21.9896
- 31972.0000 0.6695 21.7580
- 31972.0000 0.8712 21.5263
- 31972.0000 1.0729 21.2946
- 31972.0000 1.2746 21.0629
- 31972.0000 1.4613 20.8199
- 31972.0000 1.6376 20.5691
- 31972.0000 1.8140 20.3183
- 31972.0000 1.9903 20.0675
- 31972.0000 2.1667 19.8167 rg
- 31972.0000 2.5554 19.0589
- 31972.0000 3.1885 18.6167
- 31972.0000 4.0852 18.6167
- 31972.0000 4.9818 18.6246
- 31972.0000 5.8774 18.6596
- 31972.0000 6.7722 18.7180
- 31972.0000 7.6669 18.7763
- 31972.0000 8.5617 18.8346
- 31972.0000 9.4565 18.8930
- 31972.0000 10.3435 19.0034
- 31972.0000 11.1749 19.1999
- 31972.0000 11.2333 20.0500 rd
- 31972.0000 11.7638 20.3471
- 31972.0000 12.2944 20.6441
- 31972.0000 12.8249 20.9412
- 31972.0000 13.3554 21.2383
- 31972.0000 13.8859 21.5353
- 31972.0000 14.4164 21.8324
- 31972.0000 14.9526 22.1138
- 31972.0000 15.5477 22.2368
- 31972.0000 16.1428 22.3599
- 31972.0000 16.7379 22.4829
- 31972.0000 17.3330 22.6060
- 31972.0000 17.8667 22.8700
- 999.9990 999.9990 0.0000
- 23 10 0 37 32015.0000
- 32015.0000 0.0000 22.6400
- 32015.0000 0.1228 22.3821
- 32015.0000 0.2707 22.1409
- 32015.0000 0.4611 21.9280
- 32015.0000 0.6515 21.7151
- 32015.0000 0.8419 21.5022
- 32015.0000 1.0323 21.2893
- 32015.0000 1.2228 21.0764
- 32015.0000 1.3906 20.8464
- 32015.0000 1.5429 20.6048
- 32015.0000 1.6953 20.3632
- 32015.0000 1.8476 20.1216
- 32015.0000 2.0000 19.8800 rg
- 32015.0000 2.5831 19.1686
- 32015.0000 3.1821 18.5800
- 32015.0000 4.1019 18.5800
- 32015.0000 5.0217 18.5800
- 32015.0000 5.9404 18.6123
- 32015.0000 6.8577 18.6796
- 32015.0000 7.7750 18.7468
- 32015.0000 8.6924 18.8141
- 32015.0000 9.6097 18.8814
- 32015.0000 10.5154 19.0268
- 32015.0000 11.4124 19.2301
- 32015.0000 11.5000 20.0800 rd
- 32015.0000 12.0220 20.3671
- 32015.0000 12.5440 20.6542
- 32015.0000 13.0660 20.9413
- 32015.0000 13.5880 21.2284
- 32015.0000 14.1099 21.5155
- 32015.0000 14.6319 21.8026
- 32015.0000 15.1606 22.0709
- 32015.0000 15.7469 22.1764
- 32015.0000 16.3332 22.2820
- 32015.0000 16.9195 22.3875
- 32015.0000 17.5058 22.4930
- 32015.0000 18.0000 22.8100
- 999.9990 999.9990 0.0000
- 24 10 1 37 32062.5000
- 32062.5000 0.0000 22.5625
- 32062.5000 0.1515 22.3235
- 32062.5000 0.3193 22.0936
- 32062.5000 0.5189 21.8850
- 32062.5000 0.7185 21.6764
- 32062.5000 0.9181 21.4678
- 32062.5000 1.1177 21.2592
- 32062.5000 1.3124 21.0460
- 32062.5000 1.4842 20.8143
- 32062.5000 1.6444 20.5738
- 32062.5000 1.8046 20.3334
- 32062.5000 1.9648 20.0929
- 32062.5000 2.1250 19.8525 rg
- 32062.5000 2.7098 19.1501
- 32062.5000 3.3018 18.5475
- 32062.5000 4.2159 18.5475
- 32062.5000 5.1299 18.5475
- 32062.5000 6.0431 18.5717
- 32062.5000 6.9513 18.6484
- 32062.5000 7.8530 18.7663
- 32062.5000 8.7562 18.8783
- 32062.5000 9.6662 18.9599
- 32062.5000 10.5675 19.1002
- 32062.5000 11.4623 19.2839
- 32062.5000 11.7500 19.9525 rd
- 32062.5000 12.1415 20.3180
- 32062.5000 12.6640 20.6040
- 32062.5000 13.1887 20.8887
- 32062.5000 13.7133 21.1734
- 32062.5000 14.2380 21.4581
- 32062.5000 14.7626 21.7428
- 32062.5000 15.2922 22.0135
- 32062.5000 15.8758 22.1325
- 32062.5000 16.4622 22.2435
- 32062.5000 17.0487 22.3546
- 32062.5000 17.6351 22.4656
- 32062.5000 18.1500 22.7450
- 999.9990 999.9990 0.0000
- 25 10 2 37 32110.0000
- 32110.0000 0.0000 22.4850
- 32110.0000 0.1803 22.2648
- 32110.0000 0.3678 22.0463
- 32110.0000 0.5766 21.8420
- 32110.0000 0.7854 21.6377
- 32110.0000 0.9942 21.4334
- 32110.0000 1.2030 21.2291
- 32110.0000 1.4021 21.0156
- 32110.0000 1.5779 20.7822
- 32110.0000 1.7459 20.5429
- 32110.0000 1.9139 20.3036
- 32110.0000 2.0820 20.0643
- 32110.0000 2.2500 19.8250 rg
- 32110.0000 2.8364 19.1315
- 32110.0000 3.4216 18.5150
- 32110.0000 4.3298 18.5150
- 32110.0000 5.2381 18.5150
- 32110.0000 6.1458 18.5311
- 32110.0000 7.0448 18.6172
- 32110.0000 7.9311 18.7859
- 32110.0000 8.8201 18.9424
- 32110.0000 9.7228 19.0385
- 32110.0000 10.6196 19.1736
- 32110.0000 11.5122 19.3377
- 32110.0000 12.0000 19.8250 rd
- 32110.0000 12.2610 20.2688
- 32110.0000 12.7841 20.5537
- 32110.0000 13.3114 20.8361
- 32110.0000 13.8387 21.1184
- 32110.0000 14.3660 21.4007
- 32110.0000 14.8933 21.6831
- 32110.0000 15.4239 21.9561
- 32110.0000 16.0047 22.0885
- 32110.0000 16.5913 22.2051
- 32110.0000 17.1779 22.3216
- 32110.0000 17.7645 22.4382
- 32110.0000 18.3000 22.6800
- 999.9990 999.9990 0.0000
- 26 10 3 37 32157.5000
- 32157.5000 0.0000 22.4075
- 32157.5000 0.2090 22.2061
- 32157.5000 0.4164 21.9990
- 32157.5000 0.6343 21.7990
- 32157.5000 0.8523 21.5990
- 32157.5000 1.0703 21.3990
- 32157.5000 1.2883 21.1990
- 32157.5000 1.4918 20.9853
- 32157.5000 1.6715 20.7500
- 32157.5000 1.8474 20.5119
- 32157.5000 2.0233 20.2738
- 32157.5000 2.1991 20.0356
- 32157.5000 2.3750 19.7975 rg
- 32157.5000 2.9631 19.1130
- 32157.5000 3.5413 18.4825
- 32157.5000 4.4438 18.4825
- 32157.5000 5.3463 18.4825
- 32157.5000 6.2486 18.4906
- 32157.5000 7.1384 18.5860
- 32157.5000 8.0091 18.8054
- 32157.5000 8.8839 19.0066
- 32157.5000 9.7793 19.1170
- 32157.5000 10.6718 19.2470
- 32157.5000 11.5621 19.3914
- 32157.5000 12.2500 19.6975 rd
- 32157.5000 12.3805 20.2197
- 32157.5000 12.9042 20.5035
- 32157.5000 13.4341 20.7834
- 32157.5000 13.9641 21.0634
- 32157.5000 14.4940 21.3434
- 32157.5000 15.0239 21.6233
- 32157.5000 15.5555 21.8986
- 32157.5000 16.1336 22.0445
- 32157.5000 16.7204 22.1666
- 32157.5000 17.3071 22.2887
- 32157.5000 17.8939 22.4107
- 32157.5000 18.4500 22.6150
- 999.9990 999.9990 0.0000
- 27 11 0 37 32205.0000
- 32205.0000 0.0000 22.3300
- 32205.0000 0.2378 22.1475
- 32205.0000 0.4649 21.9518
- 32205.0000 0.6921 21.7560
- 32205.0000 0.9193 21.5603
- 32205.0000 1.1464 21.3646
- 32205.0000 1.3736 21.1689
- 32205.0000 1.5815 20.9549
- 32205.0000 1.7652 20.7179
- 32205.0000 1.9489 20.4809
- 32205.0000 2.1326 20.2440
- 32205.0000 2.3163 20.0070
- 32205.0000 2.5000 19.7700 rg
- 32205.0000 3.0898 19.0944
- 32205.0000 3.6610 18.4500
- 32205.0000 4.5578 18.4500
- 32205.0000 5.4545 18.4500
- 32205.0000 6.3513 18.4500
- 32205.0000 7.2320 18.5548
- 32205.0000 8.0871 18.8249
- 32205.0000 8.9478 19.0708
- 32205.0000 9.8358 19.1956
- 32205.0000 10.7239 19.3204
- 32205.0000 11.6119 19.4452
- 32205.0000 12.5000 19.5700 rd
- 32205.0000 12.5000 20.1706
- 32205.0000 13.0242 20.4532
- 32205.0000 13.5568 20.7308
- 32205.0000 14.0894 21.0084
- 32205.0000 14.6220 21.2860
- 32205.0000 15.1546 21.5636
- 32205.0000 15.6872 21.8412
- 32205.0000 16.2626 22.0006
- 32205.0000 16.8495 22.1281
- 32205.0000 17.4363 22.2557
- 32205.0000 18.0232 22.3833
- 32205.0000 18.6000 22.5500
- 999.9990 999.9990 0.0000
- 28 11 1 37 32256.0000
- 32256.0000 0.0000 22.2940
- 32256.0000 0.2560 22.1402
- 32256.0000 0.4941 21.9472
- 32256.0000 0.7321 21.7542
- 32256.0000 0.9702 21.5613
- 32256.0000 1.2082 21.3683
- 32256.0000 1.4462 21.1753
- 32256.0000 1.6574 20.9551
- 32256.0000 1.8459 20.7129
- 32256.0000 2.0344 20.4707
- 32256.0000 2.2230 20.2284
- 32256.0000 2.4115 19.9862
- 32256.0000 2.6000 19.7440 rg
- 32256.0000 3.1711 19.1093
- 32256.0000 3.7273 18.4994
- 32256.0000 4.5447 18.4160
- 32256.0000 5.3990 18.4160
- 32256.0000 6.2533 18.4160
- 32256.0000 7.0947 18.4999
- 32256.0000 7.9157 18.7159
- 32256.0000 8.7411 18.9126
- 32256.0000 9.5885 19.0125
- 32256.0000 10.4207 19.1697
- 32256.0000 11.2504 19.3368
- 32256.0000 12.0800 19.5040 rd
- 32256.0000 12.2390 20.0206
- 32256.0000 12.8173 20.2829
- 32256.0000 13.4024 20.5411
- 32256.0000 13.9874 20.7993
- 32256.0000 14.5020 21.1229
- 32256.0000 15.0776 21.4100
- 32256.0000 15.6531 21.6972
- 32256.0000 16.2629 21.8898
- 32256.0000 16.8841 22.0506
- 32256.0000 17.5109 22.1954
- 32256.0000 18.1378 22.3401
- 32256.0000 18.7400 22.5500
- 999.9990 999.9990 0.0000
- 29 11 2 37 32307.0000
- 32307.0000 0.0000 22.2580
- 32307.0000 0.2743 22.1330
- 32307.0000 0.5232 21.9427
- 32307.0000 0.7721 21.7524
- 32307.0000 1.0211 21.5622
- 32307.0000 1.2700 21.3719
- 32307.0000 1.5189 21.1817
- 32307.0000 1.7334 20.9553
- 32307.0000 1.9267 20.7078
- 32307.0000 2.1200 20.4604
- 32307.0000 2.3133 20.2129
- 32307.0000 2.5067 19.9655
- 32307.0000 2.7000 19.7180 rg
- 32307.0000 3.2524 19.1241
- 32307.0000 3.7936 18.5489
- 32307.0000 4.5316 18.3820
- 32307.0000 5.3434 18.3820
- 32307.0000 6.1553 18.3820
- 32307.0000 6.9574 18.4449
- 32307.0000 7.7443 18.6069
- 32307.0000 8.5345 18.7545
- 32307.0000 9.3411 18.8293
- 32307.0000 10.1175 19.0190
- 32307.0000 10.8888 19.2285
- 32307.0000 11.6600 19.4380 rd
- 32307.0000 11.9779 19.8706
- 32307.0000 12.6104 20.1125
- 32307.0000 13.2479 20.3513
- 32307.0000 13.8854 20.5901
- 32307.0000 14.3821 20.9597
- 32307.0000 15.0006 21.2565
- 32307.0000 15.6190 21.5532
- 32307.0000 16.2632 21.7790
- 32307.0000 16.9187 21.9731
- 32307.0000 17.5855 22.1350
- 32307.0000 18.2523 22.2970
- 32307.0000 18.8800 22.5500
- 999.9990 999.9990 0.0000
- 30 11 3 37 32358.0000
- 32358.0000 0.0000 22.2220
- 32358.0000 0.2926 22.1257
- 32358.0000 0.5524 21.9382
- 32358.0000 0.8122 21.7506
- 32358.0000 1.0720 21.5631
- 32358.0000 1.3318 21.3756
- 32358.0000 1.5916 21.1881
- 32358.0000 1.8093 20.9555
- 32358.0000 2.0074 20.7028
- 32358.0000 2.2056 20.4501
- 32358.0000 2.4037 20.1974
- 32358.0000 2.6019 19.9447
- 32358.0000 2.8000 19.6920 rg
- 32358.0000 3.3336 19.1389
- 32358.0000 3.8599 18.5983
- 32358.0000 4.5185 18.3480
- 32358.0000 5.2879 18.3480
- 32358.0000 6.0573 18.3480
- 32358.0000 6.8202 18.3899
- 32358.0000 7.5729 18.4980
- 32358.0000 8.3278 18.5963
- 32358.0000 9.0937 18.6462
- 32358.0000 9.8144 18.8683
- 32358.0000 10.5272 19.1201
- 32358.0000 11.2400 19.3720 rd
- 32358.0000 11.7169 19.7206
- 32358.0000 12.4035 19.9421
- 32358.0000 13.0934 20.1615
- 32358.0000 13.7834 20.3809
- 32358.0000 14.2621 20.7966
- 32358.0000 14.9235 21.1029
- 32358.0000 15.5850 21.4092
- 32358.0000 16.2635 21.6682
- 32358.0000 16.9533 21.8955
- 32358.0000 17.6601 22.0747
- 32358.0000 18.3668 22.2538
- 32358.0000 19.0200 22.5500
- 999.9990 999.9990 0.0000
- 31 11 4 37 32409.0000
- 32409.0000 0.0000 22.1860
- 32409.0000 0.3108 22.1184
- 32409.0000 0.5815 21.9336
- 32409.0000 0.8522 21.7488
- 32409.0000 1.1229 21.5640
- 32409.0000 1.3935 21.3792
- 32409.0000 1.6642 21.1944
- 32409.0000 1.8852 20.9557
- 32409.0000 2.0882 20.6977
- 32409.0000 2.2911 20.4398
- 32409.0000 2.4941 20.1819
- 32409.0000 2.6970 19.9239
- 32409.0000 2.9000 19.6660 rg
- 32409.0000 3.4149 19.1538
- 32409.0000 3.9262 18.6477
- 32409.0000 4.5054 18.3140
- 32409.0000 5.2323 18.3140
- 32409.0000 5.9592 18.3140
- 32409.0000 6.6829 18.3350
- 32409.0000 7.4015 18.3890
- 32409.0000 8.1212 18.4382
- 32409.0000 8.8464 18.4631
- 32409.0000 9.5112 18.7176
- 32409.0000 10.1656 19.0118
- 32409.0000 10.8200 19.3060 rd
- 32409.0000 11.4559 19.5706
- 32409.0000 12.1966 19.7717
- 32409.0000 12.9390 19.9717
- 32409.0000 13.6814 20.1718
- 32409.0000 14.1421 20.6334
- 32409.0000 14.8465 20.9493
- 32409.0000 15.5509 21.2652
- 32409.0000 16.2638 21.5574
- 32409.0000 16.9880 21.8180
- 32409.0000 17.7347 22.0143
- 32409.0000 18.4814 22.2106
- 32409.0000 19.1600 22.5500
- 999.9990 999.9990 0.0000
- 32 12 0 37 32460.0000
- 32460.0000 0.0000 22.1500
- 32460.0000 0.3291 22.1112
- 32460.0000 0.6106 21.9291
- 32460.0000 0.8922 21.7470
- 32460.0000 1.1737 21.5650
- 32460.0000 1.4553 21.3829
- 32460.0000 1.7369 21.2008
- 32460.0000 1.9612 20.9558
- 32460.0000 2.1689 20.6927
- 32460.0000 2.3767 20.4295
- 32460.0000 2.5845 20.1663
- 32460.0000 2.7922 19.9032
- 32460.0000 3.0000 19.6400 rg
- 32460.0000 3.4962 19.1686
- 32460.0000 3.9924 18.6972
- 32460.0000 4.4923 18.2800
- 32460.0000 5.1768 18.2800
- 32460.0000 5.8612 18.2800
- 32460.0000 6.5456 18.2800
- 32460.0000 7.2301 18.2800
- 32460.0000 7.9145 18.2800
- 32460.0000 8.5990 18.2800
- 32460.0000 9.2080 18.5669
- 32460.0000 9.8040 18.9034
- 32460.0000 10.4000 19.2400 rd
- 32460.0000 11.1948 19.4206
- 32460.0000 11.9897 19.6013
- 32460.0000 12.7845 19.7819
- 32460.0000 13.5794 19.9626
- 32460.0000 14.0222 20.4703
- 32460.0000 14.7695 20.7957
- 32460.0000 15.5168 21.1212
- 32460.0000 16.2641 21.4466
- 32460.0000 17.0226 21.7404
- 32460.0000 17.8092 21.9539
- 32460.0000 18.5959 22.1675
- 32460.0000 19.3000 22.5500
- 999.9990 999.9990 0.0000
- 33 12 1 37 32508.7500
- 32508.7500 0.0000 22.2250
- 32508.7500 0.3082 22.1222
- 32508.7500 0.6003 21.9372
- 32508.7500 0.8981 21.7593
- 32508.7500 1.1958 21.5814
- 32508.7500 1.4935 21.4035
- 32508.7500 1.7912 21.2256
- 32508.7500 2.0296 20.9803
- 32508.7500 2.2437 20.7067
- 32508.7500 2.4577 20.4332
- 32508.7500 2.6718 20.1596
- 32508.7500 2.8859 19.8861
- 32508.7500 3.1000 19.6125 rg
- 32508.7500 3.6174 19.1346
- 32508.7500 4.1348 18.6566
- 32508.7500 4.6613 18.2450
- 32508.7500 5.3659 18.2450
- 32508.7500 6.0704 18.2450
- 32508.7500 6.7750 18.2450
- 32508.7500 7.4796 18.2450
- 32508.7500 8.1841 18.2450
- 32508.7500 8.8887 18.2450
- 32508.7500 9.5122 18.5278
- 32508.7500 10.1061 18.9027
- 32508.7500 10.7000 19.2775 rd
- 32508.7500 11.4731 19.4655
- 32508.7500 12.2463 19.6535
- 32508.7500 13.0194 19.8416
- 32508.7500 13.7926 20.0296
- 32508.7500 14.2707 20.4910
- 32508.7500 15.0032 20.8021
- 32508.7500 15.7358 21.1131
- 32508.7500 16.4684 21.4242
- 32508.7500 17.2106 21.7077
- 32508.7500 17.9761 21.9251
- 32508.7500 18.7417 22.1426
- 32508.7500 19.4250 22.5250
- 999.9990 999.9990 0.0000
- 34 12 2 37 32557.5000
- 32557.5000 0.0000 22.3000
- 32557.5000 0.2873 22.1332
- 32557.5000 0.5901 21.9452
- 32557.5000 0.9039 21.7715
- 32557.5000 1.2178 21.5977
- 32557.5000 1.5316 21.4240
- 32557.5000 1.8455 21.2503
- 32557.5000 2.0980 21.0048
- 32557.5000 2.3184 20.7208
- 32557.5000 2.5388 20.4369
- 32557.5000 2.7592 20.1529
- 32557.5000 2.9796 19.8690
- 32557.5000 3.2000 19.5850 rg
- 32557.5000 3.7386 19.1005
- 32557.5000 4.2772 18.6161
- 32557.5000 4.8303 18.2100
- 32557.5000 5.5550 18.2100
- 32557.5000 6.2797 18.2100
- 32557.5000 7.0044 18.2100
- 32557.5000 7.7290 18.2100
- 32557.5000 8.4537 18.2100
- 32557.5000 9.1784 18.2100
- 32557.5000 9.8164 18.4888
- 32557.5000 10.4082 18.9019
- 32557.5000 11.0000 19.3150 rd
- 32557.5000 11.7515 19.5104
- 32557.5000 12.5029 19.7058
- 32557.5000 13.2544 19.9012
- 32557.5000 14.0058 20.0966
- 32557.5000 14.5192 20.5117
- 32557.5000 15.2370 20.8084
- 32557.5000 15.9548 21.1051
- 32557.5000 16.6726 21.4018
- 32557.5000 17.3986 21.6750
- 32557.5000 18.1430 21.8963
- 32557.5000 18.8874 22.1177
- 32557.5000 19.5500 22.5000
- 999.9990 999.9990 0.0000
- 35 12 3 37 32606.2500
- 32606.2500 0.0000 22.3750
- 32606.2500 0.2665 22.1443
- 32606.2500 0.5798 21.9532
- 32606.2500 0.9098 21.7837
- 32606.2500 1.2398 21.6141
- 32606.2500 1.5698 21.4445
- 32606.2500 1.8998 21.2750
- 32606.2500 2.1664 21.0292
- 32606.2500 2.3931 20.7349
- 32606.2500 2.6198 20.4405
- 32606.2500 2.8466 20.1462
- 32606.2500 3.0733 19.8518
- 32606.2500 3.3000 19.5575 rg
- 32606.2500 3.8598 19.0665
- 32606.2500 4.4196 18.5755
- 32606.2500 4.9993 18.1750
- 32606.2500 5.7441 18.1750
- 32606.2500 6.4889 18.1750
- 32606.2500 7.2337 18.1750
- 32606.2500 7.9785 18.1750
- 32606.2500 8.7233 18.1750
- 32606.2500 9.4681 18.1750
- 32606.2500 10.1206 18.4497
- 32606.2500 10.7103 18.9011
- 32606.2500 11.3000 19.3525 rd
- 32606.2500 12.0298 19.5553
- 32606.2500 12.7595 19.7580
- 32606.2500 13.4893 19.9608
- 32606.2500 14.2190 20.1635
- 32606.2500 14.7677 20.5324
- 32606.2500 15.4707 20.8147
- 32606.2500 16.1737 21.0970
- 32606.2500 16.8768 21.3793
- 32606.2500 17.5866 21.6423
- 32606.2500 18.3099 21.8675
- 32606.2500 19.0332 22.0928
- 32606.2500 19.6750 22.4750
- 999.9990 999.9990 0.0000
- 36 13 0 37 32655.0000
- 32655.0000 0.0000 22.4500
- 32655.0000 0.2456 22.1553
- 32655.0000 0.5695 21.9613
- 32655.0000 0.9156 21.7959
- 32655.0000 1.2618 21.6305
- 32655.0000 1.6079 21.4651
- 32655.0000 1.9541 21.2997
- 32655.0000 2.2348 21.0537
- 32655.0000 2.4678 20.7490
- 32655.0000 2.7009 20.4442
- 32655.0000 2.9339 20.1395
- 32655.0000 3.1670 19.8347
- 32655.0000 3.4000 19.5300 rg
- 32655.0000 3.9810 19.0325
- 32655.0000 4.5620 18.5350
- 32655.0000 5.1683 18.1400
- 32655.0000 5.9333 18.1400
- 32655.0000 6.6982 18.1400
- 32655.0000 7.4631 18.1400
- 32655.0000 8.2280 18.1400
- 32655.0000 8.9929 18.1400
- 32655.0000 9.7578 18.1400
- 32655.0000 10.4248 18.4106
- 32655.0000 11.0124 18.9003
- 32655.0000 11.6000 19.3900 rd
- 32655.0000 12.3081 19.6001
- 32655.0000 13.0161 19.8103
- 32655.0000 13.7242 20.0204
- 32655.0000 14.4322 20.2305
- 32655.0000 15.0162 20.5531
- 32655.0000 15.7044 20.8210
- 32655.0000 16.3927 21.0889
- 32655.0000 17.0810 21.3569
- 32655.0000 17.7747 21.6096
- 32655.0000 18.4768 21.8387
- 32655.0000 19.1790 22.0679
- 32655.0000 19.8000 22.4500
- 999.9990 999.9990 0.0000
- 37 13 1 37 32705.0000
- 32705.0000 0.0000 22.4500
- 32705.0000 0.2456 22.1553
- 32705.0000 0.5695 21.9613
- 32705.0000 0.9156 21.7959
- 32705.0000 1.2618 21.6305
- 32705.0000 1.6079 21.4651
- 32705.0000 1.9541 21.2997
- 32705.0000 2.2348 21.0537
- 32705.0000 2.4678 20.7490
- 32705.0000 2.7009 20.4442
- 32705.0000 2.9339 20.1395
- 32705.0000 3.1670 19.8347
- 32705.0000 3.4000 19.5300 rg
- 32705.0000 3.8613 18.8600
- 32705.0000 4.3916 18.2881
- 32705.0000 5.1489 18.0750
- 32705.0000 5.9860 18.0750
- 32705.0000 6.8230 18.0750
- 32705.0000 7.6600 18.0750
- 32705.0000 8.4970 18.0750
- 32705.0000 9.3340 18.0750
- 32705.0000 10.1475 18.1790
- 32705.0000 10.8915 18.5097
- 32705.0000 11.5957 18.9498
- 32705.0000 12.3000 19.3900 rd
- 32705.0000 12.9311 19.6450
- 32705.0000 13.5623 19.9001
- 32705.0000 14.1934 20.1551
- 32705.0000 14.7841 20.4151
- 32705.0000 15.3697 20.6907
- 32705.0000 16.0074 20.9390
- 32705.0000 16.6452 21.1872
- 32705.0000 17.2830 21.4355
- 32705.0000 17.9292 21.6601
- 32705.0000 18.5798 21.8724
- 32705.0000 19.2305 22.0847
- 32705.0000 19.8000 22.4500
- 999.9990 999.9990 0.0000
- 38 14 0 37 32755.0000
- 32755.0000 0.0000 22.4500
- 32755.0000 0.2456 22.1553
- 32755.0000 0.5695 21.9613
- 32755.0000 0.9156 21.7959
- 32755.0000 1.2618 21.6305
- 32755.0000 1.6079 21.4651
- 32755.0000 1.9541 21.2997
- 32755.0000 2.2348 21.0537
- 32755.0000 2.4678 20.7490
- 32755.0000 2.7009 20.4442
- 32755.0000 2.9339 20.1395
- 32755.0000 3.1670 19.8347
- 32755.0000 3.4000 19.5300 rg
- 32755.0000 3.7416 18.6875
- 32755.0000 4.2211 18.0412
- 32755.0000 5.1296 18.0100
- 32755.0000 6.0387 18.0100
- 32755.0000 6.9478 18.0100
- 32755.0000 7.8569 18.0100
- 32755.0000 8.7660 18.0100
- 32755.0000 9.6751 18.0100
- 32755.0000 10.5373 18.2181
- 32755.0000 11.3582 18.6087
- 32755.0000 12.1791 18.9994
- 32755.0000 13.0000 19.3900 rd
- 32755.0000 13.5542 19.6899
- 32755.0000 14.1085 19.9899
- 32755.0000 14.6627 20.2898
- 32755.0000 15.1359 20.5997
- 32755.0000 15.7232 20.8283
- 32755.0000 16.3105 21.0569
- 32755.0000 16.8977 21.2855
- 32755.0000 17.4850 21.5142
- 32755.0000 18.0838 21.7105
- 32755.0000 18.6829 21.9060
- 32755.0000 19.2820 22.1015
- 32755.0000 19.8000 22.4500
- 999.9990 999.9990 0.0000
- 39 15 0 37 32770.0000 PontA2
- 32770.0000 0.0000 25.0000
- 32770.0000 0.6592 25.0000
- 32770.0000 1.3184 25.0000
- 32770.0000 1.9000 24.9224
- 32770.0000 1.9000 24.2632
- 32770.0000 1.9000 23.6040
- 32770.0000 1.9000 22.9448
- 32770.0000 1.9000 22.2856
- 32770.0000 1.9000 21.6264
- 32770.0000 2.0859 21.0310
- 32770.0000 2.4906 20.5107
- 32770.0000 2.8953 19.9903
- 32770.0000 3.3000 19.4700 rg
- 32770.0000 3.9217 18.9361
- 32770.0000 4.5434 18.4021
- 32770.0000 5.2176 18.0100
- 32770.0000 6.0371 18.0100
- 32770.0000 6.8567 18.0100
- 32770.0000 7.6762 18.0100
- 32770.0000 8.4957 18.0100
- 32770.0000 9.3152 18.0100
- 32770.0000 10.1347 18.0100
- 32770.0000 10.8255 18.3268
- 32770.0000 11.4127 18.8984
- 32770.0000 12.0000 19.4700 rd
- 32770.0000 12.9730 19.7330
- 32770.0000 13.9461 19.9960
- 32770.0000 14.9191 20.2590
- 32770.0000 15.8922 20.5219
- 32770.0000 16.8652 20.7849
- 32770.0000 17.8383 21.0479
- 32770.0000 18.8113 21.3109
- 32770.0000 19.4000 21.8682
- 32770.0000 19.4000 22.8761
- 32770.0000 19.4000 23.8841
- 32770.0000 19.4000 24.8920
- 32770.0000 20.3000 25.0000
- 999.9990 999.9990 0.0000
- 40 16 0 37 32800.0000 PontA2
- 32800.0000 0.0000 25.0000
- 32800.0000 0.6592 25.0000
- 32800.0000 1.3184 25.0000
- 32800.0000 1.9000 24.9224
- 32800.0000 1.9000 24.2632
- 32800.0000 1.9000 23.6040
- 32800.0000 1.9000 22.9448
- 32800.0000 1.9000 22.2856
- 32800.0000 1.9000 21.6264
- 32800.0000 2.0859 21.0310
- 32800.0000 2.4906 20.5107
- 32800.0000 2.8953 19.9903
- 32800.0000 3.3000 19.4700 rg
- 32800.0000 3.9217 18.9361
- 32800.0000 4.5434 18.4021
- 32800.0000 5.2176 18.0100
- 32800.0000 6.0371 18.0100
- 32800.0000 6.8567 18.0100
- 32800.0000 7.6762 18.0100
- 32800.0000 8.4957 18.0100
- 32800.0000 9.3152 18.0100
- 32800.0000 10.1347 18.0100
- 32800.0000 10.8255 18.3268
- 32800.0000 11.4127 18.8984
- 32800.0000 12.0000 19.4700 rd
- 32800.0000 12.9730 19.7330
- 32800.0000 13.9461 19.9960
- 32800.0000 14.9191 20.2590
- 32800.0000 15.8922 20.5219
- 32800.0000 16.8652 20.7849
- 32800.0000 17.8383 21.0479
- 32800.0000 18.8113 21.3109
- 32800.0000 19.4000 21.8682
- 32800.0000 19.4000 22.8761
- 32800.0000 19.4000 23.8841
- 32800.0000 19.4000 24.8920
- 32800.0000 20.3000 25.0000
- 999.9990 999.9990 0.0000
- 41 17 0 37 32820.0000
- 32820.0000 0.0000 22.4500
- 32820.0000 0.2456 22.1553
- 32820.0000 0.5695 21.9613
- 32820.0000 0.9156 21.7959
- 32820.0000 1.2618 21.6305
- 32820.0000 1.6079 21.4651
- 32820.0000 1.9541 21.2997
- 32820.0000 2.2348 21.0537
- 32820.0000 2.4678 20.7490
- 32820.0000 2.7009 20.4442
- 32820.0000 2.9339 20.1395
- 32820.0000 3.1670 19.8347
- 32820.0000 3.4000 19.5300 rg
- 32820.0000 3.7416 18.6875
- 32820.0000 4.2211 18.0412
- 32820.0000 5.1296 18.0100
- 32820.0000 6.0387 18.0100
- 32820.0000 6.9478 18.0100
- 32820.0000 7.8569 18.0100
- 32820.0000 8.7660 18.0100
- 32820.0000 9.6751 18.0100
- 32820.0000 10.5373 18.2181
- 32820.0000 11.3582 18.6087
- 32820.0000 12.1791 18.9994
- 32820.0000 13.0000 19.3900 rd
- 32820.0000 13.5542 19.6899
- 32820.0000 14.1085 19.9899
- 32820.0000 14.6627 20.2898
- 32820.0000 15.1359 20.5997
- 32820.0000 15.7232 20.8283
- 32820.0000 16.3105 21.0569
- 32820.0000 16.8977 21.2855
- 32820.0000 17.4850 21.5142
- 32820.0000 18.0838 21.7105
- 32820.0000 18.6829 21.9060
- 32820.0000 19.2820 22.1015
- 32820.0000 19.8000 22.4500
- 999.9990 999.9990 0.0000
- 42 17 1 37 32867.5000
- 32867.5000 0.0000 22.5000
- 32867.5000 0.2395 22.1775
- 32867.5000 0.5374 21.9261
- 32867.5000 0.8940 21.7403
- 32867.5000 1.2506 21.5546
- 32867.5000 1.6072 21.3688
- 32867.5000 1.9747 21.2071
- 32867.5000 2.3133 21.0133
- 32867.5000 2.5716 20.7061
- 32867.5000 2.8287 20.3971
- 32867.5000 3.0858 20.0880
- 32867.5000 3.3429 19.7790
- 32867.5000 3.6000 19.4700 rg
- 32867.5000 4.0917 18.8134
- 32867.5000 4.6607 18.2650
- 32867.5000 5.4442 18.0241
- 32867.5000 6.2933 18.0100
- 32867.5000 7.1468 18.0100
- 32867.5000 8.0003 18.0100
- 32867.5000 8.8538 18.0100
- 32867.5000 9.7073 18.0100
- 32867.5000 10.5373 18.1140
- 32867.5000 11.3006 18.4248
- 32867.5000 12.0003 18.8949
- 32867.5000 12.7000 19.3650 rd
- 32867.5000 13.2935 19.6348
- 32867.5000 13.8871 19.9045
- 32867.5000 14.4806 20.1743
- 32867.5000 15.0337 20.4490
- 32867.5000 15.6437 20.6831
- 32867.5000 16.2538 20.9172
- 32867.5000 16.8638 21.1513
- 32867.5000 17.4739 21.3854
- 32867.5000 18.0897 21.6033
- 32867.5000 18.7057 21.8209
- 32867.5000 19.3216 22.0384
- 32867.5000 19.7500 22.5000
- 999.9990 999.9990 0.0000
- 43 18 0 37 32915.0000
- 32915.0000 0.0000 22.5500
- 32915.0000 0.2335 22.1997
- 32915.0000 0.5053 21.8909
- 32915.0000 0.8724 21.6847
- 32915.0000 1.2394 21.4786
- 32915.0000 1.6065 21.2725
- 32915.0000 1.9954 21.1145
- 32915.0000 2.3918 20.9729
- 32915.0000 2.6754 20.6632
- 32915.0000 2.9565 20.3499
- 32915.0000 3.2377 20.0366
- 32915.0000 3.5188 19.7233
- 32915.0000 3.8000 19.4100 rg
- 32915.0000 4.4418 18.9393
- 32915.0000 5.1003 18.4888
- 32915.0000 5.7588 18.0382
- 32915.0000 6.5479 18.0100
- 32915.0000 7.3458 18.0100
- 32915.0000 8.1437 18.0100
- 32915.0000 8.9416 18.0100
- 32915.0000 9.7395 18.0100
- 32915.0000 10.5374 18.0100
- 32915.0000 11.2431 18.2409
- 32915.0000 11.8215 18.7905
- 32915.0000 12.4000 19.3400 rd
- 32915.0000 13.0328 19.5796
- 32915.0000 13.6657 19.8192
- 32915.0000 14.2985 20.0587
- 32915.0000 14.9314 20.2983
- 32915.0000 15.5642 20.5379
- 32915.0000 16.1971 20.7775
- 32915.0000 16.8299 21.0170
- 32915.0000 17.4628 21.2566
- 32915.0000 18.0956 21.4962
- 32915.0000 18.7285 21.7358
- 32915.0000 19.3613 21.9753
- 32915.0000 19.7000 22.5500
- 999.9990 999.9990 0.0000
- 44 18 1 37 32960.0000
- 32960.0000 0.0800 22.3940
- 32960.0000 0.3314 22.0703
- 32960.0000 0.6134 21.7797
- 32960.0000 0.9716 21.5713
- 32960.0000 1.3298 21.3630
- 32960.0000 1.6915 21.1618
- 32960.0000 2.0770 21.0121
- 32960.0000 2.4651 20.8698
- 32960.0000 2.7496 20.5697
- 32960.0000 3.0322 20.2668
- 32960.0000 3.3148 19.9639
- 32960.0000 3.5974 19.6609
- 32960.0000 3.8800 19.3580 rg
- 32960.0000 4.5246 18.9031
- 32960.0000 5.1863 18.4694
- 32960.0000 5.8480 18.0358
- 32960.0000 6.6273 17.9920
- 32960.0000 7.4191 17.9920
- 32960.0000 8.2109 17.9920
- 32960.0000 9.0026 17.9920
- 32960.0000 9.7944 17.9920
- 32960.0000 10.5861 17.9920
- 32960.0000 11.2907 18.2107
- 32960.0000 11.8653 18.7554
- 32960.0000 12.4400 19.3000 rd
- 32960.0000 13.0579 19.5400
- 32960.0000 13.6757 19.7800
- 32960.0000 14.2936 20.0201
- 32960.0000 14.9115 20.2601
- 32960.0000 15.5294 20.5001
- 32960.0000 16.1472 20.7401
- 32960.0000 16.7651 20.9801
- 32960.0000 17.3830 21.2202
- 32960.0000 18.0009 21.4602
- 32960.0000 18.6187 21.7002
- 32960.0000 19.2366 21.9402
- 32960.0000 19.6000 22.4760
- 999.9990 999.9990 0.0000
- 45 18 2 37 33005.0000
- 33005.0000 0.1600 22.2380
- 33005.0000 0.4293 21.9409
- 33005.0000 0.7215 21.6686
- 33005.0000 1.0709 21.4579
- 33005.0000 1.4203 21.2473
- 33005.0000 1.7766 21.0511
- 33005.0000 2.1586 20.9098
- 33005.0000 2.5383 20.7667
- 33005.0000 2.8238 20.4762
- 33005.0000 3.1079 20.1837
- 33005.0000 3.3919 19.8911
- 33005.0000 3.6760 19.5986
- 33005.0000 3.9600 19.3060 rg
- 33005.0000 4.6075 18.8668
- 33005.0000 5.2723 18.4501
- 33005.0000 5.9371 18.0333
- 33005.0000 6.7067 17.9740
- 33005.0000 7.4924 17.9740
- 33005.0000 8.2780 17.9740
- 33005.0000 9.0636 17.9740
- 33005.0000 9.8492 17.9740
- 33005.0000 10.6349 17.9740
- 33005.0000 11.3383 18.1805
- 33005.0000 11.9091 18.7203
- 33005.0000 12.4800 19.2600 rd
- 33005.0000 13.0829 19.5005
- 33005.0000 13.6858 19.7409
- 33005.0000 14.2887 19.9814
- 33005.0000 14.8916 20.2219
- 33005.0000 15.4945 20.4623
- 33005.0000 16.0974 20.7028
- 33005.0000 16.7003 20.9432
- 33005.0000 17.3032 21.1837
- 33005.0000 17.9061 21.4242
- 33005.0000 18.5090 21.6646
- 33005.0000 19.1119 21.9051
- 33005.0000 19.5000 22.4020
- 999.9990 999.9990 0.0000
- 46 18 3 37 33050.0000
- 33050.0000 0.2400 22.0820
- 33050.0000 0.5271 21.8114
- 33050.0000 0.8296 21.5574
- 33050.0000 1.1702 21.3445
- 33050.0000 1.5107 21.1317
- 33050.0000 1.8616 20.9403
- 33050.0000 2.2401 20.8074
- 33050.0000 2.6116 20.6636
- 33050.0000 2.8980 20.3828
- 33050.0000 3.1835 20.1006
- 33050.0000 3.4690 19.8184
- 33050.0000 3.7545 19.5362
- 33050.0000 4.0400 19.2540 rg
- 33050.0000 4.6903 18.8306
- 33050.0000 5.3583 18.4308
- 33050.0000 6.0263 18.0309
- 33050.0000 6.7861 17.9560
- 33050.0000 7.5656 17.9560
- 33050.0000 8.3451 17.9560
- 33050.0000 9.1246 17.9560
- 33050.0000 9.9041 17.9560
- 33050.0000 10.6836 17.9560
- 33050.0000 11.3859 18.1503
- 33050.0000 11.9529 18.6852
- 33050.0000 12.5200 19.2200 rd
- 33050.0000 13.1079 19.4609
- 33050.0000 13.6959 19.7018
- 33050.0000 14.2838 19.9427
- 33050.0000 14.8717 20.1836
- 33050.0000 15.4596 20.4245
- 33050.0000 16.0476 20.6654
- 33050.0000 16.6355 20.9063
- 33050.0000 17.2234 21.1473
- 33050.0000 17.8114 21.3882
- 33050.0000 18.3993 21.6291
- 33050.0000 18.9872 21.8700
- 33050.0000 19.4000 22.3280
- 999.9990 999.9990 0.0000
- 47 18 4 37 33095.0000
- 33095.0000 0.3200 21.9260
- 33095.0000 0.6250 21.6820
- 33095.0000 0.9377 21.4463
- 33095.0000 1.2694 21.2312
- 33095.0000 1.6011 21.0160
- 33095.0000 1.9467 20.8296
- 33095.0000 2.3217 20.7051
- 33095.0000 2.6848 20.5605
- 33095.0000 2.9722 20.2893
- 33095.0000 3.2592 20.0175
- 33095.0000 3.5461 19.7457
- 33095.0000 3.8331 19.4738
- 33095.0000 4.1200 19.2020 rg
- 33095.0000 4.7732 18.7944
- 33095.0000 5.4443 18.4114
- 33095.0000 6.1155 18.0285
- 33095.0000 6.8655 17.9380
- 33095.0000 7.6389 17.9380
- 33095.0000 8.4123 17.9380
- 33095.0000 9.1856 17.9380
- 33095.0000 9.9590 17.9380
- 33095.0000 10.7324 17.9380
- 33095.0000 11.4335 18.1201
- 33095.0000 11.9967 18.6501
- 33095.0000 12.5600 19.1800 rd
- 33095.0000 13.1330 19.4214
- 33095.0000 13.7059 19.6627
- 33095.0000 14.2789 19.9041
- 33095.0000 14.8518 20.1454
- 33095.0000 15.4248 20.3868
- 33095.0000 15.9977 20.6281
- 33095.0000 16.5707 20.8695
- 33095.0000 17.1437 21.1108
- 33095.0000 17.7166 21.3522
- 33095.0000 18.2896 21.5935
- 33095.0000 18.8625 21.8349
- 33095.0000 19.3000 22.2540
- 999.9990 999.9990 0.0000
- 48 19 0 37 33140.0000
- 33140.0000 0.4000 21.7700
- 33140.0000 0.7229 21.5526
- 33140.0000 1.0458 21.3352
- 33140.0000 1.3687 21.1178
- 33140.0000 1.6916 20.9003
- 33140.0000 2.0317 20.7188
- 33140.0000 2.4033 20.6027
- 33140.0000 2.7581 20.4573
- 33140.0000 3.0465 20.1959
- 33140.0000 3.3348 19.9344
- 33140.0000 3.6232 19.6729
- 33140.0000 3.9116 19.4115
- 33140.0000 4.2000 19.1500 rg
- 33140.0000 4.8560 18.7581
- 33140.0000 5.5303 18.3921
- 33140.0000 6.2046 18.0261
- 33140.0000 6.9449 17.9200
- 33140.0000 7.7122 17.9200
- 33140.0000 8.4794 17.9200
- 33140.0000 9.2466 17.9200
- 33140.0000 10.0139 17.9200
- 33140.0000 10.7811 17.9200
- 33140.0000 11.4811 18.0899
- 33140.0000 12.0405 18.6150
- 33140.0000 12.6000 19.1400 rd
- 33140.0000 13.1580 19.3818
- 33140.0000 13.7160 19.6236
- 33140.0000 14.2740 19.8654
- 33140.0000 14.8319 20.1072
- 33140.0000 15.3899 20.3490
- 33140.0000 15.9479 20.5908
- 33140.0000 16.5059 20.8326
- 33140.0000 17.0639 21.0744
- 33140.0000 17.6219 21.3161
- 33140.0000 18.1799 21.5579
- 33140.0000 18.7378 21.7997
- 33140.0000 19.2000 22.1800
- 999.9990 999.9990 0.0000
- 49 19 1 37 33187.5000
- 33187.5000 0.3333 21.7550
- 33187.5000 0.6776 21.5513
- 33187.5000 1.0094 21.3237
- 33187.5000 1.3396 21.0932
- 33187.5000 1.6699 20.8627
- 33187.5000 2.0145 20.6622
- 33187.5000 2.3890 20.5235
- 33187.5000 2.7604 20.3816
- 33187.5000 3.0720 20.1325
- 33187.5000 3.3790 19.8732
- 33187.5000 3.6860 19.6138
- 33187.5000 3.9930 19.3544
- 33187.5000 4.3000 19.0950 rg
- 33187.5000 4.9556 18.7187
- 33187.5000 5.6286 18.3678
- 33187.5000 6.3016 18.0169
- 33187.5000 7.0330 17.9000
- 33187.5000 7.7926 17.9000
- 33187.5000 8.5521 17.9000
- 33187.5000 9.3116 17.9000
- 33187.5000 10.0711 17.9000
- 33187.5000 10.8307 17.9000
- 33187.5000 11.5294 18.0532
- 33187.5000 12.0814 18.5750
- 33187.5000 12.6333 19.0967 rd
- 33187.5000 13.1733 19.3371
- 33187.5000 13.7133 19.5774
- 33187.5000 14.2533 19.8178
- 33187.5000 14.7933 20.0582
- 33187.5000 15.3333 20.2986
- 33187.5000 15.8733 20.5390
- 33187.5000 16.4132 20.7794
- 33187.5000 16.9532 21.0197
- 33187.5000 17.4932 21.2601
- 33187.5000 18.0332 21.5005
- 33187.5000 18.5732 21.7409
- 33187.5000 19.0333 22.0967
- 999.9990 999.9990 0.0000
- 50 19 2 37 33235.0000
- 33235.0000 0.2667 21.7400
- 33235.0000 0.6324 21.5499
- 33235.0000 0.9730 21.3122
- 33235.0000 1.3106 21.0686
- 33235.0000 1.6481 20.8251
- 33235.0000 1.9972 20.6056
- 33235.0000 2.3748 20.4444
- 33235.0000 2.7628 20.3058
- 33235.0000 3.0975 20.0692
- 33235.0000 3.4231 19.8119
- 33235.0000 3.7487 19.5546
- 33235.0000 4.0744 19.2973
- 33235.0000 4.4000 19.0400 rg
- 33235.0000 5.0552 18.6792
- 33235.0000 5.7269 18.3434
- 33235.0000 6.3985 18.0077
- 33235.0000 7.1211 17.8800
- 33235.0000 7.8729 17.8800
- 33235.0000 8.6248 17.8800
- 33235.0000 9.3766 17.8800
- 33235.0000 10.1284 17.8800
- 33235.0000 10.8802 17.8800
- 33235.0000 11.5777 18.0165
- 33235.0000 12.1222 18.5349
- 33235.0000 12.6667 19.0533 rd
- 33235.0000 13.1887 19.2923
- 33235.0000 13.7106 19.5313
- 33235.0000 14.2326 19.7703
- 33235.0000 14.7546 20.0092
- 33235.0000 15.2766 20.2482
- 33235.0000 15.7986 20.4872
- 33235.0000 16.3206 20.7261
- 33235.0000 16.8426 20.9651
- 33235.0000 17.3646 21.2041
- 33235.0000 17.8866 21.4431
- 33235.0000 18.4086 21.6820
- 33235.0000 18.8667 22.0133
- 999.9990 999.9990 0.0000
- 51 19 3 37 33282.5000
- 33282.5000 0.2000 21.7250
- 33282.5000 0.5871 21.5486
- 33282.5000 0.9366 21.3007
- 33282.5000 1.2815 21.0441
- 33282.5000 1.6264 20.7875
- 33282.5000 1.9800 20.5489
- 33282.5000 2.3605 20.3652
- 33282.5000 2.7651 20.2300
- 33282.5000 3.1230 20.0059
- 33282.5000 3.4672 19.7506
- 33282.5000 3.8115 19.4954
- 33282.5000 4.1557 19.2402
- 33282.5000 4.5000 18.9850 rg
- 33282.5000 5.1548 18.6397
- 33282.5000 5.8252 18.3191
- 33282.5000 6.4955 17.9985
- 33282.5000 7.2092 17.8600
- 33282.5000 7.9533 17.8600
- 33282.5000 8.6975 17.8600
- 33282.5000 9.4416 17.8600
- 33282.5000 10.1857 17.8600
- 33282.5000 10.9298 17.8600
- 33282.5000 11.6261 17.9798
- 33282.5000 12.1630 18.4949
- 33282.5000 12.7000 19.0100 rd
- 33282.5000 13.2040 19.2476
- 33282.5000 13.7080 19.4851
- 33282.5000 14.2120 19.7227
- 33282.5000 14.7160 19.9603
- 33282.5000 15.2200 20.1978
- 33282.5000 15.7240 20.4354
- 33282.5000 16.2279 20.6729
- 33282.5000 16.7319 20.9105
- 33282.5000 17.2359 21.1481
- 33282.5000 17.7399 21.3856
- 33282.5000 18.2439 21.6232
- 33282.5000 18.7000 21.9300
- 999.9990 999.9990 0.0000
- 52 19 4 37 33330.0000
- 33330.0000 0.1333 21.7100
- 33330.0000 0.5419 21.5473
- 33330.0000 0.9002 21.2892
- 33330.0000 1.2525 21.0195
- 33330.0000 1.6047 20.7499
- 33330.0000 1.9627 20.4923
- 33330.0000 2.3463 20.2860
- 33330.0000 2.7675 20.1542
- 33330.0000 3.1485 19.9425
- 33330.0000 3.5114 19.6894
- 33330.0000 3.8742 19.4363
- 33330.0000 4.2371 19.1831
- 33330.0000 4.6000 18.9300 rg
- 33330.0000 5.2544 18.6003
- 33330.0000 5.9234 18.2948
- 33330.0000 6.5925 17.9892
- 33330.0000 7.2973 17.8400
- 33330.0000 8.0337 17.8400
- 33330.0000 8.7701 17.8400
- 33330.0000 9.5066 17.8400
- 33330.0000 10.2430 17.8400
- 33330.0000 10.9794 17.8400
- 33330.0000 11.6744 17.9431
- 33330.0000 12.2039 18.4549
- 33330.0000 12.7333 18.9667 rd
- 33330.0000 13.2193 19.2028
- 33330.0000 13.7053 19.4390
- 33330.0000 14.1913 19.6751
- 33330.0000 14.6773 19.9113
- 33330.0000 15.1633 20.1474
- 33330.0000 15.6493 20.3836
- 33330.0000 16.1353 20.6197
- 33330.0000 16.6213 20.8559
- 33330.0000 17.1073 21.0920
- 33330.0000 17.5933 21.3282
- 33330.0000 18.0793 21.5644
- 33330.0000 18.5333 21.8467
- 999.9990 999.9990 0.0000
- 53 19 5 37 33377.5000
- 33377.5000 0.0667 21.6950
- 33377.5000 0.4966 21.5459
- 33377.5000 0.8638 21.2777
- 33377.5000 1.2234 20.9950
- 33377.5000 1.5830 20.7123
- 33377.5000 1.9455 20.4357
- 33377.5000 2.3321 20.2068
- 33377.5000 2.7698 20.0784
- 33377.5000 3.1740 19.8792
- 33377.5000 3.5555 19.6281
- 33377.5000 3.9370 19.3771
- 33377.5000 4.3185 19.1260
- 33377.5000 4.7000 18.8750 rg
- 33377.5000 5.3540 18.5608
- 33377.5000 6.0217 18.2704
- 33377.5000 6.6894 17.9800
- 33377.5000 7.3854 17.8200
- 33377.5000 8.1141 17.8200
- 33377.5000 8.8428 17.8200
- 33377.5000 9.5715 17.8200
- 33377.5000 10.3002 17.8200
- 33377.5000 11.0290 17.8200
- 33377.5000 11.7227 17.9064
- 33377.5000 12.2447 18.4149
- 33377.5000 12.7667 18.9233 rd
- 33377.5000 13.2347 19.1581
- 33377.5000 13.7027 19.3928
- 33377.5000 14.1707 19.6276
- 33377.5000 14.6387 19.8623
- 33377.5000 15.1067 20.0971
- 33377.5000 15.5747 20.3318
- 33377.5000 16.0426 20.5665
- 33377.5000 16.5106 20.8013
- 33377.5000 16.9786 21.0360
- 33377.5000 17.4466 21.2708
- 33377.5000 17.9146 21.5055
- 33377.5000 18.3667 21.7633
- 999.9990 999.9990 0.0000
- 54 20 0 37 33425.0000
- 33425.0000 0.0000 21.6800
- 33425.0000 0.4514 21.5446
- 33425.0000 0.8274 21.2661
- 33425.0000 1.1943 20.9704
- 33425.0000 1.5613 20.6747
- 33425.0000 1.9282 20.3790
- 33425.0000 2.3178 20.1276
- 33425.0000 2.7722 20.0026
- 33425.0000 3.1995 19.8159
- 33425.0000 3.5996 19.5669
- 33425.0000 3.9998 19.3179
- 33425.0000 4.3999 19.0690
- 33425.0000 4.8000 18.8200 rg
- 33425.0000 5.4536 18.5213
- 33425.0000 6.1200 18.2461
- 33425.0000 6.7864 17.9708
- 33425.0000 7.4735 17.8000
- 33425.0000 8.1945 17.8000
- 33425.0000 8.9155 17.8000
- 33425.0000 9.6365 17.8000
- 33425.0000 10.3575 17.8000
- 33425.0000 11.0785 17.8000
- 33425.0000 11.7710 17.8697
- 33425.0000 12.2855 18.3749
- 33425.0000 12.8000 18.8800 rd
- 33425.0000 13.2500 19.1133
- 33425.0000 13.7000 19.3467
- 33425.0000 14.1500 19.5800
- 33425.0000 14.6000 19.8133
- 33425.0000 15.0500 20.0467
- 33425.0000 15.5000 20.2800
- 33425.0000 15.9500 20.5133
- 33425.0000 16.4000 20.7467
- 33425.0000 16.8500 20.9800
- 33425.0000 17.3000 21.2133
- 33425.0000 17.7500 21.4467
- 33425.0000 18.2000 21.6800
- 999.9990 999.9990 0.0000
- 55 20 1 37 33477.0000
- 33477.0000 0.0000 21.6500
- 33477.0000 0.4550 21.5022
- 33477.0000 0.8329 21.2134
- 33477.0000 1.2024 20.9089
- 33477.0000 1.5718 20.6044
- 33477.0000 1.9413 20.2999
- 33477.0000 2.3289 20.0309
- 33477.0000 2.7902 19.9056
- 33477.0000 3.2306 19.7315
- 33477.0000 3.6430 19.4891
- 33477.0000 4.0553 19.2468
- 33477.0000 4.4677 19.0044
- 33477.0000 4.8800 18.7620 rg
- 33477.0000 5.5341 18.4830
- 33477.0000 6.1984 18.2224
- 33477.0000 6.8626 17.9618
- 33477.0000 7.5435 17.7847
- 33477.0000 8.2568 17.7800
- 33477.0000 8.9708 17.7800
- 33477.0000 9.6848 17.7800
- 33477.0000 10.3989 17.7800
- 33477.0000 11.1129 17.7800
- 33477.0000 11.8041 17.8358
- 33477.0000 12.3140 18.3303
- 33477.0000 12.8200 18.8340 rd
- 33477.0000 13.2583 19.0687
- 33477.0000 13.6967 19.3033
- 33477.0000 14.1350 19.5380
- 33477.0000 14.5733 19.7727
- 33477.0000 15.0117 20.0073
- 33477.0000 15.4500 20.2420
- 33477.0000 15.8883 20.4767
- 33477.0000 16.3267 20.7113
- 33477.0000 16.7650 20.9460
- 33477.0000 17.2033 21.1807
- 33477.0000 17.6417 21.4153
- 33477.0000 18.0800 21.6500
- 999.9990 999.9990 0.0000
- 56 20 2 37 33529.0000
- 33529.0000 0.0000 21.6200
- 33529.0000 0.4587 21.4599
- 33529.0000 0.8384 21.1606
- 33529.0000 1.2104 20.8474
- 33529.0000 1.5824 20.5341
- 33529.0000 1.9544 20.2208
- 33529.0000 2.3400 19.9341
- 33529.0000 2.8082 19.8085
- 33529.0000 3.2617 19.6472
- 33529.0000 3.6863 19.4114
- 33529.0000 4.1109 19.1756
- 33529.0000 4.5354 18.9398
- 33529.0000 4.9600 18.7040 rg
- 33529.0000 5.6146 18.4446
- 33529.0000 6.2767 18.1987
- 33529.0000 6.9389 17.9527
- 33529.0000 7.6134 17.7694
- 33529.0000 8.3190 17.7600
- 33529.0000 9.0261 17.7600
- 33529.0000 9.7331 17.7600
- 33529.0000 10.4402 17.7600
- 33529.0000 11.1472 17.7600
- 33529.0000 11.8372 17.8018
- 33529.0000 12.3426 18.2857
- 33529.0000 12.8400 18.7880 rd
- 33529.0000 13.2667 19.0240
- 33529.0000 13.6933 19.2600
- 33529.0000 14.1200 19.4960
- 33529.0000 14.5467 19.7320
- 33529.0000 14.9733 19.9680
- 33529.0000 15.4000 20.2040
- 33529.0000 15.8267 20.4400
- 33529.0000 16.2533 20.6760
- 33529.0000 16.6800 20.9120
- 33529.0000 17.1067 21.1480
- 33529.0000 17.5333 21.3840
- 33529.0000 17.9600 21.6200
- 999.9990 999.9990 0.0000
- 57 20 3 37 33581.0000
- 33581.0000 0.0000 21.5900
- 33581.0000 0.4623 21.4175
- 33581.0000 0.8440 21.1079
- 33581.0000 1.2185 20.7858
- 33581.0000 1.5930 20.4638
- 33581.0000 1.9675 20.1417
- 33581.0000 2.3511 19.8374
- 33581.0000 2.8262 19.7114
- 33581.0000 3.2929 19.5629
- 33581.0000 3.7296 19.3336
- 33581.0000 4.1664 19.1044
- 33581.0000 4.6032 18.8752
- 33581.0000 5.0400 18.6460 rg
- 33581.0000 5.6951 18.4062
- 33581.0000 6.3551 18.1750
- 33581.0000 7.0151 17.9437
- 33581.0000 7.6834 17.7542
- 33581.0000 8.3813 17.7400
- 33581.0000 9.0814 17.7400
- 33581.0000 9.7815 17.7400
- 33581.0000 10.4815 17.7400
- 33581.0000 11.1816 17.7400
- 33581.0000 11.8703 17.7679
- 33581.0000 12.3711 18.2411
- 33581.0000 12.8600 18.7420 rd
- 33581.0000 13.2750 18.9793
- 33581.0000 13.6900 19.2167
- 33581.0000 14.1050 19.4540
- 33581.0000 14.5200 19.6913
- 33581.0000 14.9350 19.9287
- 33581.0000 15.3500 20.1660
- 33581.0000 15.7650 20.4033
- 33581.0000 16.1800 20.6407
- 33581.0000 16.5950 20.8780
- 33581.0000 17.0100 21.1153
- 33581.0000 17.4250 21.3527
- 33581.0000 17.8400 21.5900
- 999.9990 999.9990 0.0000
- 58 20 4 37 33633.0000
- 33633.0000 0.0000 21.5600
- 33633.0000 0.4659 21.3751
- 33633.0000 0.8495 21.0551
- 33633.0000 1.2265 20.7243
- 33633.0000 1.6036 20.3935
- 33633.0000 1.9806 20.0626
- 33633.0000 2.3622 19.7407
- 33633.0000 2.8442 19.6144
- 33633.0000 3.3240 19.4785
- 33633.0000 3.7730 19.2559
- 33633.0000 4.2220 19.0333
- 33633.0000 4.6710 18.8106
- 33633.0000 5.1200 18.5880 rg
- 33633.0000 5.7756 18.3679
- 33633.0000 6.4335 18.1513
- 33633.0000 7.0913 17.9346
- 33633.0000 7.7533 17.7389
- 33633.0000 8.4436 17.7200
- 33633.0000 9.1367 17.7200
- 33633.0000 9.8298 17.7200
- 33633.0000 10.5229 17.7200
- 33633.0000 11.2159 17.7200
- 33633.0000 11.9033 17.7339
- 33633.0000 12.3996 18.1965
- 33633.0000 12.8800 18.6960 rd
- 33633.0000 13.2833 18.9347
- 33633.0000 13.6867 19.1733
- 33633.0000 14.0900 19.4120
- 33633.0000 14.4933 19.6507
- 33633.0000 14.8967 19.8893
- 33633.0000 15.3000 20.1280
- 33633.0000 15.7033 20.3667
- 33633.0000 16.1067 20.6053
- 33633.0000 16.5100 20.8440
- 33633.0000 16.9133 21.0827
- 33633.0000 17.3167 21.3213
- 33633.0000 17.7200 21.5600
- 999.9990 999.9990 0.0000
- 59 21 0 37 33685.0000
- 33685.0000 0.0000 21.5300
- 33685.0000 0.4696 21.3328
- 33685.0000 0.8550 21.0024
- 33685.0000 1.2346 20.6628
- 33685.0000 1.6141 20.3231
- 33685.0000 1.9937 19.9835
- 33685.0000 2.3733 19.6439
- 33685.0000 2.8622 19.5173
- 33685.0000 3.3551 19.3942
- 33685.0000 3.8163 19.1782
- 33685.0000 4.2775 18.9621
- 33685.0000 4.7388 18.7461
- 33685.0000 5.2000 18.5300 rg
- 33685.0000 5.8562 18.3295
- 33685.0000 6.5119 18.1275
- 33685.0000 7.1676 17.9256
- 33685.0000 7.8233 17.7236
- 33685.0000 8.5059 17.7000
- 33685.0000 9.1920 17.7000
- 33685.0000 9.8781 17.7000
- 33685.0000 10.5642 17.7000
- 33685.0000 11.2503 17.7000
- 33685.0000 11.9364 17.7000
- 33685.0000 12.4281 18.1519
- 33685.0000 12.9000 18.6500 rd
- 33685.0000 13.2917 18.8900
- 33685.0000 13.6833 19.1300
- 33685.0000 14.0750 19.3700
- 33685.0000 14.4667 19.6100
- 33685.0000 14.8583 19.8500
- 33685.0000 15.2500 20.0900
- 33685.0000 15.6417 20.3300
- 33685.0000 16.0333 20.5700
- 33685.0000 16.4250 20.8100
- 33685.0000 16.8167 21.0500
- 33685.0000 17.2083 21.2900
- 33685.0000 17.6000 21.5300
- 999.9990 999.9990 0.0000
- 60 21 1 37 33732.0000
- 33732.0000 0.1200 21.4200
- 33732.0000 0.5685 21.1949
- 33732.0000 0.9496 20.8632
- 33732.0000 1.3260 20.5242
- 33732.0000 1.7025 20.1852
- 33732.0000 2.0789 19.8462
- 33732.0000 2.4678 19.5318
- 33732.0000 2.9564 19.4120
- 33732.0000 3.4467 19.2896
- 33732.0000 3.9100 19.0862
- 33732.0000 4.3734 18.8828
- 33732.0000 4.8367 18.6794
- 33732.0000 5.3000 18.4760 rg
- 33732.0000 5.9513 18.2832
- 33732.0000 6.6031 18.0924
- 33732.0000 7.2550 17.9016
- 33732.0000 7.9069 17.7108
- 33732.0000 8.5823 17.6800
- 33732.0000 9.2618 17.6800
- 33732.0000 9.9413 17.6800
- 33732.0000 10.6208 17.6800
- 33732.0000 11.3003 17.6800
- 33732.0000 11.9799 17.6800
- 33732.0000 12.4724 18.1149
- 33732.0000 12.9400 18.6080 rd
- 33732.0000 13.3183 18.8448
- 33732.0000 13.6967 19.0817
- 33732.0000 14.0750 19.3185
- 33732.0000 14.4533 19.5553
- 33732.0000 14.8317 19.7922
- 33732.0000 15.2100 20.0290
- 33732.0000 15.5883 20.2658
- 33732.0000 15.9667 20.5027
- 33732.0000 16.3450 20.7395
- 33732.0000 16.7233 20.9763
- 33732.0000 17.1017 21.2132
- 33732.0000 17.4800 21.4500
- 999.9990 999.9990 0.0000
- 61 21 2 37 33779.0000
- 33779.0000 0.2400 21.3100
- 33779.0000 0.6673 21.0570
- 33779.0000 1.0442 20.7241
- 33779.0000 1.4175 20.3857
- 33779.0000 1.7908 20.0472
- 33779.0000 2.1642 19.7088
- 33779.0000 2.5624 19.4197
- 33779.0000 3.0505 19.3067
- 33779.0000 3.5383 19.1849
- 33779.0000 4.0038 18.9942
- 33779.0000 4.4692 18.8035
- 33779.0000 4.9346 18.6127
- 33779.0000 5.4000 18.4220 rg
- 33779.0000 6.0463 18.2369
- 33779.0000 6.6944 18.0572
- 33779.0000 7.3425 17.8776
- 33779.0000 7.9905 17.6979
- 33779.0000 8.6587 17.6600
- 33779.0000 9.3316 17.6600
- 33779.0000 10.0045 17.6600
- 33779.0000 10.6774 17.6600
- 33779.0000 11.3504 17.6600
- 33779.0000 12.0233 17.6600
- 33779.0000 12.5167 18.0780
- 33779.0000 12.9800 18.5660 rd
- 33779.0000 13.3450 18.7997
- 33779.0000 13.7100 19.0333
- 33779.0000 14.0750 19.2670
- 33779.0000 14.4400 19.5007
- 33779.0000 14.8050 19.7343
- 33779.0000 15.1700 19.9680
- 33779.0000 15.5350 20.2017
- 33779.0000 15.9000 20.4353
- 33779.0000 16.2650 20.6690
- 33779.0000 16.6300 20.9027
- 33779.0000 16.9950 21.1363
- 33779.0000 17.3600 21.3700
- 999.9990 999.9990 0.0000
- 62 21 3 37 33826.0000
- 33826.0000 0.3600 21.2000
- 33826.0000 0.7662 20.9191
- 33826.0000 1.1388 20.5849
- 33826.0000 1.5090 20.2471
- 33826.0000 1.8792 19.9092
- 33826.0000 2.2494 19.5714
- 33826.0000 2.6569 19.3075
- 33826.0000 3.1447 19.2013
- 33826.0000 3.6300 19.0803
- 33826.0000 4.0975 18.9022
- 33826.0000 4.5650 18.7241
- 33826.0000 5.0325 18.5461
- 33826.0000 5.5000 18.3680 rg
- 33826.0000 6.1414 18.1906
- 33826.0000 6.7857 18.0221
- 33826.0000 7.4299 17.8536
- 33826.0000 8.0742 17.6851
- 33826.0000 8.7350 17.6400
- 33826.0000 9.4014 17.6400
- 33826.0000 10.0677 17.6400
- 33826.0000 10.7341 17.6400
- 33826.0000 11.4004 17.6400
- 33826.0000 12.0668 17.6400
- 33826.0000 12.5610 18.0410
- 33826.0000 13.0200 18.5240 rd
- 33826.0000 13.3717 18.7545
- 33826.0000 13.7233 18.9850
- 33826.0000 14.0750 19.2155
- 33826.0000 14.4267 19.4460
- 33826.0000 14.7783 19.6765
- 33826.0000 15.1300 19.9070
- 33826.0000 15.4817 20.1375
- 33826.0000 15.8333 20.3680
- 33826.0000 16.1850 20.5985
- 33826.0000 16.5367 20.8290
- 33826.0000 16.8883 21.0595
- 33826.0000 17.2400 21.2900
- 999.9990 999.9990 0.0000
- 63 21 4 37 33873.0000
- 33873.0000 0.4800 21.0900
- 33873.0000 0.8651 20.7812
- 33873.0000 1.2334 20.4458
- 33873.0000 1.6004 20.1085
- 33873.0000 1.9675 19.7713
- 33873.0000 2.3346 19.4340
- 33873.0000 2.7515 19.1954
- 33873.0000 3.2389 19.0960
- 33873.0000 3.7216 18.9756
- 33873.0000 4.1912 18.8102
- 33873.0000 4.6608 18.6448
- 33873.0000 5.1304 18.4794
- 33873.0000 5.6000 18.3140 rg
- 33873.0000 6.2365 18.1442
- 33873.0000 6.8770 17.9869
- 33873.0000 7.5174 17.8296
- 33873.0000 8.1578 17.6722
- 33873.0000 8.8114 17.6200
- 33873.0000 9.4712 17.6200
- 33873.0000 10.1310 17.6200
- 33873.0000 10.7907 17.6200
- 33873.0000 11.4505 17.6200
- 33873.0000 12.1102 17.6200
- 33873.0000 12.6053 18.0040
- 33873.0000 13.0600 18.4820 rd
- 33873.0000 13.3983 18.7093
- 33873.0000 13.7367 18.9367
- 33873.0000 14.0750 19.1640
- 33873.0000 14.4133 19.3913
- 33873.0000 14.7517 19.6187
- 33873.0000 15.0900 19.8460
- 33873.0000 15.4283 20.0733
- 33873.0000 15.7667 20.3007
- 33873.0000 16.1050 20.5280
- 33873.0000 16.4433 20.7553
- 33873.0000 16.7817 20.9827
- 33873.0000 17.1200 21.2100
- 999.9990 999.9990 0.0000
- 64 22 0 37 33920.0000
- 33920.0000 0.6000 20.9800
- 33920.0000 0.9640 20.6433
- 33920.0000 1.3279 20.3067
- 33920.0000 1.6919 19.9700
- 33920.0000 2.0559 19.6333
- 33920.0000 2.4199 19.2966
- 33920.0000 2.8460 19.0833
- 33920.0000 3.3331 18.9907
- 33920.0000 3.8132 18.8710
- 33920.0000 4.2849 18.7182
- 33920.0000 4.7566 18.5655
- 33920.0000 5.2283 18.4127
- 33920.0000 5.7000 18.2600 rg
- 33920.0000 6.3316 18.0979
- 33920.0000 6.9682 17.9517
- 33920.0000 7.6048 17.8056
- 33920.0000 8.2414 17.6594
- 33920.0000 8.8878 17.6000
- 33920.0000 9.5410 17.6000
- 33920.0000 10.1942 17.6000
- 33920.0000 10.8473 17.6000
- 33920.0000 11.5005 17.6000
- 33920.0000 12.1537 17.6000
- 33920.0000 12.6495 17.9670
- 33920.0000 13.1000 18.4400 rd
- 33920.0000 13.4250 18.6642
- 33920.0000 13.7500 18.8883
- 33920.0000 14.0750 19.1125
- 33920.0000 14.4000 19.3367
- 33920.0000 14.7250 19.5608
- 33920.0000 15.0500 19.7850
- 33920.0000 15.3750 20.0092
- 33920.0000 15.7000 20.2333
- 33920.0000 16.0250 20.4575
- 33920.0000 16.3500 20.6817
- 33920.0000 16.6750 20.9058
- 33920.0000 17.0000 21.1300
- 999.9990 999.9990 0.0000
- 65 22 1 37 33963.7500
- 33963.7500 0.6000 20.9725
- 33963.7500 0.9655 20.6239
- 33963.7500 1.3311 20.2753
- 33963.7500 1.6966 19.9267
- 33963.7500 2.0622 19.5781
- 33963.7500 2.4277 19.2295
- 33963.7500 2.8528 18.9979
- 33963.7500 3.3498 18.9069
- 33963.7500 3.8411 18.7932
- 33963.7500 4.3245 18.6474
- 33963.7500 4.8080 18.5016
- 33963.7500 5.2915 18.3558
- 33963.7500 5.7750 18.2100 rg
- 33963.7500 6.4035 18.0586
- 33963.7500 7.0364 17.9221
- 33963.7500 7.6693 17.7857
- 33963.7500 8.3023 17.6492
- 33963.7500 8.9430 17.5825
- 33963.7500 9.5906 17.5825
- 33963.7500 10.2382 17.5825
- 33963.7500 10.8859 17.5825
- 33963.7500 11.5335 17.5825
- 33963.7500 12.1812 17.5825
- 33963.7500 12.6795 17.9299
- 33963.7500 13.1250 18.4000 rd
- 33963.7500 13.4396 18.6244
- 33963.7500 13.7542 18.8488
- 33963.7500 14.0687 19.0731
- 33963.7500 14.3833 19.2975
- 33963.7500 14.6979 19.5219
- 33963.7500 15.0125 19.7462
- 33963.7500 15.3271 19.9706
- 33963.7500 15.6417 20.1950
- 33963.7500 15.9562 20.4194
- 33963.7500 16.2708 20.6437
- 33963.7500 16.5854 20.8681
- 33963.7500 16.9000 21.0925
- 999.9990 999.9990 0.0000
- 66 22 2 37 34007.5000
- 34007.5000 0.6000 20.9650
- 34007.5000 0.9671 20.6045
- 34007.5000 1.3342 20.2440
- 34007.5000 1.7014 19.8834
- 34007.5000 2.0685 19.5229
- 34007.5000 2.4356 19.1624
- 34007.5000 2.8595 18.9125
- 34007.5000 3.3664 18.8231
- 34007.5000 3.8689 18.7155
- 34007.5000 4.3642 18.5766
- 34007.5000 4.8594 18.4377
- 34007.5000 5.3547 18.2989
- 34007.5000 5.8500 18.1600 rg
- 34007.5000 6.4753 18.0192
- 34007.5000 7.1046 17.8925
- 34007.5000 7.7338 17.7658
- 34007.5000 8.3631 17.6391
- 34007.5000 8.9981 17.5650
- 34007.5000 9.6402 17.5650
- 34007.5000 10.2823 17.5650
- 34007.5000 10.9244 17.5650
- 34007.5000 11.5666 17.5650
- 34007.5000 12.2087 17.5650
- 34007.5000 12.7095 17.8928
- 34007.5000 13.1500 18.3600 rd
- 34007.5000 13.4542 18.5846
- 34007.5000 13.7583 18.8092
- 34007.5000 14.0625 19.0338
- 34007.5000 14.3667 19.2583
- 34007.5000 14.6708 19.4829
- 34007.5000 14.9750 19.7075
- 34007.5000 15.2792 19.9321
- 34007.5000 15.5833 20.1567
- 34007.5000 15.8875 20.3813
- 34007.5000 16.1917 20.6058
- 34007.5000 16.4958 20.8304
- 34007.5000 16.8000 21.0550
- 999.9990 999.9990 0.0000
- 67 22 3 37 34051.2500
- 34051.2500 0.6000 20.9575
- 34051.2500 0.9687 20.5850
- 34051.2500 1.3374 20.2126
- 34051.2500 1.7061 19.8401
- 34051.2500 2.0748 19.4677
- 34051.2500 2.4435 19.0952
- 34051.2500 2.8663 18.8271
- 34051.2500 3.3831 18.7393
- 34051.2500 3.8967 18.6377
- 34051.2500 4.4038 18.5058
- 34051.2500 4.9109 18.3739
- 34051.2500 5.4179 18.2419
- 34051.2500 5.9250 18.1100 rg
- 34051.2500 6.5472 17.9799
- 34051.2500 7.1728 17.8629
- 34051.2500 7.7984 17.7459
- 34051.2500 8.4239 17.6290
- 34051.2500 9.0532 17.5475
- 34051.2500 9.6898 17.5475
- 34051.2500 10.3264 17.5475
- 34051.2500 10.9630 17.5475
- 34051.2500 11.5996 17.5475
- 34051.2500 12.2362 17.5475
- 34051.2500 12.7394 17.8557
- 34051.2500 13.1750 18.3200 rd
- 34051.2500 13.4688 18.5448
- 34051.2500 13.7625 18.7696
- 34051.2500 14.0563 18.9944
- 34051.2500 14.3500 19.2192
- 34051.2500 14.6438 19.4440
- 34051.2500 14.9375 19.6688
- 34051.2500 15.2312 19.8935
- 34051.2500 15.5250 20.1183
- 34051.2500 15.8187 20.3431
- 34051.2500 16.1125 20.5679
- 34051.2500 16.4062 20.7927
- 34051.2500 16.7000 21.0175
- 999.9990 999.9990 0.0000
- 68 23 0 37 34095.0000
- 34095.0000 0.6000 20.9500
- 34095.0000 0.9703 20.5656
- 34095.0000 1.3405 20.1812
- 34095.0000 1.7108 19.7969
- 34095.0000 2.0811 19.4125
- 34095.0000 2.4514 19.0281
- 34095.0000 2.8730 18.7417
- 34095.0000 3.3997 18.6555
- 34095.0000 3.9245 18.5600
- 34095.0000 4.4434 18.4350
- 34095.0000 4.9623 18.3100
- 34095.0000 5.4811 18.1850
- 34095.0000 6.0000 18.0600 rg
- 34095.0000 6.6190 17.9405
- 34095.0000 7.2409 17.8333
- 34095.0000 7.8629 17.7261
- 34095.0000 8.4848 17.6188
- 34095.0000 9.1083 17.5300
- 34095.0000 9.7394 17.5300
- 34095.0000 10.3705 17.5300
- 34095.0000 11.0015 17.5300
- 34095.0000 11.6326 17.5300
- 34095.0000 12.2637 17.5300
- 34095.0000 12.7694 17.8186
- 34095.0000 13.2000 18.2800 rd
- 34095.0000 13.4833 18.5050
- 34095.0000 13.7667 18.7300
- 34095.0000 14.0500 18.9550
- 34095.0000 14.3333 19.1800
- 34095.0000 14.6167 19.4050
- 34095.0000 14.9000 19.6300
- 34095.0000 15.1833 19.8550
- 34095.0000 15.4667 20.0800
- 34095.0000 15.7500 20.3050
- 34095.0000 16.0333 20.5300
- 34095.0000 16.3167 20.7550
- 34095.0000 16.6000 20.9800
- 999.9990 999.9990 0.0000
- 69 23 1 37 34145.0000
- 34145.0000 0.4500 21.0525
- 34145.0000 0.8418 20.6635
- 34145.0000 1.2166 20.2591
- 34145.0000 1.5837 19.8477
- 34145.0000 1.9508 19.4362
- 34145.0000 2.3179 19.0248
- 34145.0000 2.7235 18.6868
- 34145.0000 3.2478 18.5649
- 34145.0000 3.7920 18.4713
- 34145.0000 4.3315 18.3543
- 34145.0000 4.8710 18.2371
- 34145.0000 5.4105 18.1198
- 34145.0000 5.9500 18.0025 rg
- 34145.0000 6.5600 17.8109
- 34145.0000 7.1979 17.7109
- 34145.0000 7.8422 17.6317
- 34145.0000 8.4866 17.5524
- 34145.0000 9.1321 17.4870
- 34145.0000 9.7833 17.4891
- 34145.0000 10.4345 17.4918
- 34145.0000 11.0857 17.4945
- 34145.0000 11.7369 17.4972
- 34145.0000 12.3881 17.4999
- 34145.0000 12.9228 17.8003
- 34145.0000 13.4000 18.2350 rd
- 34145.0000 13.6562 18.4717
- 34145.0000 13.9125 18.7083
- 34145.0000 14.1688 18.9450
- 34145.0000 14.4250 19.1817
- 34145.0000 14.6813 19.4183
- 34145.0000 14.9375 19.6550
- 34145.0000 15.1938 19.8917
- 34145.0000 15.4500 20.1283
- 34145.0000 15.7063 20.3650
- 34145.0000 15.9625 20.6017
- 34145.0000 16.2188 20.8383
- 34145.0000 16.4750 21.0750
- 999.9990 999.9990 0.0000
- 70 23 2 37 34195.0000
- 34195.0000 0.3000 21.1550
- 34195.0000 0.7132 20.7613
- 34195.0000 1.0927 20.3369
- 34195.0000 1.4566 19.8984
- 34195.0000 1.8205 19.4599
- 34195.0000 2.1844 19.0214
- 34195.0000 2.5740 18.6319
- 34195.0000 3.0958 18.4742
- 34195.0000 3.6594 18.3827
- 34195.0000 4.2196 18.2737
- 34195.0000 4.7797 18.1641
- 34195.0000 5.3399 18.0546
- 34195.0000 5.9000 17.9450 rg
- 34195.0000 6.5010 17.6812
- 34195.0000 7.1548 17.5885
- 34195.0000 7.8216 17.5373
- 34195.0000 8.4883 17.4861
- 34195.0000 9.1559 17.4440
- 34195.0000 9.8272 17.4481
- 34195.0000 10.4985 17.4535
- 34195.0000 11.1698 17.4589
- 34195.0000 11.8411 17.4643
- 34195.0000 12.5124 17.4697
- 34195.0000 13.0763 17.7820
- 34195.0000 13.6000 18.1900 rd
- 34195.0000 13.8292 18.4383
- 34195.0000 14.0583 18.6867
- 34195.0000 14.2875 18.9350
- 34195.0000 14.5167 19.1833
- 34195.0000 14.7458 19.4317
- 34195.0000 14.9750 19.6800
- 34195.0000 15.2042 19.9283
- 34195.0000 15.4333 20.1767
- 34195.0000 15.6625 20.4250
- 34195.0000 15.8917 20.6733
- 34195.0000 16.1208 20.9217
- 34195.0000 16.3500 21.1700
- 999.9990 999.9990 0.0000
- 71 23 3 37 34245.0000
- 34245.0000 0.1500 21.2575
- 34245.0000 0.5847 20.8592
- 34245.0000 0.9688 20.4148
- 34245.0000 1.3295 19.9492
- 34245.0000 1.6902 19.4837
- 34245.0000 2.0510 19.0181
- 34245.0000 2.4246 18.5770
- 34245.0000 2.9439 18.3836
- 34245.0000 3.5268 18.2940
- 34245.0000 4.1077 18.1930
- 34245.0000 4.6885 18.0912
- 34245.0000 5.2692 17.9893
- 34245.0000 5.8500 17.8875 rg
- 34245.0000 6.4420 17.5516
- 34245.0000 7.1118 17.4662
- 34245.0000 7.8009 17.4429
- 34245.0000 8.4901 17.4197
- 34245.0000 9.1797 17.4010
- 34245.0000 9.8711 17.4072
- 34245.0000 10.5625 17.4153
- 34245.0000 11.2539 17.4234
- 34245.0000 11.9453 17.4315
- 34245.0000 12.6367 17.4396
- 34245.0000 13.2297 17.7636
- 34245.0000 13.8000 18.1450 rd
- 34245.0000 14.0021 18.4050
- 34245.0000 14.2042 18.6650
- 34245.0000 14.4062 18.9250
- 34245.0000 14.6083 19.1850
- 34245.0000 14.8104 19.4450
- 34245.0000 15.0125 19.7050
- 34245.0000 15.2146 19.9650
- 34245.0000 15.4167 20.2250
- 34245.0000 15.6188 20.4850
- 34245.0000 15.8208 20.7450
- 34245.0000 16.0229 21.0050
- 34245.0000 16.2250 21.2650
- 999.9990 999.9990 0.0000
- 72 24 0 37 34295.0000
- 34295.0000 0.0000 21.3600
- 34295.0000 0.4562 20.9570
- 34295.0000 0.8449 20.4926
- 34295.0000 1.2024 20.0000
- 34295.0000 1.5600 19.5074
- 34295.0000 1.9175 19.0148
- 34295.0000 2.2751 18.5221
- 34295.0000 2.7919 18.2930
- 34295.0000 3.3943 18.2054
- 34295.0000 3.9958 18.1124
- 34295.0000 4.5972 18.0183
- 34295.0000 5.1986 17.9241
- 34295.0000 5.8000 17.8300 rg
- 34295.0000 6.3830 17.4219
- 34295.0000 7.0687 17.3438
- 34295.0000 7.7803 17.3485
- 34295.0000 8.4919 17.3533
- 34295.0000 9.2035 17.3580
- 34295.0000 9.9150 17.3663
- 34295.0000 10.6265 17.3771
- 34295.0000 11.3380 17.3878
- 34295.0000 12.0495 17.3986
- 34295.0000 12.7610 17.4094
- 34295.0000 13.3831 17.7453
- 34295.0000 14.0000 18.1000 rd
- 34295.0000 14.1750 18.3717
- 34295.0000 14.3500 18.6433
- 34295.0000 14.5250 18.9150
- 34295.0000 14.7000 19.1867
- 34295.0000 14.8750 19.4583
- 34295.0000 15.0500 19.7300
- 34295.0000 15.2250 20.0017
- 34295.0000 15.4000 20.2733
- 34295.0000 15.5750 20.5450
- 34295.0000 15.7500 20.8167
- 34295.0000 15.9250 21.0883
- 34295.0000 16.1000 21.3600
- 999.9990 999.9990 0.0000
- 73 25 0 37 34334.0000 amontPontT
- 34334.0000 0.0000 21.3600
- 34334.0000 0.4562 20.9570
- 34334.0000 0.8449 20.4926
- 34334.0000 1.2024 20.0000
- 34334.0000 1.5600 19.5074
- 34334.0000 1.9175 19.0148
- 34334.0000 2.2751 18.5221
- 34334.0000 2.7919 18.2930
- 34334.0000 3.3943 18.2054
- 34334.0000 3.9958 18.1124
- 34334.0000 4.5972 18.0183
- 34334.0000 5.1986 17.9241
- 34334.0000 5.8000 17.8300 rg
- 34334.0000 6.3830 17.4219
- 34334.0000 7.0687 17.3438
- 34334.0000 7.7803 17.3485
- 34334.0000 8.4919 17.3533
- 34334.0000 9.2035 17.3580
- 34334.0000 9.9150 17.3663
- 34334.0000 10.6265 17.3771
- 34334.0000 11.3380 17.3878
- 34334.0000 12.0495 17.3986
- 34334.0000 12.7610 17.4094
- 34334.0000 13.3831 17.7453
- 34334.0000 14.0000 18.1000 rd
- 34334.0000 14.1750 18.3525
- 34334.0000 14.3500 18.6050
- 34334.0000 14.5250 18.8575
- 34334.0000 14.7000 19.1100
- 34334.0000 14.8750 19.3625
- 34334.0000 15.0500 19.6150
- 34334.0000 15.2250 19.8675
- 34334.0000 15.4000 20.1200
- 34334.0000 15.5750 20.3725
- 34334.0000 15.7500 20.6250
- 34334.0000 15.9250 20.8775
- 34334.0000 16.1000 21.1300
- 999.9990 999.9990 0.0000
- 74 26 0 37 34335.0000 PontmThive
- 34335.0000 2.9000 20.7400
- 34335.0000 2.9000 20.5358
- 34335.0000 2.9000 20.3317
- 34335.0000 2.9000 20.1275
- 34335.0000 2.9000 19.9233
- 34335.0000 2.9000 19.7192
- 34335.0000 2.9000 19.5150
- 34335.0000 2.9000 19.3108
- 34335.0000 2.9000 19.1067
- 34335.0000 2.9000 18.9025
- 34335.0000 2.9000 18.6983
- 34335.0000 2.9000 18.4942
- 34335.0000 2.9000 18.2900 rg
- 34335.0000 3.8099 18.1600
- 34335.0000 4.7197 18.0300
- 34335.0000 5.6296 17.9001
- 34335.0000 6.5389 17.7670
- 34335.0000 7.4457 17.6168
- 34335.0000 8.3524 17.4666
- 34335.0000 9.2592 17.3164
- 34335.0000 10.1736 17.2600
- 34335.0000 11.0927 17.2600
- 34335.0000 12.0118 17.2600
- 34335.0000 12.8000 17.3909
- 34335.0000 12.8000 18.3100 rd
- 34335.0000 12.8000 18.5125
- 34335.0000 12.8000 18.7150
- 34335.0000 12.8000 18.9175
- 34335.0000 12.8000 19.1200
- 34335.0000 12.8000 19.3225
- 34335.0000 12.8000 19.5250
- 34335.0000 12.8000 19.7275
- 34335.0000 12.8000 19.9300
- 34335.0000 12.8000 20.1325
- 34335.0000 12.8000 20.3350
- 34335.0000 12.8000 20.5375
- 34335.0000 12.8000 20.7400
- 999.9990 999.9990 0.0000
- 75 27 0 37 34343.0000 PontvThive
- 34343.0000 2.9000 20.7400
- 34343.0000 2.9000 20.5358
- 34343.0000 2.9000 20.3317
- 34343.0000 2.9000 20.1275
- 34343.0000 2.9000 19.9233
- 34343.0000 2.9000 19.7192
- 34343.0000 2.9000 19.5150
- 34343.0000 2.9000 19.3108
- 34343.0000 2.9000 19.1067
- 34343.0000 2.9000 18.9025
- 34343.0000 2.9000 18.6983
- 34343.0000 2.9000 18.4942
- 34343.0000 2.9000 18.2900 rg
- 34343.0000 3.8082 18.1603
- 34343.0000 4.7164 18.0305
- 34343.0000 5.6246 17.9008
- 34343.0000 6.5324 17.7681
- 34343.0000 7.4375 17.6182
- 34343.0000 8.3426 17.4683
- 34343.0000 9.2477 17.3184
- 34343.0000 10.1603 17.2600
- 34343.0000 11.0777 17.2600
- 34343.0000 11.9951 17.2600
- 34343.0000 12.8000 17.3726
- 34343.0000 12.8000 18.2900 rd
- 34343.0000 12.8000 18.4942
- 34343.0000 12.8000 18.6983
- 34343.0000 12.8000 18.9025
- 34343.0000 12.8000 19.1067
- 34343.0000 12.8000 19.3108
- 34343.0000 12.8000 19.5150
- 34343.0000 12.8000 19.7192
- 34343.0000 12.8000 19.9233
- 34343.0000 12.8000 20.1275
- 34343.0000 12.8000 20.3317
- 34343.0000 12.8000 20.5358
- 34343.0000 12.8000 20.7400
- 999.9990 999.9990 0.0000
- 76 28 0 37 34345.0000 avalPontTh
- 34345.0000 0.0000 21.3600
- 34345.0000 0.4562 20.9570
- 34345.0000 0.8449 20.4926
- 34345.0000 1.2024 20.0000
- 34345.0000 1.5600 19.5074
- 34345.0000 1.9175 19.0148
- 34345.0000 2.2751 18.5221
- 34345.0000 2.7919 18.2930
- 34345.0000 3.3943 18.2054
- 34345.0000 3.9958 18.1124
- 34345.0000 4.5972 18.0183
- 34345.0000 5.1986 17.9241
- 34345.0000 5.8000 17.8300 rg
- 34345.0000 6.3832 17.4217
- 34345.0000 7.0692 17.3248
- 34345.0000 7.7809 17.3058
- 34345.0000 8.4926 17.2869
- 34345.0000 9.2042 17.2679
- 34345.0000 9.9156 17.2789
- 34345.0000 10.6268 17.3112
- 34345.0000 11.3380 17.3435
- 34345.0000 12.0492 17.3759
- 34345.0000 12.7604 17.4082
- 34345.0000 13.3828 17.7451
- 34345.0000 14.0000 18.1000 rd
- 34345.0000 14.1750 18.3525
- 34345.0000 14.3500 18.6050
- 34345.0000 14.5250 18.8575
- 34345.0000 14.7000 19.1100
- 34345.0000 14.8750 19.3625
- 34345.0000 15.0500 19.6150
- 34345.0000 15.2250 19.8675
- 34345.0000 15.4000 20.1200
- 34345.0000 15.5750 20.3725
- 34345.0000 15.7500 20.6250
- 34345.0000 15.9250 20.8775
- 34345.0000 16.1000 21.1300
- 999.9990 999.9990 0.0000
- 77 29 0 37 34405.0000
- 34405.0000 0.0000 21.1400
- 34405.0000 0.2417 20.8650
- 34405.0000 0.4833 20.5900
- 34405.0000 0.7250 20.3150
- 34405.0000 0.9667 20.0400
- 34405.0000 1.2083 19.7650
- 34405.0000 1.4500 19.4900
- 34405.0000 1.6917 19.2150
- 34405.0000 1.9333 18.9400
- 34405.0000 2.1750 18.6650
- 34405.0000 2.4167 18.3900
- 34405.0000 2.6583 18.1150
- 34405.0000 2.9000 17.8400 rg
- 34405.0000 3.8268 17.7341
- 34405.0000 4.7537 17.6281
- 34405.0000 5.6805 17.5222
- 34405.0000 6.6081 17.4244
- 34405.0000 7.5384 17.3546
- 34405.0000 8.4687 17.2848
- 34405.0000 9.3989 17.2151
- 34405.0000 10.3312 17.2046
- 34405.0000 11.2641 17.2104
- 34405.0000 12.1970 17.2162
- 34405.0000 13.0873 17.3819
- 34405.0000 13.9000 17.8400 rd
- 34405.0000 14.3250 18.1033
- 34405.0000 14.7500 18.3667
- 34405.0000 15.1750 18.6300
- 34405.0000 15.6000 18.8933
- 34405.0000 16.0250 19.1567
- 34405.0000 16.4500 19.4200
- 34405.0000 16.8750 19.6833
- 34405.0000 17.3000 19.9467
- 34405.0000 17.7250 20.2100
- 34405.0000 18.1500 20.4733
- 34405.0000 18.5750 20.7367
- 34405.0000 19.0000 21.0000
- 999.9990 999.9990 0.0000
- 78 29 1 37 34448.3333
- 34448.3333 0.0000 20.9567
- 34448.3333 0.2417 20.6942
- 34448.3333 0.4833 20.4317
- 34448.3333 0.7250 20.1692
- 34448.3333 0.9667 19.9067
- 34448.3333 1.2083 19.6442
- 34448.3333 1.4500 19.3817
- 34448.3333 1.6917 19.1192
- 34448.3333 1.9333 18.8567
- 34448.3333 2.1750 18.5942
- 34448.3333 2.4167 18.3317
- 34448.3333 2.6583 18.0692
- 34448.3333 2.9000 17.8067 rg
- 34448.3333 3.8187 17.6931
- 34448.3333 4.7374 17.5795
- 34448.3333 5.6561 17.4659
- 34448.3333 6.5757 17.3605
- 34448.3333 7.4991 17.2941
- 34448.3333 8.4225 17.2277
- 34448.3333 9.3459 17.1613
- 34448.3333 10.2710 17.1464
- 34448.3333 11.1968 17.1503
- 34448.3333 12.1226 17.1542
- 34448.3333 13.0115 17.2849
- 34448.3333 13.7667 17.8067 rd
- 34448.3333 14.1139 18.0617
- 34448.3333 14.4611 18.3167
- 34448.3333 14.8083 18.5717
- 34448.3333 15.1556 18.8267
- 34448.3333 15.5028 19.0817
- 34448.3333 15.8500 19.3367
- 34448.3333 16.1972 19.5917
- 34448.3333 16.5444 19.8467
- 34448.3333 16.8917 20.1017
- 34448.3333 17.2389 20.3567
- 34448.3333 17.5861 20.6117
- 34448.3333 17.9333 20.8667
- 999.9990 999.9990 0.0000
- 79 29 2 37 34491.6667
- 34491.6667 0.0000 20.7733
- 34491.6667 0.2417 20.5233
- 34491.6667 0.4833 20.2733
- 34491.6667 0.7250 20.0233
- 34491.6667 0.9667 19.7733
- 34491.6667 1.2083 19.5233
- 34491.6667 1.4500 19.2733
- 34491.6667 1.6917 19.0233
- 34491.6667 1.9333 18.7733
- 34491.6667 2.1750 18.5233
- 34491.6667 2.4167 18.2733
- 34491.6667 2.6583 18.0233
- 34491.6667 2.9000 17.7733 rg
- 34491.6667 3.8106 17.6521
- 34491.6667 4.7212 17.5308
- 34491.6667 5.6318 17.4096
- 34491.6667 6.5432 17.2966
- 34491.6667 7.4597 17.2336
- 34491.6667 8.3763 17.1705
- 34491.6667 9.2928 17.1075
- 34491.6667 10.2108 17.0882
- 34491.6667 11.1295 17.0901
- 34491.6667 12.0482 17.0921
- 34491.6667 12.9358 17.1879
- 34491.6667 13.6333 17.7733 rd
- 34491.6667 13.9028 18.0200
- 34491.6667 14.1722 18.2667
- 34491.6667 14.4417 18.5133
- 34491.6667 14.7111 18.7600
- 34491.6667 14.9806 19.0067
- 34491.6667 15.2500 19.2533
- 34491.6667 15.5194 19.5000
- 34491.6667 15.7889 19.7467
- 34491.6667 16.0583 19.9933
- 34491.6667 16.3278 20.2400
- 34491.6667 16.5972 20.4867
- 34491.6667 16.8667 20.7333
- 999.9990 999.9990 0.0000
- 80 30 0 37 34535.0000
- 34535.0000 0.0000 20.5900
- 34535.0000 0.2417 20.3525
- 34535.0000 0.4833 20.1150
- 34535.0000 0.7250 19.8775
- 34535.0000 0.9667 19.6400
- 34535.0000 1.2083 19.4025
- 34535.0000 1.4500 19.1650
- 34535.0000 1.6917 18.9275
- 34535.0000 1.9333 18.6900
- 34535.0000 2.1750 18.4525
- 34535.0000 2.4167 18.2150
- 34535.0000 2.6583 17.9775
- 34535.0000 2.9000 17.7400 rg
- 34535.0000 3.8025 17.6111
- 34535.0000 4.7049 17.4822
- 34535.0000 5.6074 17.3532
- 34535.0000 6.5107 17.2327
- 34535.0000 7.4204 17.1730
- 34535.0000 8.3300 17.1133
- 34535.0000 9.2397 17.0536
- 34535.0000 10.1506 17.0300
- 34535.0000 11.0622 17.0300
- 34535.0000 11.9738 17.0300
- 34535.0000 12.8600 17.0908
- 34535.0000 13.5000 17.7400 rd
- 34535.0000 13.6917 17.9783
- 34535.0000 13.8833 18.2167
- 34535.0000 14.0750 18.4550
- 34535.0000 14.2667 18.6933
- 34535.0000 14.4583 18.9317
- 34535.0000 14.6500 19.1700
- 34535.0000 14.8417 19.4083
- 34535.0000 15.0333 19.6467
- 34535.0000 15.2250 19.8850
- 34535.0000 15.4167 20.1233
- 34535.0000 15.6083 20.3617
- 34535.0000 15.8000 20.6000
- 999.9990 999.9990 0.0000
- 81 30 1 37 34591.6667
- 34591.6667 0.0000 20.5600
- 34591.6667 0.2417 20.3214
- 34591.6667 0.4833 20.0828
- 34591.6667 0.7250 19.8442
- 34591.6667 0.9667 19.6056
- 34591.6667 1.2083 19.3669
- 34591.6667 1.4500 19.1283
- 34591.6667 1.6917 18.8897
- 34591.6667 1.9333 18.6511
- 34591.6667 2.1750 18.4125
- 34591.6667 2.4167 18.1739
- 34591.6667 2.6583 17.9353
- 34591.6667 2.9000 17.6967 rg
- 34591.6667 3.8208 17.5651
- 34591.6667 4.7417 17.4336
- 34591.6667 5.6625 17.3020
- 34591.6667 6.5847 17.1828
- 34591.6667 7.5126 17.1169
- 34591.6667 8.4404 17.0510
- 34591.6667 9.3683 16.9858
- 34591.6667 10.2979 16.9700
- 34591.6667 11.2281 16.9700
- 34591.6667 12.1583 16.9700
- 34591.6667 13.0072 17.1708
- 34591.6667 13.6667 17.8267 rd
- 34591.6667 13.8556 18.0558
- 34591.6667 14.0444 18.2850
- 34591.6667 14.2333 18.5142
- 34591.6667 14.4222 18.7433
- 34591.6667 14.6111 18.9725
- 34591.6667 14.8000 19.2017
- 34591.6667 14.9889 19.4308
- 34591.6667 15.1778 19.6600
- 34591.6667 15.3667 19.8892
- 34591.6667 15.5556 20.1183
- 34591.6667 15.7444 20.3475
- 34591.6667 15.9333 20.5767
- 999.9990 999.9990 0.0000
- 82 30 2 37 34648.3333
- 34648.3333 0.0000 20.5300
- 34648.3333 0.2417 20.2903
- 34648.3333 0.4833 20.0506
- 34648.3333 0.7250 19.8108
- 34648.3333 0.9667 19.5711
- 34648.3333 1.2083 19.3314
- 34648.3333 1.4500 19.0917
- 34648.3333 1.6917 18.8519
- 34648.3333 1.9333 18.6122
- 34648.3333 2.1750 18.3725
- 34648.3333 2.4167 18.1328
- 34648.3333 2.6583 17.8931
- 34648.3333 2.9000 17.6533 rg
- 34648.3333 3.8392 17.5192
- 34648.3333 4.7785 17.3850
- 34648.3333 5.7177 17.2508
- 34648.3333 6.6587 17.1329
- 34648.3333 7.6047 17.0608
- 34648.3333 8.5507 16.9886
- 34648.3333 9.4968 16.9179
- 34648.3333 10.4453 16.9100
- 34648.3333 11.3941 16.9100
- 34648.3333 12.3429 16.9100
- 34648.3333 13.1544 17.2507
- 34648.3333 13.8333 17.9133 rd
- 34648.3333 14.0194 18.1333
- 34648.3333 14.2056 18.3533
- 34648.3333 14.3917 18.5733
- 34648.3333 14.5778 18.7933
- 34648.3333 14.7639 19.0133
- 34648.3333 14.9500 19.2333
- 34648.3333 15.1361 19.4533
- 34648.3333 15.3222 19.6733
- 34648.3333 15.5083 19.8933
- 34648.3333 15.6944 20.1133
- 34648.3333 15.8806 20.3333
- 34648.3333 16.0667 20.5533
- 999.9990 999.9990 0.0000
- 83 31 0 37 34705.0000
- 34705.0000 0.0000 20.5000
- 34705.0000 0.2417 20.2592
- 34705.0000 0.4833 20.0183
- 34705.0000 0.7250 19.7775
- 34705.0000 0.9667 19.5367
- 34705.0000 1.2083 19.2958
- 34705.0000 1.4500 19.0550
- 34705.0000 1.6917 18.8142
- 34705.0000 1.9333 18.5733
- 34705.0000 2.1750 18.3325
- 34705.0000 2.4167 18.0917
- 34705.0000 2.6583 17.8508
- 34705.0000 2.9000 17.6100 rg
- 34705.0000 3.8576 17.4732
- 34705.0000 4.8152 17.3364
- 34705.0000 5.7729 17.1996
- 34705.0000 6.7328 17.0830
- 34705.0000 7.6969 17.0046
- 34705.0000 8.6611 16.9263
- 34705.0000 9.6253 16.8500
- 34705.0000 10.5927 16.8500
- 34705.0000 11.5600 16.8500
- 34705.0000 12.5274 16.8500
- 34705.0000 13.3016 17.3307
- 34705.0000 14.0000 18.0000 rd
- 34705.0000 14.1833 18.2108
- 34705.0000 14.3667 18.4217
- 34705.0000 14.5500 18.6325
- 34705.0000 14.7333 18.8433
- 34705.0000 14.9167 19.0542
- 34705.0000 15.1000 19.2650
- 34705.0000 15.2833 19.4758
- 34705.0000 15.4667 19.6867
- 34705.0000 15.6500 19.8975
- 34705.0000 15.8333 20.1083
- 34705.0000 16.0167 20.3192
- 34705.0000 16.2000 20.5300
- 999.9990 999.9990 0.0000
- 84 31 1 37 34765.0000
- 34765.0000 0.0000 20.5600
- 34765.0000 0.2417 20.3104
- 34765.0000 0.4833 20.0608
- 34765.0000 0.7250 19.8113
- 34765.0000 0.9667 19.5617
- 34765.0000 1.2083 19.3121
- 34765.0000 1.4500 19.0625
- 34765.0000 1.6917 18.8129
- 34765.0000 1.9333 18.5633
- 34765.0000 2.1750 18.3137
- 34765.0000 2.4167 18.0642
- 34765.0000 2.6583 17.8146
- 34765.0000 2.9000 17.5650 rg
- 34765.0000 3.8334 17.4317
- 34765.0000 4.7668 17.2983
- 34765.0000 5.7002 17.1650
- 34765.0000 6.6351 17.0448
- 34765.0000 7.5743 16.9614
- 34765.0000 8.5134 16.8779
- 34765.0000 9.4526 16.7955
- 34765.0000 10.3948 16.7800
- 34765.0000 11.3377 16.7800
- 34765.0000 12.2805 16.7800
- 34765.0000 13.1005 17.0779
- 34765.0000 13.7500 17.7600 rd
- 34765.0000 13.9542 17.9896
- 34765.0000 14.1583 18.2192
- 34765.0000 14.3625 18.4488
- 34765.0000 14.5667 18.6783
- 34765.0000 14.7708 18.9079
- 34765.0000 14.9750 19.1375
- 34765.0000 15.1792 19.3671
- 34765.0000 15.3833 19.5967
- 34765.0000 15.5875 19.8263
- 34765.0000 15.7917 20.0558
- 34765.0000 15.9958 20.2854
- 34765.0000 16.2000 20.5150
- 999.9990 999.9990 0.0000
- 85 32 0 37 34825.0000
- 34825.0000 0.0000 20.6200
- 34825.0000 0.2417 20.3617
- 34825.0000 0.4833 20.1033
- 34825.0000 0.7250 19.8450
- 34825.0000 0.9667 19.5867
- 34825.0000 1.2083 19.3283
- 34825.0000 1.4500 19.0700
- 34825.0000 1.6917 18.8117
- 34825.0000 1.9333 18.5533
- 34825.0000 2.1750 18.2950
- 34825.0000 2.4167 18.0367
- 34825.0000 2.6583 17.7783
- 34825.0000 2.9000 17.5200 rg
- 34825.0000 3.8092 17.3901
- 34825.0000 4.7184 17.2602
- 34825.0000 5.6276 17.1303
- 34825.0000 6.5375 17.0067
- 34825.0000 7.4517 16.9181
- 34825.0000 8.3658 16.8296
- 34825.0000 9.2799 16.7410
- 34825.0000 10.1969 16.7100
- 34825.0000 11.1153 16.7100
- 34825.0000 12.0337 16.7100
- 34825.0000 12.8995 16.8251
- 34825.0000 13.5000 17.5200 rd
- 34825.0000 13.7250 17.7683
- 34825.0000 13.9500 18.0167
- 34825.0000 14.1750 18.2650
- 34825.0000 14.4000 18.5133
- 34825.0000 14.6250 18.7617
- 34825.0000 14.8500 19.0100
- 34825.0000 15.0750 19.2583
- 34825.0000 15.3000 19.5067
- 34825.0000 15.5250 19.7550
- 34825.0000 15.7500 20.0033
- 34825.0000 15.9750 20.2517
- 34825.0000 16.2000 20.5000
- 999.9990 999.9990 0.0000
- 86 32 1 37 34881.6667
- 34881.6667 0.0000 20.5433
- 34881.6667 0.2417 20.2878
- 34881.6667 0.4833 20.0322
- 34881.6667 0.7250 19.7767
- 34881.6667 0.9667 19.5211
- 34881.6667 1.2083 19.2656
- 34881.6667 1.4500 19.0100
- 34881.6667 1.6917 18.7544
- 34881.6667 1.9333 18.4989
- 34881.6667 2.1750 18.2433
- 34881.6667 2.4167 17.9878
- 34881.6667 2.6583 17.7322
- 34881.6667 2.9000 17.4767 rg
- 34881.6667 3.8130 17.3462
- 34881.6667 4.7260 17.2158
- 34881.6667 5.6390 17.0854
- 34881.6667 6.5528 16.9609
- 34881.6667 7.4702 16.8672
- 34881.6667 8.3877 16.7735
- 34881.6667 9.3052 16.6798
- 34881.6667 10.2260 16.6500
- 34881.6667 11.1483 16.6500
- 34881.6667 12.0705 16.6500
- 34881.6667 12.9270 16.7950
- 34881.6667 13.5333 17.4900 rd
- 34881.6667 13.7556 17.7358
- 34881.6667 13.9778 17.9817
- 34881.6667 14.2000 18.2275
- 34881.6667 14.4222 18.4733
- 34881.6667 14.6444 18.7192
- 34881.6667 14.8667 18.9650
- 34881.6667 15.0889 19.2108
- 34881.6667 15.3111 19.4567
- 34881.6667 15.5333 19.7025
- 34881.6667 15.7556 19.9483
- 34881.6667 15.9778 20.1942
- 34881.6667 16.2000 20.4400
- 999.9990 999.9990 0.0000
- 87 32 2 37 34938.3333
- 34938.3333 0.0000 20.4667
- 34938.3333 0.2417 20.2139
- 34938.3333 0.4833 19.9611
- 34938.3333 0.7250 19.7083
- 34938.3333 0.9667 19.4556
- 34938.3333 1.2083 19.2028
- 34938.3333 1.4500 18.9500
- 34938.3333 1.6917 18.6972
- 34938.3333 1.9333 18.4444
- 34938.3333 2.1750 18.1917
- 34938.3333 2.4167 17.9389
- 34938.3333 2.6583 17.6861
- 34938.3333 2.9000 17.4333 rg
- 34938.3333 3.8168 17.3024
- 34938.3333 4.7337 17.1714
- 34938.3333 5.6505 17.0404
- 34938.3333 6.5680 16.9151
- 34938.3333 7.4888 16.8163
- 34938.3333 8.4097 16.7175
- 34938.3333 9.3305 16.6187
- 34938.3333 10.2551 16.5900
- 34938.3333 11.1812 16.5900
- 34938.3333 12.1074 16.5900
- 34938.3333 12.9546 16.7650
- 34938.3333 13.5667 17.4600 rd
- 34938.3333 13.7861 17.7033
- 34938.3333 14.0056 17.9467
- 34938.3333 14.2250 18.1900
- 34938.3333 14.4444 18.4333
- 34938.3333 14.6639 18.6767
- 34938.3333 14.8833 18.9200
- 34938.3333 15.1028 19.1633
- 34938.3333 15.3222 19.4067
- 34938.3333 15.5417 19.6500
- 34938.3333 15.7611 19.8933
- 34938.3333 15.9806 20.1367
- 34938.3333 16.2000 20.3800
- 999.9990 999.9990 0.0000
- 88 33 0 37 34995.0000
- 34995.0000 0.0000 20.3900
- 34995.0000 0.2417 20.1400
- 34995.0000 0.4833 19.8900
- 34995.0000 0.7250 19.6400
- 34995.0000 0.9667 19.3900
- 34995.0000 1.2083 19.1400
- 34995.0000 1.4500 18.8900
- 34995.0000 1.6917 18.6400
- 34995.0000 1.9333 18.3900
- 34995.0000 2.1750 18.1400
- 34995.0000 2.4167 17.8900
- 34995.0000 2.6583 17.6400
- 34995.0000 2.9000 17.3900 rg
- 34995.0000 3.8206 17.2585
- 34995.0000 4.7413 17.1270
- 34995.0000 5.6619 16.9954
- 34995.0000 6.5833 16.8694
- 34995.0000 7.5074 16.7654
- 34995.0000 8.4316 16.6614
- 34995.0000 9.3558 16.5575
- 34995.0000 10.2842 16.5300
- 34995.0000 11.2142 16.5300
- 34995.0000 12.1442 16.5300
- 34995.0000 12.9821 16.7349
- 34995.0000 13.6000 17.4300 rd
- 34995.0000 13.8167 17.6708
- 34995.0000 14.0333 17.9117
- 34995.0000 14.2500 18.1525
- 34995.0000 14.4667 18.3933
- 34995.0000 14.6833 18.6342
- 34995.0000 14.9000 18.8750
- 34995.0000 15.1167 19.1158
- 34995.0000 15.3333 19.3567
- 34995.0000 15.5500 19.5975
- 34995.0000 15.7667 19.8383
- 34995.0000 15.9833 20.0792
- 34995.0000 16.2000 20.3200
- 999.9990 999.9990 0.0000
- 89 33 1 37 35041.6667
- 35041.6667 0.0000 20.3133
- 35041.6667 0.2417 20.0669
- 35041.6667 0.4833 19.8206
- 35041.6667 0.7250 19.5742
- 35041.6667 0.9667 19.3278
- 35041.6667 1.2083 19.0814
- 35041.6667 1.4500 18.8350
- 35041.6667 1.6917 18.5886
- 35041.6667 1.9333 18.3422
- 35041.6667 2.1750 18.0958
- 35041.6667 2.4167 17.8494
- 35041.6667 2.6583 17.6031
- 35041.6667 2.9000 17.3567 rg
- 35041.6667 3.8273 17.2242
- 35041.6667 4.7546 17.0917
- 35041.6667 5.6820 16.9592
- 35041.6667 6.6101 16.8330
- 35041.6667 7.5409 16.7283
- 35041.6667 8.4718 16.6236
- 35041.6667 9.4027 16.5189
- 35041.6667 10.3381 16.4967
- 35041.6667 11.2749 16.4967
- 35041.6667 12.2116 16.4967
- 35041.6667 13.0473 16.7408
- 35041.6667 13.7000 17.4100 rd
- 35041.6667 13.9083 17.6453
- 35041.6667 14.1167 17.8806
- 35041.6667 14.3250 18.1158
- 35041.6667 14.5333 18.3511
- 35041.6667 14.7417 18.5864
- 35041.6667 14.9500 18.8217
- 35041.6667 15.1583 19.0569
- 35041.6667 15.3667 19.2922
- 35041.6667 15.5750 19.5275
- 35041.6667 15.7833 19.7628
- 35041.6667 15.9917 19.9981
- 35041.6667 16.2000 20.2333
- 999.9990 999.9990 0.0000
- 90 33 2 37 35088.3333
- 35088.3333 0.0000 20.2367
- 35088.3333 0.2417 19.9939
- 35088.3333 0.4833 19.7511
- 35088.3333 0.7250 19.5083
- 35088.3333 0.9667 19.2656
- 35088.3333 1.2083 19.0228
- 35088.3333 1.4500 18.7800
- 35088.3333 1.6917 18.5372
- 35088.3333 1.9333 18.2944
- 35088.3333 2.1750 18.0517
- 35088.3333 2.4167 17.8089
- 35088.3333 2.6583 17.5661
- 35088.3333 2.9000 17.3233 rg
- 35088.3333 3.8340 17.1899
- 35088.3333 4.7680 17.0565
- 35088.3333 5.7020 16.9230
- 35088.3333 6.6369 16.7967
- 35088.3333 7.5744 16.6912
- 35088.3333 8.5120 16.5857
- 35088.3333 9.4496 16.4803
- 35088.3333 10.3921 16.4633
- 35088.3333 11.3356 16.4633
- 35088.3333 12.2791 16.4633
- 35088.3333 13.1125 16.7468
- 35088.3333 13.8000 17.3900 rd
- 35088.3333 14.0000 17.6197
- 35088.3333 14.2000 17.8494
- 35088.3333 14.4000 18.0792
- 35088.3333 14.6000 18.3089
- 35088.3333 14.8000 18.5386
- 35088.3333 15.0000 18.7683
- 35088.3333 15.2000 18.9981
- 35088.3333 15.4000 19.2278
- 35088.3333 15.6000 19.4575
- 35088.3333 15.8000 19.6872
- 35088.3333 16.0000 19.9169
- 35088.3333 16.2000 20.1467
- 999.9990 999.9990 0.0000
- 91 34 0 37 35135.0000
- 35135.0000 0.0000 20.1600
- 35135.0000 0.2417 19.9208
- 35135.0000 0.4833 19.6817
- 35135.0000 0.7250 19.4425
- 35135.0000 0.9667 19.2033
- 35135.0000 1.2083 18.9642
- 35135.0000 1.4500 18.7250
- 35135.0000 1.6917 18.4858
- 35135.0000 1.9333 18.2467
- 35135.0000 2.1750 18.0075
- 35135.0000 2.4167 17.7683
- 35135.0000 2.6583 17.5292
- 35135.0000 2.9000 17.2900 rg
- 35135.0000 3.8407 17.1556
- 35135.0000 4.7813 17.0212
- 35135.0000 5.7220 16.8869
- 35135.0000 6.6637 16.7603
- 35135.0000 7.6079 16.6541
- 35135.0000 8.5522 16.5479
- 35135.0000 9.4965 16.4416
- 35135.0000 10.4460 16.4300
- 35135.0000 11.3963 16.4300
- 35135.0000 12.3465 16.4300
- 35135.0000 13.1776 16.7527
- 35135.0000 13.9000 17.3700 rd
- 35135.0000 14.0917 17.5942
- 35135.0000 14.2833 17.8183
- 35135.0000 14.4750 18.0425
- 35135.0000 14.6667 18.2667
- 35135.0000 14.8583 18.4908
- 35135.0000 15.0500 18.7150
- 35135.0000 15.2417 18.9392
- 35135.0000 15.4333 19.1633
- 35135.0000 15.6250 19.3875
- 35135.0000 15.8167 19.6117
- 35135.0000 16.0083 19.8358
- 35135.0000 16.2000 20.0600
- 999.9990 999.9990 0.0000
- 92 34 1 37 35180.0000
- 35180.0000 0.0000 20.1000
- 35180.0000 0.2417 19.8630
- 35180.0000 0.4833 19.6260
- 35180.0000 0.7250 19.3890
- 35180.0000 0.9667 19.1520
- 35180.0000 1.2083 18.9150
- 35180.0000 1.4500 18.6780
- 35180.0000 1.6917 18.4410
- 35180.0000 1.9333 18.2040
- 35180.0000 2.1750 17.9670
- 35180.0000 2.4167 17.7300
- 35180.0000 2.6583 17.4930
- 35180.0000 2.9000 17.2560 rg
- 35180.0000 3.8373 17.1221
- 35180.0000 4.7747 16.9882
- 35180.0000 5.7120 16.8543
- 35180.0000 6.6503 16.7278
- 35180.0000 7.5912 16.6220
- 35180.0000 8.5321 16.5161
- 35180.0000 9.4730 16.4103
- 35180.0000 10.4191 16.3960
- 35180.0000 11.3660 16.3960
- 35180.0000 12.3128 16.3960
- 35180.0000 13.1471 16.6972
- 35180.0000 13.8600 17.3200 rd
- 35180.0000 14.0550 17.5383
- 35180.0000 14.2500 17.7567
- 35180.0000 14.4450 17.9750
- 35180.0000 14.6400 18.1933
- 35180.0000 14.8350 18.4117
- 35180.0000 15.0300 18.6300
- 35180.0000 15.2250 18.8483
- 35180.0000 15.4200 19.0667
- 35180.0000 15.6150 19.2850
- 35180.0000 15.8100 19.5033
- 35180.0000 16.0050 19.7217
- 35180.0000 16.2000 19.9400
- 999.9990 999.9990 0.0000
- 93 34 2 37 35225.0000
- 35225.0000 0.0000 20.0400
- 35225.0000 0.2417 19.8052
- 35225.0000 0.4833 19.5703
- 35225.0000 0.7250 19.3355
- 35225.0000 0.9667 19.1007
- 35225.0000 1.2083 18.8658
- 35225.0000 1.4500 18.6310
- 35225.0000 1.6917 18.3962
- 35225.0000 1.9333 18.1613
- 35225.0000 2.1750 17.9265
- 35225.0000 2.4167 17.6917
- 35225.0000 2.6583 17.4568
- 35225.0000 2.9000 17.2220 rg
- 35225.0000 3.8340 17.0886
- 35225.0000 4.7680 16.9551
- 35225.0000 5.7020 16.8217
- 35225.0000 6.6369 16.6953
- 35225.0000 7.5745 16.5899
- 35225.0000 8.5120 16.4844
- 35225.0000 9.4496 16.3789
- 35225.0000 10.3922 16.3620
- 35225.0000 11.3356 16.3620
- 35225.0000 12.2791 16.3620
- 35225.0000 13.1166 16.6417
- 35225.0000 13.8200 17.2700 rd
- 35225.0000 14.0183 17.4825
- 35225.0000 14.2167 17.6950
- 35225.0000 14.4150 17.9075
- 35225.0000 14.6133 18.1200
- 35225.0000 14.8117 18.3325
- 35225.0000 15.0100 18.5450
- 35225.0000 15.2083 18.7575
- 35225.0000 15.4067 18.9700
- 35225.0000 15.6050 19.1825
- 35225.0000 15.8033 19.3950
- 35225.0000 16.0017 19.6075
- 35225.0000 16.2000 19.8200
- 999.9990 999.9990 0.0000
- 94 34 3 37 35270.0000
- 35270.0000 0.0000 19.9800
- 35270.0000 0.2417 19.7473
- 35270.0000 0.4833 19.5147
- 35270.0000 0.7250 19.2820
- 35270.0000 0.9667 19.0493
- 35270.0000 1.2083 18.8167
- 35270.0000 1.4500 18.5840
- 35270.0000 1.6917 18.3513
- 35270.0000 1.9333 18.1187
- 35270.0000 2.1750 17.8860
- 35270.0000 2.4167 17.6533
- 35270.0000 2.6583 17.4207
- 35270.0000 2.9000 17.1880 rg
- 35270.0000 3.8307 17.0550
- 35270.0000 4.7613 16.9221
- 35270.0000 5.6920 16.7891
- 35270.0000 6.6235 16.6629
- 35270.0000 7.5577 16.5578
- 35270.0000 8.4920 16.4527
- 35270.0000 9.4262 16.3476
- 35270.0000 10.3652 16.3280
- 35270.0000 11.3053 16.3280
- 35270.0000 12.2454 16.3280
- 35270.0000 13.0862 16.5862
- 35270.0000 13.7800 17.2200 rd
- 35270.0000 13.9817 17.4267
- 35270.0000 14.1833 17.6333
- 35270.0000 14.3850 17.8400
- 35270.0000 14.5867 18.0467
- 35270.0000 14.7883 18.2533
- 35270.0000 14.9900 18.4600
- 35270.0000 15.1917 18.6667
- 35270.0000 15.3933 18.8733
- 35270.0000 15.5950 19.0800
- 35270.0000 15.7967 19.2867
- 35270.0000 15.9983 19.4933
- 35270.0000 16.2000 19.7000
- 999.9990 999.9990 0.0000
- 95 34 4 37 35315.0000
- 35315.0000 0.0000 19.9200
- 35315.0000 0.2417 19.6895
- 35315.0000 0.4833 19.4590
- 35315.0000 0.7250 19.2285
- 35315.0000 0.9667 18.9980
- 35315.0000 1.2083 18.7675
- 35315.0000 1.4500 18.5370
- 35315.0000 1.6917 18.3065
- 35315.0000 1.9333 18.0760
- 35315.0000 2.1750 17.8455
- 35315.0000 2.4167 17.6150
- 35315.0000 2.6583 17.3845
- 35315.0000 2.9000 17.1540 rg
- 35315.0000 3.8273 17.0215
- 35315.0000 4.7547 16.8890
- 35315.0000 5.6820 16.7566
- 35315.0000 6.6101 16.6304
- 35315.0000 7.5410 16.5256
- 35315.0000 8.4719 16.4209
- 35315.0000 9.4028 16.3162
- 35315.0000 10.3383 16.2940
- 35315.0000 11.2750 16.2940
- 35315.0000 12.2118 16.2940
- 35315.0000 13.0557 16.5307
- 35315.0000 13.7400 17.1700 rd
- 35315.0000 13.9450 17.3708
- 35315.0000 14.1500 17.5717
- 35315.0000 14.3550 17.7725
- 35315.0000 14.5600 17.9733
- 35315.0000 14.7650 18.1742
- 35315.0000 14.9700 18.3750
- 35315.0000 15.1750 18.5758
- 35315.0000 15.3800 18.7767
- 35315.0000 15.5850 18.9775
- 35315.0000 15.7900 19.1783
- 35315.0000 15.9950 19.3792
- 35315.0000 16.2000 19.5800
- 999.9990 999.9990 0.0000
- 96 35 0 37 35360.0000
- 35360.0000 0.0000 19.8600
- 35360.0000 0.2417 19.6317
- 35360.0000 0.4833 19.4033
- 35360.0000 0.7250 19.1750
- 35360.0000 0.9667 18.9467
- 35360.0000 1.2083 18.7183
- 35360.0000 1.4500 18.4900
- 35360.0000 1.6917 18.2617
- 35360.0000 1.9333 18.0333
- 35360.0000 2.1750 17.8050
- 35360.0000 2.4167 17.5767
- 35360.0000 2.6583 17.3483
- 35360.0000 2.9000 17.1200 rg
- 35360.0000 3.8240 16.9880
- 35360.0000 4.7480 16.8560
- 35360.0000 5.6720 16.7240
- 35360.0000 6.5967 16.5979
- 35360.0000 7.5243 16.4935
- 35360.0000 8.4518 16.3892
- 35360.0000 9.3793 16.2848
- 35360.0000 10.3113 16.2600
- 35360.0000 11.2447 16.2600
- 35360.0000 12.1781 16.2600
- 35360.0000 13.0252 16.4752
- 35360.0000 13.7000 17.1200 rd
- 35360.0000 13.9083 17.3150
- 35360.0000 14.1167 17.5100
- 35360.0000 14.3250 17.7050
- 35360.0000 14.5333 17.9000
- 35360.0000 14.7417 18.0950
- 35360.0000 14.9500 18.2900
- 35360.0000 15.1583 18.4850
- 35360.0000 15.3667 18.6800
- 35360.0000 15.5750 18.8750
- 35360.0000 15.7833 19.0700
- 35360.0000 15.9917 19.2650
- 35360.0000 16.2000 19.4600
- 999.9990 999.9990 0.0000
- 97 35 1 37 35415.0000
- 35415.0000 0.0000 19.8950
- 35415.0000 0.2417 19.6602
- 35415.0000 0.4833 19.4254
- 35415.0000 0.7250 19.1906
- 35415.0000 0.9667 18.9558
- 35415.0000 1.2083 18.7210
- 35415.0000 1.4500 18.4863
- 35415.0000 1.6917 18.2515
- 35415.0000 1.9333 18.0167
- 35415.0000 2.1750 17.7819
- 35415.0000 2.4167 17.5471
- 35415.0000 2.6583 17.3123
- 35415.0000 2.9000 17.0775 rg
- 35415.0000 3.8023 16.7626
- 35415.0000 4.8961 16.6617
- 35415.0000 5.9899 16.5609
- 35415.0000 7.0843 16.4644
- 35415.0000 8.1807 16.3842
- 35415.0000 9.2772 16.3047
- 35415.0000 10.3736 16.2283
- 35415.0000 11.4734 16.2116
- 35415.0000 12.5742 16.2135
- 35415.0000 13.6751 16.2153
- 35415.0000 14.7112 16.3786
- 35415.0000 15.5250 17.0975 rd
- 35415.0000 15.7229 17.2952
- 35415.0000 15.9208 17.4929
- 35415.0000 16.1187 17.6906
- 35415.0000 16.3167 17.8883
- 35415.0000 16.5146 18.0860
- 35415.0000 16.7125 18.2837
- 35415.0000 16.9104 18.4815
- 35415.0000 17.1083 18.6792
- 35415.0000 17.3062 18.8769
- 35415.0000 17.5042 19.0746
- 35415.0000 17.7021 19.2723
- 35415.0000 17.9000 19.4700
- 999.9990 999.9990 0.0000
- 98 35 2 37 35470.0000
- 35470.0000 0.0000 19.9300
- 35470.0000 0.2417 19.6887
- 35470.0000 0.4833 19.4475
- 35470.0000 0.7250 19.2063
- 35470.0000 0.9667 18.9650
- 35470.0000 1.2083 18.7238
- 35470.0000 1.4500 18.4825
- 35470.0000 1.6917 18.2413
- 35470.0000 1.9333 18.0000
- 35470.0000 2.1750 17.7587
- 35470.0000 2.4167 17.5175
- 35470.0000 2.6583 17.2762
- 35470.0000 2.9000 17.0350 rg
- 35470.0000 3.7807 16.5373
- 35470.0000 5.0443 16.4675
- 35470.0000 6.3079 16.3977
- 35470.0000 7.5718 16.3309
- 35470.0000 8.8372 16.2749
- 35470.0000 10.1026 16.2202
- 35470.0000 11.3679 16.1718
- 35470.0000 12.6355 16.1631
- 35470.0000 13.9038 16.1669
- 35470.0000 15.1721 16.1707
- 35470.0000 16.3972 16.2820
- 35470.0000 17.3500 17.0750 rd
- 35470.0000 17.5375 17.2754
- 35470.0000 17.7250 17.4758
- 35470.0000 17.9125 17.6763
- 35470.0000 18.1000 17.8767
- 35470.0000 18.2875 18.0771
- 35470.0000 18.4750 18.2775
- 35470.0000 18.6625 18.4779
- 35470.0000 18.8500 18.6783
- 35470.0000 19.0375 18.8788
- 35470.0000 19.2250 19.0792
- 35470.0000 19.4125 19.2796
- 35470.0000 19.6000 19.4800
- 999.9990 999.9990 0.0000
- 99 35 3 37 35525.0000
- 35525.0000 0.0000 19.9650
- 35525.0000 0.2417 19.7173
- 35525.0000 0.4833 19.4696
- 35525.0000 0.7250 19.2219
- 35525.0000 0.9667 18.9742
- 35525.0000 1.2083 18.7265
- 35525.0000 1.4500 18.4788
- 35525.0000 1.6917 18.2310
- 35525.0000 1.9333 17.9833
- 35525.0000 2.1750 17.7356
- 35525.0000 2.4167 17.4879
- 35525.0000 2.6583 17.2402
- 35525.0000 2.9000 16.9925 rg
- 35525.0000 3.7590 16.3119
- 35525.0000 5.1924 16.2732
- 35525.0000 6.6258 16.2346
- 35525.0000 8.0594 16.1974
- 35525.0000 9.4937 16.1656
- 35525.0000 10.9279 16.1357
- 35525.0000 12.3622 16.1153
- 35525.0000 13.7976 16.1147
- 35525.0000 15.2333 16.1204
- 35525.0000 16.6691 16.1260
- 35525.0000 18.0832 16.1855
- 35525.0000 19.1750 17.0525 rd
- 35525.0000 19.3521 17.2556
- 35525.0000 19.5292 17.4588
- 35525.0000 19.7063 17.6619
- 35525.0000 19.8833 17.8650
- 35525.0000 20.0604 18.0681
- 35525.0000 20.2375 18.2713
- 35525.0000 20.4146 18.4744
- 35525.0000 20.5917 18.6775
- 35525.0000 20.7688 18.8806
- 35525.0000 20.9458 19.0838
- 35525.0000 21.1229 19.2869
- 35525.0000 21.3000 19.4900
- 999.9990 999.9990 0.0000
- 100 36 0 37 35580.0000
- 35580.0000 0.0000 20.0000
- 35580.0000 0.2417 19.7458
- 35580.0000 0.4833 19.4917
- 35580.0000 0.7250 19.2375
- 35580.0000 0.9667 18.9833
- 35580.0000 1.2083 18.7292
- 35580.0000 1.4500 18.4750
- 35580.0000 1.6917 18.2208
- 35580.0000 1.9333 17.9667
- 35580.0000 2.1750 17.7125
- 35580.0000 2.4167 17.4583
- 35580.0000 2.6583 17.2042
- 35580.0000 2.9000 16.9500 rg
- 35580.0000 3.7374 16.0865
- 35580.0000 5.3406 16.0790
- 35580.0000 6.9438 16.0714
- 35580.0000 8.5470 16.0639
- 35580.0000 10.1501 16.0564
- 35580.0000 11.7533 16.0512
- 35580.0000 13.3565 16.0587
- 35580.0000 14.9597 16.0663
- 35580.0000 16.5629 16.0738
- 35580.0000 18.1661 16.0814
- 35580.0000 19.7692 16.0889
- 35580.0000 21.0000 17.0300 rd
- 35580.0000 21.1667 17.2358
- 35580.0000 21.3333 17.4417
- 35580.0000 21.5000 17.6475
- 35580.0000 21.6667 17.8533
- 35580.0000 21.8333 18.0592
- 35580.0000 22.0000 18.2650
- 35580.0000 22.1667 18.4708
- 35580.0000 22.3333 18.6767
- 35580.0000 22.5000 18.8825
- 35580.0000 22.6667 19.0883
- 35580.0000 22.8333 19.2942
- 35580.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 101 36 1 37 35628.5714
- 35628.5714 0.0000 20.0000
- 35628.5714 0.2333 19.7348
- 35628.5714 0.4667 19.4695
- 35628.5714 0.7000 19.2043
- 35628.5714 0.9333 18.9390
- 35628.5714 1.1667 18.6738
- 35628.5714 1.4000 18.4086
- 35628.5714 1.6333 18.1433
- 35628.5714 1.8667 17.8781
- 35628.5714 2.1000 17.6129
- 35628.5714 2.3333 17.3476
- 35628.5714 2.5667 17.0824
- 35628.5714 2.8000 16.8171 rg
- 35628.5714 3.6358 15.8670
- 35628.5714 5.2528 15.8591
- 35628.5714 6.8698 15.8512
- 35628.5714 8.4867 15.8433
- 35628.5714 10.1037 15.8354
- 35628.5714 11.7207 15.8296
- 35628.5714 13.3377 15.8375
- 35628.5714 14.9547 15.8454
- 35628.5714 16.5717 15.8533
- 35628.5714 18.1886 15.8612
- 35628.5714 19.8040 15.8720
- 35628.5714 20.9857 16.8857 rd
- 35628.5714 21.1536 17.1036
- 35628.5714 21.3214 17.3214
- 35628.5714 21.4893 17.5393
- 35628.5714 21.6571 17.7571
- 35628.5714 21.8250 17.9750
- 35628.5714 21.9929 18.1929
- 35628.5714 22.1607 18.4107
- 35628.5714 22.3286 18.6286
- 35628.5714 22.4964 18.8464
- 35628.5714 22.6643 19.0643
- 35628.5714 22.8321 19.2821
- 35628.5714 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 102 36 2 37 35677.1429
- 35677.1429 0.0000 20.0000
- 35677.1429 0.2250 19.7237
- 35677.1429 0.4500 19.4474
- 35677.1429 0.6750 19.1711
- 35677.1429 0.9000 18.8948
- 35677.1429 1.1250 18.6185
- 35677.1429 1.3500 18.3421
- 35677.1429 1.5750 18.0658
- 35677.1429 1.8000 17.7895
- 35677.1429 2.0250 17.5132
- 35677.1429 2.2500 17.2369
- 35677.1429 2.4750 16.9606
- 35677.1429 2.7000 16.6843 rg
- 35677.1429 3.5342 15.6475
- 35677.1429 5.1650 15.6392
- 35677.1429 6.7958 15.6310
- 35677.1429 8.4265 15.6227
- 35677.1429 10.0573 15.6145
- 35677.1429 11.6881 15.6080
- 35677.1429 13.3189 15.6163
- 35677.1429 14.9496 15.6245
- 35677.1429 16.5804 15.6328
- 35677.1429 18.2112 15.6410
- 35677.1429 19.8387 15.6550
- 35677.1429 20.9714 16.7414 rd
- 35677.1429 21.1405 16.9713
- 35677.1429 21.3095 17.2012
- 35677.1429 21.4786 17.4311
- 35677.1429 21.6476 17.6610
- 35677.1429 21.8167 17.8908
- 35677.1429 21.9857 18.1207
- 35677.1429 22.1548 18.3506
- 35677.1429 22.3238 18.5805
- 35677.1429 22.4929 18.8104
- 35677.1429 22.6619 19.0402
- 35677.1429 22.8310 19.2701
- 35677.1429 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 103 36 3 37 35725.7143
- 35725.7143 0.0000 20.0000
- 35725.7143 0.2167 19.7126
- 35725.7143 0.4333 19.4252
- 35725.7143 0.6500 19.1379
- 35725.7143 0.8667 18.8505
- 35725.7143 1.0833 18.5631
- 35725.7143 1.3000 18.2757
- 35725.7143 1.5167 17.9883
- 35725.7143 1.7333 17.7010
- 35725.7143 1.9500 17.4136
- 35725.7143 2.1667 17.1262
- 35725.7143 2.3833 16.8388
- 35725.7143 2.6000 16.5514 rg
- 35725.7143 3.4326 15.4280
- 35725.7143 5.0772 15.4194
- 35725.7143 6.7218 15.4108
- 35725.7143 8.3663 15.4022
- 35725.7143 10.0109 15.3936
- 35725.7143 11.6555 15.3865
- 35725.7143 13.3001 15.3951
- 35725.7143 14.9446 15.4037
- 35725.7143 16.5892 15.4122
- 35725.7143 18.2338 15.4208
- 35725.7143 19.8735 15.4381
- 35725.7143 20.9571 16.5971 rd
- 35725.7143 21.1274 16.8390
- 35725.7143 21.2976 17.0810
- 35725.7143 21.4679 17.3229
- 35725.7143 21.6381 17.5648
- 35725.7143 21.8083 17.8067
- 35725.7143 21.9786 18.0486
- 35725.7143 22.1488 18.2905
- 35725.7143 22.3190 18.5324
- 35725.7143 22.4893 18.7743
- 35725.7143 22.6595 19.0162
- 35725.7143 22.8298 19.2581
- 35725.7143 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 104 36 4 37 35774.2857
- 35774.2857 0.0000 20.0000
- 35774.2857 0.2083 19.7015
- 35774.2857 0.4167 19.4031
- 35774.2857 0.6250 19.1046
- 35774.2857 0.8333 18.8062
- 35774.2857 1.0417 18.5077
- 35774.2857 1.2500 18.2093
- 35774.2857 1.4583 17.9108
- 35774.2857 1.6667 17.6124
- 35774.2857 1.8750 17.3139
- 35774.2857 2.0833 17.0155
- 35774.2857 2.2917 16.7170
- 35774.2857 2.5000 16.4186 rg
- 35774.2857 3.3310 15.2084
- 35774.2857 4.9894 15.1995
- 35774.2857 6.6477 15.1905
- 35774.2857 8.3061 15.1816
- 35774.2857 9.9645 15.1726
- 35774.2857 11.6229 15.1649
- 35774.2857 13.2812 15.1738
- 35774.2857 14.9396 15.1828
- 35774.2857 16.5980 15.1917
- 35774.2857 18.2564 15.2007
- 35774.2857 19.9082 15.2212
- 35774.2857 20.9429 16.4529 rd
- 35774.2857 21.1143 16.7068
- 35774.2857 21.2857 16.9607
- 35774.2857 21.4571 17.2146
- 35774.2857 21.6286 17.4686
- 35774.2857 21.8000 17.7225
- 35774.2857 21.9714 17.9764
- 35774.2857 22.1429 18.2304
- 35774.2857 22.3143 18.4843
- 35774.2857 22.4857 18.7382
- 35774.2857 22.6571 18.9921
- 35774.2857 22.8286 19.2461
- 35774.2857 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 105 36 5 37 35822.8571
- 35822.8571 0.0000 20.0000
- 35822.8571 0.2000 19.6905
- 35822.8571 0.4000 19.3810
- 35822.8571 0.6000 19.0714
- 35822.8571 0.8000 18.7619
- 35822.8571 1.0000 18.4524
- 35822.8571 1.2000 18.1429
- 35822.8571 1.4000 17.8333
- 35822.8571 1.6000 17.5238
- 35822.8571 1.8000 17.2143
- 35822.8571 2.0000 16.9048
- 35822.8571 2.2000 16.5952
- 35822.8571 2.4000 16.2857 rg
- 35822.8571 3.2294 14.9889
- 35822.8571 4.9016 14.9796
- 35822.8571 6.5737 14.9703
- 35822.8571 8.2459 14.9610
- 35822.8571 9.9181 14.9517
- 35822.8571 11.5902 14.9433
- 35822.8571 13.2624 14.9526
- 35822.8571 14.9346 14.9619
- 35822.8571 16.6068 14.9712
- 35822.8571 18.2789 14.9805
- 35822.8571 19.9430 15.0042
- 35822.8571 20.9286 16.3086 rd
- 35822.8571 21.1012 16.5745
- 35822.8571 21.2738 16.8405
- 35822.8571 21.4464 17.1064
- 35822.8571 21.6190 17.3724
- 35822.8571 21.7917 17.6383
- 35822.8571 21.9643 17.9043
- 35822.8571 22.1369 18.1702
- 35822.8571 22.3095 18.4362
- 35822.8571 22.4821 18.7021
- 35822.8571 22.6548 18.9681
- 35822.8571 22.8274 19.2340
- 35822.8571 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 106 36 6 37 35871.4286
- 35871.4286 0.0000 20.0000
- 35871.4286 0.1917 19.6794
- 35871.4286 0.3833 19.3588
- 35871.4286 0.5750 19.0382
- 35871.4286 0.7667 18.7176
- 35871.4286 0.9583 18.3970
- 35871.4286 1.1500 18.0764
- 35871.4286 1.3417 17.7558
- 35871.4286 1.5333 17.4352
- 35871.4286 1.7250 17.1146
- 35871.4286 1.9167 16.7940
- 35871.4286 2.1083 16.4735
- 35871.4286 2.3000 16.1529 rg
- 35871.4286 3.1278 14.7694
- 35871.4286 4.8138 14.7597
- 35871.4286 6.4997 14.7501
- 35871.4286 8.1857 14.7404
- 35871.4286 9.8717 14.7308
- 35871.4286 11.5576 14.7217
- 35871.4286 13.2436 14.7314
- 35871.4286 14.9296 14.7410
- 35871.4286 16.6155 14.7507
- 35871.4286 18.3015 14.7603
- 35871.4286 19.9777 14.7873
- 35871.4286 20.9143 16.1643 rd
- 35871.4286 21.0881 16.4423
- 35871.4286 21.2619 16.7202
- 35871.4286 21.4357 16.9982
- 35871.4286 21.6095 17.2762
- 35871.4286 21.7833 17.5542
- 35871.4286 21.9571 17.8321
- 35871.4286 22.1310 18.1101
- 35871.4286 22.3048 18.3881
- 35871.4286 22.4786 18.6661
- 35871.4286 22.6524 18.9440
- 35871.4286 22.8262 19.2220
- 35871.4286 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 107 37 0 37 35920.0000
- 35920.0000 0.0000 20.0000
- 35920.0000 0.1833 19.6683
- 35920.0000 0.3667 19.3367
- 35920.0000 0.5500 19.0050
- 35920.0000 0.7333 18.6733
- 35920.0000 0.9167 18.3417
- 35920.0000 1.1000 18.0100
- 35920.0000 1.2833 17.6783
- 35920.0000 1.4667 17.3467
- 35920.0000 1.6500 17.0150
- 35920.0000 1.8333 16.6833
- 35920.0000 2.0167 16.3517
- 35920.0000 2.2000 16.0200 rg
- 35920.0000 3.0262 14.5498
- 35920.0000 4.7260 14.5398
- 35920.0000 6.4257 14.5298
- 35920.0000 8.1255 14.5199
- 35920.0000 9.8253 14.5099
- 35920.0000 11.5250 14.5001
- 35920.0000 13.2248 14.5101
- 35920.0000 14.9245 14.5201
- 35920.0000 16.6243 14.5301
- 35920.0000 18.3241 14.5401
- 35920.0000 20.0124 14.5703
- 35920.0000 20.9000 16.0200 rd
- 35920.0000 21.0750 16.3100
- 35920.0000 21.2500 16.6000
- 35920.0000 21.4250 16.8900
- 35920.0000 21.6000 17.1800
- 35920.0000 21.7750 17.4700
- 35920.0000 21.9500 17.7600
- 35920.0000 22.1250 18.0500
- 35920.0000 22.3000 18.3400
- 35920.0000 22.4750 18.6300
- 35920.0000 22.6500 18.9200
- 35920.0000 22.8250 19.2100
- 35920.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 108 37 1 37 35970.0000 S1
- 35970.0000 0.0000 20.0000
- 35970.0000 0.1786 19.6801
- 35970.0000 0.3571 19.3602
- 35970.0000 0.5357 19.0404
- 35970.0000 0.7143 18.7205
- 35970.0000 0.8929 18.4006
- 35970.0000 1.0714 18.0807
- 35970.0000 1.2500 17.7608
- 35970.0000 1.4286 17.4410
- 35970.0000 1.6071 17.1211
- 35970.0000 1.7857 16.8012
- 35970.0000 1.9643 16.4813
- 35970.0000 2.1429 16.1614 rg
- 35970.0000 2.9868 14.6829
- 35970.0000 4.6690 14.6163
- 35970.0000 6.3831 14.6069
- 35970.0000 8.0972 14.5974
- 35970.0000 9.8112 14.5879
- 35970.0000 11.5253 14.5787
- 35970.0000 13.2394 14.5882
- 35970.0000 14.9535 14.5977
- 35970.0000 16.6676 14.6071
- 35970.0000 18.3816 14.6166
- 35970.0000 20.0527 14.7056
- 35970.0000 20.9571 16.1614 rd
- 35970.0000 21.1274 16.4396
- 35970.0000 21.2976 16.7179
- 35970.0000 21.4679 16.9961
- 35970.0000 21.6381 17.2743
- 35970.0000 21.8083 17.5525
- 35970.0000 21.9786 17.8307
- 35970.0000 22.1488 18.1089
- 35970.0000 22.3190 18.3871
- 35970.0000 22.4893 18.6654
- 35970.0000 22.6595 18.9436
- 35970.0000 22.8298 19.2218
- 35970.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 109 37 2 37 36020.0000 S1
- 36020.0000 0.0000 20.0000
- 36020.0000 0.1738 19.6919
- 36020.0000 0.3476 19.3838
- 36020.0000 0.5214 19.0757
- 36020.0000 0.6952 18.7676
- 36020.0000 0.8690 18.4595
- 36020.0000 1.0429 18.1514
- 36020.0000 1.2167 17.8433
- 36020.0000 1.3905 17.5352
- 36020.0000 1.5643 17.2271
- 36020.0000 1.7381 16.9190
- 36020.0000 1.9119 16.6110
- 36020.0000 2.0857 16.3029 rg
- 36020.0000 2.9474 14.8160
- 36020.0000 4.6121 14.6928
- 36020.0000 6.3405 14.6839
- 36020.0000 8.0688 14.6749
- 36020.0000 9.7972 14.6660
- 36020.0000 11.5256 14.6573
- 36020.0000 13.2540 14.6662
- 36020.0000 14.9824 14.6752
- 36020.0000 16.7108 14.6841
- 36020.0000 18.4392 14.6931
- 36020.0000 20.0930 14.8408
- 36020.0000 21.0143 16.3029 rd
- 36020.0000 21.1798 16.5693
- 36020.0000 21.3452 16.8357
- 36020.0000 21.5107 17.1021
- 36020.0000 21.6762 17.3686
- 36020.0000 21.8417 17.6350
- 36020.0000 22.0071 17.9014
- 36020.0000 22.1726 18.1679
- 36020.0000 22.3381 18.4343
- 36020.0000 22.5036 18.7007
- 36020.0000 22.6690 18.9671
- 36020.0000 22.8345 19.2336
- 36020.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 110 37 3 37 36070.0000 S1
- 36070.0000 0.0000 20.0000
- 36070.0000 0.1690 19.7037
- 36070.0000 0.3381 19.4074
- 36070.0000 0.5071 19.1111
- 36070.0000 0.6762 18.8148
- 36070.0000 0.8452 18.5185
- 36070.0000 1.0143 18.2221
- 36070.0000 1.1833 17.9258
- 36070.0000 1.3524 17.6295
- 36070.0000 1.5214 17.3332
- 36070.0000 1.6905 17.0369
- 36070.0000 1.8595 16.7406
- 36070.0000 2.0286 16.4443 rg
- 36070.0000 2.9080 14.9491
- 36070.0000 4.5551 14.7693
- 36070.0000 6.2978 14.7609
- 36070.0000 8.0405 14.7525
- 36070.0000 9.7832 14.7440
- 36070.0000 11.5259 14.7358
- 36070.0000 13.2687 14.7443
- 36070.0000 15.0114 14.7527
- 36070.0000 16.7541 14.7611
- 36070.0000 18.4968 14.7696
- 36070.0000 20.1333 14.9761
- 36070.0000 21.0714 16.4443 rd
- 36070.0000 21.2321 16.6989
- 36070.0000 21.3929 16.9536
- 36070.0000 21.5536 17.2082
- 36070.0000 21.7143 17.4629
- 36070.0000 21.8750 17.7175
- 36070.0000 22.0357 17.9721
- 36070.0000 22.1964 18.2268
- 36070.0000 22.3571 18.4814
- 36070.0000 22.5179 18.7361
- 36070.0000 22.6786 18.9907
- 36070.0000 22.8393 19.2454
- 36070.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 111 37 4 37 36120.0000 S1
- 36120.0000 0.0000 20.0000
- 36120.0000 0.1643 19.7155
- 36120.0000 0.3286 19.4310
- 36120.0000 0.4929 19.1464
- 36120.0000 0.6571 18.8619
- 36120.0000 0.8214 18.5774
- 36120.0000 0.9857 18.2929
- 36120.0000 1.1500 18.0083
- 36120.0000 1.3143 17.7238
- 36120.0000 1.4786 17.4393
- 36120.0000 1.6429 17.1548
- 36120.0000 1.8071 16.8702
- 36120.0000 1.9714 16.5857 rg
- 36120.0000 2.8686 15.0822
- 36120.0000 4.4982 14.8458
- 36120.0000 6.2552 14.8379
- 36120.0000 8.0122 14.8300
- 36120.0000 9.7692 14.8221
- 36120.0000 11.5263 14.8144
- 36120.0000 13.2833 14.8223
- 36120.0000 15.0403 14.8302
- 36120.0000 16.7973 14.8381
- 36120.0000 18.5543 14.8461
- 36120.0000 20.1736 15.1113
- 36120.0000 21.1286 16.5857 rd
- 36120.0000 21.2845 16.8286
- 36120.0000 21.4405 17.0714
- 36120.0000 21.5964 17.3143
- 36120.0000 21.7524 17.5571
- 36120.0000 21.9083 17.8000
- 36120.0000 22.0643 18.0429
- 36120.0000 22.2202 18.2857
- 36120.0000 22.3762 18.5286
- 36120.0000 22.5321 18.7714
- 36120.0000 22.6881 19.0143
- 36120.0000 22.8440 19.2571
- 36120.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 112 37 5 37 36170.0000 S1
- 36170.0000 0.0000 20.0000
- 36170.0000 0.1595 19.7273
- 36170.0000 0.3190 19.4545
- 36170.0000 0.4786 19.1818
- 36170.0000 0.6381 18.9090
- 36170.0000 0.7976 18.6363
- 36170.0000 0.9571 18.3636
- 36170.0000 1.1167 18.0908
- 36170.0000 1.2762 17.8181
- 36170.0000 1.4357 17.5454
- 36170.0000 1.5952 17.2726
- 36170.0000 1.7548 16.9999
- 36170.0000 1.9143 16.7271 rg
- 36170.0000 2.8292 15.2152
- 36170.0000 4.4412 14.9223
- 36170.0000 6.2125 14.9149
- 36170.0000 7.9839 14.9075
- 36170.0000 9.7552 14.9001
- 36170.0000 11.5266 14.8930
- 36170.0000 13.2979 14.9004
- 36170.0000 15.0692 14.9078
- 36170.0000 16.8406 14.9152
- 36170.0000 18.6119 14.9225
- 36170.0000 20.2139 15.2466
- 36170.0000 21.1857 16.7271 rd
- 36170.0000 21.3369 16.9582
- 36170.0000 21.4881 17.1893
- 36170.0000 21.6393 17.4204
- 36170.0000 21.7905 17.6514
- 36170.0000 21.9417 17.8825
- 36170.0000 22.0929 18.1136
- 36170.0000 22.2440 18.3446
- 36170.0000 22.3952 18.5757
- 36170.0000 22.5464 18.8068
- 36170.0000 22.6976 19.0379
- 36170.0000 22.8488 19.2689
- 36170.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 113 37 6 37 36220.0000 S1
- 36220.0000 0.0000 20.0000
- 36220.0000 0.1548 19.7390
- 36220.0000 0.3095 19.4781
- 36220.0000 0.4643 19.2171
- 36220.0000 0.6190 18.9562
- 36220.0000 0.7738 18.6952
- 36220.0000 0.9286 18.4343
- 36220.0000 1.0833 18.1733
- 36220.0000 1.2381 17.9124
- 36220.0000 1.3929 17.6514
- 36220.0000 1.5476 17.3905
- 36220.0000 1.7024 17.1295
- 36220.0000 1.8571 16.8686 rg
- 36220.0000 2.7898 15.3483
- 36220.0000 4.3843 14.9988
- 36220.0000 6.1699 14.9919
- 36220.0000 7.9556 14.9851
- 36220.0000 9.7412 14.9782
- 36220.0000 11.5269 14.9715
- 36220.0000 13.3125 14.9784
- 36220.0000 15.0982 14.9853
- 36220.0000 16.8838 14.9922
- 36220.0000 18.6695 14.9990
- 36220.0000 20.2541 15.3819
- 36220.0000 21.2429 16.8686 rd
- 36220.0000 21.3893 17.0879
- 36220.0000 21.5357 17.3071
- 36220.0000 21.6821 17.5264
- 36220.0000 21.8286 17.7457
- 36220.0000 21.9750 17.9650
- 36220.0000 22.1214 18.1843
- 36220.0000 22.2679 18.4036
- 36220.0000 22.4143 18.6229
- 36220.0000 22.5607 18.8421
- 36220.0000 22.7071 19.0614
- 36220.0000 22.8536 19.2807
- 36220.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 114 38 0 37 36270.0000 S1
- 36270.0000 0.0000 20.0000
- 36270.0000 0.1500 19.7508
- 36270.0000 0.3000 19.5017
- 36270.0000 0.4500 19.2525
- 36270.0000 0.6000 19.0033
- 36270.0000 0.7500 18.7542
- 36270.0000 0.9000 18.5050
- 36270.0000 1.0500 18.2558
- 36270.0000 1.2000 18.0067
- 36270.0000 1.3500 17.7575
- 36270.0000 1.5000 17.5083
- 36270.0000 1.6500 17.2592
- 36270.0000 1.8000 17.0100 rg
- 36270.0000 2.7504 15.4814
- 36270.0000 4.3273 15.0753
- 36270.0000 6.1273 15.0690
- 36270.0000 7.9272 15.0626
- 36270.0000 9.7272 15.0563
- 36270.0000 11.5272 15.0501
- 36270.0000 13.3271 15.0564
- 36270.0000 15.1271 15.0628
- 36270.0000 16.9271 15.0692
- 36270.0000 18.7270 15.0755
- 36270.0000 20.2944 15.5171
- 36270.0000 21.3000 17.0100 rd
- 36270.0000 21.4417 17.2175
- 36270.0000 21.5833 17.4250
- 36270.0000 21.7250 17.6325
- 36270.0000 21.8667 17.8400
- 36270.0000 22.0083 18.0475
- 36270.0000 22.1500 18.2550
- 36270.0000 22.2917 18.4625
- 36270.0000 22.4333 18.6700
- 36270.0000 22.5750 18.8775
- 36270.0000 22.7167 19.0850
- 36270.0000 22.8583 19.2925
- 36270.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
- 115 39 0 37 36271.0000 S1bis
- 36271.0000 0.0000 20.0000
- 36271.0000 0.1500 19.7508
- 36271.0000 0.3000 19.5017
- 36271.0000 0.4500 19.2525
- 36271.0000 0.6000 19.0033
- 36271.0000 0.7500 18.7542
- 36271.0000 0.9000 18.5050
- 36271.0000 1.0500 18.2558
- 36271.0000 1.2000 18.0067
- 36271.0000 1.3500 17.7575
- 36271.0000 1.5000 17.5083
- 36271.0000 1.6500 17.2592
- 36271.0000 1.8000 17.0100 rg
- 36271.0000 2.4145 14.9977
- 36271.0000 3.0990 13.0797
- 36271.0000 5.2030 13.0722
- 36271.0000 7.3071 13.0648
- 36271.0000 9.4111 13.0574
- 36271.0000 11.5152 13.0501
- 36271.0000 13.6192 13.0575
- 36271.0000 15.7232 13.0649
- 36271.0000 17.8273 13.0723
- 36271.0000 19.9313 13.0798
- 36271.0000 20.6392 15.0124
- 36271.0000 21.3000 17.0100 rd
- 36271.0000 21.4417 17.2175
- 36271.0000 21.5833 17.4250
- 36271.0000 21.7250 17.6325
- 36271.0000 21.8667 17.8400
- 36271.0000 22.0083 18.0475
- 36271.0000 22.1500 18.2550
- 36271.0000 22.2917 18.4625
- 36271.0000 22.4333 18.6700
- 36271.0000 22.5750 18.8775
- 36271.0000 22.7167 19.0850
- 36271.0000 22.8583 19.2925
- 36271.0000 23.0000 19.5000
- 999.9990 999.9990 0.0000
diff --git a/doc/users/Tuto1/data/Cote_canal b/doc/users/Tuto1/data/Cote_canal
deleted file mode 100644
index f7607c352ff81c15fc6de42192278e20317b9eef..0000000000000000000000000000000000000000
--- a/doc/users/Tuto1/data/Cote_canal
+++ /dev/null
@@ -1,2 +0,0 @@
-0:00:00:00 15
-0:00:01:00 15
diff --git a/doc/users/Tuto1/data/Hogneau.SIN b/doc/users/Tuto1/data/Hogneau.SIN
deleted file mode 100644
index 53721ef1dff76b322a19178a0d32a21702ac2fa5..0000000000000000000000000000000000000000
--- a/doc/users/Tuto1/data/Hogneau.SIN
+++ /dev/null
@@ -1,25 +0,0 @@
-**************** SINGULARITES **********************
-*BieSec Nb Longueur Cote dev Cote charg Coef deb Impression
-*===---===----------==========----------==========-----------------------------
-*****************************************************
-* Bief n° 1
-*****************************************************
-* Ouvrage au pk 36270.0 seuil_aval
-*SeuilR type D
-D 1 36270.00 18.250 15.500 0.000 0.400 99999.000 seuil palplanches
-* Ouvrage au pk 31875.0 PontRS101
-*OrificeR type O
-O 1 31875.00 9.660 18.710 21.890 0.400 9999.000
-*SeuilR type D
-D 1 31875.00 14.000 22.890 0.000 0.400 99999.000
-* Ouvrage au pk 34335.0 PontThivencelle
-*SeuilR type D
-D 1 34335.00 13.000 21.740 0.000 0.400 99999.000
-*OrificeR type O
-O 1 34335.00 9.070 17.280 20.740 0.400 9999.000
-*****************************************************
-* Bief n° 3
-*****************************************************
-* Ouvrage au pk 0.0 Orifice
-*OrificeR type O
-*O 3 0.000 6.000 19.000 19.001 0.400 20.000 Clapet_001
diff --git a/doc/users/Tuto1/data/Q_permanent b/doc/users/Tuto1/data/Q_permanent
deleted file mode 100644
index 23060f863af5942d50f44afdd547ea624d3ef746..0000000000000000000000000000000000000000
--- a/doc/users/Tuto1/data/Q_permanent
+++ /dev/null
@@ -1,2 +0,0 @@
-0:00:00:00 4
-0:00:01:00 4
diff --git a/doc/users/Tuto1/data/Seuil_aval_23m b/doc/users/Tuto1/data/Seuil_aval_23m
deleted file mode 100644
index c683ca7e3c8e5153feea6b8c84be467edd8d01ad..0000000000000000000000000000000000000000
--- a/doc/users/Tuto1/data/Seuil_aval_23m
+++ /dev/null
@@ -1,24 +0,0 @@
-16,03 0
-16,13 1,29
-16,23 3,64
-16,33 6,7
-16,43 10,31
-16,53 14,41
-16,63 18,94
-16,73 23,87
-16,83 29,16
-16,93 34,79
-17,03 40,75
-17,13 47,01
-17,23 53,57
-17,33 60,4
-17,43 67,5
-17,53 74,86
-17,63 82,47
-17,73 90,33
-17,83 98,41
-17,93 106,73
-18,03 115,26
-18,13 124,01
-18,23 132,98
-18,33 142,14
diff --git a/doc/users/Tuto1/img/Geo.png b/doc/users/Tuto1/img/Geo.png
index 44a247dbbc31e1d99b58c78603e41253c74e5778..f6a03ab92c2d1265ca17cc1c5cf53f54d955eeec 100644
Binary files a/doc/users/Tuto1/img/Geo.png and b/doc/users/Tuto1/img/Geo.png differ
diff --git a/doc/users/Tuto1/img/Geo2.png b/doc/users/Tuto1/img/Geo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..62540aba20e536b1d52168f8ae3d7536418b6ac1
Binary files /dev/null and b/doc/users/Tuto1/img/Geo2.png differ
diff --git a/doc/users/Tuto1/img/K.png b/doc/users/Tuto1/img/K.png
index 6b4cdbd6000b5c548751358c5a671a4805cda2f8..006277f6c0d5320ccaeff84af7a987584e219ad6 100644
Binary files a/doc/users/Tuto1/img/K.png and b/doc/users/Tuto1/img/K.png differ
diff --git a/doc/users/Tuto1/img/OrificeRD101.png b/doc/users/Tuto1/img/OrificeRD101.png
new file mode 100644
index 0000000000000000000000000000000000000000..f712ae1614c018d6c21f41cb7c8441323529a083
Binary files /dev/null and b/doc/users/Tuto1/img/OrificeRD101.png differ
diff --git a/doc/users/Tuto1/img/OrificeThivencelle.png b/doc/users/Tuto1/img/OrificeThivencelle.png
new file mode 100644
index 0000000000000000000000000000000000000000..7837fcdc071f83690404b563a147293bdcff4c62
Binary files /dev/null and b/doc/users/Tuto1/img/OrificeThivencelle.png differ
diff --git a/doc/users/Tuto1/img/Seuil.png b/doc/users/Tuto1/img/Seuil.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5238829b8bf59210355032590e55271231fdf7b
Binary files /dev/null and b/doc/users/Tuto1/img/Seuil.png differ
diff --git a/doc/users/Tuto1/img/SeuilRD101.png b/doc/users/Tuto1/img/SeuilRD101.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ad27155be0f6ad76ca1e51ef6cd3dcd8a1f2c5e
Binary files /dev/null and b/doc/users/Tuto1/img/SeuilRD101.png differ
diff --git a/doc/users/Tuto1/img/SeuilThivencelle.png b/doc/users/Tuto1/img/SeuilThivencelle.png
new file mode 100644
index 0000000000000000000000000000000000000000..26553a75c0189456909158602b6608e6e928acf0
Binary files /dev/null and b/doc/users/Tuto1/img/SeuilThivencelle.png differ
diff --git a/doc/users/Tuto1/img/boundary.png b/doc/users/Tuto1/img/boundary.png
index 4c28e80bdc3b91e4786673de7dd89d249b4defc9..c42c3bf32d8776c9939cb31e5abf1370d5a20de6 100644
Binary files a/doc/users/Tuto1/img/boundary.png and b/doc/users/Tuto1/img/boundary.png differ
diff --git a/doc/users/Tuto1/img/dl.png b/doc/users/Tuto1/img/dl.png
index 40f6158cd25d74fea439867d1c762048d280cbc8..a0eb62798b92e53c0ec4eea85a1e77275118f8ce 100644
Binary files a/doc/users/Tuto1/img/dl.png and b/doc/users/Tuto1/img/dl.png differ
diff --git a/doc/users/Tuto1/img/edit.png b/doc/users/Tuto1/img/edit.png
deleted file mode 100644
index 1c5d322a3a00361e879dab1a5460f3571e1289ea..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/edit.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/editsect.png b/doc/users/Tuto1/img/editsect.png
index 2606b0eb3c6b896855408a747554e338fa6ab098..3602561a6a3654666d94ddef7de6dbe2125f3b50 100644
Binary files a/doc/users/Tuto1/img/editsect.png and b/doc/users/Tuto1/img/editsect.png differ
diff --git a/doc/users/Tuto1/img/fev2002.png b/doc/users/Tuto1/img/fev2002.png
index 9002213a8b5990f5d86f766ae4b4c83bc6dbb9b1..a10b001caac2d9980cebb31ae83d04dd4f9c63ae 100644
Binary files a/doc/users/Tuto1/img/fev2002.png and b/doc/users/Tuto1/img/fev2002.png differ
diff --git a/doc/users/Tuto1/img/frictions.png b/doc/users/Tuto1/img/frictions.png
index 2f66cc7339c0c25de291db9d13f7f06cea1260c5..e5fd52999cede4e9001d893865c1c3519b1a99a5 100644
Binary files a/doc/users/Tuto1/img/frictions.png and b/doc/users/Tuto1/img/frictions.png differ
diff --git a/doc/users/Tuto1/img/gtk_add.png b/doc/users/Tuto1/img/gtk_add.png
deleted file mode 100755
index 90b449e4f570d03f498aa7303043b25ea95af025..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/gtk_add.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/hs.png b/doc/users/Tuto1/img/hs.png
index 14d9f3121810141f40f2846b2febc6b01699a86c..f095ee4bcbfb6a5241ffddf39f3beca3d52f0cfa 100644
Binary files a/doc/users/Tuto1/img/hs.png and b/doc/users/Tuto1/img/hs.png differ
diff --git a/doc/users/Tuto1/img/ic.png b/doc/users/Tuto1/img/ic.png
index 5949b77f334da7ac625296c8159ec5db5772bea4..dc0bffce8184713b75098524fed81e6f379add79 100644
Binary files a/doc/users/Tuto1/img/ic.png and b/doc/users/Tuto1/img/ic.png differ
diff --git a/doc/users/Tuto1/img/maillage.png b/doc/users/Tuto1/img/maillage.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36138b6d697a03c4902cd67e6d46ab43ba7f04a
Binary files /dev/null and b/doc/users/Tuto1/img/maillage.png differ
diff --git a/doc/users/Tuto1/img/network.png b/doc/users/Tuto1/img/network.png
index 29d33e9b2f08978c1f8efc68815c184e8770cca5..71694e5bea02f0a37d3a40376a49fdea767c1004 100644
Binary files a/doc/users/Tuto1/img/network.png and b/doc/users/Tuto1/img/network.png differ
diff --git a/doc/users/Tuto1/img/orificeRS101.png b/doc/users/Tuto1/img/orificeRS101.png
deleted file mode 100644
index 335652192e159fb5562b892cebcc3095e1ea6b7d..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/orificeRS101.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/orificeThivencelle.png b/doc/users/Tuto1/img/orificeThivencelle.png
deleted file mode 100644
index bb3add01bcaff18be9b1a10b6e5ca0a0014d142d..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/orificeThivencelle.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/param.png b/doc/users/Tuto1/img/param.png
deleted file mode 100644
index 468264d4efea32e626c9eb6fabc320a17bcf7f9f..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/param.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/seuil.png b/doc/users/Tuto1/img/seuil.png
deleted file mode 100644
index 36fbd716b459ab12297541857527fcda06730ae6..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/seuil.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/seuilRS101.png b/doc/users/Tuto1/img/seuilRS101.png
deleted file mode 100644
index 119ff1bee1623771cdb5572cf613210c5d698681..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/seuilRS101.png and /dev/null differ
diff --git a/doc/users/Tuto1/img/seuilThivencelle.png b/doc/users/Tuto1/img/seuilThivencelle.png
deleted file mode 100644
index 37a8082e6ee8ee5640576c1c07bdccb509052bca..0000000000000000000000000000000000000000
Binary files a/doc/users/Tuto1/img/seuilThivencelle.png and /dev/null differ
diff --git a/doc/users/Tuto1/pas-a-pas.tex b/doc/users/Tuto1/pas-a-pas.tex
index 978c0d7d26ffdee3e86d44a25224f6cf611c7496..313a139d30eb604d1b7c7b584e3d13c9e274be35 100644
--- a/doc/users/Tuto1/pas-a-pas.tex
+++ b/doc/users/Tuto1/pas-a-pas.tex
@@ -80,7 +80,7 @@ RiverLy, Hydraulique des rivi
\begin{center}
\begin{tabular}{lll}
-Autors : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
+Auteurs : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
& Théophile TERRAZ & theophile.terraz@inrae.fr\tabularnewline
& Lionel Pénard & lionel.penard@inrae.fr\tabularnewline
@@ -110,43 +110,64 @@ Autors : & Pierre-Antoine Rouby & pierre-antoine.rouby@inrae.fr\tabularnewline
Pamhyr2 peut être téléchargé ici : \url{https://gitlab.irstea.fr/theophile.terraz/pamhyr}.
+Si vous arrivez sur une fenêtre de connexion, cliquez sur "parcourir la liste des dépôts publics" et cherchez l'URL donnée plus haut.
+Utilisez le bouton de téléchargement GNU Linux ou Windows en fonction de votre système.
+
\begin{center}
\includegraphics[width=15cm]{img/dl.png}
\par\end{center}
+Décompressez l'archive et lancez Pamhyr2.
-Utilisez le bouton de téléchargement GNU Linux ou Windows en fonction de votre système. Sous Windows, lancez le programme d'installation. Sous Linux, décompressez l'archive et lancez Pamhyr2.
+\section{Créer une première étude}
+Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude.
+Choisissez un nom, par exemple \textit{Hogneau}, et validez.
-\section{Créer une première étude}
+\begin{center}
+\includegraphics[width=15cm]{img/NEWSTUDY.png}
+\par\end{center}
-Dans la fenêtre principale, cliquez sur \texttt{[Fichier] => [Nouvelle étude]} pour créer une nouvelle étude. Choisissez un nom, par exemple Hogneau, et validez
+Pendant que vous travaillez sur votre étude, n'oubliez pas de sauvegarder régulièrement, à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} de la fenêtre principale.
-Cliquez sur \texttt{[Réseau] => [Editer le réseau]} pour créer les biefs de votre rivière. Dans cette fenêtre, vous devez définir un graphe orienté qui représente les biefs de votre réseau fluvial : les arêtes sont les biefs et les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
-Appuyez sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud. Appuyez à nouveau sur \includegraphics[width=0.5cm]{img/gtk_add.png} pour quitter le mode \textit{Ajout}. Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval. Dans la partie inférieure de la fenêtre \textit{Editer le réseau hydrographique}, vous pouvez renommer les n½uds et les biefs. Comme le bief que vous avez créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief. La fenêtre doit se présenter comme suit :
+\section{Créer la structure de la rivière}
+Cliquez sur \texttt{[Réseau] => [Éditer le réseau]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} pour créer la structure de votre rivière.
+Nous voici dans la fenêtre \textit{Réseau}.
+Dans cette fenêtre, nous allons définir un graphe orienté qui représente les biefs de notre réseau fluvial : les arêtes sont les biefs, les n½uds sont soit des conditions limites amont, soit des conditions limites aval, soit des jonctions entre biefs.
+Un bief par défaut existe dans la nouvelle étude.
+Pour les besoins de ce tutoriel, nous allons le supprimer :
+cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} pour entrer dans le mode \textit{Suppression} puis cliquez sur les n½uds.
+Nous voilà repartis sur une fenêtre vierge.
+Appuyez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour entrer dans le mode \textit{Ajout}. Créez deux n½uds en cliquant dans la zone grise de la fenêtre, et créez un lien en cliquant à nouveau sur chaque n½ud.
+Appuyez à nouveau sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour quitter le mode \textit{Ajout}.
+Vous avez créé votre premier bief, avec un n½ud amont et un n½ud aval.
+Dans la partie inférieure de la fenêtre \textit{Réseau}, vous pouvez renommer les n½uds et les biefs.
+Comme le bief que nous avons créé est automatiquement sélectionné, toutes les étapes suivantes s'appliqueront à ce bief.
+La fenêtre doit se présenter comme suit :
\begin{center}
\includegraphics[width=15cm]{img/network.png}
\par\end{center}
+Fermez la fenêtre \textit{Réseau}.
-Fermer la fenêtre \textit{Editer le réseau}.
-
-
-\section{Editer la géometrie de la rivière}
-
-Cliquez sur \texttt{[Géometrie] => [Editer la géometrie]} pour définir la géométrie du bief sélectionné. Cliquez sur le bouton \texttt{[Importer]} et sélectionnez le fichier \texttt{Data/Bief\_1.st}. Vous devriez voir :
+\section{Éditer la géométrie de la rivière}
+Cliquez sur \texttt{[Géométrie] => [Éditer la géométrie]} ou sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} pour définir la géométrie du bief sélectionné.
+Pour Importer une géométrie depuis un fichier, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png}.
+Sélectionnez le fichier \texttt{Data/Bief\_1.st}.
+Vous devriez voir :
\begin{center}
\includegraphics[width=15cm]{img/Geo.png}
\par\end{center}
+Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK).
+Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière; dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs).
+Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou sur les sections dans les deux vues du haut.
-Le panneau de gauche contient une liste de toutes les sections en travers avec leur nom et leur abscisse longitudinale (PK). Dans le graphique en haut à gauche, vous pouvez voir la vue de dessus de la rivière, dans le panneau en haut à droite, la coupe longitudinale de la rivière et dans le graphique en bas, vous pouvez voir la section en travers sélectionnée (bleu) ainsi que la suivante (pointillés violets) et la précédente (pointillés noirs). Vous pouvez vous déplacer dans la liste des sections en cliquant dans le tableau ou à l'aide de l'ascenseur situé entre le tableau et les graphiques.
-
-Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"img/edit.png"}.
+Vous pouvez éditer la section en travers sélectionnée en cliquant sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
Sélectionnez la section en travers nommée \textit{PontRD101m} et ouvrez la fenêtre d'édition. Vous devriez voir :
@@ -154,145 +175,268 @@ S
\includegraphics[width=15cm]{img/editsect.png}
\par\end{center}
+Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale.
+La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom.
+Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice).
+Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.
+
+Sur le graphique figure une projection de la section en travers.
+Vous pouvez utiliser \texttt{[clic droit]} pour afficher une ligne d'eau fictive et visualiser des données géométriques utiles.
+Vous pouvez ensuite enlever cette ligne avec \texttt{[clic molette]}.
+Vous pouvez maintenant fermer la fenêtre d'édition de la section en travers.
+
+Revenons à la fenêtre \textit{Géométrie}.
+Le jeu de sections importé est inégalement espacé, ce qui peut entraîner des difficultés de calcul.
+Nous allons utiliser l'outil de maillage pour interpoler des nouvelles sections entre les sections trop espacées.
+Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/meshing.png"}.
+Dans la fenêtre \textit{Maillage}, vous avez accès à quelques options basiques.
+L'option \textit{Limites} vous permet de définir deux sections entre lesquelles le maillage sera effectué.
+L'option \textit{Lignes directrices pour le calcul des distances} permet de spécifier au mailleur les points sur lesquels calculer les distances entre les sections.
+La distance sera la moyenne des deux distances entre les points de chaque sections qui portent ces lignes directrices.
+Pour ne choisir qu'une seule ligne, rentrez simplement deux fois la même valeur.
+Il existe toujours au moins deux lignes directrices : les deux extrémités des sections, nommés \textit{un} et \textit{np}, même si les points correspondants ne portent pas de nom.
+Les options \textit{Paramètres} permettent de définir l'interval souhaité entre les nouvelles sections, et la méthode d'interpolation.
+Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
-Sur le panneau de gauche se trouve la liste de tous les points de la section, avec leurs coordonnées, leur nom et leur abscisse transversale. La coordonnée Z du point le plus haut est inscrite en bleu et celle du point le plus bas en rouge. Les points peuvent avoir un nom. Si un point portant le même nom existe dans toutes les sections d'un bief, il forme une ligne longitudinale (ou ligne directrice). Par exemple, nous avons ici \textit{rg} et \textit{rd} qui représentent la rive gauche et la rive droite du lit mineur.
+\begin{center}
+\includegraphics[width=15cm]{img/maillage.png}
+\par\end{center}
-Sur le graphique figure une projection de la section en travers. Vous pouvez utiliser \texttt{[ctrl + clic]} pour sélectionner un point dans le tracé et \texttt{[maj + clic]} pour sélectionner une ligne d'eau et visualiser des données géométriques utiles. Vous pouvez fermer la fenêtre d'édition de la section en travers et la fenêtre d'édition de la géométrie.
+% L'option d'interpolation \textit{Spline} modifie les longueurs longitudinales.
+% Les abscices en long (Pk) des sections sont donc obsolètes.
+% Pour les recalculer, cliquez sur \texttt{[Mise à jour des PK]} dans la fenêtre \textit{Géométrie}.
+% Vous êtes maintenant dans la fenêtre \textit{Mise à jour des PK}.
+% Vous pouvez choisir la section d'origine pour le calcul des PK, ainsi que la valeur du PK à cette section.
+% Le choix des deux lignes directrices sert à calculer les distances entre sections, comme dans la fenêtre \textit{Maillage}.
+% L'orientation vous permet de choisir dans quelle direction les PK seront croissants.
+% Cette option n'a pas d'impact sur les résultats du calcul hydraulique.
+% Choisissez les options suivantes, et cliquez sur \texttt{[OK]} :
+%
+% \begin{center}
+% \includegraphics[width=15cm]{img/mjpk.png}
+% \par\end{center}
+
+La fenêtre \textit{Géométrie} doit maintenant ressembler à ça :
+
+\begin{center}
+\includegraphics[width=15cm]{img/Geo2.png}
+\par\end{center}
-\section{Editer les conditions aux limites}
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} :
+\section{Éditer les conditions aux limites}
+
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions aux limites et apports ponctuels]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
+Vous arrivez sur la fenêtre \textit{Conditions aux limites} :
\begin{center}
\includegraphics[width=15cm]{img/boundary.png}
\par\end{center}
-
- Utilisez le bouton \textit{ajouter} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
- Sur la nouvelle ligne, on peut cliquer pour sélectionner la ligne entière, et double-cliquer pour sélectionner la cellule.
- Sélectionnez la cellule \textit{Type} pour donner un nom à la condition limite. Ici, nous définirons le débit mesuré lors de la crue de février 2002. Vous pouvez nommer cette condition limite "crue2002".
- Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi Q(t).
- Sélectionnez la cellule \textit{Noeud} et attribuez cette condition au noeud amont.
- Les noms des noeuds sont rappelés dans le réseau du panneau de droite.
- Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"img/edit.png"}. Vous avez ouvert la fenêtre \textit{Éditer les conditions aux limites}.
- Dans un éditeur de texte, ouvrez le fichier \texttt{Données/Fevrier\_2002.txt}. Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau gauche de la fenêtre \textit{Éditer les conditions aux limites} avec \textit{ctrl+v}. Vous pouvez maintenant voir la courbe de débit :
+Utilisez le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre pour ajouter une condition limite pour le liquide.
+Nous pouvons cliquer sur la nouvelle ligne pour sélectionner la ligne en entier, et double-cliquer pour sélectionner une seule cellule.
+Ici, nous définirons le débit mesuré lors de la crue de février 2002.
+Sélectionnez la cellule \textit{Nom} pour donner un nom à la condition limite par exemple "crue2002".
+Sélectionner la cellule \textit{Type} et utiliser la combo box pour mettre une loi \textit{Q(t)} : débit en fonction du temps (hydrogramme).
+Sélectionnez la cellule \textit{N½ud} et attribuez cette condition au n½ud amont.
+Les noms des n½uds sont rappelés dans le panneau de droite, avec une vue du réseau.
+Sélectionnez maintenant la ligne entière et cliquez sur le bouton d'édition \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
+Vous avez ouvert la fenêtre \textit{Éditer les conditions aux limites}.
+Dans un éditeur de texte, ouvrez le fichier \texttt{data/Fevrier\_2002.txt}.
+Copiez le contenu du fichier (par exemple avec \textit{ctrl+a} puis \textit{ctrl+c}) et collez-le dans le panneau de gauche de la fenêtre \textit{Éditer les conditions aux limites} avec \textit{ctrl+v}.
+Vous pouvez maintenant voir la courbe de débit :
\begin{center}
\includegraphics[width=15cm]{img/fev2002.png}
\par\end{center}
-
-Fermer cette fenêtre. Revenir sur la fenêtre \textit{Conditions aux limites}. Ajouter une nouvelle ligne, lui donner un nom, lui donner le type \textit{Z(T)} et l'associer au noeud aval du réseau. Ouvrez la fenêtre \textit{Éditer les conditions aux limites} (\includegraphics[width=0.5cm]{"img/edit.png"}). Ajoutez deux lignes. Dans la première, entrez le temps : 0.00.00 et Z : 15.000.
-Dans la seconde, saisissez le temps : 1.00.00 et Z : 15.000. Cela crée une côte constante de l'eau en aval. Pour le calcul, Mage extrapolera continuellement l'élévation de l'eau.
+Fermez cette fenêtre. Revenez sur la fenêtre \textit{Conditions aux limites}.
+Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Z(T)} (limnigramme) et associez là au n½ud aval du réseau.
+Ouvrez la fenêtre d'édition des conditions aux limites (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
+Ajoutez deux lignes et rentrez les valeurs suivantes :
+\begin{center}
+\begin{tabular}{|c|c|}
+\hline
+temps & cote \\ \hline
+0.00.00 & 15.000\\ \hline
+1.00.00 & 15.000\\ \hline
+\end{tabular}\\
+\par\end{center}
+Cela crée une cote constante de l'eau en aval.
+Pour le calcul, le solveur extrapolera continûment l'élévation de l'eau si le temps de la simulation dépasse le dernier point de la courbe.
Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.
+% Fermer cette fenêtre.
+% Revenez sur la fenêtre \textit{Conditions aux limites}.
+% Ajoutez une nouvelle ligne, donnez lui un nom, donnez lui le type \textit{Q(Z)} (courbe de tarage) et associez-la au noeud aval du réseau.
+% Cette condition limite se trouve au niveau d'un seuil.
+% A cet endroit, l'écoulement passe d'un régime fluvial à un régime torentiel.
+% Nous allons donc calculer une courbe de tarage qui correspond au régime critique de l'écoulement au niveau du seuil.
+% Sélectionnez la condition limite et ouvrez la fenêtre \textit{Éditer les conditions aux limites} : (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
+% Dans la fenêtre \textit{Éditer les conditions aux limites} cliquez sur \texttt{[Générer régime critique]} pour générer cette courbe.
+% Cliquez ensuite sur \texttt{[Rendre croissant]} pour suprimer les points de la courbe qui ne sont pas strictement croissants.
+% Vous pouvez fermer les fenêtres \textit{Éditer les conditions aux limites} et \textit{Conditions aux limites}.
+
\section{Créer les conditions initiales}
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]}.
-Si vous ne connaissez pas les conditions initiales de la côte de l'eau et du débit de la rivière, vous pouvez utiliser les boutons \texttt{[Générer une hauteur minimale]} ou \texttt{[Générer un débit constant]} pour laisser Pamhyr2 estimer une condition initiale à l'aide de la formule de Manning-Strickler.
-Cliquez sur \texttt{[Générer à partir du débit]} et saisissez un débit de $4 m^3$ dans la fenêtre contextuelle pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler et un débit uniforme de $4 m^3$. Vous devriez voir :
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Conditions initiales]} ou sur le raccourci \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
+Pour démarrer, le code de calcul hydraulique a besoin de connaître le débit et la cote de la surface libre de la rivière en tout point à l'instant initial.
+Si vous ne connaissez pas ces conditions initiales, vous pouvez utiliser les boutons \texttt{[Générer une profondeur uniforme]}, \texttt{[Générer un débit uniforme]} ou \texttt{[Générer une cote uniforme]} pour laisser Pamhyr2 estimer une condition initiale.
+Cliquez sur \texttt{[Générer un débit uniforme]} et saisissez un débit de 4 m$^3$/s dans la fenêtre contextuelle, et cochez \texttt{[Générer une profondeur]} pour générer une condition initiale de hauteur d'eau basée sur la formule de Manning-Strickler pour le débit donné.
+Vous devriez voir :
\begin{center}
\includegraphics[width=15cm]{img/ic.png}
\par\end{center}
+% Vous pouvez également utiliser \texttt{[Générer une cote uniforme]} et saisir une cote de 21 m à l'amont et à l'aval avec un débit nul.
+% Cela revient à créer une bassine et à laisser le solveur la vider pour trouver un écoulement initial satisfaisant.
-Fermer la fenêtre \textit{Conditions initiales}
+Lors des prochaines simulations, vous pourrez utiliser l'état final de la simulation précédente comme état initial.
+Pour cela, cliquez sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} et retrouvez le résultat sous forme de fichier \textit{.BIN}.
+Ce fichier de résultats se trouve normalement dans le sous-dossier \texttt{\_PAMHYR\_/Hogneau/default-mage}.
+Fermer la fenêtre \textit{Conditions initiales}.
-\section{Editer les coefficients de frottement}
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Editer les frottements]}.
-Vous devez d'abord définir des jeux de coefficients de Strickler. Cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour ouvrir la fenêtre \textit{Strickler}. Vous pouvez y créer des couples de coefficients de Strickler, le premier pour le lit mineur, le second pour le lit moyen. Cliquez quatre fois sur \textit{add} pour créer quatre nouveaux couples. Donnez-leur les valeurs suivantes :
+\section{Éditer les coefficients de frottement}
+Nous allons maintenant définir les coefficients de frottement du fond de la rivière.
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Éditer les frottements]} ou sur l'icône \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"}.
+Dans un premier temps, vous devez définir des jeux de coefficients de Strickler.
+Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour ouvrir la fenêtre \textit{coefficients de Strickler}.
+Vous pouvez y créer des couples de coefficients de Strickler, le premier pour le lit mineur, le second pour le lit moyen.
+Cliquez quatre fois sur \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre nouveaux couples.
+Donnez-leur les valeurs suivantes :
\begin{center}
\includegraphics[width=15cm]{img/K.png}
\par\end{center}
+Vous pouvez utiliser le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} pour trier les couples par ordre alphadétique.
+Fermez la fenêtre \textit{Strickler}.
-Fermez la fenêtre \textit{Strickler}. Dans la fenêtre \textit{Editer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour créer quatre zones de frottement. Chaque zone est définie par un PK \textit{début} et de \textit{fin} PK et un couple \textit{begin} et \textit{end} couple de Strickler. Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{begin} et \textit{end}. Dans notre cas, nous utiliserons des coefficients constants par zone. Définissez les zones comme suit :
-
+Dans la fenêtre \textit{Éditer les frottements}, ajoutez quatre lignes avec le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} pour créer quatre zones de frottement.
+Chaque zone est définie par un PK de \textit{début} et de \textit{fin} associés à un couple de coefficients de Strickler.
+% Les couples de coefficients de Strickler à l'intérieur d'une zone sont interpolés à partir des couples \textit{début} et \textit{fin}.
+% Dans notre cas, nous utiliserons des coefficients uniformes par zone.
+Définissez les zones comme suit :
\begin{center}
\includegraphics[width=15cm]{img/frictions.png}
\par\end{center}
-
-La zone sélectionnée est surlignée en bleu. Fermez la fenêtre \textit{Editer les frottements}.
-
+La zone sélectionnée est surlignée en bleu.
+Vous pouvez maintenant fermer la fenêtre \textit{Éditer les frottements}.
\section{Modélisation des ouvrages hydrauliques}
-Parfois, il peut y avoir des sections en travers dans lesquelles les équations de Saint-Venant ne peuvent pas être utilisées pour modéliser l'écoulement de l'eau. Dans ce cas, nous devons définir une autre loi pour relier la côte de l'eau et le débit. C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée, ce qui entraîne un écoulement en charge. Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrables. Dans notre cas, on doit représenter un seuil et deux ponts comme ouvrages hydrauliques.
-Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques. Cliquez trois fois sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} pour créer trois ouvrages hydrauliques. Chaque structure peut avoir un nom et doit avoir une portée et un PK. Définissez-les comme suit :
-
+Parfois, il peut y avoir des sections en travers dans lesquelles les équations de Saint-Venant ne peuvent pas être utilisées pour modéliser l'écoulement de l'eau.
+Dans ce cas, nous devons définir une autre loi pour relier la cote de l'eau et le débit.
+C'est le cas, par exemple, au niveau des ponts lorsque la hauteur d'eau est trop élevée et que l'écoulement passe en charge.
+Pamhyr2 permet de définir différents ouvrages hydrauliques avec des lois paramétrables.
+Dans notre cas, nous allons devoir modéliser deux ponts et un seuil par des ouvrages hydrauliques.
+Dans la fenêtre principale, cliquez sur \texttt{[Hydraulique] => [Ouvrages hydrauliques]} pour ouvrir la fenêtre des ouvrages hydrauliques.
+Cliquez trois fois sur le bouton \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour créer trois ouvrages hydrauliques.
+% Cliquez deux fois sur le bouton \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour créer deux ouvrages hydrauliques.
+Chaque structure peut avoir un nom et doit avoir un bief et un PK.
+Définissez-les comme suit :
\begin{center}
\includegraphics[width=15cm]{img/hs.png}
\par\end{center}
-
-Sélectionnez le seuil aval et cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour modifier les lois de cette ouvrage. Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires. Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage. Pour ce seuil, nous n'avons besoin que d'un ouvrage hydraulique élémentaire de type déversoir. Cliquez sur \includegraphics[width=0.5cm]{img/gtk_add.png} pour ajouter un nouvel ouvrage hydraulique élémentaire, donnez-lui le type \textit{seuil} et configurez-le comme suit :
-
+Sélectionnez le seuil aval et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour modifier les lois de cet ouvrage. Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires. Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage. Pour ce seuil, nous n'avons besoin que d'un ouvrage hydraulique élémentaire de type déversoir. Cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/add.png"} pour ajouter un nouvel ouvrage hydraulique élémentaire, donnez-lui le type \textit{Déversoir rectangulaire} et configurez-le comme suit :
\begin{center}
-\includegraphics[width=15cm]{img/seuil.png}
+\includegraphics[width=15cm]{img/Seuil.png}
\par\end{center}
-
Retournez à la fenêtre \textit{Ouvrages hydrauliques}.
-Sélectionnez le pont RS101 et cliquez sur \includegraphics[width=0.5cm]{"img/edit.png"} pour éditer les lois de cet ouvrage. Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont. Créez deux ouvrages hydrauliques élémentaires et définissez-les comme suit :
+Sélectionnez le pont RD101 et cliquez sur \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} pour éditer les lois de cet ouvrage.
+% Les ouvrages hydrauliques sont composés d'ouvrages hydrauliques élémentaires.
+% Vous pouvez combiner les lois de plusieurs ouvrages hydrauliques élémentaires pour créer votre ouvrage.
+Un pont peut être modélisé comme une combinaison d'un orifice pour l'écoulement sous le pont et d'un déversoir pour l'écoulement au-dessus du pont.
+Créez deux ouvrages hydrauliques élémentaires à l'aide du bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} et définissez-les comme suit :
\begin{center}
-\includegraphics[width=15cm]{img/seuilRS101.png}
+\includegraphics[width=15cm]{img/SeuilRD101.png}
-\includegraphics[width=15cm]{img/orificeRS101.png}
+\includegraphics[width=15cm]{img/OrificeRD101.png}
\par\end{center}
-
Revenez à la fenêtre \textit{Ouvrages hydrauliques} et appliquez la même procédure pour le pont de Thivencelle :
-\begin{center}
-\includegraphics[width=15cm]{img/orificeThivencelle.png}
+% \begin{center}
+% \includegraphics[width=15cm]{img/SeuilThivencelle.png}
+%
+% \includegraphics[width=15cm]{img/OrificeThivencelle.png}
+% \par\end{center}
-\includegraphics[width=15cm]{img/seuilThivencelle.png}
+\begin{center}
+ \begin{tabular}{|c|c|}
+ \hline
+ \multicolumn{2}{|c|}{Orifice Thivencelle} \\ \hline
+ Largeur & 9.07 \\ \hline
+ cote & 17.28\\ \hline
+ cote de mise en charge & 20.74\\ \hline
+ coefficient de débit & 0.4\\ \hline
+ cote de mise en charge maximale & 9999.999\\ \hline
+ \end{tabular}
+ \hspace{1cm}
+ \begin{tabular}{|c|c|}
+ \hline
+ \multicolumn{2}{|c|}{Seuil Thivencelle} \\ \hline
+ Largeur & 13.0 \\ \hline
+ cote & 21.74\\ \hline
+ coefficient de débit & 0.4\\ \hline
+ \end{tabular}\\
\par\end{center}
Vous pouvez maintenant fermer les fenêtres \textit{Ouvrages hydrauliques}.
+Si vous réouvrez la fenêtre \textit{Géométrie} vous pouvez voir apparaitre la position des ouvrages hydrauliques sur la vue longitudinale.
\section{Paramètres du solveur}
Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Parameters numériques des solveurs]}.
-Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \textit{Mage v8}. Réglez les paramètres du solveur comme suit :
-
-
-\begin{center}
-\includegraphics[width=15cm]{img/param.png}
-\par\end{center}
-
-
+Dans la fenêtre \textit{Paramètres du solveur}, sélectionnez l'onglet \texttt{[Mage v8]}.
+Ces paramètres pilotent le comportement du solveur numérique.
+la valeur 999:99:00:00 du temps final indique au solveur de s'arrêter lorsqu'il a atteint un régime permanent.
+Vous pouvez changer la fréquence d'écriture des résultats dans la ligne \textit{Pas de temps d'écriture dans le fichier .BIN}.
+Une valeur inférieure à 1 seconde indique que la valeur de la ligne \textit{Pas de temps d'écriture dans le fichier .TRA} s sera prise à la place.
+% En effet, durant la montée du pic de crue, le solveur a besoin de réduire le pas de temps suffisament pour permettre la convergence des itérations.
+Pour accélérer les calculs et pour aider le solveur à démarer, nous allons l'autoriser à dégrader la précision, à l'aide des facteurs de réduction de la précision.
+Les précisions internes du solveur sont de 10$^{-9}$.
+Cette précision est multipliée par le facteur de réduction de la précision : un facteur de 1000 ramènera donc la précision à 10$^{-5}$.
+Pour utiliser ce facteur de réduction de la précision, il faut donner un \textit{nombre d'itérations à précision maximum} inférieur au \textit{nombre maximum d'itérations} : le solveur va d'abord tenter de converger avec un certain nombre d'itératons à la précision maximum avant de basculer sur une précision dégradée pour le reste des itérations.
+Dans notre cas, c'est nécessaire pour lancer le solveur à partir de la condition initiale calculée par Pamhyr2.
+rentrez 1000 dans les trois lignes \textit{facteurs de réduction de la précision}, rentrez 99 pour le \textit{Nombre d'itérations} et 5 pour le \textit{nombre d'itérations à la précision maximum}.
+Gardez les autres paramètres du solveur par défaut.
Fermer la fenêtre \textit{Paramètres du solveur}.
\section{Lancer la simulation}
Dans la fenêtre principale, cliquez sur \texttt{[Exécuter] => [Lancer le solveur]}.
-Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Exécuter}.
-Deux fenêtres s'ouvrent : la fenêtre \textit{check list} et la fenêtre \textit{Log du solveur}.
-La fenêtre \textit{Check list} donne quelques indications sur la validité de votre modèle, et la fenêtre \textit{Log du solveur} affiche les résultats du solveur.
-À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.
+Sélectionnez \textit{Defaut-Mage - (Mage8)} et cliquez sur le bouton \textit{Lancer}.
+La fenêtre \textit{Log du solveur} s'ouvre.
+Cette fenêtre affiche les sorties texte du solveur.
+À partir de la fenêtre \textit{Log du solveur}, vous pouvez réexécuter le calcul en cliquant sur l'icône \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, et vous pouvez cliquer sur le bouton \textit{Résultats} pour ouvrir la fenêtre \textit{Résultats}.
\section{Visualiser les résultats}
-il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale. Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section en travers dans ce bief. Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}. Vous pouvez utiliser le curseur du bas pour visualiser la côte de l'eau à différents pas de temps.
+il est aussi possible d'ouvrir la fenêtre \textit{Résultats} si vous avez fermé la fenêtre \textit{Log du solveur}, en cliquant sur \texttt{[Résultats] => [Visualiser les derniers résultats]} à partir de la fenêtre principale.
+Le panneau supérieur vous permet de sélectionner le bief, le panneau inférieur gauche vous permet de sélectionner une section dans ce bief.
+Les trois diagrammes sur la droite montrent le bief et la section en travers de la même manière que dans la fenêtre \textit{Géométrie}.
+Vous pouvez utiliser le curseur du bas pour visualiser les résultats à différents pas de temps.
+Les croix rouges dans les deux vues du haut correspondent aux points ou l'eau déborde de la géométrie au moins une fois dans la simulation.
+En pratique il n'y a pas de perte de volume par débordement en dehors du modèle, car le solveur ajoute un mur virtuel aux extrémités des sections.
Pour visualiser le débit, passez à l'onglet \textit{Hydrogramme}.
-Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{img/gtk_add.png} en haut à gauche de la fenêtre. Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \textit{OK}.
-Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Results}.
-
-
+Pour créer des tracés 2D personnalisés, cliquez sur le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} en haut à gauche de la fenêtre.
+Sélectionnez les valeurs que vous voulez sur les axes $X$ et $Y$ et cliquez sur \texttt{[OK]}.
+Vous pouvez maintenant voir un nouvel onglet avec le tracé 2D personnalisé dans le panneau droit de la fenêtre \textit{Résultats}.
+Le bouton \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} vous permet d'exporter les résultats au format CSV pour une utilisation en dehors de Pamhyr2.
\pagebreak{}
\end{document}
diff --git a/doc/users/Tuto1/step-by-step.tex b/doc/users/Tuto1/step-by-step.tex
index 7cc83e6c848c51aab05c78a61fcf5c33aed1e5aa..87e1a37fd73403ae9c60e34b0695ce8d65016eed 100644
--- a/doc/users/Tuto1/step-by-step.tex
+++ b/doc/users/Tuto1/step-by-step.tex
@@ -112,9 +112,28 @@ Use the GNU Linux or the Windows download button depending on your system. On wi
\section{Create your first study}
On the main windows, click on \texttt{[Files] => [New Study]} to create a new study.
+Give it a name, for example \textit{Hogneau}, and validate.
-Click on \texttt{[River Network] => [Edit River Network]} to create the reaches of your river. In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
-Press the \includegraphics[width=0.5cm]{img/gtk_add.png} to enter the \textit{add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node. press \includegraphics[width=0.5cm]{img/gtk_add.png} again to exit the \textit{add} mode. You created your first reach, with an upstream node and a downstream node. In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches. As the reach you created is automaticaly selected, all the next steps will apply to this reach. The window should look like that:
+\begin{center}
+\includegraphics[width=15cm]{img/NEWSTUDY.png}
+\par\end{center}
+
+During study, don't forget to save periodicaly your work, using the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/save.png} button on the main window.
+
+\section{Create the structure of the river}
+
+Click on \texttt{[River Network] => [Edit River Network]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/network.png} shortcut to create the structure of your river.
+In this window, you must define an oriented graph that represents the reaches of your river network: the edges are the reaches and the nodes are either upstream boundary conditions, downstream boundary conditions or junctions.
+A default reach exists in a new study.
+For this tutorial, we will delete it:
+click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/del.png} button to enter the \textit{Delete} mode, then click on the nodes.
+We can now start with an empty window.
+Press the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to enter the \textit{Add} mode. Create two nodes by clicking in the grey zone of the window, and create a link by clicking again on each node.
+Press \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} again to exit the \textit{Add} mode.
+You created your first reach, with an upstream node and a downstream node.
+In the lower part of the \textit{Edit River Network} window you can rename the nodes and the reaches.
+As the reach you created is automaticaly selected, all the next steps will apply to this reach.
+The window should look like that:
\begin{center}
\includegraphics[width=15cm]{img/network.png}
@@ -125,15 +144,19 @@ Close the \textit{Edit River Network} window.
\section{Edit the river geometry}
-Click on \texttt{[Geometry] => [Edit Geometry]} to define the geometry of the selected bief. Click on the \texttt{[Import]} button and select the file \texttt{Data/Bief\_1.st}. You should see:
+Click on \texttt{[Geometry] => [Edit Geometry]} or on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/geometry.png} shortcut to define the geometry of the selected reach.
+Click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} button and select the file \texttt{Data/Bief\_1.st}.
+You should see:
\begin{center}
\includegraphics[width=15cm]{img/Geo.png}
\par\end{center}
-On the left panel is a list of all the cross sections with their name and longitudinal abscisa. In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black). You can move in the section list using the slider at the very right of the window.
+On the left panel is a list of all the cross sections with their name and longitudinal abscisa.
+In the top left plot you can see the top view of the river, on the top right panel the longitudinal cross-section of the river and in the bottom plot you can see the selected cross-section (blue) along with the next one (dashed purple) and previous one (dashed black).
+You can move in the section list using the right table or by clicking on the sections on one of the two upper plot.
-You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"img/edit.png"} icon.
+You can edit the selected cross section by clicking on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} icon.
select the cross section named \textit{PontRD101m} and open the edition window. You should see:
@@ -141,58 +164,100 @@ select the cross section named \textit{PontRD101m} and open the edition window.
\includegraphics[width=15cm]{img/editsect.png}
\par\end{center}
-On the left panel is the list of all the points of the section, with their coordinates, their name and their transversal absisa. The Z coordinate of the highest point is written in blue and the lowest in red. Points can have a name. If a point with the same name exists in every section in a reach, it forms a longitudinal line. For example, here we have \textit{rg} and \textit{rd} which represent the left bank and the right bank of the main chanel.
+On the left panel is the list of all the points of the section, with their coordinates, their name and their transversal absisa.
+The Z coordinate of the highest point is written in blue and the lowest in red.
+Points can have a name.
+If a point with the same name exists in every section in a reach, it forms a longitudinal line.
+For example, here we have \textit{rg} and \textit{rd} which represent the left bank and the right bank of the main chanel.
+
+On the plot is a projection of the cross section. You can click on a point to select it in the plot and \texttt{[right click]} to draw a water line and visualize usefull geometric data.
+You can then remove this line with \texttt{[scroll wheel click]}.
+You can close the cross section edition window and the geometry edition window.
-On the plot is a projection of the cross section. You can use \texttt{[ctrl + click]} to select a point in the plot and \texttt{[shift + click]} to select a water line and visualize usefull geometric data. You can close the cross section edition window and the geometry edition window.
+% TODO mesh
\section{Edit the boundary conditions}
-From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]}.You should see:
+From the main window, click on \texttt{[Hydraulics] => [Boundary conditions and punctual contributions]} or on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"}.
+You are now on the \textit{Boundary conditions} window:
\begin{center}
\includegraphics[width=15cm]{img/boundary.png}
\par\end{center}
- Use the \textit{add} button on the top left of the window to add a liquid boundary condition.
+ Use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window to add a liquid boundary condition.
On the new line, click to select the whole line, double click to select the cell.
- Select the \textit{Type} cell to give a name to the boundary condition. here, we will define the flow discharge mesured during the february 2002 flood. You can name this boundary condition "flood2002".
- Select the \textit{Type} cell and use the combo box to put a Q(t) law.
+ Select the \textit{Type} cell to give a name to the boundary condition.
+ Here, we will define the flow discharge mesured during the february 2002 flood.
+ You can name this boundary condition "flood2002".
+ Select the \textit{Type} cell and use the combo box to put a \textit{Q(t)} law.
Select the \textit{Node} cell and atribute this condition to the upstream node.
- Names of the nodes are recalled in network in the right panel.
- Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"img/edit.png"}. You opened the \textit{Edit Boundary Conditions} window.
- On a text editor, open the \texttt{Data/Fevrier\_2002.txt} file. Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}. You can now see the flow discharge curve:
+ Names of the nodes are recalled in the right panel with the network view.
+ Now select the whole line and click on the edit button \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}.
+ You opened the \textit{Edit Boundary Conditions} window.
+ In a text editor, open the \texttt{Data/Fevrier\_2002.txt} file.
+ Copy the content of the file (for example with \textit{ctrl+a ctrl+c}) and paste it in the left panel of the \textit{Edit Boundary Conditions} window with \textit{ctrl+v}.
+ You can now see the flow discharge curve:
\begin{center}
\includegraphics[width=15cm]{img/fev2002.png}
\par\end{center}
-Close this window. Go back on the \textit{Boundary Conditions} window. Add a new line, give it a name, give it the textit{Z(T)} type and associate it to the downstream node of the network. Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"img/edit.png"}). Add two lines. In the first one, enter time: 0.00.00 and Z: 15.000.
-On the second one, time: 1.00.00 and Z: 15.000. It creates a constant downstream water elevation. For the computaion, Mage will extrapolate continuously the water elevation, that's why we only need to define one hour.
+Close this window.
+Go back on the \textit{Boundary Conditions} window.
+Add a new line, give it a name, give it the textit{Q(Z)} type (rating curve) and associate it to the downstream node of the network.
+This downstream boundary condition corresponds to a weir.
+There, the river transition from a fluvial flow to a torrential flow.
+This allows us to compute a rating curve corresponding to the critical flow located over the weir.
+Open the \textit{Edit Boundary Conditions} window (\includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"}).
+In the \textit{Edit boundary conditions} window click on \texttt{[Générer régime critique]} to comput the said rating curve.
+Click on \texttt{[Make increasing]} to remove the points of the curve that are not strictly increasing.
You can close the the \textit{Edit Boundary Conditions} and the \textit{Boundary Conditions} window.
\section{Create initial conditions}
-From the main window, click on \texttt{[Hydraulics] => [Initial conditions]}.
-If you don't know the initial conditions in water elevation and flow discharge of the river, you can use \texttt{[Generate minimal height]} or \texttt{[Generate from discharge]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
-Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window to generate an initial water height condition based on the Manning-Strickler formula and a uniform discharge of $4 m^3$. You should see:
+From the main window, click on \texttt{[Hydraulics] => [Initial conditions]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/boundary_condition.png"} shortcut.
+To start, the numerical solver needs to know the water elevation and the discharge at every cross-section of the river.
+If you don't know the initial water elevation and flow discharge conditions of the river, you can use the \texttt{[Generate minimal depth]}, \texttt{[Generate from discharge]} or \texttt{[Generate elevation]} buttons to let Pamhyr2 estimate an initial condition using the Manning-Strickler formula.
+Click on \texttt{[Generate from discharge]} and enter a discharge of $4 m^3$ in the pop-up window, and check the \texttt{[Generate depth]} to generate an initial water elevation condition based on the Manning-Strickler formula.
+You should see:
\begin{center}
\includegraphics[width=15cm]{img/ic.png}
\par\end{center}
+You can alternately use \texttt{[Generate elevation]} to enter a constant elevation of $21 m$ (upstream and downstream) associated with a null discharge.
+The goal is to create a lake and to let the solver drain it to find a suitable initial state.
+
+In your next simulations, you can use the final timestep of the previous simulation as an initial condition.
+To do that, click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/import.png} and find the results contained in a \textit{.BIN} file.
+This file should be in the sub-directory \textit{\_PAMHYR\_/Hogneau/default-mage}.
+
Close the \textit{Initial conditions} window.
\section{Edit friction coefficients}
-From the main window, click on \texttt{[Hydraulics] => [Edit friction]}.
-You fist have to define sets of Strickler coefficients. Click on \includegraphics[width=0.5cm]{"img/edit.png"} to open the \textit{Strickler} window. Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed. Click on \textit{add} four times to create four new couple. Give them the folowing values:
+We will now define the friction coefficients of the bottom of the river.
+From the main window, click on \texttt{[Hydraulics] => [Edit friction]} or on the \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/friction.png"} shortcut.
+You have to define sets of Strickler coefficients first.
+Click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to open the \textit{Strickler} window.
+Here you can create couples of Strickler coefficients, the first one for the minor bed, the second one for the medium bed.
+Click on \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} four times to create four new couples.
+Give them the folowing values:
\begin{center}
\includegraphics[width=15cm]{img/K.png}
\par\end{center}
-Close the \textit{Strickler} window. On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{img/gtk_add.png} to create four friction zones. Each zone is defined by a \textit{begin} and \textit{end} KP and a \textit{begin} and \textit{end} Strickler couple. The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples. In our case, we will use constant coefficients per zone. Set the zones as follow:
+You can use the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/sort_A-Z.png} button to sort the couples by alphabetical order.
+Close the \textit{Strickler} window.
+
+On the \textit{Edit friction} window, add four lines with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} to create four friction zones.
+Each zone is defined by a \textit{begin} and \textit{end} KP associated with a \textit{begin} and \textit{end} Strickler couple.
+The strickler coefficient couples inside a zone are interpolated from the \textit{begin} and \textit{end} couples.
+In our case, we will use uniform coefficients per zone.
+Set the zones as follow:
\begin{center}
\includegraphics[width=15cm]{img/frictions.png}
@@ -200,50 +265,53 @@ Close the \textit{Strickler} window. On the \textit{Edit friction} window, add f
The selected zone is highlighted in blue. Close the \textit{Edit friction} window.
-
\section{Model hydraulic structures}
-Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow. In that case, we have to define an other law to link the water elevation and the flow discharge. This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge. Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized. In our case, a weir and two bridges have to be represented as hydraulic structures.
-From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window. Click tree times on the \includegraphics[width=0.5cm]{img/gtk_add.png} button to create three hydraulic structures. Each structure can have a name and must have a reach and a KP. Set them as follow:
+Sometimes there can be cross-sections in which Shallow water equations can not be used to model the water flow.
+In that case, we have to define an other law to link the water elevation and the flow discharge.
+This is the case, for example, under bridges when the water elevation is too high, leading to a flow in charge.
+Pamhyr2 enables to define various hydraulic structures with laws that can be parametrized.
+In our case, two bridges have to be represented as hydraulic structures.
+From the main window, click on \texttt{[Hydraulics] => [Hydraulic structures]} to open the hydraulic structures window.
+Click two times on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button to create two hydraulic structures.
+Each structure can have a name and must have a reach and a KP.
+Set them as follow:
\begin{center}
\includegraphics[width=15cm]{img/hs.png}
\par\end{center}
-Select the downstream weir and click on \includegraphics[width=0.5cm]{"img/edit.png"} to edit the laws of this structure. Hydraulic structures are composed of basic hydraulic structures. You can combine the laws of several basic hydraulic structures to setup your structure. For this weir, we only need a weir basic hydraulic structure. Click on \includegraphics[width=0.5cm]{img/gtk_add.png} to add a new basic hydraulic structure, give it the \textit{weir} type and set it up as folow:
-
-\begin{center}
-\includegraphics[width=15cm]{img/seuil.png}
-\par\end{center}
-
-Go back to the \textit{hydraulic structures} window.
-
-Select the RS101 bridge and click on \includegraphics[width=0.5cm]{"img/edit.png"} to edit the laws of this structure. A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge. Create two basic hydraulic structures and set them as folow:
+Select the RD101 bridge and click on \includegraphics[width=0.5cm]{"../../../src/View/ui/ressources/edit.png"} to edit the laws of this structure.
+Hydraulic structures are composed of basic hydraulic structures.
+You can combine the laws of several basic hydraulic structures to setup your structure.
+A bridge can be modeled as a combination of an orifice for the flow under the bridge and a weir for the flow over the bridge.
+Create two basic hydraulic structures with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} and set them as folow:
\begin{center}
-\includegraphics[width=15cm]{img/seuilRS101.png}
+\includegraphics[width=15cm]{img/seuilRD101.png}
-\includegraphics[width=15cm]{img/orificeRS101.png}
+\includegraphics[width=15cm]{img/orificeRD101.png}
\par\end{center}
Go back to the \textit{hydraulic structures} window and aply the same procedure for the Thivencelle bridge:
\begin{center}
-\includegraphics[width=15cm]{img/orificeThivencelle.png}
-
\includegraphics[width=15cm]{img/seuilThivencelle.png}
+
+\includegraphics[width=15cm]{img/orificeThivencelle.png}
\par\end{center}
You can now close the \textit{hydraulic structures} windows.
+If you open the \textit{geometry} window you can see the structure position in the longitudinal view.
\section{Solver parameters}
From the main window, click on \texttt{[Execute] => [Numerical parameters for solvers]}.
-In the window \textit{solver parameters} select the \textit{Mage v8} tab. Set the solver parameters as follow:
+In the window \textit{solver parameters} select the \textit{Mage v8} tab.
+Set the minimul timestep to 0.1. and keep the default values for the other parameters.
+We need a smaller minimum timester because the solver needs to reduce the timestep in order to converge during the steep increase of discharge at the begining of the flood.
-\begin{center}
-\includegraphics[width=15cm]{img/param.png}
-\par\end{center}
+% TODO precision
Close the \textit{solver parameters} window.
@@ -251,17 +319,23 @@ Close the \textit{solver parameters} window.
From the main window, click on \texttt{[Execute] => [Run solver]}.
Select \textit{Defaut-Mage - (Mage8)} anc click on the \textit{Run} button.
-It will open two windows: the \textit{Check list} window and the \textit{Solver log} window.
-The \textit{Check list} window gives som hints about the validity of your model, and the \textit{Solver log} window displays the outputs of the solver.
-From the \textit{Solver log} window you can re-run the computation, and from the textit{Solver log} window you can click on the \textit{Results} button to open the \textit{Results} window.
+It will open the \textit{Solver log} window.
+The \textit{Solver log} window displays the outputs of the solver.
+From the \textit{Solver log} window you can re-run the computation with the button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/run.png}, and you can click on the \textit{Results} button to open the \textit{Results} window.
\section{Visualize the results}
-If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window. The top lets panel let you select your reach, the bottom left panel lets you select a cross-section in that reach. the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window. You can use the bottom slider to visualize the water elevation at different timesteps.
+If you closed the \textit{Solver log} window, you can click on \texttt{[Results] => [Visualize last results]} from the main window to open the \textit{Results} window.
+The top left panel let you select your reach, the bottom left panel lets you select a cross-section in that reach.
+the three plots on the right show the reach and the cross-section the same way than in the \textit{Geometry} window.
+You can use the bottom slider to visualize the results at different timesteps.
+The red crosses in the graphs corresponds to sections where the water level exceeds the limits of the geometry at least one time during the simulation.
+This does not corresponds to water leaks, as the solver artificialy adds a virtual wall at both ends of the cross-sections geometry.
To visualize the flow discharge, switch to the \textit{Hydrograph} tab.
-To create custom 2D plots, click on the \includegraphics[width=0.5cm]{img/gtk_add.png} button on the top left of the window. Select the values you want on the $X$ and $Y$ axis and click on \textit{OK}.
+To create custom 2D plots, click on the \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/add.png} button on the top left of the window.
+Select the values you want on the $X$ and $Y$ axis and click on \texttt{[OK]}.
You can now see a new tab with the custom 2D plot in the right panel of the \textit{Results} window.
-
+The button \includegraphics[width=0.5cm]{../../../src/View/ui/ressources/export.png} allows you to export your results to a CSV file if you want to post-process them outside Pamhyr2.
\pagebreak{}
\end{document}
diff --git a/doc/users/Tuto1/step1.pamhyr b/doc/users/Tuto1/step1.pamhyr
index 89ec2024871ab1b3328daf51957a5a394d87cb30..1808572d116fb8aeee88abc90da6846be1df9866 100644
Binary files a/doc/users/Tuto1/step1.pamhyr and b/doc/users/Tuto1/step1.pamhyr differ
diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py
index b0e63f9c66c284dd51eb7a56370df15edae9f95a..f4ca99c4c4e9a263f43d2c38c146b92171c814aa 100644
--- a/src/Model/Geometry/ProfileXYZ.py
+++ b/src/Model/Geometry/ProfileXYZ.py
@@ -253,6 +253,15 @@ class ProfileXYZ(Profile, SQLSubModel):
return point
+ def display_name(self):
+ name = ""
+ if self.name != "":
+ name += f"{self.name} "
+
+ name += f"({self.rk})"
+
+ return name
+
def x(self):
return [point.x for point in self.points]
diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py
index f33eb5deee050f5d42177dfc3aa7c24072f9ac40..c10b56fc50817e0b12264bc185e8288de0a8d275 100644
--- a/src/Model/Geometry/Reach.py
+++ b/src/Model/Geometry/Reach.py
@@ -632,8 +632,8 @@ class Reach(SQLSubModel):
try:
list_profile, list_header = self.read_file_st(str(file_path_name))
- profile_header = ["num", "code1",
- "code2", "nb_point", "rk", "name"]
+ profile_header = ["num", "code1", "code2",
+ "nb_point", "rk", "name"]
if list_profile and list_header:
for ind, profile in enumerate(list_profile):
@@ -707,6 +707,15 @@ class Reach(SQLSubModel):
line_is_header = True
else:
list_point_profile.append(line)
+ elif len(line) > 4:
+ x, y, z = line[:3]
+ if stop_code in x and stop_code in y:
+ line_is_header = True
+ list_profile.append(list_point_profile)
+ list_point_profile = []
+ else:
+ line.append("")
+ list_point_profile.append(line[:3])
else:
pass
diff --git a/src/Model/Network/Edge.py b/src/Model/Network/Edge.py
index a21c89ab47357e154391bd7547c1a237a4d8e8be..e1a83e7cae52133e3c0f903f8f0a4d504d760b23 100644
--- a/src/Model/Network/Edge.py
+++ b/src/Model/Network/Edge.py
@@ -51,9 +51,9 @@ class Edge(object):
elif name == "id":
ret = self.id
elif name == "node1":
- ret = self.node1.name
+ ret = self.node1
elif name == "node2":
- ret = self.node2.name
+ ret = self.node2
elif name == "enable":
ret = self._enable
@@ -75,10 +75,10 @@ class Edge(object):
@property
def name(self):
- name = self._name
if self._name == "":
- name = f"{self.node1.name} -> {self.node2.name}"
- return name
+ return f"R{self.id}"
+
+ return self._name
def is_enable(self):
return self._enable
diff --git a/src/Model/Network/Node.py b/src/Model/Network/Node.py
index eb763939959e94fd554f0dfa12c471f2e30422c5..3cd68b1e72b4df8a4d7050fdc459fb264fff8c1a 100644
--- a/src/Model/Network/Node.py
+++ b/src/Model/Network/Node.py
@@ -35,11 +35,7 @@ class Node(object):
else:
self.id = id
- if name == "":
- self._name = f"Node {self.id}"
- else:
- self._name = name
-
+ self._name = name
self.pos = Point(x, y)
def __getitem__(self, key):
@@ -64,6 +60,9 @@ class Node(object):
@property
def name(self):
+ if self._name == "":
+ return f"N{self.id}"
+
return self._name
@property
diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
index 45272f7d5810a3e3787a2f1244348147ac5d1baa..c3192d005af3e11294bf127b5e70a077f8fd8382 100644
--- a/src/Model/Stricklers/Stricklers.py
+++ b/src/Model/Stricklers/Stricklers.py
@@ -113,10 +113,7 @@ class Stricklers(SQLSubModel):
return True
def __str__(self):
- if self._name != "":
- return f"{self._name} ({self._minor}, {self._medium})"
-
- return f"({self._minor}, {self._medium})"
+ return f"{self.name} ({self._minor}, {self._medium})"
@property
def name(self):
diff --git a/src/View/About/Window.py b/src/View/About/Window.py
index 24931a084e2adae44eaddf7cc3ccd656d0886fe3..a3605ea859e4115343fbd048060c347100e76f66 100644
--- a/src/View/About/Window.py
+++ b/src/View/About/Window.py
@@ -55,6 +55,7 @@ class AboutWindow(PamhyrDialog):
label = self.get_label_text("label_version")
label = label.replace("@version", version)
+ label = label.replace("@codename", "(Tahiti)")
self.set_label_text("label_version", label)
# Authors
@@ -67,5 +68,5 @@ class AboutWindow(PamhyrDialog):
label = f"\n - {author}" + label
except StopIteration:
label = _translate("About", "Contributors: ") + label
- label = "Copyright © 2022-2024 INRAE\n" + label
+ # label = "Copyright © 2022-2024 INRAE\n" + label
self.set_label_text("label_copyright", label)
diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py
index dba64da5d8a6d5340f770f89d6573f889aabe713..336a9671b4e7edfafcff4ca3cf70b7f541381b8a 100644
--- a/src/View/BoundaryCondition/Edit/Window.py
+++ b/src/View/BoundaryCondition/Edit/Window.py
@@ -224,8 +224,11 @@ class EditBoundaryConditionWindow(PamhyrWindow):
self._d50sigma.sigmaChanged.connect(self.sigma_changed)
def setup_dialog(self):
- reach = self._data.reach(self._study.river)[0]
- self.slope_value = abs(reach.get_incline_median_mean())
+ if len(self._data.reach(self._study.river)) > 0:
+ reach = self._data.reach(self._study.river)[0]
+ self.slope_value = abs(reach.get_incline_median_mean())
+ else:
+ self.slope_value = 0.0
def d50_changed(self, value):
self._undo_stack.push(
diff --git a/src/View/Frictions/Window.py b/src/View/Frictions/Window.py
index a7dd9e19888e61d7363bcb69b3d84ab60949c9f3..8e4959eabbbdd8760278bf7cfecda8ff994283a9 100644
--- a/src/View/Frictions/Window.py
+++ b/src/View/Frictions/Window.py
@@ -209,9 +209,7 @@ class FrictionsWindow(PamhyrWindow):
self.update_plot(highlight)
def update_plot(self, highlight=None):
- if highlight is not None:
- self.plot.highlight = highlight
- self.plot.draw()
+ self.plot.draw(highlight)
if highlight is not None:
self.plot_2.highlight = highlight
diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py
index 5c62ba6c0ccf7fbca6c74b9a6329625643fb2cbd..9f2d329bcd64abb18b05db34fa22f273fff18c06 100644
--- a/src/View/Frictions/translate.py
+++ b/src/View/Frictions/translate.py
@@ -44,6 +44,6 @@ class FrictionsTranslate(MainTranslate):
# "edge": self._dict["reach"],
"begin_rk": _translate("Frictions", "Start (m)"),
"end_rk": _translate("Frictions", "End (m)"),
- "begin_strickler": _translate("Frictions", "Start coefficient"),
- "end_strickler": _translate("Frictions", "End coefficient"),
+ "begin_strickler": _translate("Frictions", "Coefficient"),
+ # "end_strickler": _translate("Frictions", "End coefficient"),
}
diff --git a/src/View/Geometry/MeshingDialog.py b/src/View/Geometry/MeshingDialog.py
index 1ee8daf61ac82d279fa15c16ffc80f83e1141873..07478f6e39aaae95119c2c93cf04ca57a56cd503 100644
--- a/src/View/Geometry/MeshingDialog.py
+++ b/src/View/Geometry/MeshingDialog.py
@@ -50,6 +50,8 @@ class MeshingDialog(PamhyrDialog):
self._init_default_values()
def _init_default_values(self):
+ gl, _ = self._reach.compute_guidelines()
+ self._gl = list(gl)
self._space_step = 50.0
self._lplan = False
self._lm = "3"
@@ -58,6 +60,14 @@ class MeshingDialog(PamhyrDialog):
self._end_cs = -1
self._begin_dir = "un"
self._end_dir = "np"
+
+ lower_gl = list(map(str.lower, self._gl))
+ for i, gl in enumerate(lower_gl):
+ if gl == "rg":
+ self._begin_dir = self._gl[i]
+ elif gl == "rd":
+ self._end_dir = self._gl[i]
+
self._origin = self._reach.profile(0)
self._init_default_values_profiles()
diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py
index ad43fdf3b1d13b469fcd38f04e36b13b9b758670..2be00355526dab6809851cabc9e89c5e97eb7fd7 100644
--- a/src/View/Geometry/PlotAC.py
+++ b/src/View/Geometry/PlotAC.py
@@ -41,7 +41,7 @@ class PlotAC(PamhyrPlot):
self._autoscale_update = True
self.label_x = self._trad["transverse_abscissa"]
- self.label_y = self._trad["unit_height"]
+ self.label_y = self._trad["unit_elevation"]
self.label_previous_plot_selected = self._trad["prev_cs"]
self.label_plot_selected = self._trad["cs"]
diff --git a/src/View/Geometry/PlotRKZ.py b/src/View/Geometry/PlotRKZ.py
index 848f85c29617e248e772cbdc17f510290a7d0365..55fdee911b7c1e8f7f50b03ac2135c01d1153543 100644
--- a/src/View/Geometry/PlotRKZ.py
+++ b/src/View/Geometry/PlotRKZ.py
@@ -198,7 +198,7 @@ class PlotRKZ(PamhyrPlot):
z_min = self.data.get_z_min()
z_max = self.data.get_z_max()
- self._colors, self._style = self.color_hightlight()
+ self._colors, self._style = self.color_highlight()
self.line_rk_zmin_zmax = self.canvas.axes.vlines(
x=rk, ymin=z_min, ymax=z_max,
@@ -208,7 +208,7 @@ class PlotRKZ(PamhyrPlot):
picker=10,
)
- def color_hightlight(self):
+ def color_highlight(self):
rows = sorted(list(
set(
(i.row() for i in self.parent.tableView.selectedIndexes())
@@ -292,6 +292,8 @@ class PlotRKZ(PamhyrPlot):
)
for hs in lhs:
+ if not hs.enabled:
+ continue
x = hs.input_rk
if x is not None:
z_min = reach.get_z_min()
@@ -328,7 +330,7 @@ class PlotRKZ(PamhyrPlot):
def update_current(self):
if self._current_data_update:
- self._colors, self._style = self.color_hightlight()
+ self._colors, self._style = self.color_highlight()
self.line_rk_zmin_zmax.set_colors(self._colors)
self.line_rk_zmin_zmax.set_linestyle(self._style)
@@ -345,7 +347,7 @@ class PlotRKZ(PamhyrPlot):
# TODO comprendre à quoi sert ce bout de code
# ========>
# self.line_rk_zmin_zmax.remove()
-# self._colors, self._style = self.color_hightlight()
+# self._colors, self._style = self.color_highlight()
# self.line_rk_zmin_zmax = self.canvas.axes.vlines(
# x=rk,
# ymin=z_min,
diff --git a/src/View/Geometry/Profile/Plot.py b/src/View/Geometry/Profile/Plot.py
index 0eb1543f150cfb4f190c43c2b98529f90bdf1bf9..f8c790f6a3132cca7714998d57fdabe6b1273156 100644
--- a/src/View/Geometry/Profile/Plot.py
+++ b/src/View/Geometry/Profile/Plot.py
@@ -56,8 +56,8 @@ class Plot(PamhyrPlot):
self.line_xy = []
self.line_gl = []
- self.label_x = self._trad["unit_rk"]
- self.label_y = self._trad["unit_height"]
+ self.label_x = self._trad["transverse_abscissa"]
+ self.label_y = self._trad["unit_elevation"]
self.before_plot_selected = None
self.plot_selected = None
diff --git a/src/View/Geometry/UndoCommand.py b/src/View/Geometry/UndoCommand.py
index d3cc29efcd4549f6da25f98c41a1b90cbd48afe8..456705f2ff663f38964fd876910c3237adae4419 100644
--- a/src/View/Geometry/UndoCommand.py
+++ b/src/View/Geometry/UndoCommand.py
@@ -204,19 +204,29 @@ class ImportCommand(QUndoCommand):
self._row = row
self._filename = filename
self._profiles = None
+ self._old_profiles = []
+ for row in range(len(self._reach)):
+ self._old_profiles.append((self._reach.profile(row)))
+ self._old_profiles.reverse()
def undo(self):
self._reach.delete_profiles(self._profiles)
+ for profile in self._old_profiles:
+ self._reach.insert_profile(self._row, profile)
def redo(self):
if self._profiles is None:
+ self._reach.delete_profiles(self._old_profiles)
try:
self._profiles = self._reach.import_geometry(self._filename)
self._profiles.reverse()
except Exception as e:
+ for profile in self._old_profiles:
+ self._reach.insert_profile(self._row, profile)
logger_exception(e)
exception_message_box(e)
else:
+ self._reach.delete_profiles(self._old_profiles)
for profile in self._profiles:
self._reach.insert_profile(self._row, profile)
diff --git a/src/View/Geometry/UpdateRKDialog.py b/src/View/Geometry/UpdateRKDialog.py
index 867a10a5735327b484e2ae301207658468aa274e..ec5916605458929b61931fc53b9cbe1b2057875f 100644
--- a/src/View/Geometry/UpdateRKDialog.py
+++ b/src/View/Geometry/UpdateRKDialog.py
@@ -58,9 +58,9 @@ class UpdateRKDialog(PamhyrDialog):
lower_gl = list(map(str.lower, self._gl))
for i, gl in enumerate(lower_gl):
- if gl == "rd":
+ if gl == "rg":
self._begin_dir = self._gl[i]
- elif gl == "rg":
+ elif gl == "rd":
self._end_dir = self._gl[i]
self._orientation = 0
diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
index 29a12f350feedfe000ae42954affc90e7d30ac9a..926716028c99557045c4110ab1cbff0e492a5d73 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
@@ -28,7 +28,7 @@ class BasicHydraulicStructuresTranslate(MainTranslate):
super(BasicHydraulicStructuresTranslate, self).__init__()
self._dict["Basic Hydraulic Structures"] = _translate(
- "BasicHydraulicStructures", "Basic Hydraulic Structure"
+ "BasicHydraulicStructures", "Basic Hydraulic Structures"
)
self._dict['msg_type_change_title'] = _translate(
@@ -108,7 +108,7 @@ hydraulic structure values?"
self._sub_dict["long_types"] = {
"ND": self._dict["not_defined"],
"S1": _translate(
- "BasicHydraulicStructures", "Discharge weir"
+ "BasicHydraulicStructures", "Rectangular weir"
),
"S2": _translate(
"BasicHydraulicStructures", "Trapezoidal weir"
diff --git a/src/View/HydraulicStructures/PlotAC.py b/src/View/HydraulicStructures/PlotAC.py
index 31c17b22b6c8eb92a843f2de3c66408c76ae94a1..72a6a4836bc0a8e6f0956ff9286a834940f214b9 100644
--- a/src/View/HydraulicStructures/PlotAC.py
+++ b/src/View/HydraulicStructures/PlotAC.py
@@ -118,3 +118,4 @@ class PlotAC(PamhyrPlot):
def update_clear(self):
if self.line_rk is not None:
self.line_rk.set_data([], [])
+ self.update_idle()
diff --git a/src/View/HydraulicStructures/PlotRKC.py b/src/View/HydraulicStructures/PlotRKC.py
index 72a16a8fd4cc860a35141f6f820fbc615b60343a..85bdd8ffcae53814211466b6d598e657b39fdab1 100644
--- a/src/View/HydraulicStructures/PlotRKC.py
+++ b/src/View/HydraulicStructures/PlotRKC.py
@@ -69,21 +69,23 @@ class PlotRKC(PamhyrPlot):
self.profile = None
self.line_rk_zmin_zmax = None
self.line_rk_zmin = None
+ self.hs_vlines = None
return
if self._current_reach is None:
self.profile = None
self.line_rk_zmin_zmax = None
self.line_rk_zmin = None
+ self.hs_vlines = None
return
- self.draw_data()
+ self.draw_data(highlight)
self.draw_current()
self.idle()
self._init = True
- def draw_data(self):
+ def draw_data(self, highlight):
reach = self._current_reach
rk = reach.reach.get_rk()
@@ -107,11 +109,68 @@ class PlotRKC(PamhyrPlot):
self.line_rk_zmin_zmax = self.canvas.axes.vlines(
x=rk,
ymin=z_min, ymax=z_max,
- color=self.color_plot,
+ color=self.color_highlight(highlight),
lw=1.,
picker=10
)
+ # Draw HS
+
+ lhs = filter(
+ lambda hs: hs._input_reach is reach,
+ filter(
+ lambda hs: hs._input_reach is not None,
+ self.data.hydraulic_structures.lst
+ )
+ )
+
+ vx = []
+ vymin = []
+ vymax = []
+ self.anotate_lst = []
+ hs_color = []
+ for hs in lhs:
+ if hs.enabled:
+ hs_color.append("black")
+ else:
+ hs_color.append("darkgrey")
+ x = hs.input_rk
+ if x is not None:
+ a = self.canvas.axes.annotate(
+ " > " + hs.name,
+ (x, max(z_max)),
+ horizontalalignment='left',
+ verticalalignment='top',
+ annotation_clip=True,
+ fontsize=9,
+ color=hs_color[-1],
+ )
+ self.anotate_lst.append(a)
+ vx.append(x)
+ vymin.append(min(z_min))
+ vymax.append(max(z_max))
+
+ self.hs_vlines = self.canvas.axes.vlines(
+ x=vx, ymin=vymin, ymax=vymax,
+ linestyle="--",
+ lw=1.,
+ color=hs_color,
+ )
+
+ def color_highlight(self, highlight):
+
+ reach = self._current_reach
+ colors = [self.color_plot] * reach.reach.number_profiles
+
+ if highlight is not None:
+ rk = reach.reach.get_rk()
+ rows = [i for i in range(len(rk))
+ if (rk[i] >= highlight[0] and rk[i] <= highlight[1])]
+ if len(rows) > 0:
+ for row in rows:
+ colors[row] = self.color_plot_current
+ return colors
+
def draw_current(self):
if self._current_profile is None:
self.profile = None
@@ -166,11 +225,19 @@ class PlotRKC(PamhyrPlot):
if self.line_rk_zmin is not None:
self.line_rk_zmin.set_data([], [])
+ if self.hs_vlines is not None:
+ self.hs_vlines.remove()
+ self.hs_vlines = None
+
+ for a in self.anotate_lst:
+ a.remove()
+ self.anotate_lst = []
+
self.canvas.figure.canvas.draw_idle()
def clear_profile(self):
if self.profile is not None:
- self.profile.set_data([], [])
+ self.profile[0].set_data([], [])
self.canvas.figure.canvas.draw_idle()
diff --git a/src/View/HydraulicStructures/Table.py b/src/View/HydraulicStructures/Table.py
index e8530b1a24faac926b642aeb9b53ac567811e4c8..cf547875e1afedce0d448f1f45655ff5e5f85858 100644
--- a/src/View/HydraulicStructures/Table.py
+++ b/src/View/HydraulicStructures/Table.py
@@ -65,7 +65,8 @@ class ComboBoxDelegate(QItemDelegate):
if reach is not None:
val = list(
map(
- lambda rk: str(rk), reach.reach.get_rk()
+ lambda p: p.display_name(),
+ reach.reach.profiles
)
)
else:
@@ -89,7 +90,23 @@ class ComboBoxDelegate(QItemDelegate):
def setModelData(self, editor, model, index):
text = str(editor.currentText())
- model.setData(index, text)
+
+ if self._mode == "rk":
+ reach = self._data.hydraulic_structures\
+ .get(index.row())\
+ .input_reach
+ profiles = list(
+ filter(
+ lambda p: p.display_name() == text,
+ reach.reach.profiles
+ )
+ )
+
+ value = profiles[0].rk if len(profiles) > 0 else None
+ else:
+ value = text
+
+ model.setData(index, value)
editor.close()
editor.deleteLater()
diff --git a/src/View/InitialConditions/Table.py b/src/View/InitialConditions/Table.py
index 1f6e2e8ac0d77e18c72e3c31ee4006a1f855a2c8..c9db850f613bfd4ab4a4131f91f52f9e2ae26872 100644
--- a/src/View/InitialConditions/Table.py
+++ b/src/View/InitialConditions/Table.py
@@ -38,7 +38,7 @@ from View.Tools.PamhyrTable import PamhyrTableModel
from View.InitialConditions.UndoCommand import (
SetCommand, AddCommand, DelCommand,
SortCommand, MoveCommand, InsertCommand,
- DuplicateCommand, GenerateCommand,
+ DuplicateCommand, GenerateCommand, ReplaceDataCommand,
)
logger = logging.getLogger()
@@ -267,8 +267,8 @@ class InitialConditionTableModel(PamhyrTableModel):
)
self._undo.push(
- InsertCommand(
- self._lst, index,
+ ReplaceDataCommand(
+ self._lst,
list(
map(
lambda d: self._lst.new_from_data(*d),
diff --git a/src/View/InitialConditions/UndoCommand.py b/src/View/InitialConditions/UndoCommand.py
index fd5e4de28c109ce03ed608278174777b7a280832..a3f31a2917c51b1a3685f5af00529ba75a5ce0d7 100644
--- a/src/View/InitialConditions/UndoCommand.py
+++ b/src/View/InitialConditions/UndoCommand.py
@@ -196,3 +196,24 @@ class GenerateCommand(QUndoCommand):
self._param[1],
self._option,
self._param[2])
+
+
+class ReplaceDataCommand(QUndoCommand):
+ def __init__(self, ics, new_data):
+ QUndoCommand.__init__(self)
+
+ self._ics = ics
+ self._copy = self._ics.data
+ self._new_data = new_data
+ self._rows = list(range(len(ics.data)))
+ self._new_rows = list(range(len(new_data)))
+
+ def undo(self):
+ self._ics.delete_i(self._new_rows)
+ for row, el in enumerate(self._copy):
+ self._ics.insert(row, el)
+
+ def redo(self):
+ self._ics.delete_i(self._rows)
+ for row, el in enumerate(self._new_data):
+ self._ics.insert(row, el)
diff --git a/src/View/InitialConditions/Window.py b/src/View/InitialConditions/Window.py
index 58156cb1091503f8442ef75308d763cea9e0cb94..add3f1a7537d09fcac362a1fea9dc12e6be69e55 100644
--- a/src/View/InitialConditions/Window.py
+++ b/src/View/InitialConditions/Window.py
@@ -276,11 +276,15 @@ class InitialConditionsWindow(PamhyrWindow):
.replace(".BIN", "")
def reading():
- self._tmp_results = solver.results(
- self._study,
- os.path.dirname(file_name),
- name=name
- )
+ try:
+ self._tmp_results = solver.results(
+ self._study,
+ os.path.dirname(file_name),
+ name=name
+ )
+ except Exception as e:
+ logger.error(f"Failed to open results")
+ logger_exception(e)
dlg = ReadingResultsDialog(
reading_fn=reading,
diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py
index 3ed1c398935446b06a0451d463e10e4679a2428d..0edee4dcfcfa57be66f775ec7bbdbe881c0e2edb 100644
--- a/src/View/InitialConditions/translate.py
+++ b/src/View/InitialConditions/translate.py
@@ -28,11 +28,7 @@ class ICTranslate(MainTranslate):
super(ICTranslate, self).__init__()
self._dict["Initial condition"] = _translate(
- "InitialCondition", "Initial condition")
- self._dict["Discharge"] = _translate(
- "InitialCondition", "Discharge")
- self._dict["Height"] = _translate(
- "InitialCondition", "Height")
+ "InitialCondition", "Initial conditions")
self._dict["elevation"] = self._dict["unit_elevation"]
self._dict["discharge"] = self._dict["unit_discharge"]
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 4e1ca6b8992b05f6f3891994a0ec8b411182273f..18d793551fef2f9d2786b14631f93c73384e714f 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -177,10 +177,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
title = "(dbg) " if self.conf.debug else ""
if self._study is not None:
- title += f"Pamhyr2 - {self._study.name}"
+ title += f"Pamhyr2 (Tahiti 🌴) - {self._study.name}"
self.setWindowTitle(title)
else:
- title += "Pamhyr2"
+ title += "Pamhyr2 (Tahiti 🌴)"
self.setWindowTitle(title)
def setup_tab(self):
@@ -512,6 +512,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
self.update()
def close_model(self):
+ if not self.dialog_close(cancel=True):
+ return
+
self._study = None
self.update_enable_action()
self.conf.set_close_correctly()
@@ -761,15 +764,16 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
##################
def msg_select_reach(self):
- self.message_box("Please select a reach",
- "Geometry edition need a reach selected "
- "into river network window to work on it")
+ self.message_box(
+ self._trad["mb_select_reach_title"],
+ self._trad["mb_select_reach_msg"]
+ )
def dialog_reopen_study(self):
dlg = QMessageBox(self)
- dlg.setWindowTitle("Last open study")
- dlg.setText("Do you want to open again the last open study?")
+ dlg.setWindowTitle(self._trad["mb_last_open_title"])
+ dlg.setText(self._trad["mb_last_open_msg"])
opt = QMessageBox.Cancel | QMessageBox.Ok # | QMessageBox.Open
dlg.setStandardButtons(opt)
@@ -809,9 +813,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
def dialog_close(self, cancel=True):
dlg = QMessageBox(self)
- dlg.setWindowTitle("Close PAMHYR without saving study")
- dlg.setText("Do you want to save current study before PAMHYR close ?")
- opt = QMessageBox.Save | QMessageBox.Ignore
+ dlg.setWindowTitle(self._trad["mb_close_title"])
+ dlg.setText(self._trad["mb_close_msg"])
+ opt = QMessageBox.Save | QMessageBox.Close
if cancel:
opt |= QMessageBox.Cancel
@@ -823,7 +827,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
if res == QMessageBox.Save:
self.save_study()
return True
- elif res == QMessageBox.Ignore:
+ elif res == QMessageBox.Close:
return True
elif res == QMessageBox.Cancel:
return False
@@ -1599,15 +1603,3 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
f"sqlitebrowser {file}",
shell=True
)
-
- # TODO: Delete me !
- ###############
- # DUMMY STUFF #
- ###############
-
- def open_dummy(self, title="Dummy"):
- self.dummy = DummyWindow(
- title=title if type(title) is str else "Dummy",
- parent=self
- )
- self.dummy.show()
diff --git a/src/View/Network/GraphWidget.py b/src/View/Network/GraphWidget.py
index 5b55d764cd13f508ae4f9eb54a83c76b24a40ffe..e3ac1aedacbd33b20f48fc377c9d01afc7798138 100644
--- a/src/View/Network/GraphWidget.py
+++ b/src/View/Network/GraphWidget.py
@@ -368,11 +368,18 @@ class EdgeItem(QGraphicsItem):
class NodeText(QGraphicsTextItem):
- def __init__(self, node_item):
+ def __init__(self, node_item, graph):
super(NodeText, self).__init__()
self.item = node_item
- self.setPlainText(self.item.node.name)
+ self.graph = graph
+
+ name = self.item.node.name
+ if name == "":
+ name = self.graph._trad.node_name(self.item.node)
+
+ self.setPlainText(name)
+
self.setDefaultTextColor(Qt.black)
self.set_custom_pos(self.item.pos())
self.setZValue(2)
@@ -502,7 +509,7 @@ class GraphWidget(QGraphicsView):
for node in self.graph.nodes():
inode = NodeItem(node, self)
- self.texts[inode] = NodeText(inode)
+ self.texts[inode] = NodeText(inode, self)
self.scene().addItem(self.texts[inode])
self.scene().addItem(inode)
self.node_items.append(inode)
@@ -514,14 +521,14 @@ class GraphWidget(QGraphicsView):
for edge in self.graph.edges():
n1 = next(
filter(
- lambda n: n.node.name == edge.node1.name,
+ lambda n: n.node == edge.node1,
self.node_items
)
)
n2 = next(
filter(
- lambda n: n.node.name == edge.node2.name,
+ lambda n: n.node == edge.node2,
self.node_items
)
)
@@ -578,7 +585,7 @@ class GraphWidget(QGraphicsView):
inode = NodeItem(node, self)
self.scene().addItem(inode)
self.node_items.append(inode)
- self.texts[inode] = NodeText(inode)
+ self.texts[inode] = NodeText(inode, self)
self.scene().addItem(self.texts[inode])
self.changeNode.emit(self.sender())
diff --git a/src/View/Network/Table.py b/src/View/Network/Table.py
index 8ba889bd043a169f76f94164af82741e244a4daf..97a26548516eb155cdce8aad88fb48dbfe749071 100644
--- a/src/View/Network/Table.py
+++ b/src/View/Network/Table.py
@@ -94,6 +94,9 @@ class NodeTableModel(PamhyrTableModel):
return ret
+ if self._headers[index.column()] == "name":
+ return self._trad.node_name(self._lst[index.row()])
+
return self._lst[index.row()][self._headers[index.column()]]
@pyqtSlot()
@@ -133,6 +136,15 @@ class EdgeTableModel(PamhyrTableModel):
if role != Qt.ItemDataRole.DisplayRole:
return QVariant()
+ if (self._headers[index.column()] == "node1" or
+ self._headers[index.column()] == "node2"):
+ return self._trad.node_name(
+ self._lst[index.row()][self._headers[index.column()]]
+ )
+
+ if self._headers[index.column()] == "name":
+ return self._trad.edge_name(self._lst[index.row()])
+
return self._lst[index.row()][self._headers[index.column()]]
@pyqtSlot()
diff --git a/src/View/Network/Window.py b/src/View/Network/Window.py
index eab8cae0769b46e4608da5e2c81877dc1667d55d..4a2c6efc7dc7d1088cfcbccfc9b5ea66b39f932e 100644
--- a/src/View/Network/Window.py
+++ b/src/View/Network/Window.py
@@ -90,6 +90,7 @@ class NetworkWindow(PamhyrWindow):
table_view=table,
table_headers=self._table_headers_node,
editable_headers=["name"],
+ trad=self._trad,
data=self._graph,
undo=self._undo_stack,
)
@@ -109,6 +110,7 @@ class NetworkWindow(PamhyrWindow):
table_view=table,
table_headers=self._table_headers_edge,
editable_headers=["name", "node1", "node2"],
+ trad=self._trad,
delegates={
"node1": self.delegate_combobox,
"node2": self.delegate_combobox,
diff --git a/src/View/Network/translate.py b/src/View/Network/translate.py
index ea999db2ae4b7402c617b6eceede21a798b6eff7..da3e96184119d7d45a7dd92b0e849c856cc61037 100644
--- a/src/View/Network/translate.py
+++ b/src/View/Network/translate.py
@@ -31,6 +31,9 @@ class NetworkTranslate(MainTranslate):
"Network", "River network"
)
+ self._dict["node"] = _translate("Network", "Node")
+ self._dict["edge"] = _translate("Network", "Reach")
+
self._dict["menu_add_node"] = _translate("Network", "Add node")
self._dict["menu_del_node"] = _translate("Network", "Delete the node")
self._dict["menu_edit_res_node"] = _translate(
@@ -63,3 +66,15 @@ class NetworkTranslate(MainTranslate):
"node2": _translate("Network", "Destination node"),
"id": _translate("Network", "Index"),
}
+
+ def node_name(self, node):
+ if node.name == "":
+ return f"{self['node']} #{node.id}"
+
+ return node.name
+
+ def edge_name(self, edge):
+ if edge.name == "":
+ return f"{self['edge']} #{edge.id}"
+
+ return edge.name
diff --git a/src/View/Results/CustomPlot/Plot.py b/src/View/Results/CustomPlot/Plot.py
index a3073c7a1bf4dd2b21cd737793f12f574cae6239..f1f2438f3406c1d6f50ca29c60bfdee34f9aa9c0 100644
--- a/src/View/Results/CustomPlot/Plot.py
+++ b/src/View/Results/CustomPlot/Plot.py
@@ -34,7 +34,7 @@ unit = {
"water_elevation": "0-meter",
"discharge": "1-m3s",
"velocity": "2-ms",
- "depth": "3-meter",
+ "max_depth": "3-meter",
"mean_depth": "3-meter",
"froude": "4-dimensionless",
"wet_area": "5-m2",
@@ -157,9 +157,9 @@ class CustomPlot(PamhyrPlot):
)
lines["velocity"] = line
- if "depth" in self._y:
+ if "max_depth" in self._y:
- ax = self._axes[unit["depth"]]
+ ax = self._axes[unit["max_depth"]]
d = list(
map(
lambda p: p.geometry.max_water_depth(
@@ -171,7 +171,7 @@ class CustomPlot(PamhyrPlot):
rk, d,
color='brown', lw=1.,
)
- lines["depth"] = line
+ lines["max_depth"] = line
if "mean_depth" in self._y:
@@ -361,9 +361,9 @@ class CustomPlot(PamhyrPlot):
)
lines["velocity"] = line
- if "depth" in self._y:
+ if "max_depth" in self._y:
- ax = self._axes[unit["depth"]]
+ ax = self._axes[unit["max_depth"]]
d = list(
map(lambda z: profile.geometry.max_water_depth(z), z)
)
@@ -372,7 +372,7 @@ class CustomPlot(PamhyrPlot):
ts, d,
color='brown', lw=1.,
)
- lines["depth"] = line
+ lines["max_depth"] = line
if "mean_depth" in self._y:
@@ -385,7 +385,7 @@ class CustomPlot(PamhyrPlot):
ts, d,
color='orange', lw=1.,
)
- lines["depth"] = line
+ lines["mean_depth"] = line
if "froude" in self._y:
diff --git a/src/View/Results/PlotH.py b/src/View/Results/PlotH.py
index 5920d837d40124849920cae26a619eea6d1be431..5dc258310d4e7b6f11a78bdf71e86fe210667efd 100644
--- a/src/View/Results/PlotH.py
+++ b/src/View/Results/PlotH.py
@@ -51,8 +51,8 @@ class PlotH(PamhyrPlot):
self._current_reach_id = reach_id
self._current_profile_id = profile_id
- self.label_x = _translate("Results", "Time (s)")
- self.label_y = _translate("Results", "Discharge (m³/s)")
+ self.label_x = self._trad["unit_time_s"]
+ self.label_y = self._trad["unit_discharge"]
self.label_discharge = _translate("Results", "Cross-section discharge")
self.label_discharge_max = _translate("Results", "Max discharge")
diff --git a/src/View/Results/Window.py b/src/View/Results/Window.py
index b1872102f8b16ca929601e39a205cdc9bb5601cc..eb4684cfa1be443b1dab8a69a51348245f8c67bc 100644
--- a/src/View/Results/Window.py
+++ b/src/View/Results/Window.py
@@ -292,9 +292,9 @@ class ResultsWindow(PamhyrWindow):
pname = profile.name if profile.name != "" else profile.rk
- return (f"Reach: {reach.name} | " +
- f"Profile: {pname} | " +
- f"Timestamp : {fts} ({ts} sec)")
+ return (f"{self._trad['reach']}: {reach.name} | " +
+ f"{self._trad['cross_section']}: {pname} | " +
+ f"{self._trad['unit_time_s']} : {fts} ({ts} sec)")
def setup_statusbar(self):
txt = self._compute_status_label()
@@ -695,8 +695,8 @@ class ResultsWindow(PamhyrWindow):
reach.profiles
)
)
- if "depth" in y:
- my_dict["depth"] = list(
+ if "max_depth" in y:
+ my_dict["max_depth"] = list(
map(
lambda p: p.geometry.max_water_depth(
p.get_ts_key(timestamp, "Z")),
@@ -760,8 +760,8 @@ class ResultsWindow(PamhyrWindow):
q, z
)
)
- if "depth" in y:
- my_dict["depth"] = list(
+ if "max_depth" in y:
+ my_dict["max_depth"] = list(
map(lambda z: profile.geometry.max_water_depth(z), z)
)
if "mean_depth" in y:
diff --git a/src/View/Results/translate.py b/src/View/Results/translate.py
index bddc63b00e21baa022b87deec301e5a23bd96bfe..243e618d3efcee05204f1b599111552c28db3d4b 100644
--- a/src/View/Results/translate.py
+++ b/src/View/Results/translate.py
@@ -43,7 +43,7 @@ class ResultsTranslate(MainTranslate):
self._dict['x'] = _translate("Results", "X (m)")
- self._dict['label_bottom'] = _translate("Results", "River bottom")
+ self._dict['label_bottom'] = _translate("Results", "Bottom")
self._dict['label_water'] = _translate("Results", "Water elevation")
self._dict['label_water_max'] = _translate(
"Results",
@@ -91,7 +91,7 @@ class ResultsTranslate(MainTranslate):
"water_elevation": self._dict["unit_water_elevation"],
"discharge": self._dict["unit_discharge"],
"velocity": self._dict["unit_speed"],
- "depth": self._dict["unit_max_height"],
+ "max_depth": self._dict["unit_max_height"],
"mean_depth": self._dict["unit_mean_height"],
"froude": self._dict["unit_froude"],
"wet_area": self._dict["unit_wet_area"],
diff --git a/src/View/Tools/ASubWindow.py b/src/View/Tools/ASubWindow.py
index f483b7b0c6b3d81339c7c8590eef534a9bf7dfaa..01db62f43e56f477bf40139b847971ed928a7240 100644
--- a/src/View/Tools/ASubWindow.py
+++ b/src/View/Tools/ASubWindow.py
@@ -149,6 +149,9 @@ class WindowToolKit(object):
msg.setInformativeText(informative_text)
msg.setWindowTitle(window_title)
+ msg.findChild(QLabel, "qt_msgbox_label")\
+ .setFixedWidth(384)
+
msg.exec_()
diff --git a/src/View/Translate.py b/src/View/Translate.py
index 1405a2cf8eb8f68baffd95cb8803f23a6977eb6d..3af3b28ea2db054353eb1c1a78d6e69d89bc6eee 100644
--- a/src/View/Translate.py
+++ b/src/View/Translate.py
@@ -66,8 +66,9 @@ class UnitTranslate(CommonWordTranslate):
self._dict["unit_water_elevation"] = _translate(
"Unit", "Water elevation (m)"
)
+
self._dict["unit_speed"] = _translate("Unit", "Velocity (m/s)")
- self._dict["unit_discharge"] = _translate("Unit", "Discharge (m³/s)")
+ self._dict["unit_discharge"] = _translate("Unit", "Discharge (m^3/s)")
self._dict["unit_area"] = _translate("Unit", "Area (hectare)")
self._dict["unit_time_s"] = _translate("Unit", "Time (sec)")
@@ -116,3 +117,29 @@ class MainTranslate(UnitTranslate):
self._dict["active_window"] = _translate(
"MainWindow", "Enable this window"
)
+
+ # Message box
+ self._dict["mb_select_reach_title"] = _translate(
+ "MainWindow", "Please select a reach"
+ )
+ self._dict["mb_select_reach_msg"] = _translate(
+ "MainWindow",
+ "This edition window need a reach selected "
+ "into the river network to work on it"
+ )
+
+ self._dict["mb_last_open_title"] = _translate(
+ "MainWindow", "Last open study"
+ )
+ self._dict["mb_last_open_msg"] = _translate(
+ "MainWindow",
+ "Do you want to open again the last open study?"
+ )
+
+ self._dict["mb_close_title"] = _translate(
+ "MainWindow", "Close without saving study"
+ )
+ self._dict["mb_close_msg"] = _translate(
+ "MainWindow",
+ "Do you want to save current study before closing it?"
+ )
diff --git a/src/View/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui
index 9c23ce2dd6a24f6dd70a5f665ec7b9058b63ed0b..adcab8b54bb344942bbbce2f697889ecbf05d78a 100644
--- a/src/View/ui/ConfigureDialog.ui
+++ b/src/View/ui/ConfigureDialog.ui
@@ -382,7 +382,7 @@
</widget>
<widget class="QWidget" name="tab_language">
<attribute name="title">
- <string>Langue</string>
+ <string>Language</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui
index e026887269058768b6304804bba6cfc67ed6cb7f..81faeb6a7adf6a0574f0e91b003de5171c9d8ff5 100644
--- a/src/View/ui/InitialConditions.ui
+++ b/src/View/ui/InitialConditions.ui
@@ -27,21 +27,21 @@
<item>
<widget class="QPushButton" name="pushButton_generate_1">
<property name="text">
- <string>Generate depth</string>
+ <string>Generate uniform depth</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_generate_2">
<property name="text">
- <string>Generate discharge</string>
+ <string>Generate uniform discharge</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_generate_3">
<property name="text">
- <string>Generate elevation</string>
+ <string>Generate uniform elevation</string>
</property>
</widget>
</item>
diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
index 58ae2b98cd665336835c75f06af958df315dd462..0390f175656d2b7c5d0a10b88c5cf13897f3e477 100644
--- a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
+++ b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
@@ -32,7 +32,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>Discharge (m³/s)</string>
+ <string>Discharge (m^3/s)</string>
</property>
</widget>
</item>
diff --git a/src/View/ui/PurgeOptions.ui b/src/View/ui/PurgeOptions.ui
index 9b027f970082de86d835c0dfbfbeacadc0594f7e..2571a6beb2a5d7a09e2a5377d6d17e52d964b927 100644
--- a/src/View/ui/PurgeOptions.ui
+++ b/src/View/ui/PurgeOptions.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>194</width>
+ <width>251</width>
<height>114</height>
</rect>
</property>
@@ -27,7 +27,7 @@
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
- <string>Number of points to keep</string>
+ <string>Maximum number of points to keep</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui
index e92bdab43aa2bd8be8990d5e165be34f81376aab..90ca6fb402f38ca85f715081dcb68fa893c383b2 100644
--- a/src/View/ui/Results.ui
+++ b/src/View/ui/Results.ui
@@ -139,7 +139,7 @@
</property>
<widget class="QWidget" name="tab_4">
<attribute name="title">
- <string>Raw data</string>
+ <string>Data</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="1">
diff --git a/src/View/ui/about.ui b/src/View/ui/about.ui
index 36f0efd799fd67ecf35783cdb455c7918c73e76c..48227bdf7693857067aebb1a37ce0040935a69a6 100644
--- a/src/View/ui/about.ui
+++ b/src/View/ui/about.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>640</width>
- <height>360</height>
+ <height>361</height>
</rect>
</property>
<property name="windowTitle">
@@ -17,8 +17,35 @@
<locale language="English" country="Europe"/>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="1">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_logo_pamhyr2">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap>ressources/Pamhyr2_logo.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_logo_inrae">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap>ressources/Logo-INRAE.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="2">
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="label_title">
<property name="font">
@@ -34,33 +61,215 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_copyright">
- <property name="text">
- <string>...</string>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item>
- <widget class="QLabel" name="label_version">
- <property name="text">
- <string>Version: @version</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Copyright © 2022-2024 INRAE</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QLabel" name="label_license">
- <property name="text">
- <string>License: GPLv3+</string>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_version">
+ <property name="text">
+ <string>Version: @version @codename</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_license">
+ <property name="text">
+ <string>License: GPLv3+</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_logo_gpl">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>50</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap>ressources/GPLv3_Logo.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::RichText</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6"/>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item>
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="label_copyright">
<property name="text">
- <string><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></string>
+ <string>...</string>
</property>
- <property name="textFormat">
- <enum>Qt::RichText</enum>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
</property>
</widget>
</item>
@@ -79,16 +288,6 @@
</item>
</layout>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_logo_pamhyr2">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap>ressources/Pamhyr2_logo.png</pixmap>
- </property>
- </widget>
- </item>
</layout>
</widget>
<resources/>
diff --git a/src/View/ui/ressources/GPLv3_Logo.png b/src/View/ui/ressources/GPLv3_Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f6ddf89ad8e956bf674a98e9f0cb08d0f29e651
Binary files /dev/null and b/src/View/ui/ressources/GPLv3_Logo.png differ
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index dc68faec58666e9fbf3176e22580bdfb3b424b39..8eb92d07a45c7166a911d759294bf4fe6e7a95c8 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -8,7 +8,7 @@
<translation>À propos</translation>
</message>
<message>
- <location filename="../View/About/Window.py" line="69"/>
+ <location filename="../View/About/Window.py" line="70"/>
<source>Contributors: </source>
<translation>Contributeurs : </translation>
</message>
@@ -23,7 +23,7 @@
<message>
<location filename="../View/AdditionalFiles/Translate.py" line="33"/>
<source>Edit additional file</source>
- <translation>Modifier le fichier supplémentaire</translation>
+ <translation>Éditer le fichier supplémentaire</translation>
</message>
</context>
<context>
@@ -31,7 +31,7 @@
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="30"/>
<source>Basic Hydraulic Structure</source>
- <translation>Ouvrage hydraulique élémentaire</translation>
+ <translation type="obsolete">Ouvrage hydraulique élémentaire</translation>
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="34"/>
@@ -180,8 +180,13 @@
</message>
<message>
<location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="110"/>
- <source>Discharge weir</source>
- <translation type="unfinished"></translation>
+ <source>Rectangular weir</source>
+ <translation>Déversoir rectangulaire</translation>
+ </message>
+ <message>
+ <location filename="../View/HydraulicStructures/BasicHydraulicStructures/Translate.py" line="30"/>
+ <source>Basic Hydraulic Structures</source>
+ <translation>Ouvrages hydrauliques élémentaires</translation>
</message>
</context>
<context>
@@ -189,20 +194,20 @@
<message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="32"/>
<source>Edit boundary conditions</source>
- <translation>Modifier les conditions aux limites</translation>
+ <translation>Éditer les conditions aux limites</translation>
</message>
<message>
- <location filename="../View/BoundaryCondition/Edit/translate.py" line="37"/>
+ <location filename="../View/BoundaryCondition/Edit/translate.py" line="39"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
- <location filename="../View/BoundaryCondition/Edit/translate.py" line="38"/>
+ <location filename="../View/BoundaryCondition/Edit/translate.py" line="40"/>
<source>Y</source>
<translation>Y</translation>
</message>
<message>
- <location filename="../View/BoundaryCondition/Edit/translate.py" line="43"/>
+ <location filename="../View/BoundaryCondition/Edit/translate.py" line="45"/>
<source>Solid (kg/s)</source>
<translation>Solide (kg/s)</translation>
</message>
@@ -236,6 +241,11 @@
<source>Node</source>
<translation>NÅ“ud</translation>
</message>
+ <message>
+ <location filename="../View/BoundaryCondition/Edit/translate.py" line="35"/>
+ <source>Boundary Condition Options</source>
+ <translation>Options des conditions limites</translation>
+ </message>
</context>
<context>
<name>BoundaryConditions</name>
@@ -270,21 +280,11 @@
<source>Mage geometry guideline checker</source>
<translation>Vérificateur des lignes directrices pour Mage</translation>
</message>
- <message>
- <location filename="../Checker/Mage.py" line="210"/>
- <source>Check if geometry guidelines are correctly defined for each reach</source>
- <translation type="obsolete">Vérifie si les lignes directrices sont définies pour tous les biefs</translation>
- </message>
<message>
<location filename="../Checker/Study.py" line="37"/>
<source>Study reach network checker</source>
<translation>Vérificateur des biefs de l'étude</translation>
</message>
- <message>
- <location filename="../Checker/Study.py" line="34"/>
- <source>Check if at least one reach exists</source>
- <translation type="obsolete">Vérifie s'il existe au moins un bief dans l'étude</translation>
- </message>
<message>
<location filename="../Checker/Study.py" line="64"/>
<source>Study geometry checker</source>
@@ -432,7 +432,7 @@
<message>
<location filename="../View/Configure/Translate.py" line="41"/>
<source>Edit solver</source>
- <translation>Editer le solveur</translation>
+ <translation>Éditer le solveur</translation>
</message>
<message>
<location filename="../View/Configure/Translate.py" line="44"/>
@@ -448,7 +448,7 @@
<translation>Sélection des graphiques personnalisés</translation>
</message>
<message>
- <location filename="../View/Results/CustomPlot/Translate.py" line="46"/>
+ <location filename="../View/Results/CustomPlot/Translate.py" line="54"/>
<source>Bed elevation (m)</source>
<translation>Cote du fond (m)</translation>
</message>
@@ -464,7 +464,7 @@
<context>
<name>Dialog</name>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="14"/>
+ <location filename="../View/ui/SelectSolver.ui" line="14"/>
<source>Dialog</source>
<translation>Dialogue</translation>
</message>
@@ -479,7 +479,7 @@
<translation>Type</translation>
</message>
<message>
- <location filename="../View/ui/NewStudy.ui" line="92"/>
+ <location filename="../View/ui/ConfigureAddSolverDialog.ui" line="48"/>
<source>Description</source>
<translation>Description</translation>
</message>
@@ -533,11 +533,6 @@
<source>.</source>
<translation>.</translation>
</message>
- <message>
- <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
- <source>Height</source>
- <translation type="obsolete">Hauteur</translation>
- </message>
<message>
<location filename="../View/ui/ConfigureDialog.ui" line="47"/>
<source>Solvers</source>
@@ -568,11 +563,6 @@
<source>HH:mm:ss</source>
<translation>HH:mm:ss</translation>
</message>
- <message>
- <location filename="../View/ui/ConfigureDialog.ui" line="214"/>
- <source>Strickler coefficients</source>
- <translation type="obsolete">Coefficients de Strickler</translation>
- </message>
<message>
<location filename="../View/ui/ConfigureDialog.ui" line="328"/>
<source>Editor</source>
@@ -649,9 +639,9 @@
<translation>Axe Y :</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="25"/>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="49"/>
<source>Discharge</source>
- <translation type="obsolete">Débit</translation>
+ <translation>Débit</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="168"/>
@@ -668,20 +658,10 @@
<source>First guideline</source>
<translation>Première ligne directrice</translation>
</message>
- <message>
- <location filename="../View/ui/MeshingOptions.ui" line="100"/>
- <source>Last guideline</source>
- <translation type="obsolete">Dernière ligne directrice</translation>
- </message>
- <message>
- <location filename="../View/ui/MeshingOptions.ui" line="114"/>
- <source>Space step</source>
- <translation type="obsolete">Pas d'espace</translation>
- </message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="114"/>
<source>Guideline used for distance computation</source>
- <translation>Ligne directrice pour le calcul des distances</translation>
+ <translation>Lignes directrices pour le calcul des distances</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="79"/>
@@ -718,20 +698,15 @@
<source>Line</source>
<translation>Ligne</translation>
</message>
- <message>
- <location filename="../View/ui/REPLineDialog.ui" line="57"/>
- <source>Comment lines start with '*' char (let see Mage documentation for more details)</source>
- <translation type="obsolete">Les lignes de commentaire commencent par un caractère '*' (voir la documentation de Mage pour plus de détails)</translation>
- </message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="157"/>
<source>Limits</source>
<translation>Limites</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="121"/>
+ <location filename="../View/ui/BoundaryConditionsDialogGenerator.ui" line="14"/>
<source>Options</source>
- <translation type="obsolete">Options</translation>
+ <translation>Options</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="36"/>
@@ -743,45 +718,35 @@
<source>Type of interpolation:</source>
<translation>Type d'interpolation :</translation>
</message>
- <message>
- <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
- <source>Height (m)</source>
- <translation>Hauteur (m)</translation>
- </message>
<message>
<location filename="../View/ui/ConfigureDialog.ui" line="241"/>
<source>Stricklers</source>
<translation>Stricklers</translation>
</message>
<message>
- <location filename="../View/ui/UpdateRKOptions.ui" line="30"/>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="23"/>
<source>Distance computation</source>
- <translation>Calcule des distances</translation>
+ <translation>Calcul des distances</translation>
</message>
<message>
- <location filename="../View/ui/UpdateRKOptions.ui" line="46"/>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="32"/>
<source>Second guide-line</source>
<translation>Deuxième ligne directrice</translation>
</message>
<message>
- <location filename="../View/ui/UpdateRKOptions.ui" line="63"/>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="55"/>
<source>First guide-line</source>
<translation>Première ligne directrice</translation>
</message>
<message>
- <location filename="../View/ui/UpdateRKOptions.ui" line="73"/>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="78"/>
<source>Origin</source>
<translation>Origine</translation>
</message>
<message>
- <location filename="../View/ui/UpdateRKOptions.ui" line="80"/>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="92"/>
<source>Origin value</source>
- <translation>Valeur de l'origine</translation>
- </message>
- <message>
- <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="25"/>
- <source>Discharge (m³/s)</source>
- <translation type="obsolete">Débit (m³/s)</translation>
+ <translation>Valeur à l'origine</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="30"/>
@@ -791,7 +756,7 @@
<message>
<location filename="../View/ui/ConfigureDialog.ui" line="385"/>
<source>Langue</source>
- <translation>Langue</translation>
+ <translation type="obsolete">Langue</translation>
</message>
<message>
<location filename="../View/ui/REPLineDialog.ui" line="57"/>
@@ -803,10 +768,90 @@
<source>Second guideline</source>
<translation>Seconde ligne directrice</translation>
</message>
- <message encoding="UTF-8">
- <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="25"/>
- <source>Discharge (m³/s)</source>
- <translation type="unfinished"></translation>
+ <message>
+ <location filename="../View/ui/GeometryReachShift.ui" line="35"/>
+ <source>Y coordinate</source>
+ <translation>Coordonnées Y</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/GeometryReachShift.ui" line="42"/>
+ <source>X coordinate</source>
+ <translation>Coordonnées X</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/GeometryReachShift.ui" line="78"/>
+ <source>Z coordinate</source>
+ <translation>Coordonnées Z</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="39"/>
+ <source>Upstream to downstream</source>
+ <translation>De l'amont à l'aval</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="99"/>
+ <source>Downstream to upstream</source>
+ <translation>De l'aval à l'amont</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="116"/>
+ <source>Orientation</source>
+ <translation>Orientation</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/UpdateRKOptions.ui" line="126"/>
+ <source>Keep current</source>
+ <translation>Actuelle</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="25"/>
+ <source>Upstream height (m)</source>
+ <translation>Cote à l'amont (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="73"/>
+ <source>Downstream height (m)</source>
+ <translation>Cote à l'aval (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Height.ui" line="107"/>
+ <source>Generate constant discharge</source>
+ <translation>Générer un débit (uniforme)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/BoundaryConditionsDialogGenerator.ui" line="38"/>
+ <source>Slope</source>
+ <translation>Pente</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/BoundaryConditionsDialogGenerator.ui" line="55"/>
+ <source>Estimate</source>
+ <translation>Estimer</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="54"/>
+ <source>Generate height</source>
+ <translation>Générer une profondeur</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Depth.ui" line="35"/>
+ <source>Depth (m)</source>
+ <translation>Profondeur (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Depth.ui" line="51"/>
+ <source>Generate discharge</source>
+ <translation>Générer un débit</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/PurgeOptions.ui" line="30"/>
+ <source>Maximum number of points to keep</source>
+ <translation>Nombre de points maxi à conserver</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions_Dialog_Generator_Discharge.ui" line="35"/>
+ <source>Discharge (m^3/s)</source>
+ <translation>Débit (m³/s)</translation>
</message>
</context>
<context>
@@ -912,7 +957,7 @@
<message>
<location filename="../Model/Except.py" line="214"/>
<source>External file dependence is missing</source>
- <translation>Fichier externe d'une dépendence manquant</translation>
+ <translation>Fichier d'une dépendence externe manquant</translation>
</message>
<message>
<location filename="../Model/Except.py" line="194"/>
@@ -924,32 +969,32 @@
<context>
<name>Form</name>
<message>
- <location filename="../View/ui/Widgets/MainWindowTabCheckers.ui" line="14"/>
+ <location filename="../View/ui/dummy.ui" line="14"/>
<source>Form</source>
<translation>Formulaire</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="32"/>
+ <location filename="../View/ui/about.ui" line="59"/>
<source>About Pamhyr2</source>
<translation>À propos de Pamhyr2</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="39"/>
+ <location filename="../View/ui/about.ui" line="269"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="46"/>
+ <location filename="../View/ui/about.ui" line="131"/>
<source>Version: @version</source>
- <translation>Version : @version</translation>
+ <translation type="obsolete">Version : @version</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="53"/>
+ <location filename="../View/ui/about.ui" line="168"/>
<source>License: GPLv3+</source>
<translation>Licence : GPLv3+</translation>
</message>
<message>
- <location filename="../View/ui/about.ui" line="60"/>
+ <location filename="../View/ui/about.ui" line="228"/>
<source><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Source code</a></source>
<translation><a href="https://gitlab.irstea.fr/theophile.terraz/pamhyr">Code source</a></translation>
</message>
@@ -983,16 +1028,6 @@
<source>Study</source>
<translation>Étude</translation>
</message>
- <message>
- <location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="54"/>
- <source>Description:</source>
- <translation type="obsolete">Description :</translation>
- </message>
- <message>
- <location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="68"/>
- <source>Name:</source>
- <translation type="obsolete">Nom :</translation>
- </message>
<message>
<location filename="../View/ui/Widgets/MainWindowTabInfo.ui" line="64"/>
<source>@study_name</source>
@@ -1098,11 +1133,6 @@
<source>@nb_hs</source>
<translation>@nb_hs</translation>
</message>
- <message>
- <location filename="../View/ui/Widgets/MainWindowTabCheckers.ui" line="22"/>
- <source>Restart</source>
- <translation type="obsolete">Relancer</translation>
- </message>
<message>
<location filename="../View/ui/Widgets/MainWindowTabCheckers.ui" line="29"/>
<source>Checkers list</source>
@@ -1113,64 +1143,79 @@
<source>Errors summary</source>
<translation>Résumé des erreurs</translation>
</message>
-</context>
-<context>
- <name>Frictions</name>
<message>
- <location filename="../View/Frictions/translate.py" line="31"/>
- <source>Strickler coefficients</source>
- <translation type="obsolete">Coefficients de Strickler</translation>
+ <location filename="../View/ui/about.ui" line="94"/>
+ <source>Copyright © 2022-2024 INRAE</source>
+ <translation type="obsolete">Copyright © 2022-2024 INRAE</translation>
</message>
<message>
- <location filename="../View/Frictions/translate.py" line="35"/>
- <source>Edit friction coefficients</source>
- <translation type="obsolete">Modifier les frottements</translation>
+ <location filename="../View/ui/about.ui" line="131"/>
+ <source>Version: @version @codename</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../View/ui/about.ui" line="94"/>
+ <source>Copyright © 2022-2024 INRAE</source>
+ <translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Frictions</name>
<message>
- <location filename="../View/Frictions/translate.py" line="42"/>
+ <location filename="../View/Frictions/translate.py" line="45"/>
<source>Start (m)</source>
<translation>PK de départ (m)</translation>
</message>
<message>
- <location filename="../View/Frictions/translate.py" line="43"/>
+ <location filename="../View/Frictions/translate.py" line="46"/>
<source>End (m)</source>
<translation>PK de fin (m)</translation>
</message>
<message>
- <location filename="../View/Frictions/translate.py" line="44"/>
+ <location filename="../View/Frictions/translate.py" line="47"/>
<source>Start coefficient</source>
- <translation>Coefficient de départ</translation>
+ <translation type="obsolete">Coefficient de départ</translation>
</message>
<message>
- <location filename="../View/Frictions/translate.py" line="45"/>
+ <location filename="../View/Frictions/translate.py" line="48"/>
<source>End coefficient</source>
- <translation>Coefficient de fin</translation>
+ <translation type="obsolete">Coefficient de fin</translation>
</message>
<message>
- <location filename="../View/Frictions/translate.py" line="31"/>
+ <location filename="../View/Frictions/translate.py" line="34"/>
<source>Stricklers</source>
<translation>Stricklers</translation>
</message>
<message>
- <location filename="../View/Frictions/translate.py" line="35"/>
+ <location filename="../View/Frictions/translate.py" line="38"/>
<source>Edit frictions</source>
<translation>Éditer les frotements</translation>
</message>
+ <message>
+ <location filename="../View/Frictions/translate.py" line="31"/>
+ <source>Strickler ($m^{1/3}/s$)</source>
+ <translation>Strickler ($m^{1/3}/s$)</translation>
+ </message>
+ <message>
+ <location filename="../View/Frictions/translate.py" line="47"/>
+ <source>Coefficient</source>
+ <translation>Coefficient</translation>
+ </message>
</context>
<context>
<name>Geometry</name>
<message>
- <location filename="../View/Geometry/Translate.py" line="58"/>
+ <location filename="../View/LateralContribution/translate.py" line="52"/>
<source>X (m)</source>
<translation>X (m)</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="59"/>
+ <location filename="../View/LateralContribution/translate.py" line="53"/>
<source>Y (m)</source>
<translation>Y (m)</translation>
</message>
<message>
- <location filename="../View/Geometry/Translate.py" line="60"/>
+ <location filename="../View/LateralContribution/translate.py" line="54"/>
<source>Z (m)</source>
<translation>Z (m)</translation>
</message>
@@ -1234,21 +1279,6 @@
<source>Points</source>
<translation>Points</translation>
</message>
- <message>
- <location filename="../View/Geometry/Translate.py" line="67"/>
- <source>First guideline</source>
- <translation type="obsolete">Première ligne directrice</translation>
- </message>
- <message>
- <location filename="../View/Geometry/Translate.py" line="68"/>
- <source>Second guideline</source>
- <translation type="obsolete">Seconde ligne directrice</translation>
- </message>
- <message>
- <location filename="../View/Geometry/Translate.py" line="69"/>
- <source>Mean over the two guidelines</source>
- <translation type="obsolete">Moyenne sur les deux lignes directrices</translation>
- </message>
<message>
<location filename="../View/Geometry/Translate.py" line="82"/>
<source>Meshing</source>
@@ -1309,6 +1339,21 @@
<source>the mean over the two guide-lines</source>
<translation>la moyenne entre les deux ligne directrice</translation>
</message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="85"/>
+ <source>UpdateRK</source>
+ <translation>Mise à jour PK</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="88"/>
+ <source>Purge</source>
+ <translation>Simplifier</translation>
+ </message>
+ <message>
+ <location filename="../View/Geometry/Translate.py" line="91"/>
+ <source>Shift</source>
+ <translation>Translater</translation>
+ </message>
</context>
<context>
<name>HydraulicStructures</name>
@@ -1327,18 +1372,8 @@
<name>InitialCondition</name>
<message>
<location filename="../View/InitialConditions/translate.py" line="30"/>
- <source>Initial condition</source>
- <translation>Condition initiale</translation>
- </message>
- <message>
- <location filename="../View/InitialConditions/translate.py" line="32"/>
- <source>Discharge</source>
- <translation>Débit</translation>
- </message>
- <message>
- <location filename="../View/InitialConditions/translate.py" line="34"/>
- <source>Height</source>
- <translation>Hauteur</translation>
+ <source>Initial conditions</source>
+ <translation>Conditions initiales</translation>
</message>
</context>
<context>
@@ -1387,32 +1422,27 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../View/Translate.py" line="86"/>
+ <location filename="../View/Translate.py" line="98"/>
<source>Open debug window</source>
<translation>Ouvrir la fenêtre de débogage</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="89"/>
+ <location filename="../View/Translate.py" line="101"/>
<source>Open SQLite debuging tool ('sqlitebrowser')</source>
<translation>Ouvrir l'outil de débogage SQLite ('sqlitebrowser')</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="92"/>
+ <location filename="../View/Translate.py" line="104"/>
<source>Enable this window</source>
<translation>Activer cette fenêtre</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="14"/>
+ <location filename="../View/ui/Stricklers.ui" line="14"/>
<source>MainWindow</source>
<translation>Fenêtre principale</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="112"/>
- <source>Toolbar</source>
- <translation type="obsolete">Barre d'outils</translation>
- </message>
- <message>
- <location filename="../View/ui/GeometryReach.ui" line="169"/>
+ <location filename="../View/ui/Stricklers.ui" line="70"/>
<source>Add</source>
<translation>Ajouter</translation>
</message>
@@ -1422,7 +1452,7 @@
<translation>Ajouter un casier</translation>
</message>
<message>
- <location filename="../View/ui/EditLateralContribution.ui" line="94"/>
+ <location filename="../View/ui/Stricklers.ui" line="82"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
@@ -1432,14 +1462,14 @@
<translation>Supprimer les casier(s)</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="193"/>
+ <location filename="../View/ui/ReservoirList.ui" line="105"/>
<source>Edit</source>
- <translation>modifier</translation>
+ <translation>Éditer</translation>
</message>
<message>
<location filename="../View/ui/ReservoirList.ui" line="108"/>
<source>Edit reservoir equations</source>
- <translation>Modifier la loi des casiers</translation>
+ <translation>Éditer la loi du casier</translation>
</message>
<message>
<location filename="../View/ui/Network.ui" line="118"/>
@@ -1464,10 +1494,10 @@
<message>
<location filename="../View/ui/SedimentLayersList.ui" line="86"/>
<source>Edit sediment layer</source>
- <translation>Modifier la couche sédimentaire</translation>
+ <translation>Éditer la couche sédimentaire</translation>
</message>
<message>
- <location filename="../View/ui/REPLineList.ui" line="79"/>
+ <location filename="../View/ui/Results.ui" line="268"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
@@ -1537,7 +1567,7 @@
<translation>Nouvelle étude</translation>
</message>
<message>
- <location filename="../View/ui/EditLateralContribution.ui" line="85"/>
+ <location filename="../View/ui/BoundaryConditions.ui" line="120"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
@@ -1614,20 +1644,20 @@
<message>
<location filename="../View/ui/MainWindow.ui" line="576"/>
<source>Edit river network</source>
- <translation>Modifier le réseau</translation>
+ <translation>Éditer le réseau</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="444"/>
<source>Edit geometry</source>
- <translation>Modifier la géométrie</translation>
+ <translation>Éditer la géométrie</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="148"/>
+ <location filename="../View/ui/GeometryReach.ui" line="106"/>
<source>Import geometry</source>
<translation>Importer une géométrie</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="160"/>
+ <location filename="../View/ui/GeometryReach.ui" line="118"/>
<source>Export geometry</source>
<translation>Exporter la géométrie</translation>
</message>
@@ -1649,12 +1679,12 @@
<message>
<location filename="../View/ui/MainWindow.ui" line="627"/>
<source>Edit friction</source>
- <translation>Modifier les frottements</translation>
+ <translation>Éditer les frottements</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="615"/>
<source>Edit lateral sources</source>
- <translation>Modifier les contributions latérales</translation>
+ <translation>Éditer les contributions latérales</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="561"/>
@@ -1724,7 +1754,7 @@
<message>
<location filename="../View/ui/MainWindow.ui" line="588"/>
<source>Edit reach geometry</source>
- <translation>Modifier la géométrie du bief actuel</translation>
+ <translation>Éditer la géométrie du bief actuel</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="597"/>
@@ -1734,7 +1764,7 @@
<message>
<location filename="../View/ui/MainWindow.ui" line="600"/>
<source>Edit boundary conditions and point sources</source>
- <translation>Modifier les conditions aux limites et les apports ponctuels</translation>
+ <translation>Éditer les conditions aux limites et les apports ponctuels</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="612"/>
@@ -1746,20 +1776,10 @@
<source>Friction</source>
<translation>Frottements</translation>
</message>
- <message>
- <location filename="../View/ui/MainWindow.ui" line="556"/>
- <source>Edit friction coefficients</source>
- <translation type="obsolete">Modifier les frottements</translation>
- </message>
<message>
<location filename="../View/ui/MainWindow.ui" line="636"/>
<source>Edit study</source>
- <translation>Modifier l'étude</translation>
- </message>
- <message>
- <location filename="../View/ui/MainWindow.ui" line="568"/>
- <source>Edit the study metadata</source>
- <translation type="obsolete">Modifier les informations de l'étude</translation>
+ <translation>Éditer l'étude</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="651"/>
@@ -1779,7 +1799,7 @@
<message>
<location filename="../View/ui/MainWindow.ui" line="664"/>
<source>Edit reach sediment layers</source>
- <translation>Modifier les couches sédimentaires</translation>
+ <translation>Éditer les couches sédimentaires</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="669"/>
@@ -1814,17 +1834,17 @@
<message>
<location filename="../View/ui/MainWindow.ui" line="695"/>
<source>Edit reservoirs</source>
- <translation>Modifier les casiers</translation>
+ <translation>Éditer les casiers</translation>
</message>
<message>
- <location filename="../View/ui/HydraulicStructures.ui" line="14"/>
+ <location filename="../View/ui/MainWindow.ui" line="700"/>
<source>Hydraulic structures</source>
<translation>Ouvrages hydrauliques</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="703"/>
<source>Edit hydraulic structures</source>
- <translation>Modifier les ouvrages hydrauliques</translation>
+ <translation>Éditer les ouvrages hydrauliques</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="711"/>
@@ -1862,7 +1882,7 @@
<translation>Supprimer les couches sédimentaires sélectionnées</translation>
</message>
<message>
- <location filename="../View/ui/EditLateralContribution.ui" line="100"/>
+ <location filename="../View/ui/BoundaryConditions.ui" line="135"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
@@ -1897,17 +1917,17 @@
<translation>Ajouter une condition aux limites ou un apport latéral</translation>
</message>
<message>
- <location filename="../View/ui/EditLateralContribution.ui" line="97"/>
+ <location filename="../View/ui/BoundaryConditions.ui" line="132"/>
<source>Delete current selected rows</source>
<translation>Supprimer les lignes selectionnées</translation>
</message>
<message>
<location filename="../View/ui/LateralContributions.ui" line="147"/>
<source>Edit boundary condition or lateral source</source>
- <translation>Modifier une condition aux limites ou un apport latéral</translation>
+ <translation>Éditer une condition aux limites ou un apport latéral</translation>
</message>
<message>
- <location filename="../View/ui/EditLateralContribution.ui" line="109"/>
+ <location filename="../View/ui/Stricklers.ui" line="94"/>
<source>Sort</source>
<translation>Trier</translation>
</message>
@@ -1949,52 +1969,47 @@
<message>
<location filename="../View/ui/BoundaryConditions.ui" line="147"/>
<source>Edit boundary condition or point source</source>
- <translation>Modifier une condition aux limites ou un apport ponctuel</translation>
+ <translation>Éditer une condition aux limites ou un apport ponctuel</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="152"/>
+ <location filename="../View/ui/Results.ui" line="142"/>
<source>Raw data</source>
- <translation>Données brutes</translation>
+ <translation type="obsolete">Données brutes</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="169"/>
+ <location filename="../View/ui/Results.ui" line="159"/>
<source>Water elevation</source>
<translation>Cote de l'eau</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="201"/>
+ <location filename="../View/ui/Results.ui" line="191"/>
<source>Discharge time series</source>
<translation>Hydrogramme</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="254"/>
+ <location filename="../View/ui/Results.ui" line="244"/>
<source>Add customized visualization</source>
<translation>Ajouter une visualisation personnalisée</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="263"/>
+ <location filename="../View/ui/Results.ui" line="253"/>
<source>Reload</source>
<translation>Recharger</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="157"/>
+ <location filename="../View/ui/Results.ui" line="262"/>
<source>Export</source>
<translation>Exporter</translation>
</message>
<message>
- <location filename="../View/ui/Results.ui" line="275"/>
- <source>Export raw data</source>
- <translation>Exporter les données brutes</translation>
- </message>
- <message>
- <location filename="../View/ui/GeometryReach.ui" line="181"/>
+ <location filename="../View/ui/GeometryCrossSection.ui" line="82"/>
<source>delete</source>
<translation>supprimer</translation>
</message>
<message>
<location filename="../View/ui/Frictions.ui" line="104"/>
<source>Edit Strickler coefficients</source>
- <translation>Modifier les coefficients de Strickler</translation>
+ <translation>Éditer les coefficients de Strickler</translation>
</message>
<message>
<location filename="../View/ui/WebView.ui" line="56"/>
@@ -2042,7 +2057,7 @@
<translation>Activer/Désactiver l'ouvrage hydraulique élémentaire</translation>
</message>
<message>
- <location filename="../View/ui/EditBoundaryConditions.ui" line="89"/>
+ <location filename="../View/ui/Reservoir.ui" line="78"/>
<source>Add a new point</source>
<translation>Ajouter un nouveau point</translation>
</message>
@@ -2052,9 +2067,9 @@
<translation>Supprimer les points</translation>
</message>
<message>
- <location filename="../View/ui/HydraulicStructures.ui" line="133"/>
+ <location filename="../View/ui/BasicHydraulicStructures.ui" line="136"/>
<source>Edit selected hydraulic structure</source>
- <translation>Modifier l'ouvrage hydraulique sélectionné</translation>
+ <translation>Éditer l'ouvrage hydraulique sélectionné</translation>
</message>
<message>
<location filename="../View/ui/SolverLog.ui" line="78"/>
@@ -2092,7 +2107,7 @@
<translation>Supprimer les points sélectionnés</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="229"/>
+ <location filename="../View/ui/GeometryCrossSection.ui" line="94"/>
<source>Up</source>
<translation>Monter</translation>
</message>
@@ -2102,7 +2117,7 @@
<translation>Déplacer les points sélectionnés vers le haut</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="241"/>
+ <location filename="../View/ui/GeometryCrossSection.ui" line="106"/>
<source>Down</source>
<translation>Descendre</translation>
</message>
@@ -2112,7 +2127,7 @@
<translation>Déplacer les points sélectionnés vers le bas</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="205"/>
+ <location filename="../View/ui/GeometryCrossSection.ui" line="118"/>
<source>sort_asc</source>
<translation>sort_asc</translation>
</message>
@@ -2122,7 +2137,7 @@
<translation>Trier les points par leurs plus proches voisins</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="217"/>
+ <location filename="../View/ui/GeometryCrossSection.ui" line="130"/>
<source>sort_des</source>
<translation>sort_des</translation>
</message>
@@ -2139,7 +2154,7 @@
<message>
<location filename="../View/ui/Reservoir.ui" line="102"/>
<source>Edit stage-area relation</source>
- <translation>Modifier loi cote/surface</translation>
+ <translation>Éditer loi cote/surface</translation>
</message>
<message>
<location filename="../View/ui/Reservoir.ui" line="114"/>
@@ -2147,9 +2162,9 @@
<translation>Trier les points par cote</translation>
</message>
<message>
- <location filename="../View/ui/ProfileSedimentLayers.ui" line="75"/>
+ <location filename="../View/ui/ReachSedimentLayers.ui" line="31"/>
<source>Edit sediment layers list</source>
- <translation>Modifier la liste des couches sédimentaires</translation>
+ <translation>Éditer la liste des couches sédimentaires</translation>
</message>
<message>
<location filename="../View/ui/ReachSedimentLayers.ui" line="38"/>
@@ -2159,53 +2174,33 @@
<message>
<location filename="../View/ui/ReachSedimentLayers.ui" line="80"/>
<source>Edit profile</source>
- <translation>Modifier le profil</translation>
+ <translation>Éditer le profil</translation>
</message>
<message>
<location filename="../View/ui/ReachSedimentLayers.ui" line="83"/>
<source>Edit sediment layers of the profile</source>
- <translation>Modifier les couches sédimentaires du profil</translation>
+ <translation>Éditer les couches sédimentaires du profil</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="30"/>
- <source>Generate height</source>
- <translation>Générer une hauteur</translation>
- </message>
- <message>
- <location filename="../View/ui/InitialConditions.ui" line="37"/>
- <source>Generate discharge</source>
- <translation>Générer un débit</translation>
- </message>
- <message>
- <location filename="../View/ui/InitialConditions.ui" line="98"/>
+ <location filename="../View/ui/InitialConditions.ui" line="105"/>
<source>Add new initial condition</source>
<translation>Ajouter une nouvelle condition initiale</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="110"/>
+ <location filename="../View/ui/InitialConditions.ui" line="117"/>
<source>Delete inital condition</source>
<translation>Supprimer une condition initiale</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="119"/>
+ <location filename="../View/ui/InitialConditions.ui" line="126"/>
<source>sort</source>
<translation>sort</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="122"/>
+ <location filename="../View/ui/InitialConditions.ui" line="129"/>
<source>Sort inital conditions</source>
<translation>Trier les conditions initiales</translation>
</message>
- <message>
- <location filename="../View/ui/BoundaryConditions.ui" line="117"/>
- <source>Add a new point in boundary condition or point source</source>
- <translation type="obsolete">Ajouter un nouveau point</translation>
- </message>
- <message>
- <location filename="../View/ui/EditBoundaryConditions.ui" line="119"/>
- <source>Sort boundary condition points</source>
- <translation type="obsolete">Trier les points des conditions aux limites</translation>
- </message>
<message>
<location filename="../View/ui/EditLateralContribution.ui" line="82"/>
<source>Add a new point in boundary condition or lateral source</source>
@@ -2234,60 +2229,60 @@
<message>
<location filename="../View/ui/ProfileSedimentLayers.ui" line="72"/>
<source>Edit sediment layers</source>
- <translation>Modifier les couches sédimentaires</translation>
+ <translation>Éditer les couches sédimentaires</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="145"/>
+ <location filename="../View/ui/InitialConditions.ui" line="138"/>
<source>Import</source>
<translation>Importer</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="172"/>
+ <location filename="../View/ui/GeometryReach.ui" line="130"/>
<source>Add a cross-section</source>
<translation>Ajouter une section en travers</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="184"/>
+ <location filename="../View/ui/GeometryReach.ui" line="142"/>
<source>Delete selected cross-section(s)</source>
<translation>Supprimer les sections en travers sélectionnées</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="196"/>
+ <location filename="../View/ui/GeometryReach.ui" line="154"/>
<source>Edit selected cross section(s)</source>
- <translation>Modifier les sections en travers sélectionnées</translation>
+ <translation>Éditer les sections en travers sélectionnées</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="208"/>
+ <location filename="../View/ui/GeometryReach.ui" line="166"/>
<source>Sort cross-sections by ascending position</source>
<translation>Trier les sections en travers par PK croissant</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="220"/>
+ <location filename="../View/ui/GeometryReach.ui" line="178"/>
<source>Sort cross-sections by descending position</source>
<translation>Trier les sections en travers par PK décroissant</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="232"/>
+ <location filename="../View/ui/GeometryReach.ui" line="190"/>
<source>Move up selected cross-section(s)</source>
<translation>Déplacer les sections en travers vers le haut</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="244"/>
+ <location filename="../View/ui/GeometryReach.ui" line="202"/>
<source>Move down selected cross-section(s)</source>
<translation>Déplacer les sections en travers vers le bas</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="253"/>
+ <location filename="../View/ui/GeometryReach.ui" line="211"/>
<source>Meshing</source>
<translation>Maillage</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="79"/>
+ <location filename="../View/Translate.py" line="91"/>
<source>Summary</source>
<translation>Résumé</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="82"/>
+ <location filename="../View/Translate.py" line="94"/>
<source>Checks</source>
<translation>Vérifications</translation>
</message>
@@ -2324,7 +2319,7 @@
<message>
<location filename="../View/ui/REPLineList.ui" line="76"/>
<source>Edit selected line(s)</source>
- <translation>Modifier les lignes selectionnées</translation>
+ <translation>Éditer les lignes selectionnées</translation>
</message>
<message>
<location filename="../View/ui/AdditionalFile.ui" line="46"/>
@@ -2374,22 +2369,22 @@
<message>
<location filename="../View/ui/AdditionalFileList.ui" line="70"/>
<source>Edit file</source>
- <translation>Modifier fichier</translation>
+ <translation>Éditer fichier</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="639"/>
<source>Edit the study information</source>
- <translation>Modifier les informations de l'étude</translation>
+ <translation>Éditer les informations de l'étude</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="112"/>
+ <location filename="../View/ui/Stricklers.ui" line="52"/>
<source>toolBar</source>
- <translation type="unfinished"></translation>
+ <translation>toolBar</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="303"/>
<source>toolBar_2</source>
- <translation type="unfinished"></translation>
+ <translation>toolBar_2</translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="482"/>
@@ -2397,7 +2392,7 @@
<translation>Éditer les frotements</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="266"/>
+ <location filename="../View/ui/GeometryCrossSection.ui" line="138"/>
<source>Purge</source>
<translation>Purger</translation>
</message>
@@ -2417,22 +2412,22 @@
<translation>Retourner l'ordre des points</translation>
</message>
<message>
- <location filename="../View/ui/InitialConditions.ui" line="134"/>
+ <location filename="../View/ui/InitialConditions.ui" line="141"/>
<source>Import from file</source>
<translation>Importer depuis un fichier</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="258"/>
+ <location filename="../View/ui/GeometryReach.ui" line="216"/>
<source>Update RK</source>
<translation>Mise à jour des PK</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="261"/>
+ <location filename="../View/ui/GeometryReach.ui" line="219"/>
<source>Recompute RK</source>
<translation>Recalcule des PK</translation>
</message>
<message>
- <location filename="../View/ui/GeometryReach.ui" line="269"/>
+ <location filename="../View/ui/GeometryReach.ui" line="227"/>
<source>Purge cross-sections to keep a given number of points</source>
<translation>Purger les profiles pour garder un nombre fixer de points</translation>
</message>
@@ -2441,6 +2436,106 @@
<source>Sort points</source>
<translation>Trier les points</translation>
</message>
+ <message>
+ <location filename="../View/ui/Results.ui" line="265"/>
+ <source>Export data as CSV</source>
+ <translation>Exporter les données au format CSV</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="130"/>
+ <source>Generate uniform</source>
+ <translation>Générer un regime uniforme</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="133"/>
+ <source>Generate rating curve from Manning law</source>
+ <translation>Générer une courbe de tarage (loi de Maning)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="138"/>
+ <source>Generate critical</source>
+ <translation>Générer régime critique</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="141"/>
+ <source>Generate rating curve as Q(z) = Sqrt(g*S(z)^3/L(z))</source>
+ <translation>Générer une courbe de tarage (Q(z) = Sqrt(g*S(z)^3/L(z)))</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="146"/>
+ <source>Make increasing</source>
+ <translation>Augmenter</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/EditBoundaryConditions.ui" line="149"/>
+ <source>Remove points to make the curve increasing</source>
+ <translation>Supprimer des points pour rendre la courbe croissante</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/GeometryReach.ui" line="232"/>
+ <source>Shift</source>
+ <translation>Translater</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/GeometryReach.ui" line="235"/>
+ <source>Shift selected sections coordinates</source>
+ <translation>Translater les coordonnées des sections sélectionnées</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions.ui" line="30"/>
+ <source>Generate uniform depth</source>
+ <translation>Générer une profondeur uniforme</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions.ui" line="37"/>
+ <source>Generate uniform discharge</source>
+ <translation>Générer un débit uniforme</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/InitialConditions.ui" line="44"/>
+ <source>Generate uniform elevation</source>
+ <translation>Générer une cote uniforme</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/Results.ui" line="142"/>
+ <source>Data</source>
+ <translation>Données</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="109"/>
+ <source>Please select a reach</source>
+ <translation>Veuillez sélectionner un bief</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="110"/>
+ <source>Geometry edition need a reach selected into the river network to work on it</source>
+ <translation type="obsolete">L'édition de la géométrie nécessite un bief sélectionné dans le réseau fluvial pour pouvoir travailler dessus</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="118"/>
+ <source>Last open study</source>
+ <translation>Dernière étude ouverte</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="121"/>
+ <source>Do you want to open again the last open study?</source>
+ <translation>Voulez-vous rouvrir la dernière étude ?</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="112"/>
+ <source>This edition window need a reach selected into the river network to work on it</source>
+ <translation>Cette fenêtre d'édition a besoin d'un bief sélectionné dans le réseau pour travailler dessus</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="126"/>
+ <source>Close without saving study</source>
+ <translation>Fermer sans sauvegarder l'étude</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="129"/>
+ <source>Do you want to save current study before closing it?</source>
+ <translation>Souhaitez-vous sauvegarder l'étude en cours avant de la fermer ?</translation>
+ </message>
</context>
<context>
<name>MainWindow_reach</name>
@@ -2452,7 +2547,7 @@
<message>
<location filename="../View/Results/PlotSedProfile.py" line="153"/>
<source>Height (m)</source>
- <translation>Hauteur (m)</translation>
+ <translation>Cote (m)</translation>
</message>
<message>
<location filename="../View/Results/PlotSedProfile.py" line="149"/>
@@ -2462,7 +2557,7 @@
<message>
<location filename="../View/Tools/Plot/PamhyrToolbar.py" line="225"/>
<source>Select destination file</source>
- <translation>Selectionner fichier de destination</translation>
+ <translation>Sélectionner fichier de destination</translation>
</message>
</context>
<context>
@@ -2473,60 +2568,75 @@
<translation>Réseau</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="34"/>
+ <location filename="../View/Network/translate.py" line="37"/>
<source>Add node</source>
<translation>Ajouter un nœud</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="35"/>
+ <location filename="../View/Network/translate.py" line="38"/>
<source>Delete the node</source>
<translation>Supprimer le nœud</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="36"/>
+ <location filename="../View/Network/translate.py" line="39"/>
<source>Edit node reservoir</source>
- <translation>Modifier le casier du nœud</translation>
+ <translation>Éditer le casier du nœud</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="39"/>
+ <location filename="../View/Network/translate.py" line="42"/>
<source>Add node reservoir</source>
<translation>Ajouter un casier au nœud</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="46"/>
+ <location filename="../View/Network/translate.py" line="49"/>
<source>Delete the reach</source>
<translation>Supprimer l'arrête</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="47"/>
+ <location filename="../View/Network/translate.py" line="50"/>
<source>Enable the reach</source>
<translation>Activer l'arête</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="48"/>
+ <location filename="../View/Network/translate.py" line="51"/>
<source>Disable the reach</source>
<translation>Désactiver l'arête</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="50"/>
+ <location filename="../View/Network/translate.py" line="53"/>
<source>Reverse the reach orientation</source>
<translation>Inverser l'orientation de l'arête</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="61"/>
+ <location filename="../View/Network/translate.py" line="65"/>
<source>Source node</source>
<translation>NÅ“ud source</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="62"/>
+ <location filename="../View/Network/translate.py" line="66"/>
<source>Destination node</source>
<translation>NÅ“ud destination</translation>
</message>
<message>
- <location filename="../View/Network/translate.py" line="42"/>
+ <location filename="../View/Network/translate.py" line="45"/>
<source>Delete node reservoir</source>
<translation>Supprimer le casier du nœud</translation>
</message>
+ <message>
+ <location filename="../View/Network/translate.py" line="34"/>
+ <source>Node</source>
+ <translation>NÅ“ud</translation>
+ </message>
+ <message>
+ <location filename="../View/Network/translate.py" line="35"/>
+ <source>Reach</source>
+ <translation>Bief</translation>
+ </message>
+ <message>
+ <location filename="../View/Network/translate.py" line="67"/>
+ <source>Index</source>
+ <translation>Index</translation>
+ </message>
</context>
<context>
<name>Pamhyr</name>
@@ -2546,7 +2656,7 @@
<message>
<location filename="../View/REPLines/Translate.py" line="33"/>
<source>Edit Mage REP lines</source>
- <translation>Modifier les lignes REP Mage</translation>
+ <translation>Éditer les lignes REP Mage</translation>
</message>
</context>
<context>
@@ -2564,7 +2674,7 @@
<message>
<location filename="../View/Reservoir/Edit/Translate.py" line="32"/>
<source>Edit Reservoir</source>
- <translation>Modifier le casier</translation>
+ <translation>Éditer le casier</translation>
</message>
</context>
<context>
@@ -2585,15 +2695,10 @@
<translation>X (m)</translation>
</message>
<message>
- <location filename="../View/Results/PlotXY.py" line="57"/>
+ <location filename="../View/Results/PlotXY.py" line="61"/>
<source>Y (m)</source>
<translation>Y (m)</translation>
</message>
- <message>
- <location filename="../View/Results/PlotH.py" line="54"/>
- <source>Time (s)</source>
- <translation>Temps (s)</translation>
- </message>
<message>
<location filename="../View/Results/PlotH.py" line="57"/>
<source>Cross-section discharge</source>
@@ -2622,7 +2727,7 @@
<message>
<location filename="../View/Results/translate.py" line="40"/>
<source>River bottom</source>
- <translation>Fond de la rivière</translation>
+ <translation type="obsolete">Fond de la rivière</translation>
</message>
<message>
<location filename="../View/Results/translate.py" line="41"/>
@@ -2645,14 +2750,9 @@
<translation>Profil</translation>
</message>
<message>
- <location filename="../View/Results/PlotH.py" line="55"/>
- <source>Discharge (m³/s)</source>
- <translation type="obsolete">Débit (m³/s)</translation>
- </message>
- <message encoding="UTF-8">
- <location filename="../View/Results/PlotH.py" line="55"/>
- <source>Discharge (m³/s)</source>
- <translation type="unfinished"></translation>
+ <location filename="../View/Results/translate.py" line="40"/>
+ <source>Bottom</source>
+ <translation>Fond</translation>
</message>
</context>
<context>
@@ -2665,7 +2765,7 @@
<message>
<location filename="../View/SedimentLayers/Edit/translate.py" line="30"/>
<source>Edit Sediment Layers</source>
- <translation>Modifier les couches sédimentaires</translation>
+ <translation>Éditer les couches sédimentaires</translation>
</message>
<message>
<location filename="../View/SedimentLayers/Edit/translate.py" line="40"/>
@@ -2733,7 +2833,7 @@
<message>
<location filename="../View/RunSolver/Window.py" line="68"/>
<source>Select solver</source>
- <translation>Selection du solveur</translation>
+ <translation>Sélection du solveur</translation>
</message>
<message>
<location filename="../View/RunSolver/Window.py" line="146"/>
@@ -2846,7 +2946,7 @@
<message>
<location filename="../View/SolverParameters/translate.py" line="98"/>
<source>Minimum water height (meter)</source>
- <translation>Hauteur d'eau minimale (mètres)</translation>
+ <translation>Profondeur minimale (mètres)</translation>
</message>
<message>
<location filename="../View/SolverParameters/translate.py" line="101"/>
@@ -2979,12 +3079,7 @@
<message>
<location filename="../View/Stricklers/translate.py" line="30"/>
<source>Strickler coefficients</source>
- <translation>Coefficient de Strickler</translation>
- </message>
- <message>
- <location filename="../View/Stricklers/translate.py" line="30"/>
- <source>Stricklers</source>
- <translation type="obsolete">Stricklers</translation>
+ <translation>Coefficients de Stricklers</translation>
</message>
</context>
<context>
@@ -2992,7 +3087,7 @@
<message>
<location filename="../View/Study/Window.py" line="51"/>
<source>Edit study</source>
- <translation>Modifier l'étude</translation>
+ <translation>Éditer l'étude</translation>
</message>
<message>
<location filename="../View/Study/Window.py" line="56"/>
@@ -3045,11 +3140,6 @@
</context>
<context>
<name>Unit</name>
- <message>
- <location filename="../View/Translate.py" line="55"/>
- <source>Position (m)</source>
- <translation>PK (m)</translation>
- </message>
<message>
<location filename="../View/Translate.py" line="56"/>
<source>Width (m)</source>
@@ -3058,67 +3148,97 @@
<message>
<location filename="../View/Translate.py" line="57"/>
<source>Depth (m)</source>
- <translation>Hauteur (m)</translation>
+ <translation>Profondeur (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="58"/>
+ <location filename="../View/Translate.py" line="60"/>
<source>Diameter (m)</source>
<translation>Diamètre (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="59"/>
+ <location filename="../View/Translate.py" line="61"/>
<source>Thickness (m)</source>
<translation>Épaisseur (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="60"/>
+ <location filename="../View/Translate.py" line="62"/>
<source>Elevation (m)</source>
<translation>Cote (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="61"/>
+ <location filename="../View/Translate.py" line="63"/>
<source>Water elevation (m)</source>
<translation>Cote de l'eau (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="66"/>
+ <location filename="../View/Translate.py" line="69"/>
<source>Area (hectare)</source>
<translation>Aire (hectare)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="68"/>
+ <location filename="../View/Translate.py" line="71"/>
<source>Time (sec)</source>
<translation>Temps (s)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="69"/>
+ <location filename="../View/Translate.py" line="72"/>
<source>Time (JJJ:HH:MM:SS)</source>
<translation>Temps (JJJ:HH:MM:SS)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="71"/>
+ <location filename="../View/Translate.py" line="74"/>
<source>Date (sec)</source>
<translation>Date (s)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="72"/>
+ <location filename="../View/Translate.py" line="75"/>
<source>Date (ISO format)</source>
<translation>Date (format ISO)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="64"/>
- <source>Discharge (m³/s)</source>
- <translation type="obsolete">Débit (m³/s)</translation>
+ <location filename="../View/Translate.py" line="55"/>
+ <source>River Kilometer (m)</source>
+ <translation>Point Kilométrique (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="58"/>
+ <source>Max Depth (m)</source>
+ <translation>Profondeur max (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="59"/>
+ <source>Mean Depth (m)</source>
+ <translation>Profondeur moyenne (m)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="64"/>
- <source>Speed (m/s)</source>
+ <location filename="../View/Translate.py" line="67"/>
+ <source>Velocity (m/s)</source>
<translation>Vitesse (m/s)</translation>
</message>
- <message encoding="UTF-8">
- <location filename="../View/Translate.py" line="65"/>
- <source>Discharge (m³/s)</source>
- <translation type="unfinished"></translation>
+ <message>
+ <location filename="../View/Translate.py" line="78"/>
+ <source>Wet Perimeter (m)</source>
+ <translation>Périmètre mouillé (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="81"/>
+ <source>Hydraulic Radius (m)</source>
+ <translation>Rayon hydraulique (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="84"/>
+ <source>Froude number</source>
+ <translation>Nombre de Froude</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="68"/>
+ <source>Discharge (m^3/s)</source>
+ <translation>Débit (m³/s)</translation>
+ </message>
+ <message>
+ <location filename="../View/Translate.py" line="77"/>
+ <source>Wet Area (m^2)</source>
+ <translation>Aire mouillée (m²)</translation>
</message>
</context>
</TS>