From 6267527305b6e83dcbbd183c4ebc426dce832034 Mon Sep 17 00:00:00 2001 From: Alan <37482427+alemon-aquaveo@users.noreply.github.com> Date: Mon, 8 Jan 2024 14:14:12 -0700 Subject: [PATCH 1/2] -bug fix and test for bug 14901 - crash when meshing a coverage --- test_files/meshing/bug14901.txt | 492 ++++++++++++++ test_files/meshing/bug14901_base.2dm | 856 +++++++++++++++++++++++++ xmsmesher/meshing/MeMultiPolyTo2dm.cpp | 7 + xmsmesher/meshing/MeMultiPolyTo2dm.t.h | 1 + xmsmesher/meshing/MePolyMesher.cpp | 3 + 5 files changed, 1359 insertions(+) create mode 100644 test_files/meshing/bug14901.txt create mode 100644 test_files/meshing/bug14901_base.2dm diff --git a/test_files/meshing/bug14901.txt b/test_files/meshing/bug14901.txt new file mode 100644 index 00000000..185ca69c --- /dev/null +++ b/test_files/meshing/bug14901.txt @@ -0,0 +1,492 @@ +BEGIN_POLYGON +OUTSIDE 8 +887293.95867571 1740803.3434792 +887301.96285037 1740799.3351981 +887308.58771121 1740785.8766023 +887315.21257204 1740772.4180064 +887312.38622579 1740768.3274385 +887297.83740129 1740771.731408 +887283.2885768 1740775.1353774 +887288.62362626 1740789.2394283 +BIAS 0.3 +PATCH_CORNERS 3 4 6 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 14 +887151.2162112 1740804.7899142 +887186.1977381 1740810.1703453 +887215.10936197 1740811.5342378 +887242.64706837 1740812.7884645 +887274.33304654 1740813.1714806 +887293.95867571 1740803.3434792 +887288.62362626 1740789.2394283 +887283.2885768 1740775.1353774 +887267.38205391 1740783.1009477 +887243.37460361 1740782.7956421 +887215.78554279 1740781.5335306 +887189.39661497 1740780.3124739 +887158.63810706 1740775.6068576 +887154.92715913 1740790.1983859 +BIAS 0.3 +PATCH_CORNERS 5 7 12 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 9 +887121.23646818 1740806.5659134 +887136.22633969 1740805.6779138 +887151.2162112 1740804.7899142 +887154.92715913 1740790.1983859 +887158.63810706 1740775.6068576 +887148.45 1740772.88 +887139.1536709 1740768.0518244 +887130.03487086 1740779.9610261 +887120.91607081 1740791.8702278 +BIAS 0.3 +PATCH_CORNERS 2 4 6 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 9 +887014.27882385 1739806.4659533 +887009.44317302 1739807.7586438 +886997.18428913 1739816.4575775 +886984.92540525 1739825.1565111 +886988.08383746 1739830.1676953 +886989.43908399 1739842.7462707 +887004.23957804 1739839.4964337 +887019.04007209 1739836.2465968 +887016.65944797 1739821.3562751 +BIAS 0.3 +PATCH_CORNERS 3 5 7 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 102 +886989.43908399 1739842.7462707 +886991.08279821 1739858.0022281 +887004.0576163 1739875.7854142 +887000.33660488 1739885.7742994 +886985.07832235 1739903.6050505 +886971.24236906 1739923.2166266 +886955.53602818 1739943.4341908 +886938.89371763 1739965.6208857 +886924.57792032 1739988.7506758 +886916.74357861 1740016.9622458 +886915.76299404 1740044.6619445 +886919.15468828 1740070.5758385 +886927.9806535 1740098.5406495 +886941.40720864 1740124.0060658 +886956.05264265 1740146.293016 +886974.30040066 1740167.8789283 +886994.76692339 1740185.7968157 +887013.16029107 1740204.3631906 +887035.32078527 1740220.1207736 +887059.32926991 1740232.8944902 +887081.92659636 1740242.4490897 +887106.83492602 1740248.362782 +887130.3130635 1740253.3474044 +887155.8355707 1740255.3059447 +887183.52217841 1740256.9400041 +887210.72373957 1740257.0031778 +887236.85719939 1740256.7546967 +887260.50758637 1740260.8427954 +887280.67382901 1740265.9331752 +887294.72385467 1740272.4018235 +887303.63214104 1740283.6978135 +887309.04261293 1740299.8754637 +887310.88510776 1740321.6653618 +887309.66959019 1740348.8396974 +887306.61040087 1740376.9417169 +887302.8667033 1740404.961095 +887300.15000871 1740434.1699909 +887297.55007136 1740462.3185258 +887294.44738319 1740490.9526553 +887293.5234884 1740520.8063535 +887293.05501646 1740549.0708226 +887291.2549713 1740577.281825 +887290.79215147 1740606.0791654 +887288.48374112 1740632.6473443 +887284.95903287 1740659.619549 +887282.03429337 1740686.6634902 +887278.60929552 1740713.1109149 +887280.20821434 1740736.5163022 +887278.30418623 1740760.9750767 +887283.2885768 1740775.1353774 +887297.83740129 1740771.731408 +887312.38622579 1740768.3274385 +887308.61440419 1740758.537781 +887310.2847025 1740736.5046792 +887308.7006704 1740714.4563824 +887311.782667 1740690.540974 +887314.8250935 1740662.5723636 +887318.33400808 1740635.67151 +887320.76927414 1740607.6433112 +887321.23766261 1740578.5092189 +887323.02913837 1740550.4325192 +887323.52065296 1740521.298294 +887324.38188718 1740493.1777071 +887327.41262088 1740465.207632 +887330.09112796 1740436.1924344 +887332.70315989 1740408.1804211 +887336.42599948 1740380.2940652 +887339.58535083 1740351.3272741 +887340.93747857 1740321.2143548 +887338.1213971 1740292.2567337 +887330.5166999 1740269.3783438 +887312.80521473 1740247.6996605 +887290.90059404 1740237.6147474 +887266.5600407 1740231.4346354 +887237.82450818 1740226.7410326 +887210.69674679 1740227.0020489 +887184.57258793 1740226.9423982 +887157.49103375 1740225.3462117 +887135.44678885 1740223.7067547 +887113.81502591 1740219.1761809 +887091.32672298 1740213.853645 +887071.90491005 1740205.6106374 +887051.47845146 1740194.8063616 +887032.6552255 1740181.4145411 +887015.68613107 1740164.2807232 +886996.05195817 1740147.0494371 +886980.40822242 1740128.7035618 +886967.15406177 1740108.5589705 +886955.86757819 1740087.255038 +886948.58558597 1740064.2727584 +886945.84725912 1740043.3508513 +886946.44719193 1740022.2628309 +886951.75184506 1740001.8496345 +886963.94048377 1739982.2170061 +886979.62573418 1739961.3257634 +886995.64389687 1739940.6888789 +887008.97911302 1739921.8163667 +887027.35735076 1739899.3450349 +887038.1091432 1739870.1114069 +887020.46835162 1739848.375525 +887019.04007209 1739836.2465968 +887004.23957804 1739839.4964337 +BIAS 0.3 +PATCH_CORNERS 49 51 100 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 38 +886816.37225395 1740494.5807566 +886838.65577954 1740499.3253011 +886860.94379374 1740508.6213142 +886884.99971575 1740519.8873902 +886908.81599027 1740531.6524875 +886930.45997304 1740544.8605838 +886950.5995605 1740560.265462 +886969.4939954 1740577.1669955 +886984.9242797 1740595.7387801 +886998.79974877 1740616.9616132 +887012.11983904 1740638.5375652 +887023.5525051 1740662.5147891 +887036.23471516 1740687.2211804 +887050.89883105 1740710.8051034 +887066.26839222 1740733.9353789 +887083.38139593 1740757.3183729 +887102.88303785 1740778.7532237 +887120.91607081 1740791.8702278 +887130.03487086 1740779.9610261 +887139.1536709 1740768.0518244 +887123.14408314 1740756.4438481 +887106.20470172 1740737.7813533 +887090.62631937 1740716.3869369 +887076.6666176 1740695.400328 +887062.67542764 1740672.9356069 +887050.54904643 1740649.413649 +887038.61741166 1740624.3865665 +887024.06952664 1740600.7851325 +887008.89423849 1740577.5810681 +886991.14135763 1740556.2858548 +886969.54234133 1740536.964678 +886947.50984961 1740520.1334324 +886923.85387246 1740505.6738939 +886897.88774062 1740492.7963729 +886873.92981161 1740481.5514611 +886847.18430905 1740470.3775916 +886822.84597279 1740465.273912 +886819.60911337 1740479.9273343 +BIAS 0.3 +PATCH_CORNERS 17 19 36 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 10 +886777.93620674 1740496.8448725 +886796.74 1740494.86 +886816.37225395 1740494.5807566 +886819.60911337 1740479.9273343 +886822.84597279 1740465.273912 +886806.18514265 1740450.034402 +886790.84244366 1740441.0362985 +886783.28277503 1740453.9792351 +886775.72310641 1740466.9221716 +886776.82965658 1740481.8835221 +BIAS 0.3 +PATCH_CORNERS 2 4 6 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 10 +886707.96103075 1740506.4428875 +886723.62949296 1740503.8231323 +886754.20183857 1740499.8656913 +886777.93620674 1740496.8448725 +886776.82965658 1740481.8835221 +886775.72310641 1740466.9221716 +886750.35061646 1740470.1139168 +886719.22873005 1740474.1424932 +886703.27862576 1740476.8093387 +886705.61982826 1740491.6261131 +BIAS 0.3 +PATCH_CORNERS 3 5 8 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 10 +886703.27862576 1740476.8093387 +886688.27684404 1740479.3176254 +886683.59088211 1740480.9312096 +886663.62348298 1740491.7769999 +886671.4858693 1740504.5763158 +886679.34825562 1740517.3756318 +886694.16429336 1740515.0324635 +886708.98033109 1740512.6892951 +886707.96103075 1740506.4428875 +886705.61982826 1740491.6261131 +BIAS 0.3 +PATCH_CORNERS 3 5 7 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 46 +886481.34483855 1739648.9005138 +886500.84675449 1739644.4722385 +886525.28492855 1739649.289027 +886553.00993817 1739655.0437832 +886580.59376884 1739661.4406742 +886609.46099382 1739667.2622409 +886638.51068181 1739672.0925444 +886666.51153576 1739676.3052018 +886694.39424806 1739681.2392872 +886722.27619548 1739686.1780434 +886749.96852615 1739692.0859215 +886776.18244041 1739699.2806647 +886802.15833083 1739707.291925 +886827.44022802 1739717.2770301 +886851.99454786 1739728.9393259 +886876.73496025 1739740.2018318 +886900.8358192 1739752.773587 +886923.12918963 1739766.2506886 +886942.246421 1739780.4019927 +886959.92736059 1739797.9537303 +886977.7249211 1739813.7321872 +886984.92540525 1739825.1565111 +886997.18428913 1739816.4575775 +887009.44317302 1739807.7586438 +887000.93710188 1739794.212988 +886980.37184617 1739775.9734686 +886961.78682561 1739757.5424208 +886939.68264574 1739741.2023309 +886916.16200353 1739726.9741093 +886890.65749913 1739713.6024522 +886864.45864015 1739701.6473007 +886839.63013379 1739689.8486494 +886812.85985499 1739679.2336985 +886785.35408323 1739670.7071004 +886757.58777757 1739663.0676892 +886728.15162469 1739656.7517679 +886699.79470478 1739651.7288794 +886671.43734765 1739646.7086608 +886642.95949562 1739642.4242403 +886614.55389543 1739637.6858036 +886587.60419978 1739632.2657664 +886559.55004782 1739625.7619122 +886531.35290473 1739619.9083088 +886500.54079469 1739613.7780294 +886475.95302584 1739619.3611429 +886478.64893219 1739634.1308284 +BIAS 0.3 +PATCH_CORNERS 21 23 44 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 10 +886475.95302584 1739619.3611429 +886457.05 1739606.9 +886428.07868153 1739598.3678297 +886423.88304805 1739612.7949756 +886419.68741456 1739627.2221216 +886423.0122185 1739641.8553835 +886426.33702243 1739656.4886454 +886451.13 1739652.25 +886481.34483855 1739648.9005138 +886478.64893219 1739634.1308284 +BIAS 0.3 +PATCH_CORNERS 2 6 8 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 38 +886273.95503812 1740528.9579185 +886287.84484132 1740544.3061135 +886310.48662521 1740563.7660246 +886332.96951384 1740578.9817595 +886357.10165759 1740594.1515821 +886382.99543069 1740606.0689884 +886411.90708353 1740613.5352227 +886440.04885084 1740618.0400872 +886468.54548973 1740617.3452314 +886498.1200387 1740613.2464014 +886525.60506623 1740605.6889869 +886552.1750102 1740595.3657767 +886577.63339553 1740582.5478771 +886603.31573939 1740567.3134001 +886627.39031864 1740552.0505659 +886651.19816674 1740536.3748643 +886674.52363587 1740519.9962442 +886679.34825562 1740517.3756318 +886671.4858693 1740504.5763158 +886663.62348298 1740491.7769999 +886658.43353173 1740494.5960512 +886633.94554426 1740511.8154706 +886610.94117363 1740526.9621419 +886587.67723263 1740541.7070297 +886564.01050955 1740555.7960327 +886540.50638279 1740567.6959824 +886515.94905092 1740577.2306284 +886491.69993605 1740583.89311 +886466.7899282 1740587.3450834 +886441.65397953 1740587.9646276 +886418.01190435 1740584.1331727 +886393.66456028 1740577.8457482 +886371.87459783 1740567.9264113 +886349.53598589 1740553.9689306 +886328.7091603 1740539.8739688 +886309.5997367 1740523.5305258 +886296.08261885 1740508.6745429 +886285.01882849 1740518.8162307 +BIAS 0.3 +PATCH_CORNERS 17 19 36 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 9 +886251.7345514 1740528.3793289 +886273.95503812 1740528.9579185 +886285.01882849 1740518.8162307 +886296.08261885 1740508.6745429 +886285.79 1740494.49 +886277.1198889 1740481.6522758 +886264.66317754 1740490.0105413 +886252.20646618 1740498.3688068 +886251.97050879 1740513.3740678 +BIAS 0.3 +PATCH_CORNERS 3 5 7 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 28 +885951.79382307 1740495.908409 +885968.90955707 1740489.2422237 +885989.11693012 1740490.7130266 +886012.37571672 1740497.8283353 +886038.1366309 1740503.3603355 +886062.74390031 1740509.3942434 +886090.13716228 1740516.7963461 +886117.17747038 1740520.9872809 +886144.41377066 1740523.6179783 +886172.6669083 1740526.2621807 +886200.0217399 1740525.6092398 +886226.33541244 1740526.9867487 +886251.7345514 1740528.3793289 +886251.97050879 1740513.3740678 +886252.20646618 1740498.3688068 +886227.8325881 1740497.0240461 +886200.36081549 1740495.5859113 +886174.10973478 1740496.2188925 +886147.96332397 1740493.8199323 +886120.58378057 1740491.1570366 +886095.87936839 1740487.2840801 +886070.53458607 1740480.4158419 +886045.031156 1740474.162188 +886020.57467839 1740468.9371706 +885994.26042737 1740460.9244016 +885964.3217494 1740458.8531061 +885942.32184429 1740467.4075064 +885947.05783368 1740481.6579577 +BIAS 0.3 +PATCH_CORNERS 12 14 26 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 54 +886426.33702243 1739656.4886454 +886423.0122185 1739641.8553835 +886419.68741456 1739627.2221216 +886385.85359686 1739636.9594678 +886360.68163069 1739650.631878 +886341.32908942 1739668.8091298 +886324.36635534 1739690.5965768 +886312.68163994 1739715.614498 +886301.47505571 1739738.5072276 +886290.64268516 1739754.2583288 +886264.50746082 1739771.4541536 +886254.00627461 1739769.9219834 +886239.48841091 1739762.1626014 +886221.97892095 1739749.2343362 +886206.20762179 1739731.2827024 +886188.11973133 1739709.7350335 +886167.51403325 1739692.1649181 +886146.32538059 1739677.9977884 +886120.22002216 1739669.6215482 +886097.14245252 1739673.2683957 +886073.43124455 1739682.5311944 +886056.25602507 1739694.1024208 +886039.49959328 1739705.3448169 +886020.11777252 1739715.2579185 +886002.47378488 1739723.9014824 +885982.74319189 1739728.1186332 +885958.02059401 1739731.5310238 +885931.13113012 1739737.8071583 +885935.88820692 1739752.0995425 +885941.2110607 1739766.2596797 +885963.58684965 1739761.0480785 +885987.77034086 1739757.7206052 +886012.34352924 1739752.4728653 +886033.62101949 1739742.0492732 +886054.71511862 1739731.2628306 +886072.60211903 1739719.2624972 +886088.08421518 1739708.8325032 +886104.84333406 1739702.4277413 +886119.0253069 1739700.1811809 +886132.57819775 1739704.9089724 +886149.8684861 1739716.5029998 +886167.32027904 1739731.4443686 +886183.39029803 1739750.7639385 +886200.92349737 1739770.7216233 +886223.29220766 1739787.5222742 +886243.55515506 1739798.3522388 +886271.82626629 1739802.6645676 +886310.79234124 1739776.9810012 +886327.43841745 1739753.6969779 +886339.75168359 1739728.548353 +886350.07851621 1739706.4287213 +886363.77110527 1739688.8883144 +886378.94883135 1739674.6347129 +886397.32345965 1739664.8412897 +BIAS 0.3 +PATCH_CORNERS 2 27 29 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 8 +885942.32184429 1740467.4075064 +885918.1580798 1740467.6730142 +885917.99329986 1740482.6919166 +885917.82851992 1740497.7108189 +885931.38155813 1740504.1450962 +885944.93459635 1740510.5793736 +885951.79382307 1740495.908409 +885947.05783368 1740481.6579577 +BIAS 0.3 +PATCH_CORNERS 1 3 5 +END_POLYGON +BEGIN_POLYGON +OUTSIDE 4 +885931.13113012 1739737.8071583 +885910.75049498 1739764.1122545 +885941.2110607 1739766.2596797 +885935.88820692 1739752.0995425 +BIAS 0.3 +END_POLYGON +RETURN_CELL_POLYGONS diff --git a/test_files/meshing/bug14901_base.2dm b/test_files/meshing/bug14901_base.2dm new file mode 100644 index 00000000..783d76c4 --- /dev/null +++ b/test_files/meshing/bug14901_base.2dm @@ -0,0 +1,856 @@ +MESH2D +E4Q 1 1 2 7 6 1 +E4Q 2 1 6 140 92 1 +E4Q 3 3 4 23 24 1 +E4Q 4 3 6 8 4 1 +E4Q 5 3 44 140 6 1 +E4Q 6 4 5 22 23 1 +E4Q 7 4 8 9 5 1 +E3T 8 6 7 8 1 +E3T 9 7 9 8 1 +E4Q 10 10 11 14 13 1 +E4Q 11 10 29 30 11 1 +E4Q 12 11 12 15 14 1 +E3T 13 11 30 31 1 +E4Q 14 11 31 32 12 1 +E4Q 15 13 14 17 16 1 +E4Q 16 14 15 18 17 1 +E4Q 17 16 17 20 19 1 +E4Q 18 17 18 21 20 1 +E4Q 19 19 20 23 22 1 +E4Q 20 20 21 24 23 1 +E4Q 21 25 26 30 29 1 +E4Q 22 26 27 31 30 1 +E4Q 23 26 236 237 27 1 +E4Q 24 27 28 32 31 1 +E4Q 25 27 237 238 28 1 +E4Q 26 33 34 187 91 1 +E4Q 27 33 40 41 34 1 +E4Q 28 34 35 139 187 1 +E3T 29 34 41 42 1 +E4Q 30 34 42 43 35 1 +E4Q 31 36 37 41 40 1 +E4Q 32 36 327 328 37 1 +E4Q 33 37 38 42 41 1 +E4Q 34 37 328 329 38 1 +E4Q 35 38 39 43 42 1 +E4Q 36 44 45 141 140 1 +E4Q 37 45 46 142 141 1 +E4Q 38 46 47 143 142 1 +E4Q 39 47 48 144 143 1 +E4Q 40 48 49 145 144 1 +E4Q 41 49 50 146 145 1 +E4Q 42 50 51 147 146 1 +E4Q 43 51 52 148 147 1 +E4Q 44 52 53 149 148 1 +E4Q 45 53 54 150 149 1 +E4Q 46 54 55 151 150 1 +E4Q 47 55 56 152 151 1 +E4Q 48 56 57 153 152 1 +E4Q 49 57 58 154 153 1 +E4Q 50 58 59 155 154 1 +E4Q 51 59 60 156 155 1 +E4Q 52 60 61 157 156 1 +E4Q 53 61 62 158 157 1 +E4Q 54 62 63 159 158 1 +E4Q 55 63 64 160 159 1 +E4Q 56 64 65 161 160 1 +E4Q 57 65 66 162 161 1 +E4Q 58 66 67 163 162 1 +E4Q 59 67 68 164 163 1 +E4Q 60 68 69 165 164 1 +E4Q 61 69 70 166 165 1 +E4Q 62 70 71 167 166 1 +E4Q 63 71 72 168 167 1 +E4Q 64 72 73 169 168 1 +E4Q 65 73 74 170 169 1 +E4Q 66 74 75 171 170 1 +E4Q 67 75 76 172 171 1 +E4Q 68 76 77 173 172 1 +E4Q 69 77 78 174 173 1 +E4Q 70 78 79 175 174 1 +E4Q 71 79 80 176 175 1 +E4Q 72 80 81 177 176 1 +E4Q 73 81 82 178 177 1 +E4Q 74 82 83 179 178 1 +E4Q 75 83 84 180 179 1 +E4Q 76 84 85 181 180 1 +E4Q 77 85 86 182 181 1 +E4Q 78 86 87 183 182 1 +E4Q 79 87 88 184 183 1 +E4Q 80 88 89 185 184 1 +E4Q 81 89 90 186 185 1 +E4Q 82 90 91 187 186 1 +E4Q 83 92 140 141 93 1 +E4Q 84 93 141 142 94 1 +E4Q 85 94 142 143 95 1 +E4Q 86 95 143 144 96 1 +E4Q 87 96 144 145 97 1 +E4Q 88 97 145 146 98 1 +E4Q 89 98 146 147 99 1 +E4Q 90 99 147 148 100 1 +E4Q 91 100 148 149 101 1 +E4Q 92 101 149 150 102 1 +E4Q 93 102 150 151 103 1 +E4Q 94 103 151 152 104 1 +E4Q 95 104 152 153 105 1 +E4Q 96 105 153 154 106 1 +E4Q 97 106 154 155 107 1 +E4Q 98 107 155 156 108 1 +E4Q 99 108 156 157 109 1 +E4Q 100 109 157 158 110 1 +E4Q 101 110 158 159 111 1 +E4Q 102 111 159 160 112 1 +E4Q 103 112 160 161 113 1 +E4Q 104 113 161 162 114 1 +E4Q 105 114 162 163 115 1 +E4Q 106 115 163 164 116 1 +E4Q 107 116 164 165 117 1 +E4Q 108 117 165 166 118 1 +E4Q 109 118 166 167 119 1 +E4Q 110 119 167 168 120 1 +E4Q 111 120 168 169 121 1 +E4Q 112 121 169 170 122 1 +E4Q 113 122 170 171 123 1 +E4Q 114 123 171 172 124 1 +E4Q 115 124 172 173 125 1 +E4Q 116 125 173 174 126 1 +E4Q 117 126 174 175 127 1 +E4Q 118 127 175 176 128 1 +E4Q 119 128 176 177 129 1 +E4Q 120 129 177 178 130 1 +E4Q 121 130 178 179 131 1 +E4Q 122 131 179 180 132 1 +E4Q 123 132 180 181 133 1 +E4Q 124 133 181 182 134 1 +E4Q 125 134 182 183 135 1 +E4Q 126 135 183 184 136 1 +E4Q 127 136 184 185 137 1 +E4Q 128 137 185 186 138 1 +E4Q 129 138 186 187 139 1 +E4Q 130 188 189 192 191 1 +E3T 131 188 244 245 1 +E4Q 132 188 245 246 189 1 +E4Q 133 189 190 193 192 1 +E4Q 134 189 246 247 190 1 +E3T 135 190 247 248 1 +E4Q 136 191 192 195 194 1 +E4Q 137 192 193 196 195 1 +E4Q 138 194 195 198 197 1 +E4Q 139 195 196 199 198 1 +E4Q 140 197 198 201 200 1 +E4Q 141 198 199 202 201 1 +E4Q 142 200 201 204 203 1 +E4Q 143 201 202 205 204 1 +E4Q 144 203 204 207 206 1 +E4Q 145 204 205 208 207 1 +E4Q 146 206 207 210 209 1 +E4Q 147 207 208 211 210 1 +E4Q 148 209 210 213 212 1 +E4Q 149 210 211 214 213 1 +E4Q 150 212 213 216 215 1 +E4Q 151 213 214 217 216 1 +E4Q 152 215 216 219 218 1 +E4Q 153 216 217 220 219 1 +E4Q 154 218 219 222 221 1 +E4Q 155 219 220 223 222 1 +E4Q 156 221 222 225 224 1 +E4Q 157 222 223 226 225 1 +E4Q 158 224 225 228 227 1 +E4Q 159 225 226 229 228 1 +E4Q 160 227 228 231 230 1 +E4Q 161 228 229 232 231 1 +E4Q 162 230 231 234 233 1 +E4Q 163 231 232 235 234 1 +E4Q 164 233 234 237 236 1 +E4Q 165 234 235 238 237 1 +E4Q 166 239 240 245 244 1 +E4Q 167 239 255 256 240 1 +E4Q 168 240 241 246 245 1 +E4Q 169 240 256 257 241 1 +E4Q 170 241 242 247 246 1 +E4Q 171 242 243 248 247 1 +E4Q 172 249 250 253 252 1 +E4Q 173 249 261 262 263 1 +E4Q 174 249 263 265 250 1 +E4Q 175 250 251 254 253 1 +E4Q 176 250 265 266 251 1 +E4Q 177 252 253 256 255 1 +E4Q 178 253 254 257 256 1 +E4Q 179 258 259 263 262 1 +E4Q 180 258 388 389 259 1 +E4Q 181 259 260 264 263 1 +E4Q 182 259 389 390 260 1 +E4Q 183 263 264 266 265 1 +E4Q 184 267 268 271 270 1 +E3T 185 267 335 336 1 +E4Q 186 267 336 337 268 1 +E4Q 187 268 269 272 271 1 +E4Q 188 268 337 338 269 1 +E3T 189 269 338 339 1 +E4Q 190 270 271 274 273 1 +E4Q 191 271 272 275 274 1 +E4Q 192 273 274 277 276 1 +E4Q 193 274 275 278 277 1 +E4Q 194 276 277 280 279 1 +E4Q 195 277 278 281 280 1 +E4Q 196 279 280 283 282 1 +E4Q 197 280 281 284 283 1 +E4Q 198 282 283 286 285 1 +E4Q 199 283 284 287 286 1 +E4Q 200 285 286 289 288 1 +E4Q 201 286 287 290 289 1 +E4Q 202 288 289 292 291 1 +E4Q 203 289 290 293 292 1 +E4Q 204 291 292 295 294 1 +E4Q 205 292 293 296 295 1 +E4Q 206 294 295 298 297 1 +E4Q 207 295 296 299 298 1 +E4Q 208 297 298 301 300 1 +E4Q 209 298 299 302 301 1 +E4Q 210 300 301 304 303 1 +E4Q 211 301 302 305 304 1 +E4Q 212 303 304 307 306 1 +E4Q 213 304 305 308 307 1 +E4Q 214 306 307 310 309 1 +E4Q 215 307 308 311 310 1 +E4Q 216 309 310 313 312 1 +E4Q 217 310 311 314 313 1 +E4Q 218 312 313 316 315 1 +E4Q 219 313 314 317 316 1 +E4Q 220 315 316 319 318 1 +E4Q 221 316 317 320 319 1 +E4Q 222 318 319 322 321 1 +E4Q 223 319 320 323 322 1 +E4Q 224 321 322 325 324 1 +E4Q 225 322 323 326 325 1 +E4Q 226 324 325 328 327 1 +E4Q 227 325 326 329 328 1 +E4Q 228 330 331 336 335 1 +E4Q 229 330 507 508 331 1 +E4Q 230 331 332 337 336 1 +E4Q 231 331 508 509 332 1 +E4Q 232 332 333 338 337 1 +E4Q 233 333 334 339 338 1 +E4Q 234 340 341 344 343 1 +E4Q 235 340 394 395 396 1 +E4Q 236 340 396 397 341 1 +E4Q 237 341 342 345 344 1 +E4Q 238 341 397 398 342 1 +E4Q 239 343 344 347 346 1 +E4Q 240 344 345 348 347 1 +E4Q 241 346 347 350 349 1 +E4Q 242 347 348 351 350 1 +E4Q 243 349 350 353 352 1 +E4Q 244 350 351 354 353 1 +E4Q 245 352 353 356 355 1 +E4Q 246 353 354 357 356 1 +E4Q 247 355 356 359 358 1 +E4Q 248 356 357 360 359 1 +E4Q 249 358 359 362 361 1 +E4Q 250 359 360 363 362 1 +E4Q 251 361 362 365 364 1 +E4Q 252 362 363 366 365 1 +E4Q 253 364 365 368 367 1 +E4Q 254 365 366 369 368 1 +E4Q 255 367 368 371 370 1 +E4Q 256 368 369 372 371 1 +E4Q 257 370 371 374 373 1 +E4Q 258 371 372 375 374 1 +E4Q 259 373 374 377 376 1 +E4Q 260 374 375 378 377 1 +E4Q 261 376 377 380 379 1 +E4Q 262 377 378 381 380 1 +E4Q 263 379 380 383 382 1 +E4Q 264 380 381 384 383 1 +E4Q 265 382 383 386 385 1 +E4Q 266 383 384 387 386 1 +E4Q 267 385 386 389 388 1 +E4Q 268 386 387 390 389 1 +E4Q 269 391 392 396 395 1 +E4Q 270 391 395 433 434 1 +E4Q 271 392 393 398 397 1 +E3T 272 392 397 396 1 +E4Q 273 394 432 433 395 1 +E4Q 274 399 400 403 402 1 +E4Q 275 400 401 404 403 1 +E4Q 276 402 403 406 405 1 +E4Q 277 403 404 407 406 1 +E4Q 278 405 406 409 408 1 +E4Q 279 406 407 410 409 1 +E4Q 280 408 409 412 411 1 +E4Q 281 409 410 413 412 1 +E4Q 282 411 412 415 414 1 +E4Q 283 412 413 416 415 1 +E4Q 284 414 415 418 417 1 +E4Q 285 415 416 419 418 1 +E4Q 286 417 418 421 420 1 +E4Q 287 418 419 422 421 1 +E4Q 288 420 421 424 423 1 +E4Q 289 421 422 425 424 1 +E4Q 290 423 424 427 426 1 +E4Q 291 424 425 428 427 1 +E4Q 292 426 427 430 429 1 +E4Q 293 427 428 431 430 1 +E4Q 294 429 430 433 432 1 +E4Q 295 430 431 434 433 1 +E4Q 296 435 436 439 438 1 +E3T 297 435 510 436 1 +E4Q 298 436 437 440 439 1 +E3T 299 436 510 437 1 +E4Q 300 438 439 442 441 1 +E4Q 301 439 440 443 442 1 +E4Q 302 441 442 445 444 1 +E4Q 303 442 443 446 445 1 +E4Q 304 444 445 448 447 1 +E4Q 305 445 446 449 448 1 +E4Q 306 447 448 451 450 1 +E4Q 307 448 449 452 451 1 +E4Q 308 450 451 454 453 1 +E4Q 309 451 452 455 454 1 +E4Q 310 453 454 457 456 1 +E4Q 311 454 455 458 457 1 +E4Q 312 456 457 460 459 1 +E4Q 313 457 458 461 460 1 +E4Q 314 459 460 463 462 1 +E4Q 315 460 461 464 463 1 +E4Q 316 462 463 466 465 1 +E4Q 317 463 464 467 466 1 +E4Q 318 465 466 469 468 1 +E4Q 319 466 467 470 469 1 +E4Q 320 468 469 472 471 1 +E4Q 321 469 470 473 472 1 +E4Q 322 471 472 475 474 1 +E4Q 323 472 473 476 475 1 +E4Q 324 474 475 478 477 1 +E4Q 325 475 476 479 478 1 +E4Q 326 477 478 481 480 1 +E4Q 327 478 479 482 481 1 +E4Q 328 480 481 484 483 1 +E4Q 329 481 482 485 484 1 +E4Q 330 483 484 487 486 1 +E4Q 331 484 485 488 487 1 +E4Q 332 486 487 490 489 1 +E4Q 333 487 488 491 490 1 +E4Q 334 489 490 493 492 1 +E4Q 335 490 491 494 493 1 +E4Q 336 492 493 496 495 1 +E4Q 337 493 494 497 496 1 +E4Q 338 495 496 499 498 1 +E4Q 339 496 497 500 499 1 +E4Q 340 498 499 502 501 1 +E4Q 341 499 500 503 502 1 +E4Q 342 501 502 505 504 1 +E4Q 343 502 503 506 505 1 +E4Q 344 504 505 508 507 1 +E4Q 345 505 506 509 508 1 +ND 1 887312.386 1740768.33 0.0 +ND 2 887315.213 1740772.42 0.0 +ND 3 887283.289 1740775.14 0.0 +ND 4 887288.624 1740789.24 0.0 +ND 5 887293.959 1740803.34 0.0 +ND 6 887297.837 1740771.73 0.0 +ND 7 887308.588 1740785.88 0.0 +ND 8 887297.475 1740786.1 0.0 +ND 9 887301.963 1740799.34 0.0 +ND 10 887151.216 1740804.79 0.0 +ND 11 887154.927 1740790.2 0.0 +ND 12 887158.638 1740775.61 0.0 +ND 13 887186.198 1740810.17 0.0 +ND 14 887187.797 1740795.24 0.0 +ND 15 887189.397 1740780.31 0.0 +ND 16 887215.109 1740811.53 0.0 +ND 17 887215.447 1740796.53 0.0 +ND 18 887215.786 1740781.53 0.0 +ND 19 887242.647 1740812.79 0.0 +ND 20 887243.011 1740797.79 0.0 +ND 21 887243.375 1740782.8 0.0 +ND 22 887274.333 1740813.17 0.0 +ND 23 887270.858 1740798.14 0.0 +ND 24 887267.382 1740783.1 0.0 +ND 25 887121.236 1740806.57 0.0 +ND 26 887120.916 1740791.87 0.0 +ND 27 887130.035 1740779.96 0.0 +ND 28 887139.154 1740768.05 0.0 +ND 29 887136.226 1740805.68 0.0 +ND 30 887137.152 1740793.81 0.0 +ND 31 887142.799 1740783.35 0.0 +ND 32 887148.45 1740772.88 0.0 +ND 33 886989.439 1739842.75 0.0 +ND 34 887004.24 1739839.5 0.0 +ND 35 887019.04 1739836.25 0.0 +ND 36 886984.925 1739825.16 0.0 +ND 37 886997.184 1739816.46 0.0 +ND 38 887009.443 1739807.76 0.0 +ND 39 887014.279 1739806.47 0.0 +ND 40 886988.084 1739830.17 0.0 +ND 41 886999.103 1739825.95 0.0 +ND 42 887009.823 1739821.96 0.0 +ND 43 887016.659 1739821.36 0.0 +ND 44 887278.304 1740760.98 0.0 +ND 45 887280.208 1740736.52 0.0 +ND 46 887278.609 1740713.11 0.0 +ND 47 887282.034 1740686.66 0.0 +ND 48 887284.959 1740659.62 0.0 +ND 49 887288.484 1740632.65 0.0 +ND 50 887290.792 1740606.08 0.0 +ND 51 887291.255 1740577.28 0.0 +ND 52 887293.055 1740549.07 0.0 +ND 53 887293.523 1740520.81 0.0 +ND 54 887294.447 1740490.95 0.0 +ND 55 887297.55 1740462.32 0.0 +ND 56 887300.15 1740434.17 0.0 +ND 57 887302.867 1740404.96 0.0 +ND 58 887306.61 1740376.94 0.0 +ND 59 887309.67 1740348.84 0.0 +ND 60 887310.885 1740321.67 0.0 +ND 61 887309.043 1740299.88 0.0 +ND 62 887303.632 1740283.7 0.0 +ND 63 887294.724 1740272.4 0.0 +ND 64 887280.674 1740265.93 0.0 +ND 65 887260.508 1740260.84 0.0 +ND 66 887236.857 1740256.75 0.0 +ND 67 887210.724 1740257.0 0.0 +ND 68 887183.522 1740256.94 0.0 +ND 69 887155.836 1740255.31 0.0 +ND 70 887130.313 1740253.35 0.0 +ND 71 887106.835 1740248.36 0.0 +ND 72 887081.927 1740242.45 0.0 +ND 73 887059.329 1740232.89 0.0 +ND 74 887035.321 1740220.12 0.0 +ND 75 887013.16 1740204.36 0.0 +ND 76 886994.767 1740185.8 0.0 +ND 77 886974.3 1740167.88 0.0 +ND 78 886956.053 1740146.29 0.0 +ND 79 886941.407 1740124.01 0.0 +ND 80 886927.981 1740098.54 0.0 +ND 81 886919.155 1740070.58 0.0 +ND 82 886915.763 1740044.66 0.0 +ND 83 886916.744 1740016.96 0.0 +ND 84 886924.578 1739988.75 0.0 +ND 85 886938.894 1739965.62 0.0 +ND 86 886955.536 1739943.43 0.0 +ND 87 886971.242 1739923.22 0.0 +ND 88 886985.078 1739903.61 0.0 +ND 89 887000.337 1739885.77 0.0 +ND 90 887004.058 1739875.79 0.0 +ND 91 886991.083 1739858.0 0.0 +ND 92 887308.614 1740758.54 0.0 +ND 93 887310.285 1740736.5 0.0 +ND 94 887308.701 1740714.46 0.0 +ND 95 887311.783 1740690.54 0.0 +ND 96 887314.825 1740662.57 0.0 +ND 97 887318.334 1740635.67 0.0 +ND 98 887320.769 1740607.64 0.0 +ND 99 887321.238 1740578.51 0.0 +ND 100 887323.029 1740550.43 0.0 +ND 101 887323.521 1740521.3 0.0 +ND 102 887324.382 1740493.18 0.0 +ND 103 887327.413 1740465.21 0.0 +ND 104 887330.091 1740436.19 0.0 +ND 105 887332.703 1740408.18 0.0 +ND 106 887336.426 1740380.29 0.0 +ND 107 887339.585 1740351.33 0.0 +ND 108 887340.937 1740321.21 0.0 +ND 109 887338.121 1740292.26 0.0 +ND 110 887330.517 1740269.38 0.0 +ND 111 887312.805 1740247.7 0.0 +ND 112 887290.901 1740237.61 0.0 +ND 113 887266.56 1740231.43 0.0 +ND 114 887237.825 1740226.74 0.0 +ND 115 887210.697 1740227.0 0.0 +ND 116 887184.573 1740226.94 0.0 +ND 117 887157.491 1740225.35 0.0 +ND 118 887135.447 1740223.71 0.0 +ND 119 887113.815 1740219.18 0.0 +ND 120 887091.327 1740213.85 0.0 +ND 121 887071.905 1740205.61 0.0 +ND 122 887051.478 1740194.81 0.0 +ND 123 887032.655 1740181.41 0.0 +ND 124 887015.686 1740164.28 0.0 +ND 125 886996.052 1740147.05 0.0 +ND 126 886980.408 1740128.7 0.0 +ND 127 886967.154 1740108.56 0.0 +ND 128 886955.868 1740087.26 0.0 +ND 129 886948.586 1740064.27 0.0 +ND 130 886945.847 1740043.35 0.0 +ND 131 886946.447 1740022.26 0.0 +ND 132 886951.752 1740001.85 0.0 +ND 133 886963.94 1739982.22 0.0 +ND 134 886979.626 1739961.33 0.0 +ND 135 886995.644 1739940.69 0.0 +ND 136 887008.979 1739921.82 0.0 +ND 137 887027.357 1739899.35 0.0 +ND 138 887038.109 1739870.11 0.0 +ND 139 887020.468 1739848.38 0.0 +ND 140 887293.459 1740759.76 0.0 +ND 141 887295.246 1740736.51 0.0 +ND 142 887293.655 1740713.78 0.0 +ND 143 887296.908 1740688.6 0.0 +ND 144 887299.892 1740661.1 0.0 +ND 145 887303.409 1740634.16 0.0 +ND 146 887305.781 1740606.86 0.0 +ND 147 887306.246 1740577.9 0.0 +ND 148 887308.042 1740549.75 0.0 +ND 149 887308.522 1740521.05 0.0 +ND 150 887309.415 1740492.07 0.0 +ND 151 887312.481 1740463.76 0.0 +ND 152 887315.121 1740435.18 0.0 +ND 153 887317.785 1740406.57 0.0 +ND 154 887321.518 1740378.62 0.0 +ND 155 887324.627 1740350.08 0.0 +ND 156 887325.911 1740321.44 0.0 +ND 157 887323.582 1740296.07 0.0 +ND 158 887317.074 1740276.54 0.0 +ND 159 887303.765 1740260.05 0.0 +ND 160 887285.787 1740251.77 0.0 +ND 161 887263.534 1740246.14 0.0 +ND 162 887237.341 1740241.75 0.0 +ND 163 887210.71 1740242.0 0.0 +ND 164 887184.047 1740241.94 0.0 +ND 165 887156.663 1740240.33 0.0 +ND 166 887132.88 1740238.53 0.0 +ND 167 887110.325 1740233.77 0.0 +ND 168 887086.627 1740228.15 0.0 +ND 169 887065.617 1740219.25 0.0 +ND 170 887043.4 1740207.46 0.0 +ND 171 887022.908 1740192.89 0.0 +ND 172 887005.227 1740175.04 0.0 +ND 173 886985.176 1740157.46 0.0 +ND 174 886968.23 1740137.5 0.0 +ND 175 886954.281 1740116.28 0.0 +ND 176 886941.924 1740092.9 0.0 +ND 177 886933.87 1740067.42 0.0 +ND 178 886930.805 1740044.01 0.0 +ND 179 886931.595 1740019.61 0.0 +ND 180 886938.165 1739995.3 0.0 +ND 181 886951.417 1739973.92 0.0 +ND 182 886967.581 1739952.38 0.0 +ND 183 886983.443 1739931.95 0.0 +ND 184 886997.029 1739912.71 0.0 +ND 185 887013.847 1739892.56 0.0 +ND 186 887021.083 1739872.95 0.0 +ND 187 887005.776 1739853.19 0.0 +ND 188 886816.372 1740494.58 0.0 +ND 189 886819.609 1740479.93 0.0 +ND 190 886822.846 1740465.27 0.0 +ND 191 886838.656 1740499.33 0.0 +ND 192 886842.92 1740484.85 0.0 +ND 193 886847.184 1740470.38 0.0 +ND 194 886860.944 1740508.62 0.0 +ND 195 886867.437 1740495.09 0.0 +ND 196 886873.93 1740481.55 0.0 +ND 197 886885.0 1740519.89 0.0 +ND 198 886891.444 1740506.34 0.0 +ND 199 886897.888 1740492.8 0.0 +ND 200 886908.816 1740531.65 0.0 +ND 201 886916.335 1740518.66 0.0 +ND 202 886923.854 1740505.67 0.0 +ND 203 886930.46 1740544.86 0.0 +ND 204 886938.985 1740532.5 0.0 +ND 205 886947.51 1740520.13 0.0 +ND 206 886950.6 1740560.27 0.0 +ND 207 886960.071 1740548.62 0.0 +ND 208 886969.542 1740536.96 0.0 +ND 209 886969.494 1740577.17 0.0 +ND 210 886980.318 1740566.73 0.0 +ND 211 886991.141 1740556.29 0.0 +ND 212 886984.924 1740595.74 0.0 +ND 213 886996.909 1740586.66 0.0 +ND 214 887008.894 1740577.58 0.0 +ND 215 886998.8 1740616.96 0.0 +ND 216 887011.435 1740608.87 0.0 +ND 217 887024.07 1740600.79 0.0 +ND 218 887012.12 1740638.54 0.0 +ND 219 887025.369 1740631.46 0.0 +ND 220 887038.617 1740624.39 0.0 +ND 221 887023.553 1740662.51 0.0 +ND 222 887037.051 1740655.96 0.0 +ND 223 887050.549 1740649.41 0.0 +ND 224 887036.235 1740687.22 0.0 +ND 225 887049.455 1740680.08 0.0 +ND 226 887062.675 1740672.94 0.0 +ND 227 887050.899 1740710.81 0.0 +ND 228 887063.783 1740703.1 0.0 +ND 229 887076.667 1740695.4 0.0 +ND 230 887066.268 1740733.94 0.0 +ND 231 887078.447 1740725.16 0.0 +ND 232 887090.626 1740716.39 0.0 +ND 233 887083.381 1740757.32 0.0 +ND 234 887094.793 1740747.55 0.0 +ND 235 887106.205 1740737.78 0.0 +ND 236 887102.883 1740778.75 0.0 +ND 237 887113.014 1740767.6 0.0 +ND 238 887123.144 1740756.44 0.0 +ND 239 886777.936 1740496.84 0.0 +ND 240 886776.83 1740481.88 0.0 +ND 241 886775.723 1740466.92 0.0 +ND 242 886783.283 1740453.98 0.0 +ND 243 886790.842 1740441.04 0.0 +ND 244 886796.74 1740494.86 0.0 +ND 245 886796.84 1740483.13 0.0 +ND 246 886796.831 1740471.37 0.0 +ND 247 886801.454 1740460.69 0.0 +ND 248 886806.185 1740450.03 0.0 +ND 249 886707.961 1740506.44 0.0 +ND 250 886705.62 1740491.63 0.0 +ND 251 886703.279 1740476.81 0.0 +ND 252 886723.629 1740503.82 0.0 +ND 253 886721.429 1740488.98 0.0 +ND 254 886719.229 1740474.14 0.0 +ND 255 886754.202 1740499.87 0.0 +ND 256 886752.276 1740484.99 0.0 +ND 257 886750.351 1740470.11 0.0 +ND 258 886679.348 1740517.38 0.0 +ND 259 886671.486 1740504.58 0.0 +ND 260 886663.623 1740491.78 0.0 +ND 261 886708.98 1740512.69 0.0 +ND 262 886694.164 1740515.03 0.0 +ND 263 886690.287 1740500.13 0.0 +ND 264 886683.591 1740480.93 0.0 +ND 265 886692.26 1740492.97 0.0 +ND 266 886688.277 1740479.32 0.0 +ND 267 886481.345 1739648.9 0.0 +ND 268 886478.649 1739634.13 0.0 +ND 269 886475.953 1739619.36 0.0 +ND 270 886500.847 1739644.47 0.0 +ND 271 886500.694 1739629.13 0.0 +ND 272 886500.541 1739613.78 0.0 +ND 273 886525.285 1739649.29 0.0 +ND 274 886528.319 1739634.6 0.0 +ND 275 886531.353 1739619.91 0.0 +ND 276 886553.01 1739655.04 0.0 +ND 277 886556.28 1739640.4 0.0 +ND 278 886559.55 1739625.76 0.0 +ND 279 886580.594 1739661.44 0.0 +ND 280 886584.099 1739646.85 0.0 +ND 281 886587.604 1739632.27 0.0 +ND 282 886609.461 1739667.26 0.0 +ND 283 886612.007 1739652.47 0.0 +ND 284 886614.554 1739637.69 0.0 +ND 285 886638.511 1739672.09 0.0 +ND 286 886640.735 1739657.26 0.0 +ND 287 886642.959 1739642.42 0.0 +ND 288 886666.512 1739676.31 0.0 +ND 289 886668.974 1739661.51 0.0 +ND 290 886671.437 1739646.71 0.0 +ND 291 886694.394 1739681.24 0.0 +ND 292 886697.094 1739666.48 0.0 +ND 293 886699.795 1739651.73 0.0 +ND 294 886722.276 1739686.18 0.0 +ND 295 886725.214 1739671.46 0.0 +ND 296 886728.152 1739656.75 0.0 +ND 297 886749.969 1739692.09 0.0 +ND 298 886753.778 1739677.58 0.0 +ND 299 886757.588 1739663.07 0.0 +ND 300 886776.182 1739699.28 0.0 +ND 301 886780.768 1739684.99 0.0 +ND 302 886785.354 1739670.71 0.0 +ND 303 886802.158 1739707.29 0.0 +ND 304 886807.509 1739693.26 0.0 +ND 305 886812.86 1739679.23 0.0 +ND 306 886827.44 1739717.28 0.0 +ND 307 886833.535 1739703.56 0.0 +ND 308 886839.63 1739689.85 0.0 +ND 309 886851.995 1739728.94 0.0 +ND 310 886858.227 1739715.29 0.0 +ND 311 886864.459 1739701.65 0.0 +ND 312 886876.735 1739740.2 0.0 +ND 313 886883.696 1739726.9 0.0 +ND 314 886890.657 1739713.6 0.0 +ND 315 886900.836 1739752.77 0.0 +ND 316 886908.499 1739739.87 0.0 +ND 317 886916.162 1739726.97 0.0 +ND 318 886923.129 1739766.25 0.0 +ND 319 886931.406 1739753.73 0.0 +ND 320 886939.683 1739741.2 0.0 +ND 321 886942.246 1739780.4 0.0 +ND 322 886952.017 1739768.97 0.0 +ND 323 886961.787 1739757.54 0.0 +ND 324 886959.927 1739797.95 0.0 +ND 325 886970.15 1739786.96 0.0 +ND 326 886980.372 1739775.97 0.0 +ND 327 886977.725 1739813.73 0.0 +ND 328 886989.331 1739803.97 0.0 +ND 329 887000.937 1739794.21 0.0 +ND 330 886426.337 1739656.49 0.0 +ND 331 886423.012 1739641.86 0.0 +ND 332 886419.687 1739627.22 0.0 +ND 333 886423.883 1739612.79 0.0 +ND 334 886428.079 1739598.37 0.0 +ND 335 886451.13 1739652.25 0.0 +ND 336 886450.663 1739640.86 0.0 +ND 337 886450.42 1739629.47 0.0 +ND 338 886453.847 1739618.19 0.0 +ND 339 886457.05 1739606.9 0.0 +ND 340 886273.955 1740528.96 0.0 +ND 341 886285.019 1740518.82 0.0 +ND 342 886296.083 1740508.67 0.0 +ND 343 886287.845 1740544.31 0.0 +ND 344 886298.722 1740533.92 0.0 +ND 345 886309.6 1740523.53 0.0 +ND 346 886310.487 1740563.77 0.0 +ND 347 886319.598 1740551.82 0.0 +ND 348 886328.709 1740539.87 0.0 +ND 349 886332.97 1740578.98 0.0 +ND 350 886341.253 1740566.48 0.0 +ND 351 886349.536 1740553.97 0.0 +ND 352 886357.102 1740594.15 0.0 +ND 353 886364.488 1740581.04 0.0 +ND 354 886371.875 1740567.93 0.0 +ND 355 886382.995 1740606.07 0.0 +ND 356 886388.33 1740591.96 0.0 +ND 357 886393.665 1740577.85 0.0 +ND 358 886411.907 1740613.54 0.0 +ND 359 886414.959 1740598.83 0.0 +ND 360 886418.012 1740584.13 0.0 +ND 361 886440.049 1740618.04 0.0 +ND 362 886440.851 1740603.0 0.0 +ND 363 886441.654 1740587.96 0.0 +ND 364 886468.545 1740617.35 0.0 +ND 365 886467.668 1740602.35 0.0 +ND 366 886466.79 1740587.35 0.0 +ND 367 886498.12 1740613.25 0.0 +ND 368 886494.91 1740598.57 0.0 +ND 369 886491.7 1740583.89 0.0 +ND 370 886525.605 1740605.69 0.0 +ND 371 886520.777 1740591.46 0.0 +ND 372 886515.949 1740577.23 0.0 +ND 373 886552.175 1740595.37 0.0 +ND 374 886546.341 1740581.53 0.0 +ND 375 886540.506 1740567.7 0.0 +ND 376 886577.633 1740582.55 0.0 +ND 377 886570.822 1740569.17 0.0 +ND 378 886564.011 1740555.8 0.0 +ND 379 886603.316 1740567.31 0.0 +ND 380 886595.496 1740554.51 0.0 +ND 381 886587.677 1740541.71 0.0 +ND 382 886627.39 1740552.05 0.0 +ND 383 886619.166 1740539.51 0.0 +ND 384 886610.941 1740526.96 0.0 +ND 385 886651.198 1740536.37 0.0 +ND 386 886642.572 1740524.1 0.0 +ND 387 886633.946 1740511.82 0.0 +ND 388 886674.524 1740520.0 0.0 +ND 389 886666.479 1740507.3 0.0 +ND 390 886658.434 1740494.6 0.0 +ND 391 886252.206 1740498.37 0.0 +ND 392 886264.663 1740490.01 0.0 +ND 393 886277.12 1740481.65 0.0 +ND 394 886251.735 1740528.38 0.0 +ND 395 886251.971 1740513.37 0.0 +ND 396 886266.858 1740510.55 0.0 +ND 397 886276.29 1740502.48 0.0 +ND 398 886285.79 1740494.49 0.0 +ND 399 885951.794 1740495.91 0.0 +ND 400 885947.058 1740481.66 0.0 +ND 401 885942.322 1740467.41 0.0 +ND 402 885968.91 1740489.24 0.0 +ND 403 885966.616 1740474.05 0.0 +ND 404 885964.322 1740458.85 0.0 +ND 405 885989.117 1740490.71 0.0 +ND 406 885991.689 1740475.82 0.0 +ND 407 885994.26 1740460.92 0.0 +ND 408 886012.376 1740497.83 0.0 +ND 409 886016.475 1740483.38 0.0 +ND 410 886020.575 1740468.94 0.0 +ND 411 886038.137 1740503.36 0.0 +ND 412 886041.584 1740488.76 0.0 +ND 413 886045.031 1740474.16 0.0 +ND 414 886062.744 1740509.39 0.0 +ND 415 886066.639 1740494.91 0.0 +ND 416 886070.535 1740480.42 0.0 +ND 417 886090.137 1740516.8 0.0 +ND 418 886093.008 1740502.04 0.0 +ND 419 886095.879 1740487.28 0.0 +ND 420 886117.177 1740520.99 0.0 +ND 421 886118.881 1740506.07 0.0 +ND 422 886120.584 1740491.16 0.0 +ND 423 886144.414 1740523.62 0.0 +ND 424 886146.189 1740508.72 0.0 +ND 425 886147.963 1740493.82 0.0 +ND 426 886172.667 1740526.26 0.0 +ND 427 886173.388 1740511.24 0.0 +ND 428 886174.11 1740496.22 0.0 +ND 429 886200.022 1740525.61 0.0 +ND 430 886200.191 1740510.6 0.0 +ND 431 886200.361 1740495.59 0.0 +ND 432 886226.335 1740526.99 0.0 +ND 433 886227.084 1740512.01 0.0 +ND 434 886227.833 1740497.02 0.0 +ND 435 885941.211 1739766.26 0.0 +ND 436 885935.888 1739752.1 0.0 +ND 437 885931.131 1739737.81 0.0 +ND 438 885963.587 1739761.05 0.0 +ND 439 885960.537 1739746.35 0.0 +ND 440 885958.021 1739731.53 0.0 +ND 441 885987.77 1739757.72 0.0 +ND 442 885985.002 1739742.98 0.0 +ND 443 885982.743 1739728.12 0.0 +ND 444 886012.344 1739752.47 0.0 +ND 445 886007.16 1739738.25 0.0 +ND 446 886002.474 1739723.9 0.0 +ND 447 886033.621 1739742.05 0.0 +ND 448 886026.627 1739728.71 0.0 +ND 449 886020.118 1739715.26 0.0 +ND 450 886054.715 1739731.26 0.0 +ND 451 886046.874 1739718.36 0.0 +ND 452 886039.5 1739705.34 0.0 +ND 453 886072.602 1739719.26 0.0 +ND 454 886064.205 1739706.74 0.0 +ND 455 886056.256 1739694.1 0.0 +ND 456 886088.084 1739708.83 0.0 +ND 457 886080.544 1739695.73 0.0 +ND 458 886073.431 1739682.53 0.0 +ND 459 886104.843 1739702.43 0.0 +ND 460 886100.795 1739687.89 0.0 +ND 461 886097.142 1739673.27 0.0 +ND 462 886119.025 1739700.18 0.0 +ND 463 886119.439 1739684.94 0.0 +ND 464 886120.22 1739669.62 0.0 +ND 465 886132.578 1739704.91 0.0 +ND 466 886139.286 1739691.5 0.0 +ND 467 886146.325 1739678.0 0.0 +ND 468 886149.868 1739716.5 0.0 +ND 469 886158.537 1739704.38 0.0 +ND 470 886167.514 1739692.16 0.0 +ND 471 886167.32 1739731.44 0.0 +ND 472 886177.578 1739720.63 0.0 +ND 473 886188.12 1739709.74 0.0 +ND 474 886183.39 1739750.76 0.0 +ND 475 886194.669 1739741.06 0.0 +ND 476 886206.208 1739731.28 0.0 +ND 477 886200.923 1739770.72 0.0 +ND 478 886211.331 1739760.01 0.0 +ND 479 886221.979 1739749.23 0.0 +ND 480 886223.292 1739787.52 0.0 +ND 481 886231.279 1739774.87 0.0 +ND 482 886239.488 1739762.16 0.0 +ND 483 886243.555 1739798.35 0.0 +ND 484 886248.675 1739784.16 0.0 +ND 485 886254.006 1739769.92 0.0 +ND 486 886271.826 1739802.66 0.0 +ND 487 886268.063 1739787.08 0.0 +ND 488 886264.507 1739771.45 0.0 +ND 489 886310.792 1739776.98 0.0 +ND 490 886300.628 1739765.64 0.0 +ND 491 886290.643 1739754.26 0.0 +ND 492 886327.438 1739753.7 0.0 +ND 493 886314.378 1739746.12 0.0 +ND 494 886301.475 1739738.51 0.0 +ND 495 886339.752 1739728.55 0.0 +ND 496 886326.151 1739722.1 0.0 +ND 497 886312.682 1739715.61 0.0 +ND 498 886350.079 1739706.43 0.0 +ND 499 886337.17 1739698.53 0.0 +ND 500 886324.366 1739690.6 0.0 +ND 501 886363.771 1739688.89 0.0 +ND 502 886352.51 1739678.86 0.0 +ND 503 886341.329 1739668.81 0.0 +ND 504 886378.949 1739674.63 0.0 +ND 505 886369.787 1739662.64 0.0 +ND 506 886360.682 1739650.63 0.0 +ND 507 886397.323 1739664.84 0.0 +ND 508 886391.573 1739650.9 0.0 +ND 509 886385.854 1739636.96 0.0 +ND 510 885910.75 1739764.11 0.0 diff --git a/xmsmesher/meshing/MeMultiPolyTo2dm.cpp b/xmsmesher/meshing/MeMultiPolyTo2dm.cpp index 9b63f8b6..82642290 100644 --- a/xmsmesher/meshing/MeMultiPolyTo2dm.cpp +++ b/xmsmesher/meshing/MeMultiPolyTo2dm.cpp @@ -826,4 +826,11 @@ void MeMultiPolyTo2dmIntermediateTests::test_srp_seed_pts() { iTestFromPolyFile("srp_seed_pts", 10); } // MeMultiPolyTo2dmIntermediateTests::test_srp_seed_pts +//------------------------------------------------------------------------------ +/// \brief Test for a bug where points are created with NAN coordinates +//------------------------------------------------------------------------------ +void MeMultiPolyTo2dmIntermediateTests::testbug14901() +{ + iTestFromPolyFile("bug14901", 10); +} // MeMultiPolyTo2dmIntermediateTests::testbug14901 #endif // CXX_TEST diff --git a/xmsmesher/meshing/MeMultiPolyTo2dm.t.h b/xmsmesher/meshing/MeMultiPolyTo2dm.t.h index 04d12ccd..e0cef1e6 100644 --- a/xmsmesher/meshing/MeMultiPolyTo2dm.t.h +++ b/xmsmesher/meshing/MeMultiPolyTo2dm.t.h @@ -52,6 +52,7 @@ class MeMultiPolyTo2dmIntermediateTests : public CxxTest::TestSuite void testbug13701(); void testbug13701_a(); void test_srp_seed_pts(); + void testbug14901(); }; //} // namespace xms diff --git a/xmsmesher/meshing/MePolyMesher.cpp b/xmsmesher/meshing/MePolyMesher.cpp index 123468d2..2299d215 100644 --- a/xmsmesher/meshing/MePolyMesher.cpp +++ b/xmsmesher/meshing/MePolyMesher.cpp @@ -282,7 +282,10 @@ bool MePolyMesherImpl::MeshIt(const MeMultiPolyMesherIo& a_input, if (!polyInput.m_polyCorners.empty()) m_polyCorners = polyInput.m_polyCorners; else + { SortPoly(m_outPoly); + m_polyCorners = VecInt(); + } m_elev = polyInput.m_elevFunction; m_boundPtsToRemove = polyInput.m_boundPtsToRemove; From fd3065ea0bf7428aa42d6623332b303f0b7a9f44 Mon Sep 17 00:00:00 2001 From: Alan <37482427+alemon-aquaveo@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:01:42 -0700 Subject: [PATCH 2/2] update version --- _package/xms/mesher/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_package/xms/mesher/__init__.py b/_package/xms/mesher/__init__.py index 8786100a..7c66718b 100644 --- a/_package/xms/mesher/__init__.py +++ b/_package/xms/mesher/__init__.py @@ -2,4 +2,4 @@ from . import meshing # NOQA: F401 from .api.mesh import generate_mesh # NOQA: F401 -__version__ = '5.0.13' +__version__ = '5.0.14'